projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '14308-basic-view-saving-and-removing-queries'
[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 eabf41ae715ad715e6072ca46383c0499461d170..3ae79db40515e3381a421930095783b70a925812 100644
(file)
--- a/
src/store/context-menu/context-menu-actions.ts
+++ b/
src/store/context-menu/context-menu-actions.ts
@@
-13,6
+13,7
@@
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';
+import { Process } from '~/store/processes/process';
export const contextMenuActions = unionize({
OPEN_CONTEXT_MENU: ofType<{ position: ContextMenuPosition, resource: ContextMenuResource }>(),
export const contextMenuActions = unionize({
OPEN_CONTEXT_MENU: ofType<{ position: ContextMenuPosition, resource: ContextMenuResource }>(),
@@
-30,13
+31,18
@@
export type ContextMenuResource = {
menuKind: ContextMenuKind;
isTrashed?: boolean;
};
menuKind: ContextMenuKind;
isTrashed?: boolean;
};
-
+export const isKeyboardClick = (event: React.MouseEvent<HTMLElement>) =>
+ event.nativeEvent.detail === 0;
export const openContextMenu = (event: React.MouseEvent<HTMLElement>, resource: ContextMenuResource) =>
(dispatch: Dispatch) => {
event.preventDefault();
export const openContextMenu = (event: React.MouseEvent<HTMLElement>, resource: ContextMenuResource) =>
(dispatch: Dispatch) => {
event.preventDefault();
+ const { left, top } = event.currentTarget.getBoundingClientRect();
dispatch(
contextMenuActions.OPEN_CONTEXT_MENU({
dispatch(
contextMenuActions.OPEN_CONTEXT_MENU({
- position: { x: event.clientX, y: event.clientY },
+ position: {
+ x: event.clientX || left,
+ y: event.clientY || top,
+ },
resource
})
);
resource
})
);
@@
-84,14
+90,10
@@
export const openSidePanelContextMenu = (event: React.MouseEvent<HTMLElement>, i
}
};
}
};
-export const openProcessContextMenu = (event: React.MouseEvent<HTMLElement>) =>
+export const openProcessContextMenu = (event: React.MouseEvent<HTMLElement>
, process: Process
) =>
(dispatch: Dispatch, getState: () => RootState) => {
(dispatch: Dispatch, getState: () => RootState) => {
- const { location } = getState().router;
- const pathname = location ? location.pathname : '';
- const match = matchProcessRoute(pathname);
- const uuid = match ? match.params.id : '';
const resource = {
const resource = {
- uuid,
+ uuid
: process.containerRequest.uuid
,
ownerUuid: '',
kind: ResourceKind.PROCESS,
name: '',
ownerUuid: '',
kind: ResourceKind.PROCESS,
name: '',