X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/a3d23b09663e49a187f3505f1dd41c97f3d79d51..9555a2020771863c2e4f6b8802bd6850efb37713:/src/store/details-panel/details-panel-action.ts diff --git a/src/store/details-panel/details-panel-action.ts b/src/store/details-panel/details-panel-action.ts index a5ff58730d..91ca9cbad4 100644 --- a/src/store/details-panel/details-panel-action.ts +++ b/src/store/details-panel/details-panel-action.ts @@ -12,13 +12,18 @@ import { ServiceRepository } from '~/services/services'; import { TagProperty } from '~/models/tag'; import { startSubmit, stopSubmit } from 'redux-form'; import { resourcesActions } from '~/store/resources/resources-actions'; -import { snackbarActions } from '~/store/snackbar/snackbar-actions'; +import {snackbarActions, SnackbarKind} from '~/store/snackbar/snackbar-actions'; +import { addProperty, deleteProperty } from '~/lib/resource-properties'; +import { FilterBuilder } from '~/services/api/filter-builder'; +import { OrderBuilder } from '~/services/api/order-builder'; +import { CollectionResource } from '~/models/collection'; +import { extractUuidKind, ResourceKind } from '~/models/resource'; export const SLIDE_TIMEOUT = 500; export const detailsPanelActions = unionize({ TOGGLE_DETAILS_PANEL: ofType<{}>(), - OPEN_DETAILS_PANEL: ofType(), + OPEN_DETAILS_PANEL: ofType(), LOAD_DETAILS_PANEL: ofType() }); @@ -27,29 +32,67 @@ export type DetailsPanelAction = UnionOf; export const PROJECT_PROPERTIES_FORM_NAME = 'projectPropertiesFormName'; export const PROJECT_PROPERTIES_DIALOG_NAME = 'projectPropertiesDialogName'; -export const loadDetailsPanel = (uuid: string) => detailsPanelActions.LOAD_DETAILS_PANEL(uuid); +export const loadDetailsPanel = (uuid: string) => + (dispatch: Dispatch, getState: () => RootState) => { + if (getState().detailsPanel.isOpened) { + switch(extractUuidKind(uuid)) { + case ResourceKind.COLLECTION: + const c = getResource(uuid)(getState().resources); + dispatch(refreshCollectionVersionsList(c!.currentVersionUuid)); + break; + default: + break; + } + } + dispatch(detailsPanelActions.LOAD_DETAILS_PANEL(uuid)); + }; -export const openDetailsPanel = (uuid: string) => detailsPanelActions.OPEN_DETAILS_PANEL(uuid); +export const openDetailsPanel = (uuid?: string, tabNr: number = 0) => + (dispatch: Dispatch) => { + dispatch(detailsPanelActions.OPEN_DETAILS_PANEL(tabNr)); + if (uuid !== undefined) { + dispatch(loadDetailsPanel(uuid)); + } + }; export const openProjectPropertiesDialog = () => (dispatch: Dispatch) => { dispatch(dialogActions.OPEN_DIALOG({ id: PROJECT_PROPERTIES_DIALOG_NAME, data: { } })); }; -export const deleteProjectProperty = (key: string) => +export const refreshCollectionVersionsList = (uuid: string) => + (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { + services.collectionService.list({ + filters: new FilterBuilder() + .addEqual('current_version_uuid', uuid) + .getFilters(), + includeOldVersions: true, + order: new OrderBuilder().addDesc("version").getOrder() + }).then(versions => dispatch(resourcesActions.SET_RESOURCES(versions.items)) + ).catch(e => snackbarActions.OPEN_SNACKBAR({ + message: `Couldn't retrieve versions: ${e.errors[0]}`, + hideDuration: 2000, + kind: SnackbarKind.ERROR }) + ); + }; + +export const deleteProjectProperty = (key: string, value: string) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { const { detailsPanel, resources } = getState(); const project = getResource(detailsPanel.resourceUuid)(resources) as ProjectResource; + if (!project) { return; } + + const properties = Object.assign({}, project.properties); + try { - if (project) { - delete project.properties[key]; - const updatedProject = await services.projectService.update(project.uuid, project); - dispatch(resourcesActions.SET_RESOURCES([updatedProject])); - dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Property has been successfully deleted.", hideDuration: 2000 })); - } + const updatedProject = await services.projectService.update( + project.uuid, { + properties: deleteProperty(properties, key, value), + }); + dispatch(resourcesActions.SET_RESOURCES([updatedProject])); + dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Property has been successfully deleted.", hideDuration: 2000, kind: SnackbarKind.SUCCESS })); } catch (e) { - dispatch(dialogActions.CLOSE_DIALOG({ id: PROJECT_PROPERTIES_FORM_NAME })); - throw new Error('Could not remove property from the project.'); + dispatch(snackbarActions.OPEN_SNACKBAR({ message: e.errors[0], hideDuration: 2000, kind: SnackbarKind.ERROR })); } }; @@ -57,26 +100,33 @@ export const createProjectProperty = (data: TagProperty) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { const { detailsPanel, resources } = getState(); const project = getResource(detailsPanel.resourceUuid)(resources) as ProjectResource; + if (!project) { return; } + dispatch(startSubmit(PROJECT_PROPERTIES_FORM_NAME)); try { - if (project) { - project.properties[data.key] = data.value; - const updatedProject = await services.projectService.update(project.uuid, project); - dispatch(resourcesActions.SET_RESOURCES([updatedProject])); - dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Property has been successfully added.", hideDuration: 2000 })); - dispatch(stopSubmit(PROJECT_PROPERTIES_FORM_NAME)); - } - return; + const key = data.keyID || data.key; + const value = data.valueID || data.value; + const properties = Object.assign({}, project.properties); + const updatedProject = await services.projectService.update( + project.uuid, { + properties: addProperty(properties, key, value), + } + ); + dispatch(resourcesActions.SET_RESOURCES([updatedProject])); + dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Property has been successfully added.", hideDuration: 2000, kind: SnackbarKind.SUCCESS })); + dispatch(stopSubmit(PROJECT_PROPERTIES_FORM_NAME)); } catch (e) { - dispatch(dialogActions.CLOSE_DIALOG({ id: PROJECT_PROPERTIES_FORM_NAME })); - throw new Error('Could not add property to the project.'); + dispatch(snackbarActions.OPEN_SNACKBAR({ message: e.errors[0], hideDuration: 2000, kind: SnackbarKind.ERROR })); } }; -export const toggleDetailsPanel = () => (dispatch: Dispatch) => { +export const toggleDetailsPanel = () => (dispatch: Dispatch, getState: () => RootState) => { // because of material-ui issue resizing details panel breaks tabs. // triggering window resize event fixes that. setTimeout(() => { window.dispatchEvent(new Event('resize')); }, SLIDE_TIMEOUT); dispatch(detailsPanelActions.TOGGLE_DETAILS_PANEL()); + if (getState().detailsPanel.isOpened) { + dispatch(loadDetailsPanel(getState().detailsPanel.resourceUuid)); + } };