X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/91d97c49d2a2cd2eadcabcc7e08e3ba52cb50dee..31e84a9315728c2f58a26bf0e9e1d2b38326fb86:/src/store/workbench/workbench-actions.ts diff --git a/src/store/workbench/workbench-actions.ts b/src/store/workbench/workbench-actions.ts index f514d2b3..8ea19a14 100644 --- a/src/store/workbench/workbench-actions.ts +++ b/src/store/workbench/workbench-actions.ts @@ -4,6 +4,7 @@ import { Dispatch } from 'redux'; import { RootState } from "~/store/store"; +import { getUserUuid } from "~/common/getuser"; import { loadDetailsPanel } from '~/store/details-panel/details-panel-action'; import { snackbarActions, SnackbarKind } from '~/store/snackbar/snackbar-actions'; import { favoritePanelActions, loadFavoritePanel } from '~/store/favorite-panel/favorite-panel-action'; @@ -32,7 +33,7 @@ import { setSidePanelBreadcrumbs, setTrashBreadcrumbs } from '~/store/breadcrumbs/breadcrumbs-actions'; -import { navigateTo } from '~/store/navigation/navigation-action'; +import { navigateTo, navigateToRootProject } from '~/store/navigation/navigation-action'; import { MoveToFormDialogData } from '~/store/move-to-dialog/move-to-dialog'; import { ServiceRepository } from '~/services/services'; import { getResource } from '~/store/resources/resources'; @@ -41,7 +42,6 @@ import * as projectMoveActions from '~/store/projects/project-move-actions'; import * as projectUpdateActions from '~/store/projects/project-update-actions'; import * as collectionCreateActions from '~/store/collections/collection-create-actions'; import * as collectionCopyActions from '~/store/collections/collection-copy-actions'; -import * as collectionUpdateActions from '~/store/collections/collection-update-actions'; import * as collectionMoveActions from '~/store/collections/collection-move-actions'; import * as processesActions from '~/store/processes/processes-actions'; import * as processMoveActions from '~/store/processes/process-move-actions'; @@ -96,6 +96,12 @@ import { loadPublicFavoritePanel, publicFavoritePanelActions } from '~/store/pub import { publicFavoritePanelColumns } from '~/views/public-favorites-panel/public-favorites-panel'; import { loadCollectionsContentAddressPanel, collectionsContentAddressActions } from '~/store/collections-content-address-panel/collections-content-address-panel-actions'; import { collectionContentAddressPanelColumns } from '~/views/collection-content-address-panel/collection-content-address-panel'; +import { subprocessPanelActions } from '~/store/subprocess-panel/subprocess-panel-actions'; +import { subprocessPanelColumns } from '~/views/subprocess-panel/subprocess-panel-root'; +import { loadAllProcessesPanel, allProcessesPanelActions } from '../all-processes-panel/all-processes-panel-action'; +import { allProcessesPanelColumns } from '~/views/all-processes-panel/all-processes-panel'; +import { collectionPanelFilesAction } from '../collection-panel/collection-panel-files/collection-panel-files-actions'; +import { createTree } from '~/models/tree'; export const WORKBENCH_LOADING_SCREEN = 'workbenchLoadingScreen'; @@ -104,7 +110,7 @@ export const isWorkbenchLoading = (state: RootState) => { return progress ? progress.working : false; }; -const handleFirstTimeLoad = (action: any) => +export const handleFirstTimeLoad = (action: any) => async (dispatch: Dispatch, getState: () => RootState) => { try { await dispatch(action); @@ -123,6 +129,7 @@ export const loadWorkbench = () => if (user) { dispatch(projectPanelActions.SET_COLUMNS({ columns: projectPanelColumns })); dispatch(favoritePanelActions.SET_COLUMNS({ columns: favoritePanelColumns })); + dispatch(allProcessesPanelActions.SET_COLUMNS({ columns: allProcessesPanelColumns })); dispatch(publicFavoritePanelActions.SET_COLUMNS({ columns: publicFavoritePanelColumns })); dispatch(trashPanelActions.SET_COLUMNS({ columns: trashPanelColumns })); dispatch(sharedWithMePanelActions.SET_COLUMNS({ columns: projectPanelColumns })); @@ -136,6 +143,7 @@ export const loadWorkbench = () => dispatch(computeNodesActions.SET_COLUMNS({ columns: computeNodePanelColumns })); dispatch(apiClientAuthorizationsActions.SET_COLUMNS({ columns: apiClientAuthorizationPanelColumns })); dispatch(collectionsContentAddressActions.SET_COLUMNS({ columns: collectionContentAddressPanelColumns })); + dispatch(subprocessPanelActions.SET_COLUMNS({ columns: subprocessPanelColumns })); if (services.linkAccountService.getAccountToLink()) { dispatch(linkAccountPanelActions.HAS_SESSION_DATA()); @@ -145,7 +153,7 @@ export const loadWorkbench = () => if (router.location) { const match = matchRootRoute(router.location.pathname); if (match) { - dispatch(navigateTo(user.uuid)); + dispatch(navigateToRootProject); } } } else { @@ -174,10 +182,19 @@ export const loadTrash = () => dispatch(setSidePanelBreadcrumbs(SidePanelTreeCategory.TRASH)); }); +export const loadAllProcesses = () => + handleFirstTimeLoad( + (dispatch: Dispatch) => { + dispatch(activateSidePanelTreeItem(SidePanelTreeCategory.ALL_PROCESSES)); + dispatch(loadAllProcessesPanel()); + dispatch(setSidePanelBreadcrumbs(SidePanelTreeCategory.ALL_PROCESSES)); + } + ); + export const loadProject = (uuid: string) => handleFirstTimeLoad( async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { - const userUuid = services.authService.getUuid(); + const userUuid = getUserUuid(getState()); dispatch(setIsProjectPanelTrashed(false)); if (userUuid) { if (extractUuidKind(uuid) === ResourceKind.USER && userUuid !== uuid) { @@ -221,7 +238,7 @@ export const createProject = (data: projectCreateActions.ProjectCreateFormDialog kind: SnackbarKind.SUCCESS })); await dispatch(loadSidePanelTreeProjects(newProject.ownerUuid)); - dispatch(reloadProjectMatchingUuid([newProject.ownerUuid])); + dispatch(navigateTo(newProject.uuid)); } }; @@ -260,14 +277,16 @@ export const updateProject = (data: projectUpdateActions.ProjectUpdateFormDialog export const loadCollection = (uuid: string) => handleFirstTimeLoad( async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { - const userUuid = services.authService.getUuid(); + const userUuid = getUserUuid(getState()); if (userUuid) { + // Clear collection files panel + dispatch(collectionPanelFilesAction.SET_COLLECTION_FILES({ files: createTree() })); 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(activateSidePanelTreeItem(collection.ownerUuid)); dispatch(setSidePanelBreadcrumbs(collection.ownerUuid)); dispatch(loadCollectionPanel(collection.uuid)); }, @@ -285,7 +304,6 @@ export const loadCollection = (uuid: string) => dispatch(activateSidePanelTreeItem(SidePanelTreeCategory.TRASH)); dispatch(loadCollectionPanel(collection.uuid)); }, - }); } }); @@ -300,25 +318,7 @@ export const createCollection = (data: collectionCreateActions.CollectionCreateF kind: SnackbarKind.SUCCESS })); dispatch(updateResources([collection])); - dispatch(reloadProjectMatchingUuid([collection.ownerUuid])); - } - }; - -export const updateCollection = (data: collectionUpdateActions.CollectionUpdateFormDialogData) => - async (dispatch: Dispatch) => { - try { - const collection = await dispatch(collectionUpdateActions.updateCollection(data)); - if (collection) { - dispatch(snackbarActions.OPEN_SNACKBAR({ - message: "Collection has been successfully updated.", - hideDuration: 2000, - kind: SnackbarKind.SUCCESS - })); - dispatch(updateResources([collection])); - dispatch(reloadProjectMatchingUuid([collection.ownerUuid])); - } - } catch (e) { - dispatch(snackbarActions.OPEN_SNACKBAR({ message: e.errors.join(''), hideDuration: 2000, kind: SnackbarKind.ERROR })); + dispatch(navigateTo(collection.uuid)); } }; @@ -360,7 +360,7 @@ export const loadProcess = (uuid: string) => const process = await dispatch(processesActions.loadProcess(uuid)); await dispatch(activateSidePanelTreeItem(process.containerRequest.ownerUuid)); dispatch(setProcessBreadcrumbs(uuid)); - dispatch(loadDetailsPanel(uuid)); + dispatch(loadDetailsPanel(uuid)); }); export const updateProcess = (data: processUpdateActions.ProcessUpdateFormDialogData) =>