X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/52f6efaa4834fcbcb356c3509171f95d2f1af1c7..f17cabd0672f80de53186d42855aacba482b4ccf:/src/store/workbench/workbench-actions.ts diff --git a/src/store/workbench/workbench-actions.ts b/src/store/workbench/workbench-actions.ts index d01143db7e..fb85c0e0c8 100644 --- a/src/store/workbench/workbench-actions.ts +++ b/src/store/workbench/workbench-actions.ts @@ -32,7 +32,7 @@ import { setSidePanelBreadcrumbs, setTrashBreadcrumbs } from '~/store/breadcrumbs/breadcrumbs-actions'; -import { navigateToProject } from '~/store/navigation/navigation-action'; +import { navigateTo } 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'; @@ -68,8 +68,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, @@ -85,12 +84,17 @@ import { computeNodesActions, loadComputeNodesPanel } from '~/store/compute-node import { linkPanelColumns } from '~/views/link-panel/link-panel-root'; import { userPanelColumns } from '~/views/user-panel/user-panel'; import { computeNodePanelColumns } from '~/views/compute-node-panel/compute-node-panel-root'; -import { loadApiClientAuthorizationsPanel } from '~/store/api-client-authorizations/api-client-authorizations-actions'; +import { loadApiClientAuthorizationsPanel, apiClientAuthorizationsActions } from '~/store/api-client-authorizations/api-client-authorizations-actions'; +import { apiClientAuthorizationPanelColumns } from '~/views/api-client-authorization-panel/api-client-authorization-panel-root'; import * as groupPanelActions from '~/store/groups-panel/groups-panel-actions'; import { groupsPanelColumns } from '~/views/groups-panel/groups-panel'; import * as groupDetailsPanelActions from '~/store/group-details-panel/group-details-panel-actions'; 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'; export const WORKBENCH_LOADING_SCREEN = 'workbenchLoadingScreen'; @@ -116,29 +120,28 @@ export const loadWorkbench = () => const { auth, router } = getState(); const { user } = auth; if (user) { - const userResource = await dispatch(loadResource(user.uuid)); - if (userResource) { - dispatch(projectPanelActions.SET_COLUMNS({ columns: projectPanelColumns })); - dispatch(favoritePanelActions.SET_COLUMNS({ columns: favoritePanelColumns })); - dispatch(trashPanelActions.SET_COLUMNS({ columns: trashPanelColumns })); - dispatch(sharedWithMePanelActions.SET_COLUMNS({ columns: projectPanelColumns })); - dispatch(workflowPanelActions.SET_COLUMNS({ columns: workflowPanelColumns })); - dispatch(searchResultsPanelActions.SET_FETCH_MODE({ fetchMode: DataTableFetchMode.INFINITE })); - dispatch(searchResultsPanelActions.SET_COLUMNS({ columns: searchResultsPanelColumns })); - dispatch(userBindedActions.SET_COLUMNS({ columns: userPanelColumns })); - dispatch(groupPanelActions.GroupsPanelActions.SET_COLUMNS({ columns: groupsPanelColumns })); - dispatch(groupDetailsPanelActions.GroupDetailsPanelActions.SET_COLUMNS({columns: groupDetailsPanelColumns})); - dispatch(linkPanelActions.SET_COLUMNS({ columns: linkPanelColumns })); - dispatch(computeNodesActions.SET_COLUMNS({ columns: computeNodePanelColumns })); - dispatch(initSidePanelTree()); - if (router.location) { - const match = matchRootRoute(router.location.pathname); - if (match) { - dispatch(navigateToProject(userResource.uuid)); - } + dispatch(projectPanelActions.SET_COLUMNS({ columns: projectPanelColumns })); + dispatch(favoritePanelActions.SET_COLUMNS({ columns: favoritePanelColumns })); + dispatch(publicFavoritePanelActions.SET_COLUMNS({ columns: publicFavoritePanelColumns })); + dispatch(trashPanelActions.SET_COLUMNS({ columns: trashPanelColumns })); + dispatch(sharedWithMePanelActions.SET_COLUMNS({ columns: projectPanelColumns })); + dispatch(workflowPanelActions.SET_COLUMNS({ columns: workflowPanelColumns })); + dispatch(searchResultsPanelActions.SET_FETCH_MODE({ fetchMode: DataTableFetchMode.INFINITE })); + dispatch(searchResultsPanelActions.SET_COLUMNS({ columns: searchResultsPanelColumns })); + dispatch(userBindedActions.SET_COLUMNS({ columns: userPanelColumns })); + dispatch(groupPanelActions.GroupsPanelActions.SET_COLUMNS({ columns: groupsPanelColumns })); + dispatch(groupDetailsPanelActions.GroupDetailsPanelActions.SET_COLUMNS({ columns: groupDetailsPanelColumns })); + 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(initSidePanelTree()); + if (router.location) { + const match = matchRootRoute(router.location.pathname); + if (match) { + dispatch(navigateTo(user.uuid)); } - } else { - dispatch(userIsNotAuthenticated); } } else { dispatch(userIsNotAuthenticated); @@ -153,6 +156,11 @@ export const loadFavorites = () => dispatch(setSidePanelBreadcrumbs(SidePanelTreeCategory.FAVORITES)); }); +export const loadCollectionContentAddress = handleFirstTimeLoad( + async (dispatch: Dispatch) => { + await dispatch(loadCollectionsContentAddressPanel()); + }); + export const loadTrash = () => handleFirstTimeLoad( (dispatch: Dispatch) => { @@ -204,7 +212,8 @@ export const createProject = (data: projectCreateActions.ProjectCreateFormDialog if (newProject) { dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Project has been successfully created.", - hideDuration: 2000 + hideDuration: 2000, + kind: SnackbarKind.SUCCESS })); await dispatch(loadSidePanelTreeProjects(newProject.ownerUuid)); dispatch(reloadProjectMatchingUuid([newProject.ownerUuid])); @@ -218,14 +227,14 @@ export const moveProject = (data: MoveToFormDialogData) => const oldOwnerUuid = oldProject ? oldProject.ownerUuid : ''; const movedProject = await dispatch(projectMoveActions.moveProject(data)); if (movedProject) { - dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Project has been moved', hideDuration: 2000 })); + dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Project has been moved', hideDuration: 2000, kind: SnackbarKind.SUCCESS })); if (oldProject) { await dispatch(loadSidePanelTreeProjects(oldProject.ownerUuid)); } dispatch(reloadProjectMatchingUuid([oldOwnerUuid, movedProject.ownerUuid, movedProject.uuid])); } } catch (e) { - dispatch(snackbarActions.OPEN_SNACKBAR({ message: e.message, hideDuration: 2000 })); + dispatch(snackbarActions.OPEN_SNACKBAR({ message: e.message, hideDuration: 2000, kind: SnackbarKind.ERROR })); } }; @@ -235,7 +244,8 @@ export const updateProject = (data: projectUpdateActions.ProjectUpdateFormDialog if (updatedProject) { dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Project has been successfully updated.", - hideDuration: 2000 + hideDuration: 2000, + kind: SnackbarKind.SUCCESS })); await dispatch(loadSidePanelTreeProjects(updatedProject.ownerUuid)); dispatch(reloadProjectMatchingUuid([updatedProject.ownerUuid, updatedProject.uuid])); @@ -254,21 +264,21 @@ export const loadCollection = (uuid: string) => dispatch(updateResources([collection])); await 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)); }, }); @@ -281,7 +291,8 @@ export const createCollection = (data: collectionCreateActions.CollectionCreateF if (collection) { dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Collection has been successfully created.", - hideDuration: 2000 + hideDuration: 2000, + kind: SnackbarKind.SUCCESS })); dispatch(updateResources([collection])); dispatch(reloadProjectMatchingUuid([collection.ownerUuid])); @@ -294,7 +305,8 @@ export const updateCollection = (data: collectionUpdateActions.CollectionUpdateF if (collection) { dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Collection has been successfully updated.", - hideDuration: 2000 + hideDuration: 2000, + kind: SnackbarKind.SUCCESS })); dispatch(updateResources([collection])); dispatch(reloadProjectMatchingUuid([collection.ownerUuid])); @@ -328,7 +340,7 @@ export const moveCollection = (data: MoveToFormDialogData) => dispatch(reloadProjectMatchingUuid([collection.ownerUuid])); 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 })); + dispatch(snackbarActions.OPEN_SNACKBAR({ message: e.message, hideDuration: 2000, kind: SnackbarKind.ERROR })); } }; @@ -349,13 +361,14 @@ export const updateProcess = (data: processUpdateActions.ProcessUpdateFormDialog if (process) { dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Process has been successfully updated.", - hideDuration: 2000 + hideDuration: 2000, + kind: SnackbarKind.SUCCESS })); dispatch(updateResources([process])); dispatch(reloadProjectMatchingUuid([process.ownerUuid])); } } catch (e) { - dispatch(snackbarActions.OPEN_SNACKBAR({ message: e.message, hideDuration: 2000 })); + dispatch(snackbarActions.OPEN_SNACKBAR({ message: e.message, hideDuration: 2000, kind: SnackbarKind.ERROR })); } }; @@ -365,9 +378,9 @@ export const moveProcess = (data: MoveToFormDialogData) => const process = await dispatch(processMoveActions.moveProcess(data)); dispatch(updateResources([process])); dispatch(reloadProjectMatchingUuid([process.ownerUuid])); - dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Process has been moved.', hideDuration: 2000 })); + dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Process has been moved.', hideDuration: 2000, kind: SnackbarKind.SUCCESS })); } catch (e) { - dispatch(snackbarActions.OPEN_SNACKBAR({ message: e.message, hideDuration: 2000 })); + dispatch(snackbarActions.OPEN_SNACKBAR({ message: e.message, hideDuration: 2000, kind: SnackbarKind.ERROR })); } }; @@ -377,9 +390,9 @@ export const copyProcess = (data: CopyFormDialogData) => const process = await dispatch(processCopyActions.copyProcess(data)); dispatch(updateResources([process])); dispatch(reloadProjectMatchingUuid([process.ownerUuid])); - dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Process has been copied.', hideDuration: 2000 })); + dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Process has been copied.', hideDuration: 2000, kind: SnackbarKind.SUCCESS })); } catch (e) { - dispatch(snackbarActions.OPEN_SNACKBAR({ message: e.message, hideDuration: 2000 })); + dispatch(snackbarActions.OPEN_SNACKBAR({ message: e.message, hideDuration: 2000, kind: SnackbarKind.ERROR })); } }; @@ -394,15 +407,18 @@ export const loadProcessLog = (uuid: string) => export const resourceIsNotLoaded = (uuid: string) => snackbarActions.OPEN_SNACKBAR({ - message: `Resource identified by ${uuid} is not loaded.` + message: `Resource identified by ${uuid} is not loaded.`, + kind: SnackbarKind.ERROR }); export const userIsNotAuthenticated = snackbarActions.OPEN_SNACKBAR({ - message: 'User is not authenticated' + message: 'User is not authenticated', + kind: SnackbarKind.ERROR }); export const couldNotLoadUser = snackbarActions.OPEN_SNACKBAR({ - message: 'Could not load user' + message: 'Could not load user', + kind: SnackbarKind.ERROR }); export const reloadProjectMatchingUuid = (matchingUuids: string[]) => @@ -431,6 +447,14 @@ export const loadWorkflow = handleFirstTimeLoad(async (dispatch: Dispatch) dispatch(setSidePanelBreadcrumbs(SidePanelTreeCategory.WORKFLOWS)); }); +export const loadPublicFavorites = () => + handleFirstTimeLoad( + (dispatch: Dispatch) => { + dispatch(activateSidePanelTreeItem(SidePanelTreeCategory.PUBLIC_FAVORITES)); + dispatch(loadPublicFavoritePanel()); + dispatch(setSidePanelBreadcrumbs(SidePanelTreeCategory.PUBLIC_FAVORITES)); + }); + export const loadSearchResults = handleFirstTimeLoad( async (dispatch: Dispatch) => { await dispatch(loadSearchResultsPanel()); @@ -459,9 +483,9 @@ export const loadSshKeys = handleFirstTimeLoad( }); export const loadSiteManager = handleFirstTimeLoad( -async (dispatch: Dispatch) => { - await dispatch(loadSiteManagerPanel()); -}); + async (dispatch: Dispatch) => { + await dispatch(loadSiteManagerPanel()); + }); export const loadMyAccount = handleFirstTimeLoad( (dispatch: Dispatch) => {