front/search_ui
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move searchStore into the commonStore

Browse Source
This commit is contained in:
mustafa-rezae 2025-05-18 14:19:37 +03:30
parent 117dc3e4fa
commit f4dbda3abb
18 changed files with 82 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/entity/components/EntitySelectFileQa.vue
View File

@ -235,6 +235,12 @@ import searchApi from "~/apis/searchApi";
import { mapActions, mapState } from "pinia"; import { mapActions, mapState } from "pinia";
import mammoth from "mammoth"; 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 { export default {
beforeMount() { beforeMount() {
this.httpService = useNuxtApp()["$http"]; this.httpService = useNuxtApp()["$http"];
@ -274,11 +280,11 @@ export default {
// data= new Tree(this.treeItems); // data= new Tree(this.treeItems);
// }, // },
computed: { computed: {
...mapState("entity", [ ...mapState(useEntityStore, [
"activeEntityViewSchemaGetter", "activeEntityViewSchemaGetter",
"selectedItemEntityGetter", "selectedItemEntityGetter",
]), ]),
...mapState(useSearchStore, ["searchActiveTabGetter", "domainActiveGetter"]), ...mapState(useCommonStore, ["searchActiveTabGetter", "domainActiveGetter"]),
permitUrl() { permitUrl() {
return import.meta.env.VITE_PERMIT; return import.meta.env.VITE_PERMIT;
}, },

5
components/entity/components/SelectEntityText.vue
View File

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

2
components/global/AutoComplation.vue
View File

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

3
components/search/AdvancedSearch.vue
View File

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

4
components/search/MyContent.vue
View File

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

28
components/search/forms/SearchSynonymSearch.vue
View File

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

12
components/search/forms/SynonymSearch.vue
View File

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

3
components/search/view/MajlesMashruhContent.vue
View File

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

3
components/search/view/MajlesQaSectionContent.vue
View File

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

4
components/search/view/MajlesQanonContent.vue
View File

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

4
components/search/view/MajlesQavaninContent.vue
View File

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

6
components/search/view/MajlesSectionContent.vue
View File

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

3
components/search/view/QanonContent.vue
View File

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

3
components/search/view/SearchAdvancedSearch.vue
View File

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

3
components/search/view/SearchContent.vue
View File

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

2
components/search/view/SearchSummary.vue
View File

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

15
pages/search/index.vue
View File

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

52
stores/searchStore.ts
View File

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