🐛 Address missing archetype name in delete assessment notification

konveyor · Dec 14, 2023 · f4c3f41 · f4c3f41
1 parent 1a2f183
commit f4c3f41
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/...es/assessment/components/assessment-actions/components/dynamic-assessment-actions-row.tsx b/...es/assessment/components/assessment-actions/components/dynamic-assessment-actions-row.tsx
@@ -189,6 +189,7 @@ const DynamicAssessmentActionsRow: FunctionComponent<
             assessmentId: assessment.id,
             applicationName: application?.name,
             applicationId: application?.id,
+            archetypeName: archetype?.name,
             archetypeId: archetype?.id,
           }).then(() => {
             createAssessment();
@@ -262,6 +263,7 @@ const DynamicAssessmentActionsRow: FunctionComponent<
                 assessmentId: assessment.id,
                 applicationName: application?.name,
                 applicationId: application?.id,
+                archetypeName: archetype?.name,
                 archetypeId: archetype?.id,
               });
             }}

diff --git a/client/src/app/pages/assessment/components/assessment-wizard/assessment-wizard.tsx b/client/src/app/pages/assessment/components/assessment-wizard/assessment-wizard.tsx
@@ -447,6 +447,7 @@ export const AssessmentWizard: React.FC<AssessmentWizardProps> = ({
             assessmentId: assessment.id,
             applicationName: assessment.application?.name,
             applicationId: assessment.application?.id,
+            archetypeName: assessment.archetype?.name,
             archetypeId: assessment.archetype?.id,
           });
       } else {
@@ -455,6 +456,7 @@ export const AssessmentWizard: React.FC<AssessmentWizardProps> = ({
             assessmentId: assessment.id,
             applicationName: assessment.application?.name,
             applicationId: assessment.application?.id,
+            archetypeName: assessment.archetype?.name,
             archetypeId: assessment.archetype?.id,
           });
       }

diff --git a/client/src/app/queries/assessments.ts b/client/src/app/queries/assessments.ts
@@ -107,7 +107,7 @@ export const useUpdateAssessmentMutation = (
 };
 
 export const useDeleteAssessmentMutation = (
-  onSuccess?: (applicationName: string) => void,
+  onSuccess?: (name: string) => void,
   onError?: (err: AxiosError) => void
 ) => {
   const queryClient = useQueryClient();
@@ -117,6 +117,7 @@ export const useDeleteAssessmentMutation = (
       assessmentId: number;
       applicationName?: string;
       applicationId?: number;
+      archetypeName?: string;
       archetypeId?: number;
     }) => {
       const deletedAssessment = deleteAssessment(args.assessmentId);
@@ -138,7 +139,8 @@ export const useDeleteAssessmentMutation = (
       return deletedAssessment;
     },
     onSuccess: (_, args) => {
-      onSuccess && onSuccess(args?.applicationName || "Unknown");
+      onSuccess &&
+        onSuccess(args?.applicationName || args?.archetypeName || "Unknown");
     },
     onError: onError,
   });