From df5b012bcd1b759d15d6629692829d57a97532e4 Mon Sep 17 00:00:00 2001
From: xue jiahao <hsuehchiahao@gmail.com>
Date: Wed, 27 Nov 2024 11:19:15 +0800
Subject: [PATCH 1/3] fix api call result & some UI improve

---
 frontend/src/components/DomainSelect.vue |  8 +++++++-
 frontend/src/pages/UserDomain.vue        | 23 +++++++++++++----------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/frontend/src/components/DomainSelect.vue b/frontend/src/components/DomainSelect.vue
index ecddd74..c6fa61c 100644
--- a/frontend/src/components/DomainSelect.vue
+++ b/frontend/src/components/DomainSelect.vue
@@ -11,7 +11,10 @@ export default {
   name: 'DomainSelect',
   props: {
     name: String,
-    type: String
+    type: String,
+    filterInitRowsFunc: {
+      type: Function,
+    },
   },
   setup() {
   const columns = [
@@ -26,6 +29,9 @@ export default {
       api.get(`api/domains`).then(res =>{
          res.data.data.forEach((item) =>
         {
+          if (props.filterInitRowsFunc && !props.filterInitRowsFunc(item)) {
+            return;
+          }
           rows.push({id:item.id,tenantid:item.tenantid,name:item.name,url:item.url,kintoneuser:item.kintoneuser});
         }
         )
diff --git a/frontend/src/pages/UserDomain.vue b/frontend/src/pages/UserDomain.vue
index adc0ab7..faaefdb 100644
--- a/frontend/src/pages/UserDomain.vue
+++ b/frontend/src/pages/UserDomain.vue
@@ -14,14 +14,14 @@
 
         <q-space />
         <div class="row q-gutter-md">
-          <q-item v-if="authStore.permissions === 'admin'" tag="label" dense @click="clickSwitchUser()">
+          <!-- <q-item v-if="authStore.permissions === 'admin'" tag="label" dense @click="clickSwitchUser()">
             <q-item-section>
               <q-item-label>適用するユーザ : </q-item-label>
             </q-item-section>
             <q-item-section avatar>
               {{ currentUserName }}
             </q-item-section>
-          </q-item>
+          </q-item> -->
 
           <q-input borderless dense filled debounce="300" v-model="userDomainTableFilter" placeholder="Search">
             <template v-slot:append>
@@ -74,7 +74,7 @@
     </q-table>
 
     <show-dialog v-model:visible="showAddDomainDg" name="ドメイン" @close="addUserDomainFinished">
-      <domain-select ref="addDomainRef" name="ドメイン" type="multiple"></domain-select>
+      <domain-select ref="addDomainRef" name="ドメイン" type="single" :filterInitRowsFunc="filterInitRows"></domain-select>
     </show-dialog>
 
     <show-dialog v-model:visible="showSwitchUserDd" name="ドメイン" minWidth="35vw" @close="switchUserFinished">
@@ -131,6 +131,7 @@ import UserList from 'components/UserList.vue';
 const authStore = useAuthStore();
 const pagination = ref({ sortBy: 'id', rowsPerPage: 0 });
 const rows = ref([] as any[]);
+const rowIds = new Set<string>();
 const loading = ref(true);
 
 const columns = [
@@ -152,19 +153,19 @@ let editId = ref(0);
 const showAddDomainDg = ref(false);
 const addDomainRef = ref();
 
+const filterInitRows = (row: {id: string}) => {
+  return !rowIds.has(row.id);
+}
+
 const clickAddDomain = () => {
   editId.value = 0;
   showAddDomainDg.value = true;
 };
 
 const addUserDomainFinished = (val: string) => {
-  if (val == 'OK') {
-    let dodmainids = [];
-    let domains = JSON.parse(JSON.stringify(addDomainRef.value.selected));
-    for (var key in domains) {
-      dodmainids.push(domains[key].id);
-    }
-    api.post(`api/domain/${useOtherUser.value ? otherUserId.value : authStore.userId}`, dodmainids)
+  const selected = addDomainRef.value.selected;
+  if (val == 'OK' && selected.length > 0) {
+    api.post(`api/domain/${useOtherUser.value ? otherUserId.value : authStore.userId}?domainid=${selected[0].id}`)
       .then(() => { getDomain(useOtherUser.value ? otherUserId.value : undefined); });
   }
 };
@@ -221,11 +222,13 @@ const switchUserFinished = async (val: string) => {
 
 const getDomain = async (userId? : string) => {
   loading.value = true;
+  rowIds.clear();
   const resp = await api.get(`api/activedomain${useOtherUser.value ? `?userId=${otherUserId.value}` : ''}`);
   activeDomainId.value = resp?.data?.data?.id;
   const domainResult = userId ? await api.get(`api/domain?userId=${userId}`) : await api.get(`api/domain`);
   const domains = domainResult.data as any[];
   rows.value = domains.map((item) => {
+    rowIds.add(item.id);
     return { id: item.id, name: item.name, url: item.url, kintoneuser: item.kintoneuser, kintonepwd: item.kintonepwd }
   });
   loading.value = false;

From 024645e16a7dd3fa06f329829b17c0102df982c8 Mon Sep 17 00:00:00 2001
From: xue jiahao <hsuehchiahao@gmail.com>
Date: Wed, 27 Nov 2024 16:01:18 +0800
Subject: [PATCH 2/3] [UI] dialog and redirect for no active domain

---
 frontend/quasar.config.js                 |  3 ++-
 frontend/src/components/DomainSelect.vue  | 26 +++++++++++------------
 frontend/src/components/EssentialLink.vue |  2 ++
 frontend/src/layouts/MainLayout.vue       |  6 ++++--
 frontend/src/pages/UserDomain.vue         | 21 ++++++++++++++++--
 frontend/src/router/index.ts              | 15 +++++++++++++
 frontend/src/stores/useAuthStore.ts       |  4 ++++
 7 files changed, 59 insertions(+), 18 deletions(-)

diff --git a/frontend/quasar.config.js b/frontend/quasar.config.js
index 449fef0..40530ff 100644
--- a/frontend/quasar.config.js
+++ b/frontend/quasar.config.js
@@ -115,7 +115,8 @@ module.exports = configure(function (/* ctx */) {
 
       // Quasar plugins
       plugins: [
-        'Notify'
+        'Notify',
+        'Dialog'
       ]
     },
 
diff --git a/frontend/src/components/DomainSelect.vue b/frontend/src/components/DomainSelect.vue
index c6fa61c..65759f1 100644
--- a/frontend/src/components/DomainSelect.vue
+++ b/frontend/src/components/DomainSelect.vue
@@ -16,19 +16,19 @@ export default {
       type: Function,
     },
   },
-  setup() {
-  const columns = [
-  { name: 'id'},
-  { name: 'tenantid', required: true,label: 'テナント',align: 'left',field: 'tenantid',sortable: true},
-  { name: 'name', align: 'center', label: 'ドメイン', field: 'name', sortable: true },
-  { name: 'url', label: 'URL', field: 'url', sortable: true },
-  { name: 'kintoneuser', label: 'アカウント', field: 'kintoneuser' }
-  ]
-  const rows = reactive([])
-    onMounted( () => {
+  setup(props) {
+    const columns = [
+      { name: 'id'},
+      { name: 'tenantid', required: true,label: 'テナント',align: 'left',field: 'tenantid',sortable: true},
+      { name: 'name', align: 'center', label: 'ドメイン', field: 'name', sortable: true },
+      { name: 'url', label: 'URL', field: 'url', sortable: true },
+      { name: 'kintoneuser', label: 'アカウント', field: 'kintoneuser' }
+    ]
+    const rows = reactive([]);
+
+    onMounted(() => {
       api.get(`api/domains`).then(res =>{
-         res.data.data.forEach((item) =>
-        {
+         res.data.data.forEach((item) => {
           if (props.filterInitRowsFunc && !props.filterInitRowsFunc(item)) {
             return;
           }
@@ -36,7 +36,7 @@ export default {
         }
         )
       });
-      });
+    });
     return {
       columns,
       rows,
diff --git a/frontend/src/components/EssentialLink.vue b/frontend/src/components/EssentialLink.vue
index c736344..3a677c5 100644
--- a/frontend/src/components/EssentialLink.vue
+++ b/frontend/src/components/EssentialLink.vue
@@ -4,6 +4,7 @@
     tag="a"
     :target="target?target:'_blank'"
     :href="link"
+    :disable="disable"
     v-if="!isSeparator"
   >
     <q-item-section
@@ -33,6 +34,7 @@ export interface EssentialLinkProps {
   icon?: string;
   isSeparator?: boolean;
   target?:string;
+  disable?:boolean;
 }
 withDefaults(defineProps<EssentialLinkProps>(), {
   caption: '',
diff --git a/frontend/src/layouts/MainLayout.vue b/frontend/src/layouts/MainLayout.vue
index e699cf4..32e3f9c 100644
--- a/frontend/src/layouts/MainLayout.vue
+++ b/frontend/src/layouts/MainLayout.vue
@@ -47,7 +47,8 @@ const essentialLinks: EssentialLinkProps[] = [
     caption: '設計書から導入する',
     icon: 'home',
     link: '/',
-    target: '_self'
+    target: '_self',
+    disable: !authStore.hasDomain
   },
   // {
   //   title: 'フローエディター',
@@ -61,7 +62,8 @@ const essentialLinks: EssentialLinkProps[] = [
     caption: 'アプリを管理する',
     icon: 'widgets',
     link: '/#/app',
-    target: '_self'
+    target: '_self',
+    disable: !authStore.hasDomain
   },
   // {
   //   title: '条件エディター',
diff --git a/frontend/src/pages/UserDomain.vue b/frontend/src/pages/UserDomain.vue
index faaefdb..653b25f 100644
--- a/frontend/src/pages/UserDomain.vue
+++ b/frontend/src/pages/UserDomain.vue
@@ -123,12 +123,14 @@
 import { ref, onMounted, computed } from 'vue'
 import { api } from 'boot/axios';
 import { useAuthStore } from 'stores/useAuthStore';
+import { useDomainStore } from 'stores/useDomainStore';
 
 import ShowDialog from 'components/ShowDialog.vue';
 import DomainSelect from 'components/DomainSelect.vue';
 import UserList from 'components/UserList.vue';
 
 const authStore = useAuthStore();
+const domainStore = useDomainStore();
 const pagination = ref({ sortBy: 'id', rowsPerPage: 0 });
 const rows = ref([] as any[]);
 const rowIds = new Set<string>();
@@ -166,7 +168,18 @@ const addUserDomainFinished = (val: string) => {
   const selected = addDomainRef.value.selected;
   if (val == 'OK' && selected.length > 0) {
     api.post(`api/domain/${useOtherUser.value ? otherUserId.value : authStore.userId}?domainid=${selected[0].id}`)
-      .then(() => { getDomain(useOtherUser.value ? otherUserId.value : undefined); });
+      .then(({ data }) => {
+        if (rows.value.length === 0 && data.data) {
+          const domain = data.data;
+          authStore.setCurrentDomain({
+            id: domain.id,
+            kintoneUrl: domain.url,
+            domainName: domain.name
+          });
+        }
+        domainStore.loadUserDomains();
+        getDomain(useOtherUser.value ? otherUserId.value : undefined);
+      });
   }
 };
 
@@ -223,7 +236,11 @@ const switchUserFinished = async (val: string) => {
 const getDomain = async (userId? : string) => {
   loading.value = true;
   rowIds.clear();
-  const resp = await api.get(`api/activedomain${useOtherUser.value ? `?userId=${otherUserId.value}` : ''}`);
+  if (useOtherUser.value) {
+    // TODO
+    return;
+  }
+  const resp = await api.get(`api/activedomain`);
   activeDomainId.value = resp?.data?.data?.id;
   const domainResult = userId ? await api.get(`api/domain?userId=${userId}`) : await api.get(`api/domain`);
   const domains = domainResult.data as any[];
diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts
index db72a87..44ed7db 100644
--- a/frontend/src/router/index.ts
+++ b/frontend/src/router/index.ts
@@ -5,6 +5,7 @@ import {
   createWebHashHistory,
   createWebHistory,
 } from 'vue-router';
+import { Dialog } from 'quasar'
 
 import routes from './routes';
 import { useAuthStore } from 'stores/useAuthStore';
@@ -47,6 +48,20 @@ export default route(function (/* { store, ssrContext } */) {
           authStore.returnUrl = to.fullPath;
           return '/login';
       }
+
+      // redirect to domain setting page if no domain exist
+      const domainPages = [...publicPages, '/domain', '/userDomain', '/user'];
+      if (!authStore.hasDomain && !domainPages.includes(to.path)) {
+        Dialog.create({
+          title: '注意',
+          message: '既定/利用可能なドメインはありません。<br>ドメイン管理ページに遷移して処理します。',
+          html: true,
+          persistent: true,
+        }).onDismiss(() => {
+          console.log('Dialog dismissed. You can do some clean up here')
+        })
+        return '/domain';
+      }
   });
   return routerInstance;
 });
diff --git a/frontend/src/stores/useAuthStore.ts b/frontend/src/stores/useAuthStore.ts
index d27817f..6770efa 100644
--- a/frontend/src/stores/useAuthStore.ts
+++ b/frontend/src/stores/useAuthStore.ts
@@ -35,6 +35,9 @@ export const useAuthStore = defineStore('auth', {
     toggleLeftDrawer(): boolean {
       return this.LeftDrawer;
     },
+    hasDomain(): boolean {
+      return !!this.currentDomain.id;
+    }
   },
   actions: {
     setLeftMenu(value:boolean){
@@ -84,6 +87,7 @@ export const useAuthStore = defineStore('auth', {
     logout() {
       this.token = '';
       this.currentDomain = {} as IDomainInfo; // 清空当前域
+      this.returnUrl = '';
       router.push('/login');
     },
     async setCurrentDomain(domain: IDomainInfo) {

From bca2f46ea58f8b637a67691d3037d5d74c0433c5 Mon Sep 17 00:00:00 2001
From: xue jiahao <hsuehchiahao@gmail.com>
Date: Wed, 27 Nov 2024 18:05:48 +0800
Subject: [PATCH 3/3] [UI] Fix behavious when delete user domain

---
 frontend/src/components/DomainSelect.vue   | 55 +++++++++++++++++-----
 frontend/src/components/DomainSelector.vue |  6 +--
 frontend/src/layouts/MainLayout.vue        | 19 ++++----
 frontend/src/pages/TenantDomain.vue        | 15 +++---
 frontend/src/pages/UserDomain.vue          | 34 ++++++++-----
 frontend/src/router/index.ts               |  2 -
 frontend/src/stores/useAuthStore.ts        |  9 ++--
 frontend/src/types/DomainTypes.ts          |  2 +-
 8 files changed, 93 insertions(+), 49 deletions(-)

diff --git a/frontend/src/components/DomainSelect.vue b/frontend/src/components/DomainSelect.vue
index 65759f1..e598f57 100644
--- a/frontend/src/components/DomainSelect.vue
+++ b/frontend/src/components/DomainSelect.vue
@@ -1,11 +1,20 @@
 <template>
   <div class="q-pa-md">
-    <q-table :title="name+'一覧'" :selection="type" v-model:selected="selected" :columns="columns" :rows="rows" />
+    <q-table :loading="loading" :title="name+'一覧'" :selection="type" v-model:selected="selected" :columns="columns" :rows="rows">
+      <template v-slot:body-cell-name="p">
+        <q-td class="content-box flex justify-between items-center" :props="p">
+          {{ p.row.name }}
+          <q-badge v-if="!p.row.domainActive" color="grey">未启用</q-badge>
+          <q-badge v-if="p.row.id == currentDomainId" color="primary">現在</q-badge>
+        </q-td>
+      </template>
+    </q-table>
   </div>
 </template>
 <script>
-import { ref,onMounted,reactive } from 'vue'
+import { ref,onMounted,reactive, computed } from 'vue'
 import { api } from 'boot/axios';
+import { useAuthStore } from 'src/stores/useAuthStore';
 
 export default {
   name: 'DomainSelect',
@@ -17,27 +26,43 @@ export default {
     },
   },
   setup(props) {
+    const authStore = useAuthStore();
+    const currentDomainId = computed(() => authStore.currentDomain.id);
+    const loading = ref(true);
+    const inactiveRowClass = (row) => row.domainActive ? '' : 'inactive-row';
+
     const columns = [
-      { name: 'id'},
-      { name: 'tenantid', required: true,label: 'テナント',align: 'left',field: 'tenantid',sortable: true},
-      { name: 'name', align: 'center', label: 'ドメイン', field: 'name', sortable: true },
-      { name: 'url', label: 'URL', field: 'url', sortable: true },
-      { name: 'kintoneuser', label: 'アカウント', field: 'kintoneuser' }
+      { name: 'id', label: 'ID', field: 'id', align: 'left', sortable: true, classes: inactiveRowClass },
+      { name: 'tenantid', required: true,label: 'テナント',align: 'left',field: 'tenantid',sortable: true, classes: inactiveRowClass},
+      { name: 'name', align: 'center', label: 'ドメイン', field: 'name', sortable: true, classes: inactiveRowClass },
+      { name: 'url', label: 'URL', field: 'url', sortable: true, classes: inactiveRowClass },
+      { name: 'user', label: 'アカウント', field: 'user', classes: inactiveRowClass }
     ]
     const rows = reactive([]);
 
     onMounted(() => {
+      loading.value = true;
       api.get(`api/domains`).then(res =>{
-         res.data.data.forEach((item) => {
+         res.data.data.forEach((data) => {
+          const item = {
+            id: data.id,
+            tenantid: data.tenantid,
+            domainActive: data.is_active,
+            name: data.name,
+            url: data.url,
+            user: data.kintoneuser,
+          }
           if (props.filterInitRowsFunc && !props.filterInitRowsFunc(item)) {
             return;
           }
-          rows.push({id:item.id,tenantid:item.tenantid,name:item.name,url:item.url,kintoneuser:item.kintoneuser});
-        }
-        )
+          rows.push(item);
+        })
+        loading.value = false;
       });
     });
     return {
+      loading,
+      currentDomainId,
       columns,
       rows,
       selected: ref([]),
@@ -46,3 +71,11 @@ export default {
 
 }
 </script>
+<style lang="scss">
+.q-table td.inactive-row {
+  color: #aaa;
+}
+.q-table .content-box {
+  box-sizing: content-box;
+}
+</style>
\ No newline at end of file
diff --git a/frontend/src/components/DomainSelector.vue b/frontend/src/components/DomainSelector.vue
index 1369480..44676e4 100644
--- a/frontend/src/components/DomainSelector.vue
+++ b/frontend/src/components/DomainSelector.vue
@@ -7,9 +7,9 @@
       icon="share"
       size="md"
       :label="userStore.currentDomain.domainName"
-      :disable-dropdown="isUnclickable"
-      :dropdown-icon="isUnclickable ? 'none' : ''"
-      :disable="isUnclickable"
+      :disable-dropdown="true"
+      dropdown-icon='none'
+      :disable="true"
     >
       <q-list>
         <q-item :active="isCurrentDomain(domain)" active-class="active-domain-item" v-for="domain in domains" :key="domain.domainName"
diff --git a/frontend/src/layouts/MainLayout.vue b/frontend/src/layouts/MainLayout.vue
index 32e3f9c..04247fc 100644
--- a/frontend/src/layouts/MainLayout.vue
+++ b/frontend/src/layouts/MainLayout.vue
@@ -34,21 +34,22 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted } from 'vue';
+import { computed, onMounted, reactive } from 'vue';
 import EssentialLink, { EssentialLinkProps } from 'components/EssentialLink.vue';
 import DomainSelector from 'components/DomainSelector.vue';
 import { useAuthStore } from 'stores/useAuthStore';
 
 const authStore = useAuthStore();
+const noDomain = computed(() => !authStore.hasDomain);
 
-const essentialLinks: EssentialLinkProps[] = [
+const essentialLinks: EssentialLinkProps[] = reactive([
   {
     title: 'ホーム',
     caption: '設計書から導入する',
     icon: 'home',
     link: '/',
     target: '_self',
-    disable: !authStore.hasDomain
+    disable: noDomain
   },
   // {
   //   title: 'フローエディター',
@@ -63,7 +64,7 @@ const essentialLinks: EssentialLinkProps[] = [
     icon: 'widgets',
     link: '/#/app',
     target: '_self',
-    disable: !authStore.hasDomain
+    disable: noDomain
   },
   // {
   //   title: '条件エディター',
@@ -94,9 +95,9 @@ const essentialLinks: EssentialLinkProps[] = [
   //   link:'https://cybozu.dev/ja/kintone/docs/',
   //   icon:'help_outline'
   // },
-];
+]);
 
-const domainLinks: EssentialLinkProps[] = [
+const domainLinks: EssentialLinkProps[] = reactive([
   {
     title: 'ドメイン管理',
     caption: 'kintoneのドメイン設定',
@@ -111,9 +112,9 @@ const domainLinks: EssentialLinkProps[] = [
     link: '/#/userDomain',
     target: '_self'
   },
-];
+]);
 
-const adminLinks: EssentialLinkProps[] = [
+const adminLinks: EssentialLinkProps[] = reactive([
   {
     title: 'ユーザー管理',
     caption: 'ユーザーを管理する',
@@ -121,7 +122,7 @@ const adminLinks: EssentialLinkProps[] = [
     link: '/#/user',
     target: '_self'
   },
-]
+])
 
 const version = process.env.version;
 const productName = process.env.productName;
diff --git a/frontend/src/pages/TenantDomain.vue b/frontend/src/pages/TenantDomain.vue
index 2f1ba2e..2b5e32e 100644
--- a/frontend/src/pages/TenantDomain.vue
+++ b/frontend/src/pages/TenantDomain.vue
@@ -5,7 +5,7 @@
           <q-breadcrumbs-el icon="domain" label="ドメイン管理" />
         </q-breadcrumbs>
     </div>
-    <q-table title="Treats" :rows="rows" :columns="columns" row-key="id" :filter="filter" :loading="loading" :pagination="pagination">
+    <q-table :rows="rows" :columns="columns" row-key="id" :filter="filter" :loading="loading" :pagination="pagination">
 
       <template v-slot:top>
         <q-btn color="primary" :disable="loading" label="新規" @click="addRow" />
@@ -21,7 +21,7 @@
         <q-td class="flex justify-between items-center" :props="p">
           {{ p.row.name }}
           <q-badge v-if="!p.row.domainActive" color="grey">未启用</q-badge>
-          <q-badge v-if="p.row.id == currendDomainId" color="primary">現在</q-badge>
+          <q-badge v-if="p.row.id == currentDomainId" color="primary">現在</q-badge>
         </q-td>
       </template>
 
@@ -145,8 +145,7 @@ const columns = [
     name: 'tenantid',
     required: true,
     label: 'テナントID',
-    field: row => row.tenantid,
-    format: val => `${val}`,
+    field: 'tenantid',
     align: 'left',
     sortable: true,
     classes: inactiveRowClass
@@ -165,7 +164,7 @@ const show = ref(false);
 const confirm = ref(false);
 const resetPsw = ref(false);
 
-const currendDomainId = computed(() => authStore.currentDomain.id);
+const currentDomainId = computed(() => authStore.currentDomain.id);
 const tenantid = ref(authStore.currentDomain.id);
 const name = ref('');
 const url = ref('');
@@ -180,9 +179,8 @@ let ownerid = ref('');
 
 const getDomain = async () => {
   loading.value = true;
-  const userId = authStore.userId;
-  const result = await api.get<IDomain[]>(`api/domains`);
-  rows.value = result.data.data.map((item) => {
+  const { data } = await api.get<{data:IDomain[]}>(`api/domains`);
+  rows.value = data.data.map((item) => {
     return {
       id: item.id,
       tenantid: item.tenantid,
@@ -215,6 +213,7 @@ const removeRow = (row: IDomainDisplay) => {
 const deleteDomain = () => {
   api.delete(`api/domain/${editId.value}`).then(() => {
     getDomain();
+    // authStore.setCurrentDomain();
   })
   editId.value = 0; // set in removeRow()
 };
diff --git a/frontend/src/pages/UserDomain.vue b/frontend/src/pages/UserDomain.vue
index 653b25f..105a27a 100644
--- a/frontend/src/pages/UserDomain.vue
+++ b/frontend/src/pages/UserDomain.vue
@@ -62,7 +62,7 @@
                       isActive(props.row.id)?'既定':'' }}</div>
                   <div class="col-auto">
                     <q-btn v-if="!isActive(props.row.id)" flat
-                      @click="activeDomain(props.row.id)">既定にする</q-btn>
+                      @click="activeDomain(props.row)">既定にする</q-btn>
                     <q-btn flat @click="clickDeleteConfirm(props.row)">削除</q-btn>
                   </div>
                 </div>
@@ -74,7 +74,7 @@
     </q-table>
 
     <show-dialog v-model:visible="showAddDomainDg" name="ドメイン" @close="addUserDomainFinished">
-      <domain-select ref="addDomainRef" name="ドメイン" type="single" :filterInitRowsFunc="filterInitRows"></domain-select>
+      <domain-select ref="addDomainRef" name="ドメイン" type="single" :filterInitRowsFunc="filterAddDgInitRows"></domain-select>
     </show-dialog>
 
     <show-dialog v-model:visible="showSwitchUserDd" name="ドメイン" minWidth="35vw" @close="switchUserFinished">
@@ -155,8 +155,8 @@ let editId = ref(0);
 const showAddDomainDg = ref(false);
 const addDomainRef = ref();
 
-const filterInitRows = (row: {id: string}) => {
-  return !rowIds.has(row.id);
+const filterAddDgInitRows = (row: {domainActive: boolean, id: string}) => {
+  return row.domainActive && !rowIds.has(row.id);
 }
 
 const clickAddDomain = () => {
@@ -168,16 +168,15 @@ const addUserDomainFinished = (val: string) => {
   const selected = addDomainRef.value.selected;
   if (val == 'OK' && selected.length > 0) {
     api.post(`api/domain/${useOtherUser.value ? otherUserId.value : authStore.userId}?domainid=${selected[0].id}`)
-      .then(({ data }) => {
+      .then(async ({ data }) => {
         if (rows.value.length === 0 && data.data) {
           const domain = data.data;
-          authStore.setCurrentDomain({
+          await authStore.setCurrentDomain({
             id: domain.id,
             kintoneUrl: domain.url,
             domainName: domain.name
           });
         }
-        domainStore.loadUserDomains();
         getDomain(useOtherUser.value ? otherUserId.value : undefined);
       });
   }
@@ -190,16 +189,27 @@ const clickDeleteConfirm = (row: any) => {
   editId.value = row.id;
 };
 
-const deleteDomainFinished = () => {
-  api.delete(`api/domain/${editId.value}/${useOtherUser.value ? otherUserId.value : authStore.userId}`).then(() => {
+const deleteDomainFinished = async () => {
+  await api.delete(`api/domain/${editId.value}/${useOtherUser.value ? otherUserId.value : authStore.userId}`).then(({ data }) => {
+    if (data.msg == 'OK' && authStore.currentDomain.id === editId.value) {
+      authStore.setCurrentDomain();
+    }
     getDomain(useOtherUser.value ? otherUserId.value : undefined);
   })
   editId.value = 0;
 };
 
-const activeDomain = (id: number) => {
-  api.put(`api/activedomain/${id}${useOtherUser.value ? `?userId=${otherUserId.value}` : ''}`)
-    .then(() => { getDomain(useOtherUser.value ? otherUserId.value : undefined); })
+const activeDomain = async (domain: any) => {
+  if (useOtherUser.value) {
+    // TODO
+    return;
+  }
+  await authStore.setCurrentDomain({
+    id: domain.id,
+    kintoneUrl: domain.url,
+    domainName: domain.name
+  });
+  getDomain();
 };
 
 let activeDomainId = ref(0);
diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts
index 44ed7db..e6c96f4 100644
--- a/frontend/src/router/index.ts
+++ b/frontend/src/router/index.ts
@@ -57,8 +57,6 @@ export default route(function (/* { store, ssrContext } */) {
           message: '既定/利用可能なドメインはありません。<br>ドメイン管理ページに遷移して処理します。',
           html: true,
           persistent: true,
-        }).onDismiss(() => {
-          console.log('Dialog dismissed. You can do some clean up here')
         })
         return '/domain';
       }
diff --git a/frontend/src/stores/useAuthStore.ts b/frontend/src/stores/useAuthStore.ts
index 6770efa..f58028f 100644
--- a/frontend/src/stores/useAuthStore.ts
+++ b/frontend/src/stores/useAuthStore.ts
@@ -36,7 +36,7 @@ export const useAuthStore = defineStore('auth', {
       return this.LeftDrawer;
     },
     hasDomain(): boolean {
-      return !!this.currentDomain.id;
+      return this.currentDomain.id !== undefined;
     }
   },
   actions: {
@@ -87,10 +87,13 @@ export const useAuthStore = defineStore('auth', {
     logout() {
       this.token = '';
       this.currentDomain = {} as IDomainInfo; // 清空当前域
-      this.returnUrl = '';
       router.push('/login');
     },
-    async setCurrentDomain(domain: IDomainInfo) {
+    async setCurrentDomain(domain?: IDomainInfo) {
+      if (!domain) {
+        this.currentDomain = {} as IDomainInfo;
+        return;
+      }
       if (domain.id === this.currentDomain.id) {
         return;
       }
diff --git a/frontend/src/types/DomainTypes.ts b/frontend/src/types/DomainTypes.ts
index 380081f..2594450 100644
--- a/frontend/src/types/DomainTypes.ts
+++ b/frontend/src/types/DomainTypes.ts
@@ -30,6 +30,6 @@ export interface IDomainDisplay {
   name: string;
   url: string;
   user: string;
-  password: string;
+  password?: string;
   domainActive: boolean;
 }
\ No newline at end of file