Merge branch '17782-react-scripts-ts-migration' into main. Closes #17782

[arvados-workbench2.git] / src / store / details-panel / details-panel-action.ts

diff --git a/src/store/details-panel/details-panel-action.ts b/src/store/details-panel/details-panel-action.ts
index cbce4210e5b055cb55217ae68a395305bc805342..bda35441a83fda894d80338dbabe48dd33fd5943 100644 (file)
--- a/src/store/details-panel/details-panel-action.ts
+++ b/src/store/details-panel/details-panel-action.ts
@@ -2,22 +2,22 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { unionize, ofType, UnionOf } from '~/common/unionize';
-import { RootState } from '~/store/store';
+import { unionize, ofType, UnionOf } from 'common/unionize';
+import { RootState } from 'store/store';
 import { Dispatch } from 'redux';
-import { dialogActions } from '~/store/dialog/dialog-actions';
-import { getResource } from '~/store/resources/resources';
-import { ProjectResource } from "~/models/project";
-import { ServiceRepository } from '~/services/services';
-import { TagProperty } from '~/models/tag';
+import { dialogActions } from 'store/dialog/dialog-actions';
+import { getResource } from 'store/resources/resources';
+import { ProjectResource } from "models/project";
+import { ServiceRepository } from 'services/services';
+import { TagProperty } from 'models/tag';
 import { startSubmit, stopSubmit } from 'redux-form';
-import { resourcesActions } from '~/store/resources/resources-actions';
-import {snackbarActions, SnackbarKind} from '~/store/snackbar/snackbar-actions';
-import { addProperty, deleteProperty } from '~/lib/resource-properties';
-import { FilterBuilder } from '~/services/api/filter-builder';
-import { OrderBuilder } from '~/services/api/order-builder';
-import { CollectionResource } from '~/models/collection';
-import { extractUuidKind, ResourceKind } from '~/models/resource';
+import { resourcesActions } from 'store/resources/resources-actions';
+import {snackbarActions, SnackbarKind} from 'store/snackbar/snackbar-actions';
+import { addProperty, deleteProperty } from 'lib/resource-properties';
+import { FilterBuilder } from 'services/api/filter-builder';
+import { OrderBuilder } from 'services/api/order-builder';
+import { CollectionResource } from 'models/collection';
+import { extractUuidKind, ResourceKind } from 'models/resource';
 
 export const SLIDE_TIMEOUT = 500;
 
@@ -37,7 +37,8 @@ export const loadDetailsPanel = (uuid: string) =>
         if (getState().detailsPanel.isOpened) {
             switch(extractUuidKind(uuid)) {
                 case ResourceKind.COLLECTION:
-                    dispatch<any>(refreshCollectionVersionsList(uuid));
+                    const c = getResource<CollectionResource>(uuid)(getState().resources);
+                    dispatch<any>(refreshCollectionVersionsList(c!.currentVersionUuid));
                     break;
                 default:
                     break;
@@ -46,10 +47,12 @@ export const loadDetailsPanel = (uuid: string) =>
         dispatch(detailsPanelActions.LOAD_DETAILS_PANEL(uuid));
     };
 
-export const openDetailsPanel = (uuid: string, tabNr: number = 0) =>
+export const openDetailsPanel = (uuid?: string, tabNr: number = 0) =>
     (dispatch: Dispatch) => {
-        dispatch<any>(loadDetailsPanel(uuid));
         dispatch(detailsPanelActions.OPEN_DETAILS_PANEL(tabNr));
+        if (uuid !== undefined) {
+            dispatch<any>(loadDetailsPanel(uuid));
+        }
     };
 
 export const openProjectPropertiesDialog = () =>
@@ -58,15 +61,19 @@ export const openProjectPropertiesDialog = () =>
     };
 
 export const refreshCollectionVersionsList = (uuid: string) =>
-    async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
-        const versions = await services.collectionService.list({
+    (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+        services.collectionService.list({
             filters: new FilterBuilder()
                 .addEqual('current_version_uuid', uuid)
                 .getFilters(),
             includeOldVersions: true,
             order: new OrderBuilder<CollectionResource>().addDesc("version").getOrder()
-        });
-        dispatch(resourcesActions.SET_RESOURCES(versions.items.slice(1)));
+        }).then(versions => dispatch(resourcesActions.SET_RESOURCES(versions.items))
+        ).catch(e => snackbarActions.OPEN_SNACKBAR({
+            message: `Couldn't retrieve versions: ${e.errors[0]}`,
+            hideDuration: 2000,
+            kind: SnackbarKind.ERROR })
+        );
     };
 
 export const deleteProjectProperty = (key: string, value: string) =>
@@ -112,11 +119,14 @@ export const createProjectProperty = (data: TagProperty) =>
             dispatch(snackbarActions.OPEN_SNACKBAR({ message: e.errors[0], hideDuration: 2000, kind: SnackbarKind.ERROR }));
         }
     };
-export const toggleDetailsPanel = () => (dispatch: Dispatch) => {
+export const toggleDetailsPanel = () => (dispatch: Dispatch, getState: () => RootState) => {
     // because of material-ui issue resizing details panel breaks tabs.
     // triggering window resize event fixes that.
     setTimeout(() => {
         window.dispatchEvent(new Event('resize'));
     }, SLIDE_TIMEOUT);
     dispatch(detailsPanelActions.TOGGLE_DETAILS_PANEL());
+    if (getState().detailsPanel.isOpened) {
+        dispatch<any>(loadDetailsPanel(getState().detailsPanel.resourceUuid));
+    }
 };