components/entity/components/EntitySelectFileQa.vue

@@ -235,12 +235,6 @@ import searchApi from "~/apis/searchApi";
 import { mapActions, mapState } from "pinia";
 import mammoth from "mammoth";
 
-// import { useAuthStore } from "~/stores/authStore";
-import { useCommonStore } from "~/stores/commonStore";
-import { useEntityStore } from "~/stores/entityStore";
-// import { useSearchStore } from "@search/stores/searchStore";
-// import { useResearchStore } from "@research/stores/researchStore";
-
 export default {
   beforeMount() {
     this.httpService = useNuxtApp()["$http"];
@@ -280,11 +274,11 @@ export default {
   //   data= new Tree(this.treeItems);
   // },
   computed: {
-    ...mapState(useEntityStore, [
+    ...mapState("entity", [
       "activeEntityViewSchemaGetter",
       "selectedItemEntityGetter",
     ]),
-    ...mapState(useCommonStore, ["searchActiveTabGetter", "domainActiveGetter"]),
+    ...mapState(useSearchStore, ["searchActiveTabGetter", "domainActiveGetter"]),
     permitUrl() {
       return import.meta.env.VITE_PERMIT;
     },

components/entity/components/SelectEntityText.vue

@@ -235,7 +235,6 @@ import { mapActions, mapState } from "pinia";
 import mammoth from "mammoth";
 import { useSearchStore } from "@search/stores/searchStore";
 import { useEntityStore } from "@search/stores/entityStore";
-import { useCommonStore } from "~/stores/commonStore";
 
 export default {
   mounted() {
@@ -276,7 +275,7 @@ export default {
       "activeEntityViewSchemaGetter",
       "selectedItemEntityGetter",
     ]),
-    ...mapState(useCommonStore, [
+    ...mapState(useSearchStore, [
       "searchActiveTabGetter",
       "domainActiveGetter",
     ]),
@@ -285,7 +284,7 @@ export default {
     },
   },
   methods: {
-    ...mapActions(useCommonStore, ["domainActiveSetter"]),
+    ...mapActions(useSearchStore, ["domainActiveSetter"]),
     async getDefultList(sortKey = "lasttitle") {
       let url = searchApi.search.queryNormal;
       url = url.replace("{{appname}}", buildName());

components/global/AutoComplation.vue

@@ -250,7 +250,7 @@ export default {
     };
   },
   computed: {
-    ...mapState(useCommonStore, [
+    ...mapState(useSearchStore, [
       "domainActiveGetter",
       "searchActiveTabGetter",
       "searchSchemaGetter",

components/search/AdvancedSearch.vue

@@ -41,7 +41,6 @@
 <script>
 
 import { useResearchStore } from "../../../stores/researchStore";
-import { useCommonStore } from "~/stores/commonStore";
 
 import { mapState } from "pinia";
 
@@ -54,7 +53,7 @@ export default {
     };
   },
   computed: {
-    ...mapState(useCommonStore, ["searchActiveTabGetter"]),
+    ...mapState(useSearchStore, ["searchActiveTabGetter"]),
     ...mapState(useResearchStore, ["researchSchemaGetter"]),
   },
   watch: {

components/search/MyContent.vue

@@ -405,7 +405,7 @@ import researchApi from "@search/apis/researchApi";
 import { mapState, mapActions } from "pinia";
 
 // import { useResearchStore } from "@search/stores/researchStore";
-import { useCommonStore } from "@search/stores/commonStore";
+import { useSearchStore } from "@search/stores/searchStore";
 import { useEntityStore } from "@search/stores/entityStore";
 
 export default {
@@ -478,7 +478,7 @@ export default {
   },
   computed: {
     // ...mapState(useResearchStore, ["searchActiveTabGetter"]),
-    ...mapState(useCommonStore, ["searchActiveTabGetter"]),
+    ...mapState(useSearchStore, ["searchActiveTabGetter"]),
   },
   methods: {
     ...mapActions(useEntityStore, ["SET_ITEM_ENTITY", "SET_LIST_ENTITY"]),

components/search/forms/SearchSynonymSearch.vue

@@ -67,8 +67,6 @@
 import { mapActions, mapState } from "pinia";
 import searchApi from "~/apis/searchApi";
 
-import { useSearchStore } from "@search/stores/seachStore";
-import { useCommonStore } from "@stores/commonStore";
 
 export default {
   props: {
@@ -86,7 +84,7 @@ export default {
   mounted() {
     this.query = this.searchSynonymTitleGetter ?? null;
     this.synonyms = this.searchSynonymFormGetter ?? undefined;
-    if (!this.synonyms) {
+    if(!this.synonyms){
       this.getSynonyms();
     }
   },
@@ -111,14 +109,18 @@ export default {
     ...mapState({
       activeSchemaGetter: "activeSchemaGetter",
     }),
-    ...mapState(useSearchStore, ["searchSynonymFormGetter"]),
+    ...mapState(useSearchStore, [
-    ...mapState(useCommonStore, ["searchSynonymTitleSetter"]),
+      "searchSynonymFormGetter",
+      "searchSynonymTitleGetter",
+    ]),
   },
   methods: {
-    ...mapActions(useCommonStore, ["searchSynonymFormSetter"]),
+    ...mapActions("search", [
-    ...mapActions(useSearchStore, ["searchSynonymTitleSetter"]),
+      "searchSynonymFormSetter",
+      "searchSynonymTitleSetter",
+    ]),
     getSynonyms() {
-      if (!this.query) {
+      if(!this.query){
       //   this.mySwalConfirm({
       //   title: "خطا!!",
       //   html: `عبارت جستجو نباید خالی باشد`,

components/search/forms/SynonymSearch.vue

@@ -108,15 +108,17 @@ export default {
     };
   },
   computed: {
-    ...mapState(useCommonStore, [
+    ...mapState(useCommonStore, ["activeSchemaGetter"]),
-      "activeSchemaGetter",
+    ...mapState(useSearchStore, [
+      "searchSynonymFormGetter",
       "searchSynonymTitleGetter",
     ]),
-    ...mapState(useSearchStore, ["searchSynonymFormGetter"]),
   },
   methods: {
-    ...mapActions(useCommonStore, ["searchSynonymTitleSetter"]),
+    ...mapActions(useSearchStore, [
-    ...mapActions(useSearchStore, ["searchSynonymFormSetter"]),
+      "searchSynonymFormSetter",
+      "searchSynonymTitleSetter",
+    ]),
     async getSynonyms() {
       if (!this.query) {
         //   this.mySwalConfirm({

components/search/view/MajlesMashruhContent.vue

@@ -194,7 +194,6 @@
 import favoriteApi from "~/apis/favoriteApi";
 import { mapState, mapActions } from "pinia";
 import idbUtil from "~/mixins/idb.js";
-import { useCommonStore } from "~/stores/commonStore";
 
 /**
  * @vue-prop {Array} [summeryKeys=] - کلیدهای خلاصه
@@ -352,7 +351,7 @@ export default {
   },
   computed: {
     ...mapState(["userPermisionGetter", "currentUser", "selectedlists"]),
-    ...mapState(useCommonStore, ["searchActiveTabGetter", "domainActiveGetter"]),
+    ...mapState(useSearchStore, ["searchActiveTabGetter", "domainActiveGetter"]),
 
     showActionMenu() {
       let show = false;

components/search/view/MajlesQaSectionContent.vue

@@ -243,7 +243,6 @@ import favoriteApi from "~/apis/favoriteApi";
 import { mapState, mapActions } from "pinia";
 import tableActions from "~/json/search/listTableContextMenu";
 // import idbUtil from "~/mixins/idb.js";
-import { useCommonStore } from "~/stores/commonStore";
 
 /**
  * @vue-prop {Array} [summeryKeys=] - کلیدهای خلاصه
@@ -380,7 +379,7 @@ export default {
   },
   computed: {
     ...mapState(["userPermisionGetter", "currentUser", "selectedlists"]),
-    ...mapState(useCommonStore, ["searchActiveTabGetter", "domainActiveGetter"]),
+    ...mapState(useSearchStore, ["searchActiveTabGetter", "domainActiveGetter"]),
 
     myKey() {
       if (this.key_data) return this.key_data;

components/search/view/MajlesQanonContent.vue

@@ -205,8 +205,8 @@ import searchApis from "~/apis/searchApi";
 import favoriteApi from "~/apis/favoriteApi";
 import { mapState, mapActions } from "pinia";
 import idbUtil from "~/mixins/idb.js";
-import { useCommonStore } from "~/stores/commonStore";
 
+/**
  * @vue-prop {Array} [summeryKeys=] - کلیدهای خلاصه
  * @vue-prop {Object} [pagination=] - صفحه بندی
  *
@@ -346,7 +346,7 @@ export default {
   computed: {
     ...mapState(["userPermisionGetter", "currentUser"]),
 
-    ...mapState(useCommonStore, ["searchActiveTabGetter", "domainActiveGetter"]),
+    ...mapState(useSearchStore, ["searchActiveTabGetter", "domainActiveGetter"]),
 
     showActionMenu() {
       let show = false;

components/search/view/MajlesQavaninContent.vue

@@ -192,8 +192,6 @@ import searchApis from "~/apis/searchApi";
 
 import favoriteApi from "~/apis/favoriteApi";
 import { mapState, mapActions } from "pinia";
-import { useCommonStore } from "~/stores/commonStore";
-
 export default {
   props: ["summeryKeys", "pagination"],
   name: "MajlesQavaninContent",
@@ -239,7 +237,7 @@ export default {
       "currentUser",
       "selectedlists",
       ]),
-    ...mapState(useCommonStore,[
+    ...mapState(useSearchStore,[
       "searchActiveTabGetter",
     ]),
 

components/search/view/MajlesSectionContent.vue

@@ -161,8 +161,6 @@
 
 import favoriteApi from "~/apis/favoriteApi";
 import { mapState, mapActions } from "pinia";
-import { useCommonStore } from "~/stores/commonStore";
-import { useAuthStore } from "~/stores/authStore";
 
 /**
  * @vue-prop {Array} [summeryKeys=] - کلیدهای خلاصه
@@ -232,8 +230,8 @@ export default {
     this.httpService = new HttpService(import.meta.env.VITE_REPO_BASE_URL);
   },
   computed: {
-    ...mapState(useAuthStore,["userPermisionGetter", "currentUser"]),
+    ...mapState(["userPermisionGetter", "currentUser"]),
-    ...mapState(useCommonStore, ["searchActiveTabGetter"]),
+    ...mapState(useSearchStore, ["searchActiveTabGetter"]),
 
     showActionMenu() {
       let show = false;

components/search/view/QanonContent.vue

@@ -184,7 +184,6 @@ import searchApis from "~/apis/searchApi";
 import favoriteApi from "~/apis/favoriteApi";
 import { mapState, mapActions } from "pinia";
 import idbUtil from "~/mixins/idb.js";
-import { useCommonStore } from "~/stores/commonStore";
 
 /**
  * @vue-prop {Array} [summeryKeys=] - کلیدهای خلاصه
@@ -325,7 +324,7 @@ export default {
   },
   computed: {
     ...mapState(["userPermisionGetter", "currentUser"]),
-    ...mapState(useCommonStore, ["searchActiveTabGetter", "domainActiveGetter"]),
+    ...mapState(useSearchStore, ["searchActiveTabGetter", "domainActiveGetter"]),
 
     showActionMenu() {
       let show = false;

components/search/view/SearchAdvancedSearch.vue

@@ -51,7 +51,6 @@
 
 
 import { mapState } from "pinia";
-import { useCommonStore } from "~/stores/commonStore";
 
 /**
  *
@@ -71,7 +70,7 @@ export default {
     };
   },
   computed: {
-    ...mapState(useCommonStore, ["searchActiveTabGetter"]),
+    ...mapState(useSearchStore, ["searchActiveTabGetter"]),
   },
   watch: {
     searchActiveTabGetter: {

components/search/view/SearchContent.vue

@@ -313,7 +313,6 @@ import favoriteApi from "~/apis/favoriteApi";
 import tableActions from "~/json/search/listTableContextMenu";
 import { mapState, mapActions } from "pinia";
 import idbUtil from "~/mixins/idb.js";
-import { useCommonStore } from "~/stores/commonStore";
 
 /**
  * @vue-prop {Array} [summeryKeys=] - کلیدهای خلاصه
@@ -452,7 +451,7 @@ export default {
     ...mapState(["userPermisionGetter", "currentUser", "selectedlists"]),
     // ...mapState(useSearchStore, ["activeTabGetter"]),
     ...mapState("entity", ["selectedItemEntityGetter"]),
-    ...mapState(useCommonStore, ["searchActiveTabGetter", "domainActiveGetter"]),
+    ...mapState(useSearchStore, ["searchActiveTabGetter", "domainActiveGetter"]),
 
     showActionMenu() {
       let show = false;

components/search/view/SearchSummary.vue

@@ -118,7 +118,7 @@ export default {
     },
   },
   computed: {
-    ...mapState(useCommonStore, ["searchActiveTabGetter"]),
+    ...mapState(useSearchStore, ["searchActiveTabGetter"]),
   },
 };
 </script>

pages/search/index.vue

@@ -1035,15 +1035,17 @@ export default {
   },
 
   computed: {
+    ...mapState(useSearchStore, [
+      "searchActiveTabGetter",
+      "searchSchemaGetter",
+      "searchSynonymTitleGetter",
+    ]),
     ...mapState(useCommonStore, [
       "currentUser",
       "organNameGetter",
       "isSidebarCollapsed",
-      "searchSchemaGetter",
       "userPermisionGetter",
       "domainActiveGetter",
-      "searchActiveTabGetter",
-      "searchSynonymTitleGetter",
     ]),
     // metaTitle() {
     //   return import.meta.env.VITE_SEARCH_PAGE_TITLE;
@@ -1160,12 +1162,15 @@ export default {
   methods: {
     ...mapActions(useCommonStore, [
       "TOGGLE_SIDEBAR_MENU",
-      "domainActiveSetter",
-      "searchActiveTabSetter",
       "sidebarCollapsedSetter",
+      "domainActiveSetter",
+    ]),
+
+    ...mapActions(useSearchStore, [
+      "searchActiveTabSetter",
+      "searchSchemaSetter",
       "searchSynonymTitleSetter",
     ]),
-    ...mapActions(useCommonStore, ["searchSchemaSetter"]),
     initComponent() {
       let activeItem = this.searchSchemaGetter[0];
       if (this.$route.query.key) {

stores/searchStore.ts

@@ -1,10 +1,13 @@
 import type {
   activeSearchChartSchema,
   activeSearchListSchema,
+  Domain,
   searchActiveTab,
   searchChartActiveTab,
   searchListActiveTab,
+  searchSchema,
   searchSynonymForm,
+  searchSynonymTitle,
   selectionFilterItems,
 } from "~/types/searchTypes";
 
@@ -21,8 +24,7 @@ import type {
 export const useSearchStore = defineStore("searchStore", {
   persist: {
     storage: piniaPluginPersistedstate.localStorage(),
-  },
+  },  state: () => ({
-  state: () => ({
     selectedProject: undefined as selectedProject | undefined,
     isReturnFromItemshowPage: false as isReturnFromItemshowPage,
     list: undefined as list | undefined,
@@ -32,8 +34,14 @@ export const useSearchStore = defineStore("searchStore", {
     // pieData: [],
     selectedItem: undefined as selectedItem | undefined,
 
+
     // activeTab: undefined,
+
+    searchActiveTab: undefined as searchActiveTab | undefined,
+    searchSchema: undefined as searchSchema | undefined,
+
     searchActiveSchema: undefined as searchActiveTab | undefined,
+
     searchListActiveTab: undefined as searchListActiveTab | undefined,
     searchListSchema: undefined as searchListActiveTab[] | undefined,
     activeSearchListSchema: undefined as activeSearchListSchema | undefined,
@@ -42,6 +50,7 @@ export const useSearchStore = defineStore("searchStore", {
     searchChartSchema: undefined as searchChartActiveTab[] | undefined,
     activeSearchChartSchema: undefined as activeSearchChartSchema | undefined,
 
+    searchSynonymTitle: undefined as searchSynonymTitle | undefined,
     searchSynonymForm: undefined as searchSynonymForm | undefined,
 
     selectionFilterItems: [] as selectionFilterItems,
@@ -69,25 +78,25 @@ export const useSearchStore = defineStore("searchStore", {
       return state.list;
     },
 
-    // searchSynonymTitleGetter(state) {
+    searchSynonymTitleGetter(state) {
-    //   return state.searchSynonymTitle;
+      return state.searchSynonymTitle;
-    // },
+    },
     searchSynonymFormGetter(state) {
       return state.searchSynonymForm;
     },
 
+  
     // activeTabGetter(state) {
     //   return state.activeTab;
     // },
 
     // search page
-    // moved to common store.
+    searchActiveTabGetter(state) {
-    // searchActiveTabGetter(state) {
+      return state.searchActiveTab;
-    //   return state.searchActiveTab;
+    },
-    // },
+    searchSchemaGetter(state) {
-    // searchSchemaGetter(state) {
+      return state.searchSchema;
-    //   return state.searchSchema;
+    },
-    // },
 
     searchActiveSchemaGetter(state) {
       return state.searchActiveSchema;
@@ -144,21 +153,22 @@ export const useSearchStore = defineStore("searchStore", {
     searchSynonymFormSetter(searchSynonymForm = undefined) {
       this.searchSynonymForm = searchSynonymForm;
     },
-    // searchSynonymTitleSetter(searchSynonymTitle = undefined) {
+    searchSynonymTitleSetter(searchSynonymTitle = undefined) {
-    //   this.searchSynonymTitle = searchSynonymTitle;
+      this.searchSynonymTitle = searchSynonymTitle;
-    // },
+    },
+
    
     // activeTabSetter(activeTab = undefined) {
     //   this.activeTab = activeTab;
     // },
 
     // search page
-    // searchActiveTabSetter(searchActiveTab: searchActiveTab = undefined) {
+    searchActiveTabSetter(searchActiveTab: searchActiveTab = undefined) {
-    //   this.searchActiveTab = searchActiveTab;
+      this.searchActiveTab = searchActiveTab;
-    // },
+    },
-    // searchSchemaSetter(searchSchema = undefined) {
+    searchSchemaSetter(searchSchema = undefined) {
-    //   this.searchSchema = searchSchema;
+      this.searchSchema = searchSchema;
-    // },
+    },
  
     searchActiveSchemaSetter(searchActiveSchema = undefined) {
       this.searchActiveSchema = searchActiveSchema;