Merge pull request #230 from CSCfi/CSCFC4EMSCR-591-Remove-File-Upload…

…-from-Add-Revision-Modal-for-MSCR-Format Cscfc4 emscr 591 remove file upload from add revision modal for mscr format
CSCfi · Nov 20, 2024 · 796f292 · 796f292
2 parents 1ce8bce + 524c258
commit 796f292
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 32 deletions.
diff --git a/mscr-ui/src/common/components/schema/schema.slice.tsx b/mscr-ui/src/common/components/schema/schema.slice.tsx
@@ -64,6 +64,14 @@ export const schemaApi = createApi({
         },
       })
     }),
+    // this should be the API for creating revisions of schemas in MSCR format
+    putMscrSchemaRevision: builder.mutation<Schema, { pid: string; data: Partial<Metadata> }>({
+      query: ({pid, data }) => ({
+        url: `/schema?action=revisionOf&target=${pid}`,
+        method: 'PUT',
+        data: data,
+      })
+    }),
     putSchemaMscrCopy: builder.mutation<Schema, { pid: string; data: Partial<Metadata> }>({
       query: ({pid, data }) => ({
         url: `/schema?action=mscrCopyOf&target=${pid}`,
@@ -182,6 +190,7 @@ export const {
   useGetSchemasQuery,
   usePutSchemaFullMutation,
   usePutSchemaRevisionMutation,
+  usePutMscrSchemaRevisionMutation,
   usePutSchemaMscrCopyMutation,
   usePatchSchemaMutation,
   usePatchSchemaRootSelectionMutation,

diff --git a/mscr-ui/src/modules/form/generate-payload.tsx b/mscr-ui/src/modules/form/generate-payload.tsx
@@ -72,7 +72,7 @@ export default function generatePayload(
     }
   } else if (modalType == ModalType.RevisionMscr) {
     if (contentType == Type.Schema) {
-      const { namespace, organizations, format, ...revisionPayload } =
+      const { organizations, ...revisionPayload } =
         schemaPayload;
       return revisionPayload;
     } else if (contentType == Type.Crosswalk) {

diff --git a/mscr-ui/src/modules/form/index.tsx b/mscr-ui/src/modules/form/index.tsx
@@ -18,6 +18,7 @@ import { useTranslation } from 'next-i18next';
 import getApiError from '@app/common/utils/getApiErrors';
 import { useRouter } from 'next/router';
 import {
+  usePutMscrSchemaRevisionMutation,
   usePutSchemaFullMutation,
   usePutSchemaMscrCopyMutation,
   usePutSchemaRevisionMutation,
@@ -100,6 +101,8 @@ export default function FormModal({
   const [putCrosswalkFull, resultCrosswalkFull] = usePutCrosswalkFullMutation();
   const [putSchemaRevision, resultSchemaRevision] =
     usePutSchemaRevisionMutation();
+  const [putMscrSchemaRevision, resultMscrSchemaRevision] =
+    usePutMscrSchemaRevisionMutation();
   const [putCrosswalkRevision, resultCrosswalkRevision] =
     usePutCrosswalkRevisionMutation();
   const [putCrosswalkFullRevision, resultCrosswalkFullRevision] =
@@ -108,10 +111,9 @@ export default function FormModal({
     usePutSchemaMscrCopyMutation();
   const [submitAnimationVisible, setSubmitAnimationVisible] =
     useState<boolean>(false);
-
   const formDataFromInitialData = useCallback(() => {
     if (!initialData) return;
-    const existingData: FormType = {
+  const existingData: FormType = {
       format:
         modalType == ModalType.MscrCopy ? Format.Mscr : initialData.format,
       languages: [
@@ -202,6 +204,12 @@ export default function FormModal({
             resultCrosswalkRevision.data
           ) {
             pid = resultCrosswalkRevision.data.pid;
+          } else if (
+            contentType == Type.Schema &&
+            resultMscrSchemaRevision.isSuccess &&
+            resultMscrSchemaRevision.data
+          ) {
+            pid = resultMscrSchemaRevision.data.pid;
           }
           break;
         case ModalType.RevisionFull:
@@ -247,6 +255,8 @@ export default function FormModal({
       resultSchemaMscrCopy.isSuccess,
       resultSchemaRevision.data,
       resultSchemaRevision.isSuccess,
+      resultMscrSchemaRevision.data,
+      resultMscrSchemaRevision.isSuccess,
     ]
   );
 
@@ -325,6 +335,7 @@ export default function FormModal({
       fileData,
       fileUri
     );
+
     setErrors(formErrors);
 
     if (
@@ -343,6 +354,7 @@ export default function FormModal({
         modalType,
         organizationPid
       );
+
       const newFormData = new FormData();
       newFormData.append('metadata', JSON.stringify(payload));
       if (fileUri && fileUri.length > 0) {
@@ -352,7 +364,6 @@ export default function FormModal({
       } else if (formData.format !== Format.Mscr) {
         return;
       }
-
       // Choose the api call and parameters according to content type and modal type
       let makeApiCall;
       if (modalType == ModalType.RegisterNewFull) {
@@ -364,6 +375,7 @@ export default function FormModal({
           }
         );
       } else if (modalType == ModalType.RegisterNewMscr) {
+        //what is register new MSCR?
         Promise.all([spinnerDelay(), putCrosswalk(payload)]).then((_values) => {
           setSubmitAnimationVisible(false);
         });
@@ -400,8 +412,20 @@ export default function FormModal({
         ]).then((_values) => {
           setSubmitAnimationVisible(false);
         });
+        // Creating revision of MSCR format schemas
+      } else if (
+        initialData &&
+        modalType == ModalType.RevisionMscr &&
+        contentType == Type.Schema
+      ) {
+        Promise.all([
+          spinnerDelay(),
+          putMscrSchemaRevision({ pid: initialData.pid, data: payload }),
+        ]).then((_values) => {
+          setSubmitAnimationVisible(false);
+        });
       }
-      // Missing scenarios: MSCR copy of a crosswalk, revision of an MSCR copy
+      // Missing scenarios: MSCR copy of a crosswalk
     }
   };
 
@@ -565,19 +589,19 @@ export default function FormModal({
             ? modalType == ModalType.RegisterNewFull
               ? t('content-form.title.schema-register')
               : modalType == ModalType.MscrCopy
-                ? t('content-form.title.schema-mscr-copy')
-                : t('content-form.title.schema-revision')
+              ? t('content-form.title.schema-mscr-copy')
+              : t('content-form.title.schema-revision')
             : modalType == ModalType.RegisterNewFull
-              ? t('content-form.title.crosswalk-register')
-              : modalType == ModalType.RegisterNewMscr
-                ? t('content-form.title.crosswalk-create')
-                : modalType == ModalType.MscrCopy
-                  ? t('content-form.title.crosswalk-mscr-copy')
-                  : t('content-form.title.crosswalk-revision')}
+            ? t('content-form.title.crosswalk-register')
+            : modalType == ModalType.RegisterNewMscr
+            ? t('content-form.title.crosswalk-create')
+            : modalType == ModalType.MscrCopy
+            ? t('content-form.title.crosswalk-mscr-copy')
+            : t('content-form.title.crosswalk-revision')}
         </ModalTitle>
 
         {(modalType == ModalType.RegisterNewFull ||
-            modalType == ModalType.RevisionFull) &&
+          modalType == ModalType.RevisionFull) &&
           renderFileDropArea()}
 
         {contentType == Type.Schema && (
@@ -628,15 +652,15 @@ export default function FormModal({
             ? modalType == ModalType.RegisterNewFull
               ? t('content-form.button.schema-register')
               : modalType == ModalType.MscrCopy
-                ? t('content-form.button.mscr-copy')
-                : t('content-form.button.schema-revision')
+              ? t('content-form.button.mscr-copy')
+              : t('content-form.button.schema-revision')
             : modalType == ModalType.RegisterNewFull
-              ? t('content-form.button.crosswalk-register')
-              : modalType == ModalType.RegisterNewMscr
-                ? t('content-form.button.crosswalk-create')
-                : modalType == ModalType.MscrCopy
-                  ? t('content-form.button.mscr-copy')
-                  : t('content-form.button.crosswalk-revision')}
+            ? t('content-form.button.crosswalk-register')
+            : modalType == ModalType.RegisterNewMscr
+            ? t('content-form.button.crosswalk-create')
+            : modalType == ModalType.MscrCopy
+            ? t('content-form.button.mscr-copy')
+            : t('content-form.button.crosswalk-revision')}
         </Button>
         <Button variant="secondary" onClick={() => handleClose()}>
           {userPosted ? t('close') : t('cancel')}

diff --git a/mscr-ui/src/modules/schema-view/index.tsx b/mscr-ui/src/modules/schema-view/index.tsx
@@ -351,16 +351,28 @@ export default function SchemaView({ schemaId }: { schemaId: string }) {
             text1={t('confirm-modal.unset-root-selection')}
           />
         )}
-        {/*ToDo: When making a revision of an mscr copy is possible, take that into account here (Modaltype.RevisionMscr)*/}
-        <FormModal
-          modalType={ModalType.RevisionFull}
-          contentType={Type.Schema}
-          visible={formModalIsOpen.version}
-          setVisible={(value) =>
-            dispatch(setFormModalState({ key: 'version', value: value }))
-          }
-          initialData={schemaData}
-        />
+        {schemaData.format == Format.Mscr ? (
+          <FormModal
+            modalType={ModalType.RevisionMscr}
+            contentType={Type.Schema}
+            visible={formModalIsOpen.version}
+            setVisible={(value) =>
+              dispatch(setFormModalState({ key: 'version', value: value }))
+            }
+            initialData={schemaData}
+          />
+        ) : (
+          <FormModal
+            modalType={ModalType.RevisionFull}
+            contentType={Type.Schema}
+            visible={formModalIsOpen.version}
+            setVisible={(value) =>
+              dispatch(setFormModalState({ key: 'version', value: value }))
+            }
+            initialData={schemaData}
+          />
+        )}
+
         <FormModal
           modalType={ModalType.MscrCopy}
           contentType={Type.Schema}