From f6fd37899fd116066f8ab0e93155500c57434400 Mon Sep 17 00:00:00 2001
From: konolak <kari.konola@csc.fi>
Date: Tue, 14 May 2024 19:01:50 +0300
Subject: [PATCH 1/3] change action menu hover background to non transparent to
 fix heading overflow

---
 .../schema-and-crosswalk-actionmenu/index.tsx | 203 +++++++++---------
 ...schema-and-crosswalk-actionmenu.styles.tsx |   7 +
 2 files changed, 110 insertions(+), 100 deletions(-)
 create mode 100644 mscr-ui/src/common/components/schema-and-crosswalk-actionmenu/schema-and-crosswalk-actionmenu.styles.tsx

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
index 13784260b..dd4b51a0d 100644
--- a/mscr-ui/src/common/components/schema-and-crosswalk-actionmenu/index.tsx
+++ b/mscr-ui/src/common/components/schema-and-crosswalk-actionmenu/index.tsx
@@ -22,6 +22,10 @@ import { mscrSearchApi } from '@app/common/components/mscr-search/mscr-search.sl
 import { CrosswalkWithVersionInfo } from '@app/common/interfaces/crosswalk.interface';
 import { SchemaWithVersionInfo } from '@app/common/interfaces/schema.interface';
 import RevisionFormModal from '@app/modules/form/revision-form-modal';
+import {
+  ActionMenuWrapper,
+  StyledActionMenu
+} from "@app/common/components/schema-and-crosswalk-actionmenu/schema-and-crosswalk-actionmenu.styles";
 
 interface SchemaAndCrosswalkActionmenuProps {
   type: ActionMenuTypes;
@@ -32,14 +36,14 @@ interface SchemaAndCrosswalkActionmenuProps {
 }
 
 export default function SchemaAndCrosswalkActionMenu({
-  type,
-  metadata,
-  isMappingsEditModeActive,
-  refetchMetadata,
-  buttonCallbackFunction = () => {
-    return;
-  },
-}: SchemaAndCrosswalkActionmenuProps) {
+                                                       type,
+                                                       metadata,
+                                                       isMappingsEditModeActive,
+                                                       refetchMetadata,
+                                                       buttonCallbackFunction = () => {
+                                                         return;
+                                                       },
+                                                     }: SchemaAndCrosswalkActionmenuProps) {
   const { t } = useTranslation('common');
   const dispatch = useStoreDispatch();
   const [isEditModeActive, setIsEditModeActive] = useState(false);
@@ -103,10 +107,10 @@ export default function SchemaAndCrosswalkActionMenu({
                 action === 'publish'
                   ? 'CROSSWALK_PUBLISH'
                   : action === 'invalidate'
-                  ? 'CROSSWALK_INVALIDATE'
-                  : action === 'deprecate'
-                  ? 'CROSSWALK_DEPRECATE'
-                  : 'CROSSWALK_DELETE'
+                    ? 'CROSSWALK_INVALIDATE'
+                    : action === 'deprecate'
+                      ? 'CROSSWALK_DEPRECATE'
+                      : 'CROSSWALK_DELETE'
               )
             );
             refetchMetadata();
@@ -131,10 +135,10 @@ export default function SchemaAndCrosswalkActionMenu({
                 action === 'publish'
                   ? 'SCHEMA_PUBLISH'
                   : action === 'invalidate'
-                  ? 'SCHEMA_INVALIDATE'
-                  : action === 'deprecate'
-                  ? 'SCHEMA_DEPRECATE'
-                  : 'SCHEMA_DELETE'
+                    ? 'SCHEMA_INVALIDATE'
+                    : action === 'deprecate'
+                      ? 'SCHEMA_DEPRECATE'
+                      : 'SCHEMA_DELETE'
               )
             );
             refetchMetadata();
@@ -174,7 +178,6 @@ export default function SchemaAndCrosswalkActionMenu({
     }
   };
 
-
   useEffect(() => {
     setIsEditModeActive(isMappingsEditModeActive);
   }, [isMappingsEditModeActive]);
@@ -183,92 +186,92 @@ export default function SchemaAndCrosswalkActionMenu({
     dispatch(clearNotification());
   }, [dispatch]);
 
- 
-
   return (
     <>
-      <ActionMenu buttonText={t('action.actions')}>
-        <ActionMenuItem
-          className={
-            type === ActionMenuTypes.CrosswalkEditor &&
-            metadata.state == State.Draft
-              ? ''
-              : 'd-none'
-          }
-          onClick={() => buttonCallbackFunction('edit')}
-        >
-          {isEditModeActive
-            ? t('actionmenu.finish-editing')
-            : t('actionmenu.edit-mappings')}
-        </ActionMenuItem>
-        <ActionMenuItem
-          onClick={() => buttonCallbackFunction('edit')}
-          className={
-            type === ActionMenuTypes.CrosswalkMetadata ||
+      <ActionMenuWrapper>
+        <ActionMenu buttonText={t('action.actions')}>
+          <ActionMenuItem
+            className={
+              type === ActionMenuTypes.CrosswalkEditor &&
+              metadata.state == State.Draft
+                ? ''
+                : 'd-none'
+            }
+            onClick={() => buttonCallbackFunction('edit')}
+          >
+            {isEditModeActive
+              ? t('actionmenu.finish-editing')
+              : t('actionmenu.edit-mappings')}
+          </ActionMenuItem>
+          <ActionMenuItem
+            onClick={() => buttonCallbackFunction('edit')}
+            className={
+              type === ActionMenuTypes.CrosswalkMetadata ||
+              type === ActionMenuTypes.SchemaMetadata
+                ? ''
+                : 'd-none'
+            }
+          >
+            {t('actionmenu.edit-metadata')}
+          </ActionMenuItem>
+          <ActionMenuItem
+            className={metadata && metadata.state == State.Draft ? '' : 'd-none'}
+            onClick={() => setPublishConfirmModalOpen(true)}
+          >
+            {type === ActionMenuTypes.Schema ||
             type === ActionMenuTypes.SchemaMetadata
-              ? ''
-              : 'd-none'
-          }
-        >
-          {t('actionmenu.edit-metadata')}
-        </ActionMenuItem>
-        <ActionMenuItem
-          className={metadata && metadata.state == State.Draft ? '' : 'd-none'}
-          onClick={() => setPublishConfirmModalOpen(true)}
-        >
-          {type === ActionMenuTypes.Schema ||
-          type === ActionMenuTypes.SchemaMetadata
-            ? t('actionmenu.publish-schema')
-            : t('actionmenu.publish-crosswalk')}
-        </ActionMenuItem>
-        <ActionMenuItem
-          className={
-            metadata && metadata.state == State.Published ? '' : 'd-none'
-          }
-          onClick={() => setInvalidateConfirmModalOpen(true)}
-        >
-          {type === ActionMenuTypes.Schema ||
-          type === ActionMenuTypes.SchemaMetadata
-            ? t('actionmenu.invalidate-schema')
-            : t('actionmenu.invalidate-crosswalk')}
-        </ActionMenuItem>
-        <ActionMenuItem
-          className={
-            metadata && metadata.state == State.Published ? '' : 'd-none'
-          }
-          onClick={() => setDeprecateConfirmModalOpen(true)}
-        >
-          {type === ActionMenuTypes.Schema ||
-          type === ActionMenuTypes.SchemaMetadata
-            ? t('actionmenu.deprecate-schema')
-            : t('actionmenu.deprecate-crosswalk')}
-        </ActionMenuItem>
-        <ActionMenuItem
-          className={metadata && metadata.state == State.Draft ? '' : 'd-none'}
-          onClick={() => setDeleteConfirmModalOpen(true)}
-        >
-          {t('actionmenu.delete-draft')}
-        </ActionMenuItem>
-        <ActionMenuItem
-          className={
-            metadata &&
-            metadata.state &&
-            (metadata.state == State.Invalid ||
-              metadata.state == State.Deprecated)
-              ? ''
-              : 'd-none'
-          }
-          onClick={() => setRemoveConfirmModalOpen(true)}
-        >
-          {type === ActionMenuTypes.Schema ||
-          type === ActionMenuTypes.SchemaMetadata
-            ? t('actionmenu.delete-schema')
-            : t('actionmenu.delete-crosswalk')}
-        </ActionMenuItem>
-        <ActionMenuItem onClick={() => setRevisionModalOpen(true)}>
-          {t('actionmenu.revision')}
-        </ActionMenuItem>
-      </ActionMenu>
+              ? t('actionmenu.publish-schema')
+              : t('actionmenu.publish-crosswalk')}
+          </ActionMenuItem>
+          <ActionMenuItem
+            className={
+              metadata && metadata.state == State.Published ? '' : 'd-none'
+            }
+            onClick={() => setInvalidateConfirmModalOpen(true)}
+          >
+            {type === ActionMenuTypes.Schema ||
+            type === ActionMenuTypes.SchemaMetadata
+              ? t('actionmenu.invalidate-schema')
+              : t('actionmenu.invalidate-crosswalk')}
+          </ActionMenuItem>
+          <ActionMenuItem
+            className={
+              metadata && metadata.state == State.Published ? '' : 'd-none'
+            }
+            onClick={() => setDeprecateConfirmModalOpen(true)}
+          >
+            {type === ActionMenuTypes.Schema ||
+            type === ActionMenuTypes.SchemaMetadata
+              ? t('actionmenu.deprecate-schema')
+              : t('actionmenu.deprecate-crosswalk')}
+          </ActionMenuItem>
+          <ActionMenuItem
+            className={metadata && metadata.state == State.Draft ? '' : 'd-none'}
+            onClick={() => setDeleteConfirmModalOpen(true)}
+          >
+            {t('actionmenu.delete-draft')}
+          </ActionMenuItem>
+          <ActionMenuItem
+            className={
+              metadata &&
+              metadata.state &&
+              (metadata.state == State.Invalid ||
+                metadata.state == State.Deprecated)
+                ? ''
+                : 'd-none'
+            }
+            onClick={() => setRemoveConfirmModalOpen(true)}
+          >
+            {type === ActionMenuTypes.Schema ||
+            type === ActionMenuTypes.SchemaMetadata
+              ? t('actionmenu.delete-schema')
+              : t('actionmenu.delete-crosswalk')}
+          </ActionMenuItem>
+          <ActionMenuItem onClick={() => setRevisionModalOpen(true)}>
+            {t('actionmenu.revision')}
+          </ActionMenuItem>
+        </ActionMenu>
+      </ActionMenuWrapper>
       <ConfirmModal
         isVisible={isDeleteConfirmModalOpen}
         actionName={
diff --git a/mscr-ui/src/common/components/schema-and-crosswalk-actionmenu/schema-and-crosswalk-actionmenu.styles.tsx b/mscr-ui/src/common/components/schema-and-crosswalk-actionmenu/schema-and-crosswalk-actionmenu.styles.tsx
new file mode 100644
index 000000000..a9dda0540
--- /dev/null
+++ b/mscr-ui/src/common/components/schema-and-crosswalk-actionmenu/schema-and-crosswalk-actionmenu.styles.tsx
@@ -0,0 +1,7 @@
+import styled from 'styled-components';
+
+export const ActionMenuWrapper = styled.div`
+  && .fi-button--secondary:hover {
+    background: #fff;
+  }
+`;

From 8cb06c53d874cf37a7a2cbfb791b0fe7069978e4 Mon Sep 17 00:00:00 2001
From: konolak <kari.konola@csc.fi>
Date: Wed, 22 May 2024 12:46:46 +0300
Subject: [PATCH 2/3] remove unused import and fix formatting

---
 .../schema-and-crosswalk-actionmenu/index.tsx   | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 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
index dd4b51a0d..1bb5f46ef 100644
--- a/mscr-ui/src/common/components/schema-and-crosswalk-actionmenu/index.tsx
+++ b/mscr-ui/src/common/components/schema-and-crosswalk-actionmenu/index.tsx
@@ -24,7 +24,6 @@ import { SchemaWithVersionInfo } from '@app/common/interfaces/schema.interface';
 import RevisionFormModal from '@app/modules/form/revision-form-modal';
 import {
   ActionMenuWrapper,
-  StyledActionMenu
 } from "@app/common/components/schema-and-crosswalk-actionmenu/schema-and-crosswalk-actionmenu.styles";
 
 interface SchemaAndCrosswalkActionmenuProps {
@@ -36,14 +35,14 @@ interface SchemaAndCrosswalkActionmenuProps {
 }
 
 export default function SchemaAndCrosswalkActionMenu({
-                                                       type,
-                                                       metadata,
-                                                       isMappingsEditModeActive,
-                                                       refetchMetadata,
-                                                       buttonCallbackFunction = () => {
-                                                         return;
-                                                       },
-                                                     }: SchemaAndCrosswalkActionmenuProps) {
+  type,
+  metadata,
+  isMappingsEditModeActive,
+  refetchMetadata,
+  buttonCallbackFunction = () => {
+    return;
+  },
+}: SchemaAndCrosswalkActionmenuProps) {
   const { t } = useTranslation('common');
   const dispatch = useStoreDispatch();
   const [isEditModeActive, setIsEditModeActive] = useState(false);

From 33641d8f58832c01140d04ec8efbf88a5165c4fa Mon Sep 17 00:00:00 2001
From: konolak <kari.konola@csc.fi>
Date: Wed, 22 May 2024 12:48:00 +0300
Subject: [PATCH 3/3] fix quotes

---
 .../common/components/schema-and-crosswalk-actionmenu/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 1bb5f46ef..a34d106b1 100644
--- a/mscr-ui/src/common/components/schema-and-crosswalk-actionmenu/index.tsx
+++ b/mscr-ui/src/common/components/schema-and-crosswalk-actionmenu/index.tsx
@@ -24,7 +24,7 @@ import { SchemaWithVersionInfo } from '@app/common/interfaces/schema.interface';
 import RevisionFormModal from '@app/modules/form/revision-form-modal';
 import {
   ActionMenuWrapper,
-} from "@app/common/components/schema-and-crosswalk-actionmenu/schema-and-crosswalk-actionmenu.styles";
+} from '@app/common/components/schema-and-crosswalk-actionmenu/schema-and-crosswalk-actionmenu.styles';
 
 interface SchemaAndCrosswalkActionmenuProps {
   type: ActionMenuTypes;