educator profile tag is changed according to prevPath

Author: brrkrmn

zubhub_backend/zubhub/activities/views.py

@@ -128,7 +128,7 @@ class ActivityDeleteAPIView(DestroyAPIView):
     """
     queryset = Activity.objects.all()
     serializer_class = ActivitySerializer
-    permission_classes = [IsAuthenticated, IsOwner]
+    permission_classes = [IsAuthenticated, IsOwner, IsStaffOrModeratorOrEducator]
 
     def delete(self, request, *args, **kwargs):
         activity = self.get_object()

zubhub_frontend/zubhub/src/views/activity_details/ActivityDetailsV2.jsx

@@ -128,7 +128,10 @@ export default function ActivityDetailsV2(props) {
       {open ? <ReactConfetti width={width} height={height} /> : null}
       <div className={classes.card}>
         <div className={classes.headerFlex}>
-          <Link className={commonClasses.textDecorationNone} to={`/creators/${creator?.username}`}>
+          <Link
+            className={commonClasses.textDecorationNone}
+            to={{ pathname: `/creators/${creator?.username}`, state: { prevPath: window.location.pathname } }}
+          >
             <div className={classes.creatorBox}>
               <Avatar src={creator?.avatar} alt={creator?.username} className={classes.avatar} />
               <div>

zubhub_frontend/zubhub/src/views/profile/Profile.jsx

@@ -64,6 +64,7 @@ import styles from '../../assets/js/styles/views/profile/profileStyles';
 import commonStyles from '../../assets/js/styles';
 import ProjectsDraftsGrid from '../../components/projects_drafts/ProjectsDraftsGrid';
 import UserActivitylog from '../../components/user_activitylog/UserActivitylog';
+import { USER_TAGS } from '../../assets/js/utils/constants.js';
 
 const useStyles = makeStyles(styles);
 const useCommonStyles = makeStyles(commonStyles);
@@ -206,7 +207,17 @@ function Profile(props) {
                     {profile.username}
                   </Typography>
                   <Box className={classes.tagsContainerStyle}>
-                    {sortTags(profile.tags).map(tag => (
+                    {props.location.state?.prevPath.split('/')[1] === 'activities' ? (
+                      <Typography
+                        className={clsx(common_classes.baseTagStyle, {
+                          [common_classes.extendedTagStyle]: !isBaseTag(USER_TAGS.educator),
+                        })}
+                        component="h2"
+                      >
+                        {USER_TAGS.educator}
+                      </Typography>
+                    ) :
+                    sortTags(profile.tags).map(tag => (
                       <Typography
                         key={tag}
                         className={clsx(common_classes.baseTagStyle, {