fix: exam.examtype instead of exam.type

informatici · Jul 17, 2024 · 5bceabd · 5bceabd
1 parent c2a039a
commit 5bceabd
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 18 deletions.
diff --git a/src/components/accessories/admin/exams/examForm/ExamForm.tsx b/src/components/accessories/admin/exams/examForm/ExamForm.tsx
@@ -82,7 +82,7 @@ const ExamForm: FC<IExamProps> = ({
   const validationSchema = object({
     code: string().required(t("common.required")),
     description: string().required(t("common.required")),
-    type: string().required(t("common.required")),
+    examtype: string().required(t("common.required")),
     procedure: number()
       .test({
         name: "onetwothree",
@@ -99,8 +99,8 @@ const ExamForm: FC<IExamProps> = ({
     enableReinitialize: true,
     onSubmit: (values) => {
       const formattedValues = formatAllFieldValues(fields, values);
-      formattedValues.type = examTypeState.data?.find(
-        (item) => item.code === values.type
+      formattedValues.examtype = examTypeState.data?.find(
+        (item) => item.code === values.examtype
       );
       onSubmit(formattedValues as any);
     },
@@ -154,12 +154,12 @@ const ExamForm: FC<IExamProps> = ({
         <div className="row start-sm center-xs">
           <div className="examForm__item fullWidth">
             <AutocompleteField
-              fieldName="type"
-              fieldValue={formik.values.type}
+              fieldName="examtype"
+              fieldValue={formik.values.examtype}
               label={t("exam.examtype")}
-              isValid={isValid("type")}
-              errorText={getErrorText("type")}
-              onBlur={onBlurCallback("type")}
+              isValid={isValid("examtype")}
+              errorText={getErrorText("examtype")}
+              onBlur={onBlurCallback("examtype")}
               options={examTypeStateOptions}
               loading={examTypeState.status === "LOADING"}
               disabled={isLoading}

diff --git a/src/components/accessories/admin/exams/examForm/consts.ts b/src/components/accessories/admin/exams/examForm/consts.ts
@@ -6,7 +6,7 @@ export const getInitialFields: (
   operation: ExamDTO | undefined
 ) => TFields<ExamProps> = (exam) => ({
   code: { type: "text", value: exam?.code ?? "" },
-  type: { type: "text", value: exam?.examtype?.code ?? "" },
+  examtype: { type: "text", value: exam?.examtype?.code ?? "" },
   description: { type: "text", value: exam?.description ?? "" },
   procedure: { type: "number", value: exam?.procedure?.toString() ?? "" },
   defaultResult: { type: "text", value: exam?.defaultResult ?? "" },

diff --git a/src/components/accessories/admin/exams/examsTable/ExamsTable.tsx b/src/components/accessories/admin/exams/examsTable/ExamsTable.tsx
@@ -36,7 +36,7 @@ export const ExamsTable = ({ onDelete, onEdit, headerActions }: IOwnProps) => {
 
   const header: Array<ExamProps> = [
     "code",
-    "type",
+    "examtype",
     "description",
     "procedure",
     "defaultResult",
@@ -65,14 +65,14 @@ export const ExamsTable = ({ onDelete, onEdit, headerActions }: IOwnProps) => {
 
   const label = {
     code: t("exam.code"),
-    type: t("exam.examtype"),
+    examtype: t("exam.examtype"),
     description: t("exam.description"),
     procedure: t("exam.procedure"),
     defaultResult: t("exam.defaultResult"),
   };
   const order: Array<ExamProps> = [
     "code",
-    "type",
+    "examtype",
     "description",
     "procedure",
     "defaultResult",
@@ -90,7 +90,7 @@ export const ExamsTable = ({ onDelete, onEdit, headerActions }: IOwnProps) => {
     return data.map((item) => {
       return {
         code: item.code ?? "",
-        type: item.examtype?.description ?? "",
+        examtype: item.examtype?.description ?? "",
         description: item.description ?? "",
         procedure: item.procedure ?? "",
         defaultResult: item.defaultResult ?? "",
@@ -132,10 +132,7 @@ export const ExamsTable = ({ onDelete, onEdit, headerActions }: IOwnProps) => {
                   onDelete={onDelete}
                   headerActions={headerActions}
                   filterColumns={filters}
-                  rawData={(data ?? []).map((exam) => ({
-                    ...exam,
-                    type: exam.examtype?.code,
-                  }))}
+                  rawData={data ?? []}
                   manualFilter={false}
                   rowKey="code"
                 />

diff --git a/src/components/accessories/admin/exams/types.ts b/src/components/accessories/admin/exams/types.ts
@@ -1,6 +1,6 @@
 export type ExamProps =
   | "code"
-  | "type"
+  | "examtype"
   | "description"
   | "procedure"
   | "defaultResult";