change Save + Exit activity to just an Exit activity

This activity still allows you to save your changes if you like

Author: ahmedhamidawan

client/src/components/Workflow/Editor/Index.vue

@@ -15,7 +15,11 @@
             @onRefactor="onRefactor"
             @onShow="hideModal" />
         <MessagesModal :title="messageTitle" :message="messageBody" :error="messageIsError" @onHidden="resetMessage" />
-        <SaveChangesModal :nav-url.sync="navUrl" :show-modal.sync="showSaveChangesModal" @on-proceed="onNavigate" />
+        <SaveChangesModal
+            :append-version="saveChangesAppendVersion"
+            :nav-url="navUrl"
+            :show-modal.sync="showSaveChangesModal"
+            @on-proceed="onNavigate" />
         <GModal
             :show.sync="showSaveAsModal"
             confirm
@@ -624,7 +628,6 @@ export default {
 
         const { specialWorkflowActivities, exitWorkflowActivity, runWorkflowActivity } = useSpecialWorkflowActivities(
             computed(() => ({
-                hasInvalidConnections: hasInvalidConnections.value,
                 lintData: lintData,
             })),
         );
@@ -768,6 +771,7 @@ export default {
             graphOffset: { left: 0, top: 0, width: 0, height: 0 },
             debounceTimer: null,
             showSaveChangesModal: false,
+            saveChangesAppendVersion: false,
             navUrl: "",
             faArrowLeft,
             faArrowRight,
@@ -1008,13 +1012,8 @@ export default {
             }
         },
         async onActivityClicked(activityId) {
-            if (activityId === "save-and-exit") {
-                await this.saveOrCreate();
-                this.$router.push("/workflows/list");
-            }
-
             if (activityId === "exit") {
-                this.$router.push("/workflows/list");
+                this.onNavigate("/workflows/list");
             }
 
             if (activityId === "workflow-download") {
@@ -1123,6 +1122,7 @@ export default {
             } else if (this.hasChanges && !forceSave && !ignoreChanges) {
                 // if there are changes, prompt user to save or discard or cancel
                 this.navUrl = url;
+                this.saveChangesAppendVersion = appendVersion;
                 this.showSaveChangesModal = true;
             } else if (forceSave) {
                 // when forceSave is true, save the workflow before navigating

client/src/components/Workflow/Editor/SaveChangesModal.vue

@@ -13,19 +13,20 @@ interface Props {
     showModal: boolean;
     /** The URL to navigate to before saving/ignoring changes */
     navUrl: string;
+    /** Whether to append the version to the URL */
+    appendVersion: boolean;
 }
 
 const props = withDefaults(defineProps<Props>(), {
     showModal: false,
+    appendVersion: false,
 });
 
 const busy = ref(false);
 
 const emit = defineEmits<{
     /** Proceed with or without saving the changes */
     (e: "on-proceed", url: string, forceSave: boolean, ignoreChanges: boolean, appendVersion: boolean): void;
-    /** Update the nav URL prop */
-    (e: "update:nav-url", url: string): void;
     /** Update the show modal boolean prop */
     (e: "update:show-modal", showModal: boolean): void;
 }>();
@@ -43,18 +44,17 @@ const buttonTitles = {
 
 function closeModal() {
     emit("update:show-modal", false);
-    emit("update:nav-url", "");
 }
 
 function dontSave() {
     busy.value = true;
-    emit("on-proceed", props.navUrl, false, true, true);
+    emit("on-proceed", props.navUrl, false, true, props.appendVersion);
 }
 
 function saveChanges() {
     busy.value = true;
     closeModal();
-    emit("on-proceed", props.navUrl, true, false, true);
+    emit("on-proceed", props.navUrl, true, false, props.appendVersion);
 }
 </script>
 

client/src/components/Workflow/Editor/modules/activities.test.ts

@@ -111,18 +111,4 @@ describe("useSpecialWorkflowActivities", () => {
             );
         });
     });
-
-    describe("exitWorkflowActivity tooltip", () => {
-        it("shows save and exit message when connections are valid", () => {
-            const { exitWorkflowActivity } = setUpBestPractices(false);
-            expect(exitWorkflowActivity.value.tooltip).toBe("Save this workflow, then exit the workflow editor");
-        });
-
-        it("shows invalid connections warning when hasInvalidConnections is true", () => {
-            const { exitWorkflowActivity } = setUpBestPractices(true);
-            expect(exitWorkflowActivity.value.tooltip).toBe(
-                "Workflow has invalid connections, review and remove invalid connections",
-            );
-        });
-    });
 });

client/src/components/Workflow/Editor/modules/activities.ts

@@ -188,33 +188,14 @@ export function useWorkflowActivities(
             click: true,
             optional: true,
         },
-        {
-            description: "Exit the workflow editor and return to the start screen.",
-            icon: faSignOutAlt,
-            id: "exit",
-            title: "Exit",
-            tooltip: "Exit workflow editor",
-            visible: false,
-            click: true,
-            optional: true,
-        },
     ]);
 }
 
 interface SpecialActivityOptions {
-    hasInvalidConnections: boolean;
     lintData: LintData;
 }
 
 export function useSpecialWorkflowActivities(options: Ref<SpecialActivityOptions>) {
-    const saveHover = computed(() => {
-        if (options.value.hasInvalidConnections) {
-            return "Workflow has invalid connections, review and remove invalid connections";
-        } else {
-            return "Save this workflow, then exit the workflow editor";
-        }
-    });
-
     /** Indicator for best practices activity
      * @returns
      * - `number`: count of critical issues remaining
@@ -282,16 +263,17 @@ export function useSpecialWorkflowActivities(options: Ref<SpecialActivityOptions
         optional: true,
     };
 
-    const exitWorkflowActivity = computed<Activity>(() => ({
-        description: "",
-        icon: faSave,
-        id: "save-and-exit",
-        title: "Save + Exit",
-        tooltip: saveHover.value,
+    const exitWorkflowActivity: Activity = {
+        description:
+            "Exit the workflow editor and return to your Galaxy. If you have unsaved changes you will be prompted to save or discard them.",
+        icon: faSignOutAlt,
+        id: "exit",
+        title: "Exit",
+        tooltip: "Exit workflow editor",
         visible: false,
         click: true,
-        mutable: false,
-    }));
+        optional: true,
+    };
 
     return {
         specialWorkflowActivities,