Skip to content

Commit

Permalink
Merge pull request #174 from CSCfi/CSCFC4EMSCR-488
Browse files Browse the repository at this point in the history 
change action menu hover background to non transparent to fix heading…
  • Loading branch information
@maariaw
maariaw authored May 22, 2024
2 parents a3771b6 + 33641d8 commit 7ef5f73
Show file tree
Hide file tree
Showing 2 changed files with 101 additions and 89 deletions.
183 changes: 94 additions & 89 deletions mscr-ui/src/common/components/schema-and-crosswalk-actionmenu/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ 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,
} from '@app/common/components/schema-and-crosswalk-actionmenu/schema-and-crosswalk-actionmenu.styles';

interface SchemaAndCrosswalkActionmenuProps {
type: ActionMenuTypes;
Expand Down Expand Up @@ -115,10 +118,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();
Expand All @@ -143,10 +146,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();
Expand Down Expand Up @@ -196,88 +199,90 @@ export default function SchemaAndCrosswalkActionMenu({

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={
Expand Down
7 changes: 7 additions & 0 deletions ...mon/components/schema-and-crosswalk-actionmenu/schema-and-crosswalk-actionmenu.styles.tsx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import styled from 'styled-components';

export const ActionMenuWrapper = styled.div`
&& .fi-button--secondary:hover {
background: #fff;
}
`;

0 comments on commit 7ef5f73

Please sign in to comment.