Merge pull request #173 from CSCfi/CSCFC4EMSCR-457v2

disable edit mode after publihing crosswalk and remove unused code
CSCfi · May 22, 2024 · a3771b6 · a3771b6
2 parents 18b56c5 + 7f61d8d
commit a3771b6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 49 deletions.
diff --git a/mscr-ui/src/common/components/schema-and-crosswalk-actionmenu/index.tsx b/mscr-ui/src/common/components/schema-and-crosswalk-actionmenu/index.tsx
@@ -43,7 +43,7 @@ export default function SchemaAndCrosswalkActionMenu({
   const { t } = useTranslation('common');
   const dispatch = useStoreDispatch();
   const [isEditModeActive, setIsEditModeActive] = useState(false);
-  const [patchCrosswalk] = usePatchCrosswalkMutation();
+  const [patchCrosswalk, crosswalkPatchResponse] = usePatchCrosswalkMutation();
   const [patchSchema] = usePatchSchemaMutation();
   const [deleteSchema] = useDeleteSchemaMutation();
   const [deleteCrosswalk] = useDeleteCrosswalkMutation();
@@ -56,6 +56,18 @@ export default function SchemaAndCrosswalkActionMenu({
   const [isDeleteConfirmModalOpen, setDeleteConfirmModalOpen] = useState(false);
   const [isRemoveConfirmModalOpen, setRemoveConfirmModalOpen] = useState(false);
   const [isRevisionModalOpen, setRevisionModalOpen] = useState(false);
+  const [isCrosswalkPublished, setCrosswalkPublished] =
+    React.useState<boolean>(false);
+
+  if (!isCrosswalkPublished && crosswalkPatchResponse.isSuccess) {
+    if (
+      crosswalkPatchResponse?.originalArgs?.payload?.state === State.Published
+    ) {
+      buttonCallbackFunction('disableEdit');
+      setIsEditModeActive(false);
+      setCrosswalkPublished(true);
+    }
+  }
 
   const performModalAction = (action: string) => {
     setPublishConfirmModalOpen(false);
@@ -174,7 +186,6 @@ export default function SchemaAndCrosswalkActionMenu({
     }
   };
 
-
   useEffect(() => {
     setIsEditModeActive(isMappingsEditModeActive);
   }, [isMappingsEditModeActive]);
@@ -183,8 +194,6 @@ export default function SchemaAndCrosswalkActionMenu({
     dispatch(clearNotification());
   }, [dispatch]);
 
-
-
   return (
     <>
       <ActionMenu buttonText={t('action.actions')}>

diff --git a/mscr-ui/src/modules/crosswalk-editor/index.tsx b/mscr-ui/src/modules/crosswalk-editor/index.tsx
@@ -113,10 +113,6 @@ export default function CrosswalkEditor({
 
   const [crosswalkPublished, setCrosswalkPublished] =
     React.useState<boolean>(true);
-  const [publishNotificationVisible, setPublishNotificationVisible] =
-    React.useState<boolean>(false);
-  const [saveNotificationVisible, setSaveNotificationVisible] =
-    React.useState<boolean>(false);
   const [lastPatchCrosswalkId, setLastPatchCrosswalkId] =
     React.useState<string>('');
   const [lastPutMappingPid, setLastPutMappingPid] = React.useState<string>('');
@@ -126,7 +122,6 @@ export default function CrosswalkEditor({
     React.useState<string>('');
   const [showAttributeNames, setShowAttributeNames] = React.useState(true);
 
-  const [patchCrosswalk, crosswalkPatchResponse] = usePatchCrosswalkMutation();
   const [putMapping, putMappingResponse] = usePutMappingMutation();
   const [deleteMapping, deleteMappingResponse] = useDeleteMappingMutation();
   const [patchMapping, patchMappingResponse] = usePatchMappingMutation();
@@ -172,28 +167,6 @@ export default function CrosswalkEditor({
     </TreeItem>
   );
 
-  if (crosswalkPatchResponse.isSuccess) {
-    if (
-      !crosswalkPublished &&
-      crosswalkPatchResponse?.originalArgs?.payload?.state === 'PUBLISHED'
-    ) {
-      setCrosswalkPublished(true);
-      setPublishNotificationVisible(true);
-      setEditModeActive(false);
-      setLastPatchCrosswalkId(crosswalkPatchResponse.requestId);
-      refetchCrosswalkData();
-      setSelectedTab(0);
-    } else if (
-      !saveNotificationVisible &&
-      lastPatchCrosswalkId !== crosswalkPatchResponse.requestId
-    ) {
-      // Operation is regular patch without publishing (save)
-      setLastPatchCrosswalkId(crosswalkPatchResponse.requestId);
-      refetchCrosswalkData();
-      setSaveNotificationVisible(true);
-    }
-  }
-
   useEffect(() => {
     // Reset initial state when tab changed.
     if (selectedTab === 1) {
@@ -449,6 +422,9 @@ export default function CrosswalkEditor({
   };
 
   const performCallbackFromActionMenu = (action: any) => {
+    if (action === 'disableEdit') {
+      setEditModeActive(false);
+    }
     if (action === 'edit') {
       if (isEditModeActive) {
         dispatch(setNotification('FINISH_EDITING_MAPPINGS'));
@@ -586,24 +562,6 @@ export default function CrosswalkEditor({
             <CustomTabPanel value={selectedTab} index={2}>
             </CustomTabPanel>*/}
             <div className="row d-flex h-0">
-              {crosswalkPublished && publishNotificationVisible && (
-                <Notification
-                  closeText="Close"
-                  headingText="Crosswalk published successfully"
-                  smallScreen
-                  onCloseButtonClick={() =>
-                    setPublishNotificationVisible(false)
-                  }
-                ></Notification>
-              )}
-              {saveNotificationVisible && (
-                <Notification
-                  closeText="Close"
-                  headingText="Crosswalk saved successfully"
-                  smallScreen
-                  onCloseButtonClick={() => setSaveNotificationVisible(false)}
-                ></Notification>
-              )}
               <div className={selectedTab === 1 ? 'col-10' : 'd-none'}></div>
               <div
                 className={