projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
21225: Fix capped maxWidth preventing full width with negative margins on MPV
[arvados.git]
/
services
/
workbench2
/
src
/
store
/
project-panel
/
project-panel-middleware-service.ts
diff --git
a/services/workbench2/src/store/project-panel/project-panel-middleware-service.ts
b/services/workbench2/src/store/project-panel/project-panel-middleware-service.ts
index c0c0cd1873f262546b694bf2132a5e353f12cb14..61c89cd6a78ea76331fbb89aad8aeac9fddf7c47 100644
(file)
--- a/
services/workbench2/src/store/project-panel/project-panel-middleware-service.ts
+++ b/
services/workbench2/src/store/project-panel/project-panel-middleware-service.ts
@@
-35,6
+35,9
@@
import { updatePublicFavorites } from "store/public-favorites/public-favorites-a
import { selectedFieldsOfGroup } from "models/group";
import { defaultCollectionSelectedFields } from "models/collection";
import { containerRequestFieldsNoMounts } from "models/container-request";
import { selectedFieldsOfGroup } from "models/group";
import { defaultCollectionSelectedFields } from "models/collection";
import { containerRequestFieldsNoMounts } from "models/container-request";
+import { ContextMenuActionNames } from "views-components/context-menu/context-menu-action-set";
+import { removeDisabledButton } from "store/multiselect/multiselect-actions";
+import { dataExplorerActions } from "store/data-explorer/data-explorer-action";
export class ProjectPanelMiddlewareService extends DataExplorerMiddlewareService {
constructor(private services: ServiceRepository, id: string) {
export class ProjectPanelMiddlewareService extends DataExplorerMiddlewareService {
constructor(private services: ServiceRepository, id: string) {
@@
-52,9
+55,10
@@
export class ProjectPanelMiddlewareService extends DataExplorerMiddlewareService
api.dispatch(projectPanelDataExplorerIsNotSet());
} else {
try {
api.dispatch(projectPanelDataExplorerIsNotSet());
} else {
try {
+ api.dispatch<any>(dataExplorerActions.SET_IS_NOT_FOUND({ id: this.id, isNotFound: false }));
if (!background) { api.dispatch(progressIndicatorActions.START_WORKING(this.getId())); }
const response = await this.services.groupsService.contents(projectUuid, getParams(dataExplorer, !!isProjectTrashed));
if (!background) { api.dispatch(progressIndicatorActions.START_WORKING(this.getId())); }
const response = await this.services.groupsService.contents(projectUuid, getParams(dataExplorer, !!isProjectTrashed));
- const resourceUuids =
response.items.map(item => item.uuid)
;
+ const resourceUuids =
[...response.items.map(item => item.uuid), projectUuid]
;
api.dispatch<any>(updateFavorites(resourceUuids));
api.dispatch<any>(updatePublicFavorites(resourceUuids));
api.dispatch(updateResources(response.items));
api.dispatch<any>(updateFavorites(resourceUuids));
api.dispatch<any>(updatePublicFavorites(resourceUuids));
api.dispatch(updateResources(response.items));
@@
-69,9
+73,17
@@
export class ProjectPanelMiddlewareService extends DataExplorerMiddlewareService
rowsPerPage: dataExplorer.rowsPerPage,
})
);
rowsPerPage: dataExplorer.rowsPerPage,
})
);
- api.dispatch(couldNotFetchProjectContents());
+ if (e.status === 404) {
+ api.dispatch<any>(dataExplorerActions.SET_IS_NOT_FOUND({ id: this.id, isNotFound: true}));
+ }
+ else {
+ api.dispatch(couldNotFetchProjectContents());
+ }
} finally {
} finally {
- if (!background) { api.dispatch(progressIndicatorActions.PERSIST_STOP_WORKING(this.getId())); }
+ if (!background) {
+ api.dispatch(progressIndicatorActions.PERSIST_STOP_WORKING(this.getId()));
+ api.dispatch<any>(removeDisabledButton(ContextMenuActionNames.MOVE_TO_TRASH))
+ }
}
}
}
}
}
}