Merge branch 'dev3' of https://dev.azure.com/alicorn-dev/KintoneAppBuilder/_git/KintoneAppBuilder into dev3

frontend/src/components/ShareDomain/ShareDomainDialog.vue

@@ -9,7 +9,7 @@
       <q-card-section class="q-mx-md " >
         <q-select
           class="q-mt-md"
-          :disable="loading"
+          :disable="loading||!domain.domainActive"
           filled
           dense
           v-model="canSharedUserFilter"
@@ -17,7 +17,7 @@
           input-debounce="0"
           :options="canSharedUserFilteredOptions"
           clearable
-          :placeholder="canSharedUserFilter ? '' : '共有するユーザーを選択'"
+          :placeholder="canSharedUserFilter ? '' : domain.domainActive ? '共有するユーザーを選択' : 'ドメインが有効でないため、共有ができない。'"
           @filter="filterFn"
           :display-value="canSharedUserFilter?`${canSharedUserFilter.fullName} （${canSharedUserFilter.email}）`:''">
 

frontend/src/pages/TenantDomain.vue

@@ -32,7 +32,7 @@
         <q-td :props="p">
           <q-btn-group flat>
             <q-btn flat color="primary" padding="xs" size="1em" icon="edit_note" @click="editRow(p.row)" />
-            <q-btn flat color="primary" :disable="!p.row.domainActive" padding="xs" size="1em" icon="person_add_alt" @click="openShareDg(p.row)" />
+            <q-btn flat color="primary" padding="xs" size="1em" icon="person_add_alt" @click="openShareDg(p.row)" />
             <q-btn flat color="negative" padding="xs" size="1em" icon="delete_outline" @click="removeRow(p.row)" />
           </q-btn-group>
         </q-td>
@@ -294,7 +294,11 @@ const onSubmit = () => {
     'ownerid': authStore.userId || ''
   }
   // for search: api.put(`api/domain`)、api.post(`api/domain`)
-  api[method].apply(api, [`api/domain`, param]).then(() => {
+  api[method].apply(api, [`api/domain`, param]).then(async (resp: any) => {
+      const res = resp.data;
+      if (res.data.id === currentDomainId.value && !res.data.is_active) {
+        await authStore.setCurrentDomain();
+      }
       getDomain();
       domainStore.loadUserDomains();
       closeDg();

frontend/src/pages/UserDomain.vue

@@ -171,17 +171,21 @@ const getDomain = async (userId? : string) => {
   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) => {
+  rows.value = domains.reduce((acc, item) => {
     rowIds.add(item.id);
-    return {
-      id: item.id,
-      name: item.name,
-      url: item.url,
-      kintoneuser: item.kintoneuser,
-      ownerEmail: item.owner.email,
-      owner: item.owner.first_name + ' ' + item.owner.last_name,
+    if (item.is_active) {
+      acc.push({
+        id: item.id,
+        name: item.name,
+        url: item.url,
+        kintoneuser: item.kintoneuser,
+        ownerEmail: item.owner.email,
+        owner: item.owner.first_name + ' ' + item.owner.last_name,
+      })
     }
-  });
+    return acc;
+  }, []);
+
 }
 
 onMounted(async () => {