X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/80fdf9603c057f1e41915e7c8890c942d240b36e..31e84a9315728c2f58a26bf0e9e1d2b38326fb86:/src/store/workbench/workbench-actions.ts diff --git a/src/store/workbench/workbench-actions.ts b/src/store/workbench/workbench-actions.ts index e2276cef..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'; @@ -19,7 +20,7 @@ import { loadSidePanelTreeProjects, SidePanelTreeCategory } from '~/store/side-panel-tree/side-panel-tree-actions'; -import { loadResource, updateResources } from '~/store/resources/resources-actions'; +import { updateResources } from '~/store/resources/resources-actions'; import { projectPanelColumns } from '~/views/project-panel/project-panel'; import { favoritePanelColumns } from '~/views/favorite-panel/favorite-panel'; import { matchRootRoute } from '~/routes/routes'; @@ -32,7 +33,7 @@ import { setSidePanelBreadcrumbs, setTrashBreadcrumbs } from '~/store/breadcrumbs/breadcrumbs-actions'; -import { navigateToProject } 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'; @@ -59,6 +59,7 @@ 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-ssh'; import { loadMyAccountPanel } from '~/store/my-account/my-account-panel-actions'; +import { loadLinkAccountPanel, linkAccountPanelActions } from '~/store/link-account-panel/link-account-panel-actions'; import { loadSiteManagerPanel } from '~/store/auth/auth-action-session'; import { workflowPanelColumns } from '~/views/workflow-panel/workflow-panel-view'; import { progressIndicatorActions } from '~/store/progress-indicator/progress-indicator-actions'; @@ -68,8 +69,7 @@ import { FilterBuilder } from '~/services/api/filter-builder'; import { GroupContentsResource } from '~/services/groups-service/groups-service'; import { MatchCases, ofType, unionize, UnionOf } 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 { collectionPanelActions } from "~/store/collection-panel/collection-panel-action"; +import { collectionPanelActions, loadCollectionPanel } from "~/store/collection-panel/collection-panel-action"; import { CollectionResource } from "~/models/collection"; import { loadSearchResultsPanel, @@ -93,6 +93,15 @@ import * as groupDetailsPanelActions from '~/store/group-details-panel/group-det import { groupDetailsPanelColumns } from '~/views/group-details-panel/group-details-panel'; import { DataTableFetchMode } from "~/components/data-table/data-table"; import { loadPublicFavoritePanel, publicFavoritePanelActions } from '~/store/public-favorites-panel/public-favorites-action'; +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'; @@ -101,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); @@ -113,14 +122,15 @@ const handleFirstTimeLoad = (action: any) => }; export const loadWorkbench = () => - async (dispatch: Dispatch, getState: () => RootState) => { + async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { dispatch(progressIndicatorActions.START_WORKING(WORKBENCH_LOADING_SCREEN)); const { auth, router } = getState(); const { user } = auth; if (user) { dispatch(projectPanelActions.SET_COLUMNS({ columns: projectPanelColumns })); dispatch(favoritePanelActions.SET_COLUMNS({ columns: favoritePanelColumns })); - dispatch(publicFavoritePanelActions.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 })); dispatch(workflowPanelActions.SET_COLUMNS({ columns: workflowPanelColumns })); @@ -132,12 +142,18 @@ export const loadWorkbench = () => dispatch(linkPanelActions.SET_COLUMNS({ columns: linkPanelColumns })); 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()); + } dispatch(initSidePanelTree()); if (router.location) { const match = matchRootRoute(router.location.pathname); if (match) { - dispatch(navigateToProject(user.uuid)); + dispatch(navigateToRootProject); } } } else { @@ -153,6 +169,11 @@ export const loadFavorites = () => dispatch(setSidePanelBreadcrumbs(SidePanelTreeCategory.FAVORITES)); }); +export const loadCollectionContentAddress = handleFirstTimeLoad( + async (dispatch: Dispatch) => { + await dispatch(loadCollectionsContentAddressPanel()); + }); + export const loadTrash = () => handleFirstTimeLoad( (dispatch: Dispatch) => { @@ -161,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) { @@ -208,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)); } }; @@ -247,32 +277,33 @@ 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(loadCollectionFiles(collection.uuid)); + dispatch(loadCollectionPanel(collection.uuid)); }, SHARED: collection => { dispatch(collectionPanelActions.SET_COLLECTION(collection as CollectionResource)); dispatch(updateResources([collection])); dispatch(setSharedWithMeBreadcrumbs(collection.ownerUuid)); dispatch(activateSidePanelTreeItem(collection.ownerUuid)); - dispatch(loadCollectionFiles(collection.uuid)); + dispatch(loadCollectionPanel(collection.uuid)); }, TRASHED: collection => { dispatch(collectionPanelActions.SET_COLLECTION(collection as CollectionResource)); dispatch(updateResources([collection])); dispatch(setTrashBreadcrumbs('')); dispatch(activateSidePanelTreeItem(SidePanelTreeCategory.TRASH)); - dispatch(loadCollectionFiles(collection.uuid)); + dispatch(loadCollectionPanel(collection.uuid)); }, - }); } }); @@ -287,21 +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) => { - 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])); + dispatch(navigateTo(collection.uuid)); } }; @@ -343,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) => @@ -484,6 +501,11 @@ export const loadMyAccount = handleFirstTimeLoad( dispatch(loadMyAccountPanel()); }); +export const loadLinkAccount = handleFirstTimeLoad( + (dispatch: Dispatch) => { + dispatch(loadLinkAccountPanel()); + }); + export const loadKeepServices = handleFirstTimeLoad( async (dispatch: Dispatch) => { await dispatch(loadKeepServicesPanel());