From c3f6de67332161d39ea087f4437b3932a60f7a47 Mon Sep 17 00:00:00 2001
From: "xiaozhe.ma" <xiaozhe.ma@jp.ricoh.com>
Date: Tue, 20 Aug 2024 17:21:30 +0900
Subject: [PATCH] =?UTF-8?q?feat:=E7=AE=A1=E7=90=86=E8=80=85=E6=A9=9F?=
 =?UTF-8?q?=E8=83=BD=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/layouts/MainLayout.vue   | 12 ++++++------
 frontend/src/pages/TenantDomain.vue   |  5 +++++
 frontend/src/pages/UserDomain.vue     | 23 +++++++++++++----------
 frontend/src/pages/UserManagement.vue |  7 ++++++-
 4 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/frontend/src/layouts/MainLayout.vue b/frontend/src/layouts/MainLayout.vue
index 4c346dd..83d81f5 100644
--- a/frontend/src/layouts/MainLayout.vue
+++ b/frontend/src/layouts/MainLayout.vue
@@ -139,22 +139,22 @@ const essentialLinks: EssentialLinkProps[] = [
 
 const adminLinks: EssentialLinkProps[] = [
   {
-    title: 'ユーザー',
-    caption: 'ユーザー設定する',
+    title: 'ユーザー管理',
+    caption: 'ユーザーを管理する',
     icon: 'manage_accounts',
     link: '/#/user',
     target: '_self'
   },
   {
-    title: 'テナント',
-    caption: 'テナント設定',
+    title: 'ドメイン管理',
+    caption: 'kintoneのドメイン設定',
     icon: 'domain',
     link: '/#/domain',
     target: '_self'
   },
   {
-    title: 'アカウント',
-    caption: 'アカウント設定',
+    title: 'ドメイン適用',
+    caption: 'ユーザー使用可能なドメインの設定',
     icon: 'assignment_ind',
     link: '/#/userDomain',
     target: '_self'
diff --git a/frontend/src/pages/TenantDomain.vue b/frontend/src/pages/TenantDomain.vue
index 58366fe..b880503 100644
--- a/frontend/src/pages/TenantDomain.vue
+++ b/frontend/src/pages/TenantDomain.vue
@@ -1,5 +1,10 @@
 <template>
   <div class="q-pa-md">
+    <div class="q-gutter-sm row items-start">
+        <q-breadcrumbs>
+          <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">
 
       <template v-slot:top>
diff --git a/frontend/src/pages/UserDomain.vue b/frontend/src/pages/UserDomain.vue
index dbfd692..166cb1c 100644
--- a/frontend/src/pages/UserDomain.vue
+++ b/frontend/src/pages/UserDomain.vue
@@ -1,5 +1,11 @@
 <template>
+
   <div class="q-pa-lg">
+    <div class="q-gutter-sm row items-start">
+    <q-breadcrumbs>
+      <q-breadcrumbs-el icon="assignment_ind" label="ドメイン適用" />
+    </q-breadcrumbs>
+  </div>
     <q-table grid grid-header title="Domain" selection="single" :rows="rows" :columns="columns" row-key="name"
       :filter="userDomainTableFilter" virtual-scroll v-model:pagination="pagination">
       <template v-slot:top>
@@ -10,7 +16,7 @@
         <div class="row q-gutter-md">
           <q-item v-if="authStore.permissions === 'admin'" tag="label" dense @click="clickSwitchUser()">
             <q-item-section>
-              <q-item-label>オブジェクトユーザ : </q-item-label>
+              <q-item-label>適用するユーザ : </q-item-label>
             </q-item-section>
             <q-item-section avatar>
               {{ currentUserName }}
@@ -52,11 +58,11 @@
               <div style="width: 98%;">
                 <div class="row items-center justify-between">
                   <div class="q-table__grid-item-value"
-                    :class="isActive(props.row.id) === 'Active' ? 'text-positive' : 'text-negative'">{{
-                      isActive(props.row.id) }}</div>
+                    :class="isActive(props.row.id) ? 'text-positive' : 'text-negative'">{{
+                      isActive(props.row.id)?'既定':'' }}</div>
                   <div class="col-auto">
-                    <q-btn v-if="isActive(props.row.id) !== 'Active'" flat
-                      @click="activeDomain(props.row.id)">有効</q-btn>
+                    <q-btn v-if="!isActive(props.row.id)" flat
+                      @click="activeDomain(props.row.id)">既定にする</q-btn>
                     <q-btn flat @click="clickDeleteConfirm(props.row)">削除</q-btn>
                   </div>
                 </div>
@@ -184,11 +190,8 @@ const activeDomain = (id: number) => {
 let activeDomainId = ref(0);
 
 const isActive = computed(() => (id: number) => {
-  if (id == activeDomainId.value)
-    return "Active";
-  else
-    return "Inactive";
-})
+  return id == activeDomainId.value;
+});
 
 
 const showSwitchUserDd = ref(false);
diff --git a/frontend/src/pages/UserManagement.vue b/frontend/src/pages/UserManagement.vue
index e347dd7..5482ad3 100644
--- a/frontend/src/pages/UserManagement.vue
+++ b/frontend/src/pages/UserManagement.vue
@@ -1,7 +1,12 @@
 <template>
   <div class="q-pa-md">
+    <div class="q-gutter-sm row items-start">
+        <q-breadcrumbs>
+          <q-breadcrumbs-el icon="manage_accounts" label="ユーザー管理" />
+        </q-breadcrumbs>
+     </div>
     <q-table title="ユーザーリスト" :rows="rows" :columns="columns" row-key="id" :filter="filter" :loading="loading"
-      :pagination="pagination">
+      :pagination="pagination" >
 
       <template v-slot:top>
         <q-btn color="primary" :disable="loading" label="新規" @click="addRow" />