X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ec2ce1a965e15cb272737251b56bca2c1529ebff..5df95741b820e18db893c8ce1fac67b921b7fafc:/src/store/workbench/workbench-actions.ts diff --git a/src/store/workbench/workbench-actions.ts b/src/store/workbench/workbench-actions.ts index ddfe296cbd..dc638387bb 100644 --- a/src/store/workbench/workbench-actions.ts +++ b/src/store/workbench/workbench-actions.ts @@ -19,7 +19,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 +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'; @@ -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, @@ -92,6 +92,10 @@ 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'; @@ -112,13 +116,14 @@ 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: publicFavoritePanelColumns })); dispatch(trashPanelActions.SET_COLUMNS({ columns: trashPanelColumns })); dispatch(sharedWithMePanelActions.SET_COLUMNS({ columns: projectPanelColumns })); dispatch(workflowPanelActions.SET_COLUMNS({ columns: workflowPanelColumns })); @@ -130,12 +135,17 @@ 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 })); + + 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(navigateTo(user.uuid)); } } } else { @@ -151,6 +161,11 @@ export const loadFavorites = () => dispatch(setSidePanelBreadcrumbs(SidePanelTreeCategory.FAVORITES)); }); +export const loadCollectionContentAddress = handleFirstTimeLoad( + async (dispatch: Dispatch) => { + await dispatch(loadCollectionsContentAddressPanel()); + }); + export const loadTrash = () => handleFirstTimeLoad( (dispatch: Dispatch) => { @@ -254,21 +269,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)); }, }); @@ -437,6 +452,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()); @@ -474,6 +497,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());