From e362c80e98140139242bc499746b06a468d336c3 Mon Sep 17 00:00:00 2001
From: xue jiahao <hsuehchiahao@gmail.com>
Date: Wed, 6 Nov 2024 21:56:14 +0800
Subject: [PATCH] show domain page for all user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. show ドメイン管理
2. hide ドメイン適用
3. force redirect to domain page if user no domain exist
---
 frontend/src/components/EssentialLink.vue |  2 +
 frontend/src/layouts/MainLayout.vue       | 89 ++++++-----------------
 frontend/src/router/index.ts              |  7 ++
 frontend/src/stores/useAuthStore.ts       | 11 ++-
 4 files changed, 38 insertions(+), 71 deletions(-)

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 83d81f5..6969ca3 100644
--- a/frontend/src/layouts/MainLayout.vue
+++ b/frontend/src/layouts/MainLayout.vue
@@ -22,6 +22,8 @@
         <div v-if="isAdmin()">
           <EssentialLink v-for="link in adminLinks" :key="link.title" v-bind="link" />
         </div>
+        <EssentialLink v-for="link in domainLinks" :key="link.title" v-bind="link" />
+
       </q-list>
     </q-drawer>
 
@@ -32,7 +34,7 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted } from 'vue';
+import { onMounted, computed } from 'vue';
 import EssentialLink, { EssentialLinkProps } from 'components/EssentialLink.vue';
 import DomainSelector from 'components/DomainSelector.vue';
 import { useAuthStore } from 'stores/useAuthStore';
@@ -45,14 +47,16 @@ const essentialLinks: EssentialLinkProps[] = [
     caption: '設計書から導入する',
     icon: 'home',
     link: '/',
-    target: '_self'
+    target: '_self',
+    disable: !authStore.hasDomain,
   },
   {
     title: 'フローエディター',
     caption: 'イベントを設定する',
     icon: 'account_tree',
     link: '/#/FlowChart',
-    target: '_self'
+    target: '_self',
+    disable: !authStore.hasDomain, 
   },
   // {
   //   title: '条件エディター',
@@ -83,58 +87,23 @@ const essentialLinks: EssentialLinkProps[] = [
   //   link:'https://cybozu.dev/ja/kintone/docs/',
   //   icon:'help_outline'
   // },
+];
+
+const domainLinks: EssentialLinkProps[] = [
+  {
+    title: 'ドメイン管理',
+    caption: 'kintoneのドメイン設定',
+    icon: 'domain',
+    link: '/#/domain',
+    target: '_self'
+  },
   // {
-  //   title:'',
-  //   isSeparator:true
+  //   title: 'ドメイン適用',
+  //   caption: 'ユーザー使用可能なドメインの設定',
+  //   icon: 'assignment_ind',
+  //   link: '/#/userDomain',
+  //   target: '_self'
   // },
-  // {
-  //   title: 'Docs',
-  //   caption: 'quasar.dev',
-  //   icon: 'school',
-  //   link: 'https://quasar.dev'
-  // },
-  // {
-  //   title: 'Icons',
-  //   caption: 'Material Icons',
-  //   icon: 'insert_emoticon',
-  //   link: 'https://fonts.google.com/icons?selected=Material+Icons:insert_emoticon:'
-  // },
-  // {
-  //   title: 'Github',
-  //   caption: 'github.com/quasarframework',
-  //   icon: 'code',
-  //   link: 'https://github.com/quasarframework'
-  // },
-  // {
-  //   title: 'Discord Chat Channel',
-  //   caption: 'chat.quasar.dev',
-  //   icon: 'chat',
-  //   link: 'https://chat.quasar.dev'
-  // },
-  // {
-  //   title: 'Forum',
-  //   caption: 'forum.quasar.dev',
-  //   icon: 'record_voice_over',
-  //   link: 'https://forum.quasar.dev'
-  // },
-  // {
-  //   title: 'Twitter',
-  //   caption: '@quasarframework',
-  //   icon: 'rss_feed',
-  //   link: 'https://twitter.quasar.dev'
-  // },
-  // {
-  //   title: 'Facebook',
-  //   caption: '@QuasarFramework',
-  //   icon: 'public',
-  //   link: 'https://facebook.quasar.dev'
-  // },
-  // {
-  //   title: 'Quasar Awesome',
-  //   caption: 'Community Quasar projects',
-  //   icon: 'favorite',
-  //   link: 'https://awesome.quasar.dev'
-  // }
 ];
 
 const adminLinks: EssentialLinkProps[] = [
@@ -145,20 +114,6 @@ const adminLinks: EssentialLinkProps[] = [
     link: '/#/user',
     target: '_self'
   },
-  {
-    title: 'ドメイン管理',
-    caption: 'kintoneのドメイン設定',
-    icon: 'domain',
-    link: '/#/domain',
-    target: '_self'
-  },
-  {
-    title: 'ドメイン適用',
-    caption: 'ユーザー使用可能なドメインの設定',
-    icon: 'assignment_ind',
-    link: '/#/userDomain',
-    target: '_self'
-  },
 ]
 
 const version = process.env.version;
diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts
index db72a87..afe80c1 100644
--- a/frontend/src/router/index.ts
+++ b/frontend/src/router/index.ts
@@ -47,6 +47,13 @@ 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'];
+      if (!authStore.hasDomain && !domainPages.includes(to.path)) {
+        authStore.returnUrl = to.fullPath;
+        return '/domain';
+      }
   });
   return routerInstance;
 });
diff --git a/frontend/src/stores/useAuthStore.ts b/frontend/src/stores/useAuthStore.ts
index 8887ddd..dc0802f 100644
--- a/frontend/src/stores/useAuthStore.ts
+++ b/frontend/src/stores/useAuthStore.ts
@@ -33,6 +33,9 @@ export const useAuthStore = defineStore('auth', {
     toggleLeftDrawer(): boolean {
       return this.LeftDrawer;
     },
+    hasDomain(): boolean {
+      return this.currentDomain.id === null;
+    }
   },
   actions: {
     toggleLeftMenu() {
@@ -60,11 +63,11 @@ export const useAuthStore = defineStore('auth', {
       }
     },
     async getCurrentDomain(): Promise<IDomainInfo> {
-      const activedomain = await api.get(`api/activedomain`);
+      const activedomain = (await api.get(`api/activedomain`))?.data;
       return {
-        id: activedomain.data.id,
-        domainName: activedomain.data.name,
-        kintoneUrl: activedomain.data.url,
+        id: activedomain?.id,
+        domainName: activedomain?.name,
+        kintoneUrl: activedomain?.url,
       };
     },
     async getUserDomains(): Promise<IDomainInfo[]> {