Merge branch '21535-multi-wf-delete'
authorLisa Knox <lisaknox83@gmail.com>
Thu, 16 May 2024 13:41:37 +0000 (09:41 -0400)
committerLisa Knox <lisaknox83@gmail.com>
Thu, 16 May 2024 13:41:37 +0000 (09:41 -0400)
closes #21535

Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox@curii.com>

1  2 
services/workbench2/cypress/e2e/workflow.cy.js
services/workbench2/src/components/icon/icon.tsx
services/workbench2/src/components/multiselect-toolbar/ms-toolbar-action-filters.ts
services/workbench2/src/views-components/context-menu/action-sets/workflow-action-set.ts
services/workbench2/src/views-components/multiselect-toolbar/ms-process-action-set.ts
services/workbench2/src/views-components/multiselect-toolbar/ms-workflow-action-set.ts
services/workbench2/src/views/workbench/workbench.tsx

index 08c2e8f45476874d32f6474d545f6a1a6ee2dfe2,bb7f6c2bf9f9c74b4a79bb356133907c235db801..476c0cbe57399f2f0d85c78fb00ffb95b04fa63f
@@@ -179,13 -179,13 +179,20 @@@ export const DoubleRightArrows: IconTyp
      </SvgIcon>
  )
  
 +//https://pictogrammers.com/library/memory/icon/box-light-vertical/
 +export const VerticalLineDivider: IconType = (props: any) => (
 +    <SvgIcon {...props}>
 +        <path d="M12 0V22H10V0H12Z" />
 +    </SvgIcon>
 +)
 +
+ //https://pictogrammers.com/library/mdi/icon/delete-forever/
+ export const DeleteForever: IconType = (props: any) => (
+     <SvgIcon {...props}>
+         <path d="M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19M8.46,11.88L9.87,10.47L12,12.59L14.12,10.47L15.53,11.88L13.41,14L15.53,16.12L14.12,17.53L12,15.41L9.88,17.53L8.47,16.12L10.59,14L8.46,11.88M15.5,4L14.5,3H9.5L8.5,4H5V6H19V4H15.5Z" />
+     </SvgIcon>
+ )
  export type IconType = React.SFC<{ className?: string; style?: object }>;
  
  export const AddIcon: IconType = props => <Add {...props} />;
index f03340db4b91758f2c2b7130df92c1cff239e62b,6da6a7102f9c38ba01f4966b97f2c115dd6c837a..4e76f2aa4d0c979b8a3ff1ce428a544082dd6fbe
@@@ -2,9 -2,9 +2,9 @@@
  //
  // SPDX-License-Identifier: AGPL-3.0
  
 -import { ContextMenuActionSet } from "views-components/context-menu/context-menu-action-set";
 +import { ContextMenuActionSet, ContextMenuActionNames } from "views-components/context-menu/context-menu-action-set";
- import { openRunProcess, deleteWorkflow } from "store/workflow-panel/workflow-panel-actions";
- import { DetailsIcon, AdvancedIcon, OpenIcon, Link, StartIcon, TrashIcon } from "components/icon/icon";
+ import { openRunProcess, openRemoveWorkflowDialog } from "store/workflow-panel/workflow-panel-actions";
+ import { DetailsIcon, AdvancedIcon, OpenIcon, Link, StartIcon, DeleteForever } from "components/icon/icon";
  import { copyToClipboardAction, openInNewTabAction } from "store/open-in-new-tab/open-in-new-tab.actions";
  import { toggleDetailsPanel } from "store/details-panel/details-panel-action";
  import { openAdvancedTabDialog } from "store/advanced-tab/advanced-tab";
index 73aebe27bcb87ffcf474839923ac94fd8a20beaf,b6ab92471df71408cafbcda8d6bd4d8e9141841b..0637fcc468acff64726a15879644759b5ca5bab3
@@@ -2,11 -2,12 +2,11 @@@
  //
  // SPDX-License-Identifier: AGPL-3.0
  
- import { RemoveIcon, ReRunProcessIcon, OutputIcon, RenameIcon, StopIcon } from "components/icon/icon";
 -import { MoveToIcon, DeleteForever, ReRunProcessIcon, OutputIcon, RenameIcon, StopIcon } from "components/icon/icon";
 -import { openMoveProcessDialog } from "store/processes/process-move-actions";
++import { ContextMenuActionNames } from "views-components/context-menu/context-menu-action-set";
++import { DeleteForever, ReRunProcessIcon, OutputIcon, RenameIcon, StopIcon } from "components/icon/icon";
  import { openCopyProcessDialog } from "store/processes/process-copy-actions";
  import { openRemoveProcessDialog } from "store/processes/processes-actions";
  import { MultiSelectMenuAction, MultiSelectMenuActionSet, msCommonActionSet } from "./ms-menu-actions";
- import { ContextMenuActionNames } from "views-components/context-menu/context-menu-action-set";
 -import { MultiSelectMenuActionNames } from "components/multiselect-toolbar/ms-menu-actions"; 
  import { openProcessUpdateDialog } from "store/processes/process-update-actions";
  import { msNavigateToOutput } from "store/multiselect/multiselect-actions";
  import { cancelRunningWorkflow } from "store/processes/processes-actions";
@@@ -24,8 -25,8 +24,8 @@@ const msCopyAndRerunProcess: MultiSelec
  }
  
  const msRemoveProcess: MultiSelectMenuAction = {
 -    name: MultiSelectMenuActionNames.REMOVE,
 +    name: ContextMenuActionNames.REMOVE,
-     icon: RemoveIcon,
+     icon: DeleteForever,
      hasAlts: false,
      isForMulti: true,
      execute: (dispatch, resources) => {
index 9c5cdd79e03cc72e97659b33f1133407b53473db,cc8ebef20f0150bf01a461272e4c8905cdd92ec9..124981aa17943d385d64538d4b4763c0460ad82d
@@@ -2,15 -2,13 +2,15 @@@
  //
  // SPDX-License-Identifier: AGPL-3.0
  
- import { openRunProcess, deleteWorkflow } from 'store/workflow-panel/workflow-panel-actions';
- import { StartIcon, TrashIcon, Link } from 'components/icon/icon';
+ import { openRunProcess, openRemoveWorkflowDialog } from 'store/workflow-panel/workflow-panel-actions';
+ import { StartIcon, DeleteForever, Link } from 'components/icon/icon';
  import { MultiSelectMenuAction, MultiSelectMenuActionSet, msCommonActionSet } from './ms-menu-actions';
 -import { MultiSelectMenuActionNames } from "components/multiselect-toolbar/ms-menu-actions"; 
 +import { ContextMenuActionNames } from 'views-components/context-menu/context-menu-action-set';
  import { copyToClipboardAction } from 'store/open-in-new-tab/open-in-new-tab.actions';
 +import { openSharingDialog } from 'store/sharing-dialog/sharing-dialog-actions';
 +import { ShareIcon } from 'components/icon/icon';
  
 -const { OPEN_IN_NEW_TAB, COPY_TO_CLIPBOARD, VIEW_DETAILS, API_DETAILS, RUN_WORKFLOW, DELETE_WORKFLOW } = MultiSelectMenuActionNames;
 +const { OPEN_IN_NEW_TAB, COPY_LINK_TO_CLIPBOARD, VIEW_DETAILS, API_DETAILS, RUN_WORKFLOW, DELETE_WORKFLOW, SHARE } = ContextMenuActionNames;
  
  const msRunWorkflow: MultiSelectMenuAction = {
      name: RUN_WORKFLOW,