From f4dbda3abbe6ca4b18fe3e2f452a3684ca13c9ad Mon Sep 17 00:00:00 2001 From: mustafa-rezae Date: Sun, 18 May 2025 14:19:37 +0330 Subject: [PATCH] Move searchStore into the commonStore --- .../entity/components/EntitySelectFileQa.vue | 10 +++- .../entity/components/SelectEntityText.vue | 5 +- components/global/AutoComplation.vue | 2 +- components/search/AdvancedSearch.vue | 3 +- components/search/MyContent.vue | 4 +- .../search/forms/SearchSynonymSearch.vue | 28 +++++----- components/search/forms/SynonymSearch.vue | 12 ++-- .../search/view/MajlesMashruhContent.vue | 3 +- .../search/view/MajlesQaSectionContent.vue | 3 +- components/search/view/MajlesQanonContent.vue | 4 +- .../search/view/MajlesQavaninContent.vue | 4 +- .../search/view/MajlesSectionContent.vue | 6 +- components/search/view/QanonContent.vue | 3 +- .../search/view/SearchAdvancedSearch.vue | 3 +- components/search/view/SearchContent.vue | 3 +- components/search/view/SearchSummary.vue | 2 +- pages/search/index.vue | 15 ++--- stores/searchStore.ts | 56 ++++++++----------- 18 files changed, 82 insertions(+), 84 deletions(-) diff --git a/components/entity/components/EntitySelectFileQa.vue b/components/entity/components/EntitySelectFileQa.vue index d739a72..064468f 100644 --- a/components/entity/components/EntitySelectFileQa.vue +++ b/components/entity/components/EntitySelectFileQa.vue @@ -235,6 +235,12 @@ 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"]; @@ -274,11 +280,11 @@ export default { // data= new Tree(this.treeItems); // }, computed: { - ...mapState("entity", [ + ...mapState(useEntityStore, [ "activeEntityViewSchemaGetter", "selectedItemEntityGetter", ]), - ...mapState(useSearchStore, ["searchActiveTabGetter", "domainActiveGetter"]), + ...mapState(useCommonStore, ["searchActiveTabGetter", "domainActiveGetter"]), permitUrl() { return import.meta.env.VITE_PERMIT; }, diff --git a/components/entity/components/SelectEntityText.vue b/components/entity/components/SelectEntityText.vue index ea11b81..6c26ae4 100644 --- a/components/entity/components/SelectEntityText.vue +++ b/components/entity/components/SelectEntityText.vue @@ -235,6 +235,7 @@ 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() { @@ -275,7 +276,7 @@ export default { "activeEntityViewSchemaGetter", "selectedItemEntityGetter", ]), - ...mapState(useSearchStore, [ + ...mapState(useCommonStore, [ "searchActiveTabGetter", "domainActiveGetter", ]), @@ -284,7 +285,7 @@ export default { }, }, methods: { - ...mapActions(useSearchStore, ["domainActiveSetter"]), + ...mapActions(useCommonStore, ["domainActiveSetter"]), async getDefultList(sortKey = "lasttitle") { let url = searchApi.search.queryNormal; url = url.replace("{{appname}}", buildName()); diff --git a/components/global/AutoComplation.vue b/components/global/AutoComplation.vue index 5ae1ef9..f26363d 100644 --- a/components/global/AutoComplation.vue +++ b/components/global/AutoComplation.vue @@ -250,7 +250,7 @@ export default { }; }, computed: { - ...mapState(useSearchStore, [ + ...mapState(useCommonStore, [ "domainActiveGetter", "searchActiveTabGetter", "searchSchemaGetter", diff --git a/components/search/AdvancedSearch.vue b/components/search/AdvancedSearch.vue index 24e5d6a..65381a3 100644 --- a/components/search/AdvancedSearch.vue +++ b/components/search/AdvancedSearch.vue @@ -41,6 +41,7 @@ diff --git a/pages/search/index.vue b/pages/search/index.vue index 1628a81..fb701e1 100644 --- a/pages/search/index.vue +++ b/pages/search/index.vue @@ -1035,17 +1035,15 @@ 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; @@ -1162,15 +1160,12 @@ export default { methods: { ...mapActions(useCommonStore, [ "TOGGLE_SIDEBAR_MENU", - "sidebarCollapsedSetter", "domainActiveSetter", - ]), - - ...mapActions(useSearchStore, [ "searchActiveTabSetter", - "searchSchemaSetter", + "sidebarCollapsedSetter", "searchSynonymTitleSetter", ]), + ...mapActions(useCommonStore, ["searchSchemaSetter"]), initComponent() { let activeItem = this.searchSchemaGetter[0]; if (this.$route.query.key) { diff --git a/stores/searchStore.ts b/stores/searchStore.ts index ff14869..864c093 100644 --- a/stores/searchStore.ts +++ b/stores/searchStore.ts @@ -1,13 +1,10 @@ import type { activeSearchChartSchema, activeSearchListSchema, - Domain, searchActiveTab, searchChartActiveTab, searchListActiveTab, - searchSchema, searchSynonymForm, - searchSynonymTitle, selectionFilterItems, } from "~/types/searchTypes"; @@ -24,7 +21,8 @@ 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, @@ -34,14 +32,8 @@ 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, @@ -50,7 +42,6 @@ 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, @@ -78,25 +69,25 @@ export const useSearchStore = defineStore("searchStore", { return state.list; }, - searchSynonymTitleGetter(state) { - return state.searchSynonymTitle; - }, + // searchSynonymTitleGetter(state) { + // return state.searchSynonymTitle; + // }, searchSynonymFormGetter(state) { return state.searchSynonymForm; }, - // activeTabGetter(state) { // return state.activeTab; // }, // search page - searchActiveTabGetter(state) { - return state.searchActiveTab; - }, - searchSchemaGetter(state) { - return state.searchSchema; - }, + // moved to common store. + // searchActiveTabGetter(state) { + // return state.searchActiveTab; + // }, + // searchSchemaGetter(state) { + // return state.searchSchema; + // }, searchActiveSchemaGetter(state) { return state.searchActiveSchema; @@ -149,27 +140,26 @@ export const useSearchStore = defineStore("searchStore", { SET_LIST(list = undefined) { this.list = list; }, - + searchSynonymFormSetter(searchSynonymForm = undefined) { this.searchSynonymForm = searchSynonymForm; }, - searchSynonymTitleSetter(searchSynonymTitle = undefined) { - this.searchSynonymTitle = searchSynonymTitle; - }, + // searchSynonymTitleSetter(searchSynonymTitle = undefined) { + // this.searchSynonymTitle = searchSynonymTitle; + // }, - // activeTabSetter(activeTab = undefined) { // this.activeTab = activeTab; // }, // search page - searchActiveTabSetter(searchActiveTab: searchActiveTab = undefined) { - this.searchActiveTab = searchActiveTab; - }, - searchSchemaSetter(searchSchema = undefined) { - this.searchSchema = searchSchema; - }, - + // searchActiveTabSetter(searchActiveTab: searchActiveTab = undefined) { + // this.searchActiveTab = searchActiveTab; + // }, + // searchSchemaSetter(searchSchema = undefined) { + // this.searchSchema = searchSchema; + // }, + searchActiveSchemaSetter(searchActiveSchema = undefined) { this.searchActiveSchema = searchActiveSchema; },