From 2cdeeab86f7168dcd7ea3598c4dcc4ad4d6eed95 Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Wed, 13 Mar 2024 12:06:40 -0400
Subject: [PATCH 1/2] More cleanup after the activity bar default swap.  With
 it enabled by default and the only option, there is no need for a separate
 store or user preference setting -- various items are now accessible *only*
 through the activity bar and it is part of the standard interface.

---
 .../src/components/Common/PublishedItem.vue   |  4 +--
 client/src/components/Masthead/Masthead.vue   |  4 +--
 .../User/UserActivityBarSettings.vue          | 31 -------------------
 .../src/components/User/UserPreferences.vue   | 13 --------
 .../Workflow/Published/WorkflowPublished.vue  |  4 +--
 client/src/composables/usePanels.ts           |  7 +----
 .../src/entry/analysis/modules/Analysis.vue   |  4 +--
 client/src/stores/userStore.ts                |  7 -----
 8 files changed, 9 insertions(+), 65 deletions(-)
 delete mode 100644 client/src/components/User/UserActivityBarSettings.vue

diff --git a/client/src/components/Common/PublishedItem.vue b/client/src/components/Common/PublishedItem.vue
index 7be9e46c5f98..b641ebf9be29 100644
--- a/client/src/components/Common/PublishedItem.vue
+++ b/client/src/components/Common/PublishedItem.vue
@@ -46,12 +46,12 @@ const pluralPath = computed(() => plural.value.toLowerCase());
 const publishedByUser = computed(() => `/${pluralPath.value}/list_published?f-username=${owner.value}`);
 const urlAll = computed(() => `/${pluralPath.value}/list_published`);
 
-const { showActivityBar, showToolbox } = usePanels();
+const { showToolbox } = usePanels();
 </script>
 
 <template>
     <div id="columns" class="d-flex">
-        <ActivityBar v-if="showActivityBar" />
+        <ActivityBar />
 
         <FlexPanel v-if="showToolbox" side="left">
             <ToolPanel />
diff --git a/client/src/components/Masthead/Masthead.vue b/client/src/components/Masthead/Masthead.vue
index be4006a6e4bf..0390029c3951 100644
--- a/client/src/components/Masthead/Masthead.vue
+++ b/client/src/components/Masthead/Masthead.vue
@@ -16,7 +16,7 @@ import { getActiveTab } from "./utilities";
 
 import NotificationsBell from "@/components/Notifications/NotificationsBell.vue";
 
-const { isAnonymous, showActivityBar } = storeToRefs(useUserStore());
+const { isAnonymous } = storeToRefs(useUserStore());
 
 const route = useRoute();
 const { config, isConfigLoaded } = useConfig();
@@ -139,7 +139,7 @@ onMounted(() => {
                 @open-url="emit('open-url', $event)" />
             <MastheadItem v-if="windowTab" :tab="windowTab" :toggle="windowToggle" @click="onWindowToggle" />
             <BNavItem
-                v-if="!isAnonymous && isConfigLoaded && config.enable_notification_system && !showActivityBar"
+                v-if="!isAnonymous && isConfigLoaded && config.enable_notification_system"
                 id="notifications-bell">
                 <NotificationsBell tooltip-placement="bottom" />
             </BNavItem>
diff --git a/client/src/components/User/UserActivityBarSettings.vue b/client/src/components/User/UserActivityBarSettings.vue
deleted file mode 100644
index 878f7377ea3d..000000000000
--- a/client/src/components/User/UserActivityBarSettings.vue
+++ /dev/null
@@ -1,31 +0,0 @@
-<script setup lang="ts">
-import { computed, type Ref, ref, type WritableComputedRef } from "vue";
-
-import { useUserStore } from "@/stores/userStore";
-
-const userStore = useUserStore();
-
-const show: Ref<Boolean> = ref(false);
-
-const enableActivityBar: WritableComputedRef<Boolean> = computed({
-    get: () => {
-        return userStore.showActivityBar;
-    },
-    set: () => {
-        // always toggle tool side panel when enabling activity bar
-        if (userStore.toggledSideBar !== "tools") {
-            userStore.toggleSideBar("tools");
-        }
-        // toggle activity bar
-        userStore.toggleActivityBar();
-    },
-});
-</script>
-
-<template>
-    <b-card :show="show" class="user-activity-bar-settings mr-3">
-        <b-form-checkbox v-model="enableActivityBar" switch>
-            <b>Enable Activity Bar</b>
-        </b-form-checkbox>
-    </b-card>
-</template>
diff --git a/client/src/components/User/UserPreferences.vue b/client/src/components/User/UserPreferences.vue
index b4c63a597076..6fe6ba55e81c 100644
--- a/client/src/components/User/UserPreferences.vue
+++ b/client/src/components/User/UserPreferences.vue
@@ -67,16 +67,6 @@
             title="Manage Custom Builds"
             description="Add or remove custom builds using history datasets."
             to="/custom_builds" />
-        <UserPreferencesElement
-            icon="fa-th-list"
-            title="Manage Activity Bar"
-            description="Click here to show or hide the activity bar."
-            badge="New!"
-            @click="toggleActivityBar = !toggleActivityBar">
-            <b-collapse v-model="toggleActivityBar">
-                <UserActivityBarSettings />
-            </b-collapse>
-        </UserPreferencesElement>
         <UserPreferencesElement
             v-if="hasThemes"
             icon="fa-palette"
@@ -148,7 +138,6 @@ import Vue from "vue";
 import { useConfig } from "@/composables/config";
 import { useUserStore } from "@/stores/userStore";
 
-import UserActivityBarSettings from "./UserActivityBarSettings";
 import UserBeaconSettings from "./UserBeaconSettings";
 import UserDeletion from "./UserDeletion";
 import UserPreferencesElement from "./UserPreferencesElement";
@@ -160,7 +149,6 @@ Vue.use(BootstrapVue);
 
 export default {
     components: {
-        UserActivityBarSettings,
         UserDeletion,
         UserPreferencesElement,
         ThemeSelector,
@@ -190,7 +178,6 @@ export default {
             message: null,
             showLogoutModal: false,
             showDataPrivateModal: false,
-            toggleActivityBar: false,
             toggleTheme: false,
         };
     },
diff --git a/client/src/components/Workflow/Published/WorkflowPublished.vue b/client/src/components/Workflow/Published/WorkflowPublished.vue
index 45ffdd2fc5f4..506ebe555e98 100644
--- a/client/src/components/Workflow/Published/WorkflowPublished.vue
+++ b/client/src/components/Workflow/Published/WorkflowPublished.vue
@@ -130,7 +130,7 @@ watch(
     }
 );
 
-const { showActivityBar, showToolbox } = usePanels();
+const { showToolbox } = usePanels();
 
 const downloadUrl = computed(() => withPrefix(`/api/workflows/${props.id}/download?format=json-download`));
 const importUrl = computed(() => withPrefix(`/workflow/imp?id=${props.id}`));
@@ -156,7 +156,7 @@ const viewUrl = computed(() => withPrefix(`/published/workflow?id=${props.id}`))
 
 <template>
     <div id="columns" class="d-flex">
-        <ActivityBar v-if="!props.embed && showActivityBar" />
+        <ActivityBar v-if="!props.embed" />
         <FlexPanel v-if="!props.embed && showToolbox" side="left">
             <ToolPanel />
         </FlexPanel>
diff --git a/client/src/composables/usePanels.ts b/client/src/composables/usePanels.ts
index 2b2d97cb020d..6e43cb7e8241 100644
--- a/client/src/composables/usePanels.ts
+++ b/client/src/composables/usePanels.ts
@@ -1,10 +1,7 @@
 import { computed } from "vue";
 import { useRoute } from "vue-router/composables";
 
-import { useUserStore } from "@/stores/userStore";
-
 export function usePanels() {
-    const userStore = useUserStore();
     const route = useRoute();
 
     const showPanels = computed(() => {
@@ -15,12 +12,10 @@ export function usePanels() {
         return true;
     });
 
-    const showActivityBar = computed(() => showPanels.value && userStore.showActivityBar);
-    const showToolbox = computed(() => showPanels.value && !showActivityBar.value);
+    const showToolbox = computed(() => showPanels.value);
 
     return {
         showPanels,
-        showActivityBar,
         showToolbox,
     };
 }
diff --git a/client/src/entry/analysis/modules/Analysis.vue b/client/src/entry/analysis/modules/Analysis.vue
index e865276d6f5f..91f88ae821a4 100644
--- a/client/src/entry/analysis/modules/Analysis.vue
+++ b/client/src/entry/analysis/modules/Analysis.vue
@@ -13,7 +13,7 @@ import DragAndDropModal from "@/components/Upload/DragAndDropModal.vue";
 
 const router = useRouter();
 const showCenter = ref(false);
-const { showActivityBar, showToolbox, showPanels } = usePanels();
+const { showToolbox, showPanels } = usePanels();
 
 // methods
 function hideCenter() {
@@ -38,7 +38,7 @@ onUnmounted(() => {
 
 <template>
     <div id="columns" class="d-flex">
-        <ActivityBar v-if="showActivityBar" />
+        <ActivityBar />
         <FlexPanel v-if="showToolbox" side="left">
             <ToolPanel />
         </FlexPanel>
diff --git a/client/src/stores/userStore.ts b/client/src/stores/userStore.ts
index 68b9820585f8..435ece6608a2 100644
--- a/client/src/stores/userStore.ts
+++ b/client/src/stores/userStore.ts
@@ -43,7 +43,6 @@ export const useUserStore = defineStore("userStore", () => {
 
     // explicitly pass current User, because userStore might not exist yet
     const toggledSideBar = useUserLocalStorage("user-store-toggled-side-bar", "tools", currentUser);
-    const showActivityBar = useUserLocalStorage("user-store-show-activity-bar", true, currentUser);
     const preferredListViewMode = useUserLocalStorage("user-store-preferred-list-view-mode", "grid", currentUser);
 
     let loadPromise: Promise<void> | null = null;
@@ -135,10 +134,6 @@ export const useUserStore = defineStore("userStore", () => {
         preferredListViewMode.value = view;
     }
 
-    function toggleActivityBar() {
-        showActivityBar.value = !showActivityBar.value;
-    }
-
     function toggleSideBar(currentOpen = "") {
         toggledSideBar.value = toggledSideBar.value === currentOpen ? "" : currentOpen;
     }
@@ -153,7 +148,6 @@ export const useUserStore = defineStore("userStore", () => {
         isAnonymous,
         currentTheme,
         currentFavorites,
-        showActivityBar,
         toggledSideBar,
         preferredListViewMode,
         loadUser,
@@ -162,7 +156,6 @@ export const useUserStore = defineStore("userStore", () => {
         setPreferredListViewMode,
         addFavoriteTool,
         removeFavoriteTool,
-        toggleActivityBar,
         toggleSideBar,
         isRegisteredUser,
         $reset,

From c50240c48c623bb410a0584a600e011c80b2300f Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Wed, 13 Mar 2024 12:34:08 -0400
Subject: [PATCH 2/2] Defer to activity bar for tool panel.

---
 client/src/entry/analysis/modules/Analysis.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/client/src/entry/analysis/modules/Analysis.vue b/client/src/entry/analysis/modules/Analysis.vue
index 91f88ae821a4..df91d66c4655 100644
--- a/client/src/entry/analysis/modules/Analysis.vue
+++ b/client/src/entry/analysis/modules/Analysis.vue
@@ -8,12 +8,11 @@ import CenterFrame from "./CenterFrame.vue";
 import ActivityBar from "@/components/ActivityBar/ActivityBar.vue";
 import HistoryIndex from "@/components/History/Index.vue";
 import FlexPanel from "@/components/Panels/FlexPanel.vue";
-import ToolPanel from "@/components/Panels/ToolPanel.vue";
 import DragAndDropModal from "@/components/Upload/DragAndDropModal.vue";
 
 const router = useRouter();
 const showCenter = ref(false);
-const { showToolbox, showPanels } = usePanels();
+const { showPanels } = usePanels();
 
 // methods
 function hideCenter() {
@@ -39,9 +38,6 @@ onUnmounted(() => {
 <template>
     <div id="columns" class="d-flex">
         <ActivityBar />
-        <FlexPanel v-if="showToolbox" side="left">
-            <ToolPanel />
-        </FlexPanel>
         <div id="center" class="overflow-auto p-3 w-100">
             <CenterFrame v-show="showCenter" id="galaxy_main" @load="onLoad" />
             <router-view v-show="!showCenter" :key="$route.fullPath" class="h-100" />