X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/39f1477d9f0592a3d847eb3181c9b814a3b7b153..62ff5a943865229c1630c66366f824511048ce63:/src/store/workbench/workbench-actions.ts diff --git a/src/store/workbench/workbench-actions.ts b/src/store/workbench/workbench-actions.ts index bd480bda..5cc9ea34 100644 --- a/src/store/workbench/workbench-actions.ts +++ b/src/store/workbench/workbench-actions.ts @@ -7,7 +7,7 @@ import { RootState } from "../store"; import { loadDetailsPanel } from '~/store/details-panel/details-panel-action'; import { snackbarActions } from '../snackbar/snackbar-actions'; import { loadFavoritePanel } from '../favorite-panel/favorite-panel-action'; -import { openProjectPanel, projectPanelActions } from '~/store/project-panel/project-panel-action'; +import { openProjectPanel, projectPanelActions, setIsProjectPanelTrashed } from '~/store/project-panel/project-panel-action'; import { activateSidePanelTreeItem, initSidePanelTree, SidePanelTreeCategory, loadSidePanelTreeProjects } from '../side-panel-tree/side-panel-tree-actions'; import { loadResource, updateResources } from '../resources/resources-actions'; import { favoritePanelActions } from '~/store/favorite-panel/favorite-panel-action'; @@ -39,6 +39,7 @@ import { sharedWithMePanelActions } from '~/store/shared-with-me-panel/shared-wi import { loadSharedWithMePanel } from '../shared-with-me-panel/shared-with-me-panel-actions'; import { CopyFormDialogData } from '~/store/copy-dialog/copy-dialog'; import { loadWorkflowPanel, workflowPanelActions } from '~/store/workflow-panel/workflow-panel-actions'; +import { loadSshKeysPanel } from '~/store/auth/auth-action'; import { workflowPanelColumns } from '~/views/workflow-panel/workflow-panel-view'; import { progressIndicatorActions } from '~/store/progress-indicator/progress-indicator-actions'; import { getProgressIndicator } from '../progress-indicator/progress-indicator-reducer'; @@ -48,6 +49,11 @@ import { GroupContentsResource } from '~/services/groups-service/groups-service' import { unionize, ofType, UnionOf, MatchCases } from '~/common/unionize'; import { loadRunProcessPanel } from '~/store/run-process-panel/run-process-panel-actions'; import { loadCollectionFiles } from '~/store/collection-panel/collection-panel-files/collection-panel-files-actions'; +import { SnackbarKind } from '~/store/snackbar/snackbar-actions'; +import { collectionPanelActions } from "~/store/collection-panel/collection-panel-action"; +import { CollectionResource } from "~/models/collection"; +import { searchResultsPanelActions, loadSearchResultsPanel } from '~/store/search-results-panel/search-results-panel-actions'; +import { searchResultsPanelColumns } from '~/views/search-results-panel/search-results-panel-view'; export const WORKBENCH_LOADING_SCREEN = 'workbenchLoadingScreen'; @@ -81,6 +87,7 @@ export const loadWorkbench = () => dispatch(trashPanelActions.SET_COLUMNS({ columns: trashPanelColumns })); dispatch(sharedWithMePanelActions.SET_COLUMNS({ columns: projectPanelColumns })); dispatch(workflowPanelActions.SET_COLUMNS({ columns: workflowPanelColumns })); + dispatch(searchResultsPanelActions.SET_COLUMNS({ columns: searchResultsPanelColumns })); dispatch(initSidePanelTree()); if (router.location) { const match = matchRootRoute(router.location.pathname); @@ -116,6 +123,7 @@ export const loadProject = (uuid: string) => handleFirstTimeLoad( async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { const userUuid = services.authService.getUuid(); + dispatch(setIsProjectPanelTrashed(false)); if (userUuid) { if (userUuid !== uuid) { const match = await loadGroupContentsResource({ uuid, userUuid, services }); @@ -127,11 +135,12 @@ export const loadProject = (uuid: string) => }, SHARED: project => { dispatch(setSharedWithMeBreadcrumbs(uuid)); - dispatch(activateSidePanelTreeItem(SidePanelTreeCategory.SHARED_WITH_ME)); + dispatch(activateSidePanelTreeItem(uuid)); dispatch(finishLoadingProject(project)); }, TRASHED: project => { dispatch(setTrashBreadcrumbs(uuid)); + dispatch(setIsProjectPanelTrashed(true)); dispatch(activateSidePanelTreeItem(SidePanelTreeCategory.TRASH)); dispatch(finishLoadingProject(project)); } @@ -196,18 +205,21 @@ export const loadCollection = (uuid: string) => const match = await loadGroupContentsResource({ uuid, userUuid, services }); match({ OWNED: async collection => { + dispatch(collectionPanelActions.SET_COLLECTION(collection as CollectionResource)); dispatch(updateResources([collection])); await dispatch(activateSidePanelTreeItem(collection.ownerUuid)); dispatch(setSidePanelBreadcrumbs(collection.ownerUuid)); dispatch(loadCollectionFiles(collection.uuid)); }, SHARED: collection => { + dispatch(collectionPanelActions.SET_COLLECTION(collection as CollectionResource)); dispatch(updateResources([collection])); dispatch(setSharedWithMeBreadcrumbs(collection.ownerUuid)); - dispatch(activateSidePanelTreeItem(SidePanelTreeCategory.SHARED_WITH_ME)); + dispatch(activateSidePanelTreeItem(collection.ownerUuid)); dispatch(loadCollectionFiles(collection.uuid)); }, TRASHED: collection => { + dispatch(collectionPanelActions.SET_COLLECTION(collection as CollectionResource)); dispatch(updateResources([collection])); dispatch(setTrashBreadcrumbs('')); dispatch(activateSidePanelTreeItem(SidePanelTreeCategory.TRASH)); @@ -247,12 +259,19 @@ export const updateCollection = (data: collectionUpdateActions.CollectionUpdateF export const copyCollection = (data: CopyFormDialogData) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { try { + const copyToProject = getResource(data.ownerUuid)(getState().resources); const collection = await dispatch(collectionCopyActions.copyCollection(data)); - dispatch(updateResources([collection])); - dispatch(reloadProjectMatchingUuid([collection.ownerUuid])); - dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Collection has been copied.', hideDuration: 2000 })); + if (copyToProject && collection) { + dispatch(reloadProjectMatchingUuid([copyToProject.uuid])); + dispatch(snackbarActions.OPEN_SNACKBAR({ + message: 'Collection has been copied.', + hideDuration: 3000, + kind: SnackbarKind.SUCCESS, + link: collection.ownerUuid + })); + } } catch (e) { - dispatch(snackbarActions.OPEN_SNACKBAR({ message: e.message, hideDuration: 2000 })); + dispatch(snackbarActions.OPEN_SNACKBAR({ message: e.message, hideDuration: 2000, kind: SnackbarKind.ERROR })); } }; @@ -262,7 +281,7 @@ export const moveCollection = (data: MoveToFormDialogData) => const collection = await dispatch(collectionMoveActions.moveCollection(data)); dispatch(updateResources([collection])); dispatch(reloadProjectMatchingUuid([collection.ownerUuid])); - dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Collection has been moved.', hideDuration: 2000 })); + dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Collection has been moved.', hideDuration: 2000, kind: SnackbarKind.SUCCESS })); } catch (e) { dispatch(snackbarActions.OPEN_SNACKBAR({ message: e.message, hideDuration: 2000 })); } @@ -357,7 +376,7 @@ export const loadSharedWithMe = handleFirstTimeLoad(async (dispatch: Dispatch) = export const loadRunProcess = handleFirstTimeLoad( async (dispatch: Dispatch) => { - dispatch(loadRunProcessPanel()); + await dispatch(loadRunProcessPanel()); } ); @@ -367,6 +386,16 @@ export const loadWorkflow = handleFirstTimeLoad(async (dispatch: Dispatch) dispatch(setSidePanelBreadcrumbs(SidePanelTreeCategory.WORKFLOWS)); }); +export const loadSearchResults = handleFirstTimeLoad( + async (dispatch: Dispatch) => { + await dispatch(loadSearchResultsPanel()); + }); + +export const loadSshKeys = handleFirstTimeLoad( + async (dispatch: Dispatch) => { + await dispatch(loadSshKeysPanel()); + }); + const finishLoadingProject = (project: GroupContentsResource | string) => async (dispatch: Dispatch) => { const uuid = typeof project === 'string' ? project : project.uuid;