Skip to content

Use separate Dialog for Manage Export Attributes #1158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexabird wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use separate Dialog for Manage Export Attributes #1158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 12 additions & 16 deletions ...tend/packages/catalog-ui-search/src/main/webapp/component/tabs/metacard/transfer-list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -648,13 +648,15 @@ const TransferList = ({
startingHideEmpty,
lazyResult,
onSave,
onClose,
}: {
startingLeft: string[]
requiredAttributes?: string[]
startingRight: string[]
startingHideEmpty?: boolean
lazyResult?: LazyQueryResult
onSave: (arg: string[], hideEmpty: boolean | undefined) => void
onClose?: () => void
}) => {
const dialogContext = useDialog()
const [mode, setMode] = React.useState(
Expand Down Expand Up @@ -757,6 +759,13 @@ const TransferList = ({
),
})
}
const handleClose = () => {
if (onClose) {
onClose()
} else {
dialogContext.setProps({ open: false, children: null })
}
}
const totalPossible = startingLeft.length + startingRight.length
return (
<>
Expand All @@ -767,12 +776,7 @@ const TransferList = ({
className="absolute right-0 top-0 mr-1 mt-1"
variant="text"
size="small"
onClick={() => {
dialogContext.setProps({
open: false,
children: null,
})
}}
onClick={handleClose}
>
<CloseIcon />
</Button>
Expand Down Expand Up @@ -860,12 +864,7 @@ const TransferList = ({
<Button
data-id="dialog-save-button"
disabled={mode === 'saving'}
onClick={() => {
dialogContext.setProps({
open: false,
children: null,
})
}}
onClick={handleClose}
variant="text"
color="secondary"
className="mr-2"
Expand All @@ -878,10 +877,7 @@ const TransferList = ({
onClick={() => {
setMode('saving')
onSave(Object.keys(left), hideEmpty)
dialogContext.setProps({
open: false,
children: null,
})
handleClose()
}}
variant="contained"
color="primary"
Expand Down
76 changes: 35 additions & 41 deletions ...h/src/main/webapp/react-component/summary-manage-attributes/summary-manage-attributes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,56 +12,50 @@
* <http://www.gnu.org/licenses/lgpl.html>.
*
**/

import React from 'react'
import Button from '@mui/material/Button'
import Dialog from '@mui/material/Dialog'
import user from '../../component/singletons/user-instance'
import TransferList from '../../component/tabs/metacard/transfer-list'
import { useDialog } from '../../component/dialog'
import { TypedUserInstance } from '../../component/singletons/TypedUser'
import { StartupDataStore } from '../../js/model/Startup/startup'

export default ({ isExport = false }: { isExport?: boolean }) => {
const requiredAttributes =
StartupDataStore.Configuration.getRequiredExportAttributes()
const dialogContext = useDialog()
const [open, setOpen] = React.useState(false)

return (
<Button
data-id="manage-attributes-button"
onClick={() => {
dialogContext.setProps({
open: true,
disableEnforceFocus: true,
children: (
<div
style={{
minHeight: '60vh',
}}
>
<TransferList
startingLeft={TypedUserInstance.getResultsAttributesSummaryShown()}
requiredAttributes={requiredAttributes}
startingRight={TypedUserInstance.getResultsAttributesPossibleSummaryShown()}
startingHideEmpty={user
.get('user')
.get('preferences')
.get('inspector-hideEmpty')}
onSave={(active: any, newHideEmpty: any) => {
user.get('user').get('preferences').set({
'inspector-summaryShown': active,
'inspector-hideEmpty': newHideEmpty,
})
user.savePreferences()
}}
/>
</div>
),
})
}}
color="primary"
size="small"
style={{ height: 'auto' }}
>
{isExport ? 'Select Attributes to Export' : 'Manage Attributes'}
</Button>
<>
<Button
data-id="manage-attributes-button"
onClick={() => setOpen(true)}
color="primary"
size="small"
style={{ height: 'auto' }}
>
{isExport ? 'Select Attributes to Export' : 'Manage Attributes'}
</Button>

<Dialog open={open} disableEnforceFocus maxWidth="md" fullWidth>
<TransferList
startingLeft={TypedUserInstance.getResultsAttributesSummaryShown()}
requiredAttributes={requiredAttributes}
startingRight={TypedUserInstance.getResultsAttributesPossibleSummaryShown()}
startingHideEmpty={user
.get('user')
.get('preferences')
.get('inspector-hideEmpty')}
onSave={(active: any, newHideEmpty: any) => {
user.get('user').get('preferences').set({
'inspector-summaryShown': active,
'inspector-hideEmpty': newHideEmpty,
})
user.savePreferences()
}}
onClose={() => setOpen(false)}
/>
</Dialog>
</>
)
}
Loading