projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refs #master Merge branch 'origin/master' into 13828-trash-view
[arvados-workbench2.git]
/
src
/
store
/
context-menu
/
context-menu-actions.ts
diff --git
a/src/store/context-menu/context-menu-actions.ts
b/src/store/context-menu/context-menu-actions.ts
index cf66a53d2361587823219d3d698cfa2572fd07d5..a1ed6c5536bc4b71bb2b6b8e26ed5fc4f16dfcf7 100644
(file)
--- a/
src/store/context-menu/context-menu-actions.ts
+++ b/
src/store/context-menu/context-menu-actions.ts
@@
-9,7
+9,7
@@
import { Dispatch } from 'redux';
import { RootState } from '~/store/store';
import { getResource } from '../resources/resources';
import { ProjectResource } from '~/models/project';
import { RootState } from '~/store/store';
import { getResource } from '../resources/resources';
import { ProjectResource } from '~/models/project';
-import { UserResource } from '
../..
/models/user';
+import { UserResource } from '
~
/models/user';
import { isSidePanelTreeCategory } from '~/store/side-panel-tree/side-panel-tree-actions';
import { extractUuidKind, ResourceKind } from '~/models/resource';
import { isSidePanelTreeCategory } from '~/store/side-panel-tree/side-panel-tree-actions';
import { extractUuidKind, ResourceKind } from '~/models/resource';
@@
-20,7
+20,16
@@
export const contextMenuActions = unionize({
export type ContextMenuAction = UnionOf<typeof contextMenuActions>;
export type ContextMenuAction = UnionOf<typeof contextMenuActions>;
-export const openContextMenu = (event: React.MouseEvent<HTMLElement>, resource: { name: string; uuid: string; description?: string; kind: ContextMenuKind; }) =>
+export type ContextMenuResource = {
+ name: string;
+ uuid: string;
+ ownerUuid: string;
+ description?: string;
+ kind: ContextMenuKind;
+ isTrashed?: boolean;
+}
+
+export const openContextMenu = (event: React.MouseEvent<HTMLElement>, resource: ContextMenuResource) =>
(dispatch: Dispatch) => {
event.preventDefault();
dispatch(
(dispatch: Dispatch) => {
event.preventDefault();
dispatch(
@@
-33,24
+42,28
@@
export const openContextMenu = (event: React.MouseEvent<HTMLElement>, resource:
export const openRootProjectContextMenu = (event: React.MouseEvent<HTMLElement>, projectUuid: string) =>
(dispatch: Dispatch, getState: () => RootState) => {
export const openRootProjectContextMenu = (event: React.MouseEvent<HTMLElement>, projectUuid: string) =>
(dispatch: Dispatch, getState: () => RootState) => {
- const
userResource
= getResource<UserResource>(projectUuid)(getState().resources);
- if (
userResource
) {
+ const
res
= getResource<UserResource>(projectUuid)(getState().resources);
+ if (
res
) {
dispatch<any>(openContextMenu(event, {
name: '',
dispatch<any>(openContextMenu(event, {
name: '',
- uuid: userResource.uuid,
- kind: ContextMenuKind.ROOT_PROJECT
+ uuid: res.uuid,
+ ownerUuid: res.uuid,
+ kind: ContextMenuKind.ROOT_PROJECT,
+ isTrashed: false
}));
}
};
export const openProjectContextMenu = (event: React.MouseEvent<HTMLElement>, projectUuid: string) =>
(dispatch: Dispatch, getState: () => RootState) => {
}));
}
};
export const openProjectContextMenu = (event: React.MouseEvent<HTMLElement>, projectUuid: string) =>
(dispatch: Dispatch, getState: () => RootState) => {
- const
projectResource
= getResource<ProjectResource>(projectUuid)(getState().resources);
- if (
projectResource
) {
+ const
res
= getResource<ProjectResource>(projectUuid)(getState().resources);
+ if (
res
) {
dispatch<any>(openContextMenu(event, {
dispatch<any>(openContextMenu(event, {
- name: projectResource.name,
- uuid: projectResource.uuid,
- kind: ContextMenuKind.PROJECT
+ name: res.name,
+ uuid: res.uuid,
+ kind: ContextMenuKind.PROJECT,
+ ownerUuid: res.ownerUuid,
+ isTrashed: res.isTrashed
}));
}
};
}));
}
};