components/research/components/ResearchContent.vue

@@ -190,7 +190,6 @@ import researchApi from "~/apis/researchApi";
 
 import { mapState, mapActions } from "pinia";
 import { useResearchStore } from "../../../stores/researchStore";
-import { useCommonStore } from "~/stores/commonStore";
 
 export default {
   props: {
@@ -279,7 +278,7 @@ export default {
   computed: {
     ...mapState(["userPermisionGetter", "currentUser", "selectedlists"]),
     ...mapState(useResearchStore, ["researchSchemaGetter"]),
-    ...mapState(useCommonStore, ["searchActiveTabGetter"]),
+    ...mapState(useSearchStore, ["searchActiveTabGetter"]),
 
     showActionMenu() {
       let show = false;

pages/index.vue

@@ -584,6 +584,11 @@ export default {
     };
   },
   computed: {
+    ...mapState(useSearchStore, [
+      "domainActiveGetter",
+      "searchActiveTabGetter",
+      "searchSchemaGetter",
+    ]),
     ...mapState(useResearchStore, [
       "researchSchemaGetter",
       "researchActiveSchemaGetter",
@@ -592,9 +597,6 @@ export default {
       "selectedlists",
       "organNameGetter",
       "isSidebarCollapsed",
-      "searchSchemaGetter",
-      "domainActiveGetter",
-      "searchActiveTabGetter",
     ]),
     ...mapState(useAuthStore, ["currentUser"]),
 
@@ -639,10 +641,10 @@ export default {
   },
   methods: {
     // ...mapActions(["TOGGLE_SIDEBAR_MENU"]),
-    ...mapActions(useCommonStore, [
+    ...mapActions(useCommonStore, ["TOGGLE_SIDEBAR_MENU"]),
-      "TOGGLE_SIDEBAR_MENU",
+    ...mapActions(useSearchStore, [
       "searchActiveTabSetter",
-      "domainActiveSetter"
+      "domainActiveSetter",
     ]),
     ...mapActions(useResearchStore, [
       "researchActiveSchemaSetter",