projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
14096-move-to-process
[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 3440a3053dad930dd1db230e0b52e9100e690935..eabf41ae715ad715e6072ca46383c0499461d170 100644
(file)
--- a/
src/store/context-menu/context-menu-actions.ts
+++ b/
src/store/context-menu/context-menu-actions.ts
@@
-3,13
+3,13
@@
// SPDX-License-Identifier: AGPL-3.0
import { unionize, ofType, UnionOf } from '~/common/unionize';
// SPDX-License-Identifier: AGPL-3.0
import { unionize, ofType, UnionOf } from '~/common/unionize';
-import { ContextMenuPosition
, ContextMenuResource
} from "./context-menu-reducer";
+import { ContextMenuPosition } from "./context-menu-reducer";
import { ContextMenuKind } from '~/views-components/context-menu/context-menu';
import { Dispatch } from 'redux';
import { RootState } from '~/store/store';
import { getResource } from '../resources/resources';
import { ProjectResource } from '~/models/project';
import { ContextMenuKind } from '~/views-components/context-menu/context-menu';
import { Dispatch } from 'redux';
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 { matchProcessRoute } from '~/routes/routes';
import { isSidePanelTreeCategory } from '~/store/side-panel-tree/side-panel-tree-actions';
import { extractUuidKind, ResourceKind } from '~/models/resource';
import { matchProcessRoute } from '~/routes/routes';
@@
-21,7
+21,17
@@
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: ResourceKind,
+ menuKind: ContextMenuKind;
+ isTrashed?: boolean;
+};
+
+export const openContextMenu = (event: React.MouseEvent<HTMLElement>, resource: ContextMenuResource) =>
(dispatch: Dispatch) => {
event.preventDefault();
dispatch(
(dispatch: Dispatch) => {
event.preventDefault();
dispatch(
@@
-34,24
+44,30
@@
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: res.kind,
+ menuKind: 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: res.kind,
+ menuKind: ContextMenuKind.PROJECT,
+ ownerUuid: res.ownerUuid,
+ isTrashed: res.isTrashed
}));
}
};
}));
}
};
@@
-72,16
+88,15
@@
export const openProcessContextMenu = (event: React.MouseEvent<HTMLElement>) =>
(dispatch: Dispatch, getState: () => RootState) => {
const { location } = getState().router;
const pathname = location ? location.pathname : '';
(dispatch: Dispatch, getState: () => RootState) => {
const { location } = getState().router;
const pathname = location ? location.pathname : '';
- // ToDo: We get error from matchProcessRoute
- // const match = matchProcessRoute(pathname);
- // console.log('match: ', match);
- // const uuid = match ? match.params.id : '';
- const uuid = pathname.split('/').slice(-1)[0];
+ const match = matchProcessRoute(pathname);
+ const uuid = match ? match.params.id : '';
const resource = {
uuid,
const resource = {
uuid,
+ ownerUuid: '',
+ kind: ResourceKind.PROCESS,
name: '',
description: '',
name: '',
description: '',
-
k
ind: ContextMenuKind.PROCESS
+
menuK
ind: ContextMenuKind.PROCESS
};
dispatch<any>(openContextMenu(event, resource));
};
};
dispatch<any>(openContextMenu(event, resource));
};
@@
-93,6
+108,8
@@
export const resourceKindToContextMenuKind = (uuid: string) => {
return ContextMenuKind.PROJECT;
case ResourceKind.COLLECTION:
return ContextMenuKind.COLLECTION_RESOURCE;
return ContextMenuKind.PROJECT;
case ResourceKind.COLLECTION:
return ContextMenuKind.COLLECTION_RESOURCE;
+ case ResourceKind.PROCESS:
+ return ContextMenuKind.PROCESS_RESOURCE;
case ResourceKind.USER:
return ContextMenuKind.ROOT_PROJECT;
default:
case ResourceKind.USER:
return ContextMenuKind.ROOT_PROJECT;
default: