diff --git a/frontend/src/components/DomainSelector.vue b/frontend/src/components/DomainSelector.vue index 44676e4..c0ea828 100644 --- a/frontend/src/components/DomainSelector.vue +++ b/frontend/src/components/DomainSelector.vue @@ -8,65 +8,23 @@ size="md" :label="userStore.currentDomain.domainName" :disable-dropdown="true" - dropdown-icon='none' + dropdown-icon="none" :disable="true" > - - - - - - - {{domain.domainName}} - {{domain.kintoneUrl}} - - - - - diff --git a/frontend/src/pages/AppManagement.vue b/frontend/src/pages/AppManagement.vue index 3a07975..0576a4d 100644 --- a/frontend/src/pages/AppManagement.vue +++ b/frontend/src/pages/AppManagement.vue @@ -144,10 +144,6 @@ onMounted(async () => { await getApps(); }); -watch(() => authStore.currentDomain.id, async () => { - await getApps(); -}); - const filterInitRows = (row: {id: string}) => { return !rowIds.has(row.id); } diff --git a/frontend/src/pages/TenantDomain.vue b/frontend/src/pages/TenantDomain.vue index 8d9cff9..de05c02 100644 --- a/frontend/src/pages/TenantDomain.vue +++ b/frontend/src/pages/TenantDomain.vue @@ -142,13 +142,11 @@ import { ref, onMounted, computed } from 'vue'; import { api } from 'boot/axios'; import { useAuthStore } from 'stores/useAuthStore'; -import { useDomainStore } from 'stores/useDomainStore'; import ShareDomainDialog from 'components/ShareDomain/ShareDomainDialog.vue'; import TableActionMenu from 'components/TableActionMenu.vue'; import { IDomain, IDomainDisplay, IDomainOwnerDisplay, IDomainSubmit } from '../types/DomainTypes'; const authStore = useAuthStore(); -const domainStore = useDomainStore(); const inactiveRowClass = (row: IDomainOwnerDisplay) => row.domainActive ? '' : 'inactive-row'; const columns = [ @@ -329,7 +327,6 @@ const onSubmit = () => { await authStore.setCurrentDomain(); } getDomain(); - domainStore.loadUserDomains(); closeDg(); onReset(); addEditLoading.value = false; diff --git a/frontend/src/stores/useDomainStore.ts b/frontend/src/stores/useDomainStore.ts deleted file mode 100644 index d5c64fa..0000000 --- a/frontend/src/stores/useDomainStore.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { defineStore } from 'pinia'; -import { api } from 'boot/axios'; -import { IDomainInfo, IDomain } from '../types/DomainTypes'; - -export const useDomainStore = defineStore('domain', { - state: () => ({ - userDomains: [] as IDomainInfo[], - }), - actions: { - async loadUserDomains(): Promise { - const resp = await api.get(`api/domain`); - const domains = resp.data as IDomain[]; - this.userDomains = domains - .filter(data => data.is_active) - .map((data) => ({ - id: data.id, - domainName: data.name, - kintoneUrl: data.url, - })); - return this.userDomains; - }, - }, -});