feat(all): permissions added and navlink problems solved delete button works

Author: thegreenmilecomposer

packages/backend/src/permissions.ts

@@ -86,8 +86,8 @@ export const permissions = shield<unknown, Context>(
       // Trainer mutations
       claimTrainee: and(authenticated, trainer),
       unclaimTrainee: and(authenticated, trainer),
-      trainerMarkUserForDeletion: and(authenticated, admin),
-      trainerUnMarkUserForDeletion: and(authenticated, admin),
+      trainerMarkUserForDeletion: and(authenticated, trainer),
+      trainerUnMarkUserForDeletion: and(authenticated, trainer),
 
       // Trainer and Admin mutations
       createTrainee: and(authenticated, or(admin, trainer)),

packages/backend/src/resolvers/trainer.resolver.ts

@@ -8,8 +8,8 @@ import { updateUser, userById } from '../repositories/user.repo'
 import { alexaSkillLinked } from '../services/alexa.service'
 import { createT } from '../i18n'
 import { addMonths } from 'date-fns'
-import { isTrainee } from 'src/permissions'
-import { sendDeletionMail } from 'src/services/email.service'
+import { isTrainee } from '../permissions'
+import { sendDeletionMail } from '../services/email.service'
 
 export const trainerResolver: GqlResolvers<TrainerContext> = {
   Trainer: {

packages/frontend/src/components/renderDeleteAction.tsx

@@ -37,6 +37,7 @@ export const useDeleteActions = ({ currentUserId, id }: UseDeleteActionsProps) =
   const [showDeletionModal, setShowDeletionModal] = React.useState(false)
 
   const toggleDeletionModal = () => {
+    console.log('trigger deletion')
     setShowDeletionModal(!showDeletionModal)
   }
 

packages/frontend/src/components/trainee-row.tsx

@@ -109,31 +109,33 @@ const TraineeRow: React.FunctionComponent<TraineeRowProps> = (props) => {
           <StyledName>
             {trainee.firstName} {trainee.lastName} TEST
           </StyledName>
-          {!pagequeryloading && data?.companies && data?.getUser?.__typename === 'Trainee' && (
-            <EditUserLayout
-              backButton={
-                <NavigationButtonLink
-                  label={strings.back}
-                  to="/trainees"
-                  icon="ChevronLeft"
-                  isLeft
-                  iconColor="iconLightGrey"
-                />
-              }
-              content={<div>Inhalt kommt hier</div>}
-              actions={renderDeleteAction(data?.getUser?.deleteAt)}
-            />
-          )}
-          {!loading && (
-            <DeletionModal
-              show={showDeletionModal}
-              onClose={toggleDeletionModal}
-              onConfirm={() => markForDeleteTrainer(vars)}
-              userName={`${trainee?.firstName} ${trainee?.lastName}`}
-            />
-          )}
           <StyledCourse>{trainee.course}</StyledCourse>
         </StyledHeader>
+
+        {!pagequeryloading && data?.companies && data?.getUser?.__typename === 'Trainee' && (
+          <EditUserLayout
+            backButton={
+              <NavigationButtonLink
+                label={strings.back}
+                to="/trainees"
+                icon="ChevronLeft"
+                isLeft
+                iconColor="iconLightGrey"
+              />
+            }
+            content={<div>Inhalt kommt hier</div>}
+            actions={renderDeleteAction(data?.getUser?.deleteAt)}
+          />
+        )}
+        {!loading && (
+          <DeletionModal
+            show={showDeletionModal}
+            onClose={toggleDeletionModal}
+            onConfirm={() => markForDeleteTrainer(vars)}
+            userName={`${trainee?.firstName} ${trainee?.lastName}`}
+          />
+        )}
+
         <StyledControls>
           <motion.div
             animate={{