From 53e5a449d447551049e8915e92c11b14fecb7b76 Mon Sep 17 00:00:00 2001
From: Mouriya <mouriya@bu.edu>
Date: Mon, 19 Aug 2024 11:21:24 +0900
Subject: [PATCH 01/12] =?UTF-8?q?=E3=82=B0=E3=83=AD=E3=83=BC=E3=83=90?=
 =?UTF-8?q?=E3=83=AB=E8=AA=8D=E8=A8=BC=E7=8A=B6=E6=85=8B=E3=81=ABpermissio?=
 =?UTF-8?q?n=E6=83=85=E5=A0=B1=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/stores/useAuthStore.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frontend/src/stores/useAuthStore.ts b/frontend/src/stores/useAuthStore.ts
index 16f6ffc..73fe7c3 100644
--- a/frontend/src/stores/useAuthStore.ts
+++ b/frontend/src/stores/useAuthStore.ts
@@ -9,6 +9,7 @@ export interface IUserState {
   currentDomain: IDomainInfo;
   LeftDrawer: boolean;
   userId?: string;
+  permissions: 'admin'|'user';
 }
 
 export const useAuthStore = defineStore('auth', {
@@ -18,6 +19,7 @@ export const useAuthStore = defineStore('auth', {
     LeftDrawer: false,
     currentDomain: {} as IDomainInfo,
     userId: '',
+    permissions: 'user'
   }),
   getters: {
     toggleLeftDrawer(): boolean {
@@ -36,7 +38,9 @@ export const useAuthStore = defineStore('auth', {
         const result = await api.post(`api/token`, params);
         console.info(result);
         this.token = result.data.access_token;
-        this.userId = jwtDecode(result.data.access_token).sub;
+        const tokenJson = jwtDecode(result.data.access_token)
+        this.userId = tokenJson.sub;
+        this.permissions = (tokenJson as any).permissions ?? 'user';
         api.defaults.headers['Authorization'] = 'Bearer ' + this.token;
         this.currentDomain = await this.getCurrentDomain();
         router.push(this.returnUrl || '/');

From cca7a1ba22c50abb687838def77cd21d4b6e7b33 Mon Sep 17 00:00:00 2001
From: Mouriya <mouriya@bu.edu>
Date: Mon, 19 Aug 2024 11:56:17 +0900
Subject: [PATCH 02/12] =?UTF-8?q?=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC?=
 =?UTF-8?q?=E3=83=89=E3=83=A1=E3=82=A4=E3=83=B3=E3=83=9A=E3=83=BC=E3=82=B8?=
 =?UTF-8?q?=E3=82=92=E6=9C=80=E9=81=A9=E5=8C=96=E3=81=97=E3=81=BE=E3=81=97?=
 =?UTF-8?q?=E3=81=9F=20:=20=E3=83=9A=E3=83=BC=E3=82=B8=E3=83=8D=E3=83=BC?=
 =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=B3=E3=82=92=E7=84=A1=E9=99=90=E5=A4=A7?=
 =?UTF-8?q?=E3=81=AB=E8=A8=AD=E5=AE=9A=E3=81=97=E3=80=81=E4=BB=AE=E6=83=B3?=
 =?UTF-8?q?=E3=83=AA=E3=82=B9=E3=83=88=E3=82=92=E6=9C=89=E5=8A=B9=E3=81=AB?=
 =?UTF-8?q?=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/pages/UserDomain.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/frontend/src/pages/UserDomain.vue b/frontend/src/pages/UserDomain.vue
index 39406a4..519cd31 100644
--- a/frontend/src/pages/UserDomain.vue
+++ b/frontend/src/pages/UserDomain.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="q-pa-lg">
     <q-table grid grid-header title="Domain" selection="single" :rows="rows" :columns="columns"
-      v-model:selected="selected" row-key="name" :filter="filter" hide-header>
+      v-model:selected="selected" row-key="name" :filter="filter" virtual-scroll v-model:pagination="pagination">
       <template v-slot:top>
         <div class="q-gutter-sm">
           <q-btn class="q-mx-none" color="primary" label="追加" @click="newDomain()" />
@@ -14,6 +14,11 @@
         </q-input>
       </template>
 
+      <template v-slot:header>
+        <div style="height: 1dvh">
+        </div>
+      </template>
+
       <template v-slot:item="props">
         <div class="q-pa-sm">
           <q-card>
@@ -91,6 +96,8 @@ const filter = ref()
 let editId = ref(0);
 let activedomainid = ref(0);
 
+const pagination = ref({ rowsPerPage: 0 });
+
 const columns = [
   { name: 'id' },
   { name: 'name', required: true, label: 'Name', align: 'left', field: 'name', sortable: true },

From f699e250901c17fba340544eca57408259a733ce Mon Sep 17 00:00:00 2001
From: Mouriya <mouriya@bu.edu>
Date: Mon, 19 Aug 2024 21:20:09 +0900
Subject: [PATCH 03/12] =?UTF-8?q?=E6=96=B0=E3=81=97=E3=81=84User=E3=82=92?=
 =?UTF-8?q?=E4=BD=9C=E6=88=90=E3=81=97=E3=81=9F=E3=81=A8=E3=81=8D=E3=80=81?=
 =?UTF-8?q?UserDomain=E3=82=92=E7=B6=AD=E6=8C=81=E3=81=99=E3=82=8B?=
 =?UTF-8?q?=E9=9A=9B=E3=81=AB=E3=80=81=E9=96=8B=E3=81=84=E3=81=A6=E3=81=84?=
 =?UTF-8?q?=E3=82=8BUserDomain=E3=81=8C=E5=AD=98=E5=9C=A8=E3=81=97?=
 =?UTF-8?q?=E3=81=AA=E3=81=84=E5=A0=B4=E5=90=88=E3=81=AF=E3=80=81=E4=BE=8B?=
 =?UTF-8?q?=E5=A4=96=E3=82=92=E3=82=B9=E3=83=AD=E3=83=BC=E3=81=99=E3=82=8B?=
 =?UTF-8?q?=E5=BF=85=E8=A6=81=E3=81=AF=E3=81=82=E3=82=8A=E3=81=BE=E3=81=9B?=
 =?UTF-8?q?=E3=82=93=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/app/db/crud.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/app/db/crud.py b/backend/app/db/crud.py
index 2101ad9..70ef451 100644
--- a/backend/app/db/crud.py
+++ b/backend/app/db/crud.py
@@ -253,8 +253,8 @@ def active_userdomain(db: Session, userid: int,domainid: int):
 
 def get_activedomain(db: Session, userid: int):
     db_domain = db.query(models.Domain).join(models.UserDomain,models.UserDomain.domainid == models.Domain.id ).filter(and_(models.UserDomain.userid == userid,models.UserDomain.active == True)).first()
-    if not db_domain:
-        raise HTTPException(status.HTTP_404_NOT_FOUND, detail="Domain not found")
+    # if not db_domain:
+    #     raise HTTPException(status.HTTP_404_NOT_FOUND, detail="Domain not found")
     return db_domain
 
 def get_domain(db: Session, userid: str):

From 22a8bf99cafab28691610340cb80c000eb9adadc Mon Sep 17 00:00:00 2001
From: Mouriya <mouriya@bu.edu>
Date: Mon, 19 Aug 2024 21:21:13 +0900
Subject: [PATCH 04/12] =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=82=BF=E3=83=BC?=
 =?UTF-8?q?=E3=83=95=E3=82=A7=E3=83=BC=E3=82=B9=E3=81=AB=E3=82=AA=E3=83=97?=
 =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=AEuserId=E3=82=92=E8=BF=BD?=
 =?UTF-8?q?=E5=8A=A0=E3=81=97=E3=81=BE=E3=81=99=E3=80=82=E6=B8=A1=E3=81=95?=
 =?UTF-8?q?=E3=82=8C=E3=81=9F=E5=A0=B4=E5=90=88=E3=81=AF=E3=81=9D=E3=81=AE?=
 =?UTF-8?q?userId=E3=82=92=E4=BD=BF=E7=94=A8=E3=81=97=E3=80=81=E6=B8=A1?=
 =?UTF-8?q?=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84=E5=A0=B4=E5=90=88=E3=81=AF?=
 =?UTF-8?q?=E3=83=88=E3=83=BC=E3=82=AF=E3=83=B3=E5=86=85=E3=81=AEID?=
 =?UTF-8?q?=E3=82=92=E4=BD=BF=E7=94=A8=E3=81=97=E3=81=BE=E3=81=99=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/app/api/api_v1/routers/platform.py | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/backend/app/api/api_v1/routers/platform.py b/backend/app/api/api_v1/routers/platform.py
index 2ab6b46..53937a6 100644
--- a/backend/app/api/api_v1/routers/platform.py
+++ b/backend/app/api/api_v1/routers/platform.py
@@ -1,9 +1,9 @@
-from fastapi import Request,Depends, APIRouter, UploadFile,HTTPException,File
+from fastapi import Query, Request,Depends, APIRouter, UploadFile,HTTPException,File
 from app.db import Base,engine
 from app.db.session import get_db
 from app.db.crud import *
 from app.db.schemas import *
-from typing import List
+from typing import List, Optional
 from app.core.auth import get_current_active_user,get_current_user
 from app.core.apiexception import APIException
 
@@ -233,16 +233,17 @@ async def domain_delete(
 
 @r.get(
     "/domain",
-    response_model=List[Domain],
+    # response_model=List[Domain],
     response_model_exclude_none=True,
 )
 async def userdomain_details(
     request: Request,
+    userId: Optional[int] = Query(None, alias="userId"),
     user=Depends(get_current_user),
     db=Depends(get_db),
 ):
     try:
-        domains = get_domain(db, user.id)
+        domains = get_domain(db, userId if userId is not None else user.id)
         return domains
     except Exception as e:
         raise APIException('platform:domain',request.url._url,f"Error occurred while get user({user.id}) domain:",e)
@@ -285,11 +286,14 @@ async def userdomain_delete(
 )
 async def get_useractivedomain(
     request: Request,
+    userId: Optional[int] = Query(None, alias="userId"),
     user=Depends(get_current_user),
     db=Depends(get_db),
 ):
     try:
-        domain = get_activedomain(db, user.id)
+        # domain = get_activedomain(db, user.id)
+
+        domain = get_activedomain(db, userId if userId is not None else user.id)
         return domain
     except Exception as e:
         raise APIException('platform:activedomain',request.url._url,f"Error occurred while get user({user.id}) activedomain:",e)
@@ -301,11 +305,12 @@ async def get_useractivedomain(
 async def update_activeuserdomain(
     request: Request,
     domainid:int,
+    userId: Optional[int] = Query(None, alias="userId"),
     user=Depends(get_current_user),
     db=Depends(get_db),
 ):
     try:
-        domain = active_userdomain(db, user.id,domainid)
+        domain = active_userdomain(db, userId if userId is not None else user.id,domainid)
         return domain
     except Exception as e:
         raise APIException('platform:activedomain',request.url._url,f"Error occurred while update user({user.id}) activedomain:",e)

From 8b9f83ab25326e0ac27513f62b8fab16cd3ce8f0 Mon Sep 17 00:00:00 2001
From: Mouriya <mouriya@bu.edu>
Date: Mon, 19 Aug 2024 21:22:12 +0900
Subject: [PATCH 05/12] =?UTF-8?q?=E3=83=AD=E3=82=B0=E3=82=A4=E3=83=B3?=
 =?UTF-8?q?=E5=BE=8C=E3=81=AB=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC=E6=83=85?=
 =?UTF-8?q?=E5=A0=B1=E3=82=92=E5=8F=96=E5=BE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/stores/useAuthStore.ts | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/frontend/src/stores/useAuthStore.ts b/frontend/src/stores/useAuthStore.ts
index 73fe7c3..7deb2cb 100644
--- a/frontend/src/stores/useAuthStore.ts
+++ b/frontend/src/stores/useAuthStore.ts
@@ -3,13 +3,20 @@ import { api } from 'boot/axios';
 import { router } from 'src/router';
 import { IDomainInfo } from '../types/ActionTypes';
 import { jwtDecode } from 'jwt-decode';
+interface UserInfo {
+  firstName: string;
+  lastName: string;
+  email: string;
+}
+
 export interface IUserState {
   token?: string;
   returnUrl: string;
   currentDomain: IDomainInfo;
   LeftDrawer: boolean;
   userId?: string;
-  permissions: 'admin'|'user';
+  userInfo: UserInfo;
+  permissions: 'admin' | 'user';
 }
 
 export const useAuthStore = defineStore('auth', {
@@ -19,7 +26,8 @@ export const useAuthStore = defineStore('auth', {
     LeftDrawer: false,
     currentDomain: {} as IDomainInfo,
     userId: '',
-    permissions: 'user'
+    userInfo: {} as UserInfo,
+    permissions: 'user',
   }),
   getters: {
     toggleLeftDrawer(): boolean {
@@ -38,11 +46,12 @@ export const useAuthStore = defineStore('auth', {
         const result = await api.post(`api/token`, params);
         console.info(result);
         this.token = result.data.access_token;
-        const tokenJson = jwtDecode(result.data.access_token)
+        const tokenJson = jwtDecode(result.data.access_token);
         this.userId = tokenJson.sub;
         this.permissions = (tokenJson as any).permissions ?? 'user';
         api.defaults.headers['Authorization'] = 'Bearer ' + this.token;
         this.currentDomain = await this.getCurrentDomain();
+        this.userInfo = await this.getUserInfo(this.userId!);
         router.push(this.returnUrl || '/');
         return true;
       } catch (e) {
@@ -67,6 +76,14 @@ export const useAuthStore = defineStore('auth', {
         kintoneUrl: data.url,
       }));
     },
+    async getUserInfo(id:string):Promise<UserInfo>{
+      const resp = (await api.get(`api/v1/users/${id}`)).data;
+      return {
+        firstName: resp.first_name,
+        lastName: resp.last_name,
+        email: resp.email,
+      }
+    },
     logout() {
       this.token = '';
       this.currentDomain = {} as IDomainInfo; // 清空当前域

From fe311a2be47dc0c030f1d9294359bafaff9a0b0d Mon Sep 17 00:00:00 2001
From: Mouriya <mouriya@bu.edu>
Date: Mon, 19 Aug 2024 21:22:47 +0900
Subject: [PATCH 06/12] =?UTF-8?q?=E5=88=86=E5=89=B2=E7=B7=9A=E3=81=AE?=
 =?UTF-8?q?=E9=96=93=E9=9A=94=E3=82=92=E8=AA=BF=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/EssentialLink.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/components/EssentialLink.vue b/frontend/src/components/EssentialLink.vue
index 59e9f1f..c736344 100644
--- a/frontend/src/components/EssentialLink.vue
+++ b/frontend/src/components/EssentialLink.vue
@@ -19,6 +19,7 @@
     </q-item-section>
   </q-item>
   <q-separator
+    class="q-my-sm"
     v-if="isSeparator"
     inset
   />

From 9eb87fe3f37620dd69eb1b88e5a2c2f2b3735daf Mon Sep 17 00:00:00 2001
From: Mouriya <mouriya@bu.edu>
Date: Mon, 19 Aug 2024 21:23:49 +0900
Subject: [PATCH 07/12] =?UTF-8?q?=E3=83=89=E3=83=A1=E3=82=A4=E3=83=B3?=
 =?UTF-8?q?=E3=83=9A=E3=83=BC=E3=82=B8=E3=81=AE=E3=83=9A=E3=83=BC=E3=82=B8?=
 =?UTF-8?q?=E3=83=8D=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3=E3=83=91=E3=83=A9?=
 =?UTF-8?q?=E3=83=A1=E3=83=BC=E3=82=BF=E3=82=92=E8=AA=BF=E6=95=B4=E3=81=97?=
 =?UTF-8?q?=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/pages/TenantDomain.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/pages/TenantDomain.vue b/frontend/src/pages/TenantDomain.vue
index f440afc..58366fe 100644
--- a/frontend/src/pages/TenantDomain.vue
+++ b/frontend/src/pages/TenantDomain.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="q-pa-md">
-    <q-table title="Treats" :rows="rows" :columns="columns" row-key="id" :filter="filter" :loading="loading">
+    <q-table title="Treats" :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" />
@@ -130,7 +130,7 @@ const columns = [
   { name: 'actions', label: '操作', field: 'actions' }
 ];
 
-
+const pagination = ref({ sortBy: 'id', descending: true, rowsPerPage: 20 });
 const loading = ref(false);
 const filter = ref('');
 const rows = ref([]);

From 2f1132319326fbe210da684ad975e51834402994 Mon Sep 17 00:00:00 2001
From: Mouriya <mouriya@bu.edu>
Date: Mon, 19 Aug 2024 21:24:38 +0900
Subject: [PATCH 08/12] =?UTF-8?q?=E3=82=B7=E3=82=B9=E3=83=86=E3=83=A0?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=80=85=E5=B0=82=E7=94=A8=E3=81=AE=E3=83=9A?=
 =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=82=92=E8=BF=BD=E5=8A=A0=E3=81=97=E3=81=BE?=
 =?UTF-8?q?=E3=81=97=E3=81=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/layouts/MainLayout.vue | 69 ++++++++++++++++++-----------
 1 file changed, 42 insertions(+), 27 deletions(-)

diff --git a/frontend/src/layouts/MainLayout.vue b/frontend/src/layouts/MainLayout.vue
index b5a8019..462ed91 100644
--- a/frontend/src/layouts/MainLayout.vue
+++ b/frontend/src/layouts/MainLayout.vue
@@ -2,40 +2,26 @@
   <q-layout view="lHh Lpr lFf">
     <q-header elevated>
       <q-toolbar>
-        <q-btn
-          flat
-          dense
-          round
-          icon="menu"
-          aria-label="Menu"
-          @click="toggleLeftDrawer"
-        />
+        <q-btn flat dense round icon="menu" aria-label="Menu" @click="toggleLeftDrawer" />
         <q-toolbar-title>
           {{ productName }}
           <q-badge align="top" outline>V{{ version }}</q-badge>
         </q-toolbar-title>
         <domain-selector></domain-selector>
-        <q-btn flat round dense icon="logout" @click="authStore.logout()"/>
+        <q-btn flat round dense icon="logout" @click="authStore.logout()" />
       </q-toolbar>
     </q-header>
 
-    <q-drawer
-      :model-value="authStore.LeftDrawer"
-      :show-if-above="false"
-      bordered
-    >
+    <q-drawer :model-value="authStore.LeftDrawer" :show-if-above="false" bordered>
       <q-list>
-        <q-item-label
-          header
-        >
+        <q-item-label header>
           メニュー
         </q-item-label>
 
-        <EssentialLink
-          v-for="link in essentialLinks"
-          :key="link.title"
-          v-bind="link"
-        />
+        <EssentialLink v-for="link in essentialLinks" :key="link.title" v-bind="link" />
+        <div v-if="isAdmin">
+          <EssentialLink v-for="link in adminLinks" :key="link.title" v-bind="link" />
+        </div>
       </q-list>
     </q-drawer>
 
@@ -54,19 +40,19 @@ import { useAuthStore } from 'stores/useAuthStore';
 const authStore = useAuthStore();
 
 const essentialLinks: EssentialLinkProps[] = [
-{
+  {
     title: 'ホーム',
     caption: '設計書から導入する',
     icon: 'home',
     link: '/',
-    target:'_self'
+    target: '_self'
   },
   {
     title: 'フローエディター',
     caption: 'イベントを設定する',
     icon: 'account_tree',
     link: '/#/FlowChart',
-    target:'_self'
+    target: '_self'
   },
   // {
   //   title: '条件エディター',
@@ -76,8 +62,8 @@ const essentialLinks: EssentialLinkProps[] = [
   //   target:'_self'
   // },
   {
-    title:'',
-    isSeparator:true
+    title: '',
+    isSeparator: true
   },
   // {
   //   title:'Kintone ポータル',
@@ -151,8 +137,33 @@ const essentialLinks: EssentialLinkProps[] = [
   // }
 ];
 
+const adminLinks: EssentialLinkProps[] = [
+  {
+    title: 'ユーザー',
+    caption: 'ユーザー設定する',
+    icon: 'manage_accounts',
+    link: '/#/user',
+    target: '_self'
+  },
+  {
+    title: 'テナント',
+    caption: 'テナント設定',
+    icon: 'domain',
+    link: '/#/domain',
+    target: '_self'
+  },
+  {
+    title: 'アカウント',
+    caption: 'アカウント設定',
+    icon: 'assignment_ind',
+    link: '/#/userDomain',
+    target: '_self'
+  },
+]
+
 const version = process.env.version;
 const productName = process.env.productName;
+
 onMounted(() => {
   authStore.toggleLeftMenu();
 });
@@ -160,4 +171,8 @@ onMounted(() => {
 function toggleLeftDrawer() {
   authStore.toggleLeftMenu();
 }
+function isAdmin(){
+  const permission = authStore.permissions;
+  return permission === 'admin'
+}
 </script>

From acf8f0489d474256325f07d0dc21b935c75a4232 Mon Sep 17 00:00:00 2001
From: Mouriya <mouriya@bu.edu>
Date: Mon, 19 Aug 2024 21:25:05 +0900
Subject: [PATCH 09/12] =?UTF-8?q?=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=83=9A=E3=83=BC=E3=82=B8=E3=82=92=E8=BF=BD?=
 =?UTF-8?q?=E5=8A=A0=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/UserList.vue  |  36 +++
 frontend/src/pages/UserManagement.vue | 302 ++++++++++++++++++++++++++
 frontend/src/router/routes.ts         |   1 +
 3 files changed, 339 insertions(+)
 create mode 100644 frontend/src/components/UserList.vue
 create mode 100644 frontend/src/pages/UserManagement.vue

diff --git a/frontend/src/components/UserList.vue b/frontend/src/components/UserList.vue
new file mode 100644
index 0000000..64b3b35
--- /dev/null
+++ b/frontend/src/components/UserList.vue
@@ -0,0 +1,36 @@
+<template>
+    <q-table :rows="rows" :columns="columns" row-key="id" :filter="props.filter" :loading="loading"
+    :pagination="pagination" selection="single" v-model:selected="selected"></q-table>
+    
+</template>
+<script setup lang="ts">
+import { ref, onMounted } from 'vue'
+import { api } from 'boot/axios';
+const props = defineProps<{filter:string}>()
+const columns = [
+  { name: 'id', label: 'ID', field: 'id', align: 'left', sortable: true },
+  { name: 'firstName', label: '氏名', field: 'firstName', align: 'left', sortable: true },
+  { name: 'lastName', label: '苗字', field: 'lastName', align: 'left', sortable: true },
+  { name: 'email', label: '電子メール', field: 'email', align: 'left', sortable: true },
+];
+
+const pagination = ref({ sortBy: 'id', descending: true, rowsPerPage: 10 });
+const rows = ref([]);
+const loading = ref(false);
+const selected = ref([]);
+defineExpose({
+  selected
+})
+const getUsers = async (filter = () => true) => {
+  loading.value = true;
+  const result = await api.get(`api/v1/users`);
+  rows.value = result.data.map((item) => {
+    return { id: item.id, firstName: item.first_name, lastName: item.last_name, email: item.email, isSuperuser: item.is_superuser, isActive: item.is_active }
+  }).filter(filter);
+  loading.value = false;
+}
+
+onMounted(async () => {
+  await getUsers();
+})
+</script>
diff --git a/frontend/src/pages/UserManagement.vue b/frontend/src/pages/UserManagement.vue
new file mode 100644
index 0000000..e347dd7
--- /dev/null
+++ b/frontend/src/pages/UserManagement.vue
@@ -0,0 +1,302 @@
+<template>
+  <div class="q-pa-md">
+    <q-table title="ユーザーリスト" :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" />
+        <q-space />
+        <q-input borderless dense filled debounce="300" v-model="filter" placeholder="検索">
+          <template v-slot:append>
+            <q-icon name="search" />
+          </template>
+        </q-input>
+      </template>
+
+      <template v-slot:body-cell-status="props">
+        <q-td :props="props">
+          <div class="row">
+            <div v-if="props.row.isActive">
+              <q-chip square color="positive" text-color="white" icon="done" label="使用可能" size="sm" />
+            </div>
+            <div v-else>
+              <q-chip square color="negative" text-color="white" icon="block" label="使用不可" size="sm" />
+            </div>
+
+            <q-chip v-if="props.row.isSuperuser" square color="accent" text-color="white" icon="admin_panel_settings"
+              label="システム管理者" size="sm" />
+          </div>
+
+        </q-td>
+      </template>
+
+      <template v-slot:header-cell-status="p">
+        <q-th :props="p">
+          <div class="row items-center">
+            <label class="q-mr-md">{{ p.col.label }}</label>
+            <q-select v-model="statusFilter" :options="options" @update:model-value="updateStatusFilter" borderless
+              dense options-dense style="font-size: 12px; padding-top: 1px;" />
+          </div>
+        </q-th>
+      </template>
+
+      <template v-slot:body-cell-actions="p">
+        <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="negative" padding="xs" size="1em" icon="delete_outline" @click="removeRow(p.row)" />
+          </q-btn-group>
+        </q-td>
+      </template>
+    </q-table>
+
+    <q-dialog :model-value="show" persistent>
+      <q-card style="min-width: 36em">
+        <q-form class="q-gutter-md" @submit="onSubmit" autocomplete="off">
+          <q-card-section>
+            <div class="text-h6 q-ma-sm">K-True Account</div>
+          </q-card-section>
+
+          <q-card-section class="q-pt-none q-mt-none">
+            <div class="q-gutter-lg">
+
+              <q-input filled v-model="firstName" label="氏名 *" hint="ユーザーの氏名を入力してください" lazy-rules
+                :rules="[val => val && val.length > 0 || 'ユーザーの氏名を入力してください。']" />
+
+              <q-input filled v-model="lastName" label="苗字 *" hint="ユーザーの苗字を入力してください" lazy-rules
+                :rules="[val => val && val.length > 0 || 'ユーザーの苗字を入力してください']" />
+
+              <q-input filled type="email" v-model="email" label="電子メール *" hint="電子メール、ログインとしても使用" lazy-rules
+                :rules="[val => val && val.length > 0 || '電子メールを入力してください']" autocomplete="new-password" />
+
+              <q-input v-if="isCreate" v-model="pwd" filled :type="isPwd ? 'password' : 'text'" hint="パスワード"
+                label="パスワード" :disable="!isCreate" lazy-rules
+                :rules="[val => val && val.length > 0 || 'Please type something']" autocomplete="new-password">
+                <template v-slot:append>
+                  <q-icon :name="isPwd ? 'visibility_off' : 'visibility'" class="cursor-pointer"
+                    @click="isPwd = !isPwd" />
+                </template>
+              </q-input>
+
+              <q-item tag="label" class="q-pl-sm q-pr-none q-py-xs">
+                <q-item-section>
+                  <q-item-label>システム管理者</q-item-label>
+                </q-item-section>
+                <q-item-section avatar>
+                  <q-toggle v-model="isSuperuser" />
+                </q-item-section>
+              </q-item>
+
+              <q-item tag="label" class="q-pl-sm q-pr-none q-py-xs">
+                <q-item-section>
+                  <q-item-label>使用可能</q-item-label>
+                </q-item-section>
+                <q-item-section avatar>
+                  <q-toggle v-model="isActive" />
+                </q-item-section>
+              </q-item>
+
+              <div class="q-gutter-y-md" v-if="!isCreate">
+                <q-separator />
+
+                <q-item tag="label" class="q-pl-sm q-pr-none q-py-xs">
+                  <q-item-section>
+                    <q-item-label>パスワードリセット</q-item-label>
+                  </q-item-section>
+                  <q-item-section avatar>
+                    <q-toggle v-model="resetPsw" />
+                  </q-item-section>
+                </q-item>
+
+                <q-input v-model="pwd" filled :type="isPwd ? 'password' : 'text'" hint="パスワードを入力してください" label="パスワード"
+                  :disable="!resetPsw" lazy-rules :rules="[val => val && val.length > 0 || 'Please type something']"
+                  autocomplete="new-password">
+                  <template v-slot:append>
+                    <q-icon :name="isPwd ? 'visibility_off' : 'visibility'" class="cursor-pointer"
+                      @click="isPwd = !isPwd" />
+                  </template>
+                </q-input>
+                <!-- <q-btn label="asdf"/> -->
+              </div>
+            </div>
+
+          </q-card-section>
+          <q-card-actions align="right" class="text-primary q-mb-md q-mx-sm">
+            <q-btn label="保存" type="submit" color="primary" />
+            <q-btn label="キャンセル" type="cancel" color="primary" flat class="q-ml-sm" @click="closeDg()" />
+          </q-card-actions>
+        </q-form>
+      </q-card>
+
+    </q-dialog>
+
+    <q-dialog v-model="confirm" persistent>
+      <q-card>
+        <q-card-section class="row items-center">
+          <q-icon name="warning" color="warning" size="2em" />
+          <span class="q-ml-sm">削除してもよろしいですか？</span>
+        </q-card-section>
+
+        <q-card-actions align="right">
+          <q-btn flat label="Cancel" color="primary" v-close-popup />
+          <q-btn flat label="OK" color="primary" v-close-popup @click="deleteUser()" />
+        </q-card-actions>
+      </q-card>
+    </q-dialog>
+
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, onMounted } from 'vue';
+import { api } from 'boot/axios';
+
+const columns = [
+  { name: 'id', label: 'ID', field: 'id', align: 'left', sortable: true },
+  { name: 'firstName', label: '氏名', field: 'firstName', align: 'left', sortable: true },
+  { name: 'lastName', label: '苗字', field: 'lastName', align: 'left', sortable: true },
+  { name: 'email', label: '電子メール', field: 'email', align: 'left', sortable: true },
+  { name: 'status', label: '状況', field: 'status', align: 'left' },
+  { name: 'actions', label: '操作', field: 'actions' }
+];
+
+const pagination = ref({ sortBy: 'id', descending: true, rowsPerPage: 20 });
+
+const loading = ref(false);
+const filter = ref('');
+const statusFilter = ref('全データ');
+const rows = ref([]);
+const show = ref(false);
+const confirm = ref(false);
+const resetPsw = ref(false);
+
+const firstName = ref('');
+const lastName = ref('');
+const email = ref('');
+const isSuperuser = ref(false);
+const isActive = ref(true);
+
+const isPwd = ref(true);
+const pwd = ref('');
+const isCreate = ref(true);
+let editId = ref(0);
+
+const getUsers = async (filter = () => true) => {
+  loading.value = true;
+  const result = await api.get(`api/v1/users`);
+  rows.value = result.data.map((item) => {
+    return { id: item.id, firstName: item.first_name, lastName: item.last_name, email: item.email, isSuperuser: item.is_superuser, isActive: item.is_active }
+  }).filter(filter);
+  loading.value = false;
+}
+
+const updateStatusFilter = (status) => {
+  switch (status) {
+    case 'システム管理者のみ':
+      getUsers((row) => row.isSuperuser)
+      break;
+    case '使用可能':
+      getUsers((row) => row.isActive)
+      break;
+    case '使用不可':
+      getUsers((row) => !row.isActive)
+      break;
+    default:
+      getUsers()
+      break;
+  }
+
+}
+
+onMounted(async () => {
+  await getUsers();
+})
+
+const options = ['全データ', 'システム管理者のみ', '使用可能', '使用不可']
+
+// emulate fetching data from server
+const addRow = () => {
+  // editId.value
+  onReset();
+  show.value = true;
+}
+
+const removeRow = (row) => {
+  confirm.value = true;
+  editId.value = row.id;
+}
+
+const deleteUser = () => {
+  api.delete(`api/v1/users/${editId.value}`).then(() => {
+    getUsers();
+  })
+  editId.value = 0;
+};
+
+const editRow = (row) => {
+  isCreate.value = false
+  editId.value = row.id;
+
+  firstName.value = row.firstName;
+  lastName.value = row.lastName;
+  email.value = row.email;
+  pwd.value = row.password;
+
+  isSuperuser.value = row.isSuperuser;
+  isActive.value = row.isActive;
+
+  isPwd.value = true;
+  show.value = true;
+};
+
+const closeDg = () => {
+  show.value = false;
+  onReset();
+}
+
+const onSubmit = () => {
+  if (editId.value !== 0) {
+    api.put(`api/v1/users/${editId.value}`, {
+      'first_name': firstName.value,
+      'last_name': lastName.value,
+      'is_superuser': isSuperuser.value,
+      'is_active': isActive.value,
+      'email': email.value,
+      ...(isCreate.value || resetPsw.value ? { password: pwd.value } : {})
+    }).then(() => {
+      getUsers();
+      closeDg();
+      onReset();
+    })
+  }
+  else {
+    api.post(`api/v1/users`, {
+      'id': 0,
+      'first_name': firstName.value,
+      'last_name': lastName.value,
+      'is_superuser': isSuperuser.value,
+      'is_active': isActive.value,
+      'email': email.value,
+      'password': pwd.value
+    }).then(() => {
+      getUsers();
+      closeDg();
+      onReset();
+    })
+  }
+
+}
+
+const onReset = () => {
+  firstName.value = '';
+  lastName.value = '';
+  email.value = '';
+  pwd.value = '';
+  isActive.value = true;
+  isSuperuser.value = false;
+  isPwd.value = true;
+  editId.value = 0;
+  isCreate.value = true;
+  resetPsw.value = false
+}
+</script>
diff --git a/frontend/src/router/routes.ts b/frontend/src/router/routes.ts
index af5edf3..f7c6d02 100644
--- a/frontend/src/router/routes.ts
+++ b/frontend/src/router/routes.ts
@@ -26,6 +26,7 @@ const routes: RouteRecordRaw[] = [
       { path: 'right', component: () => import('pages/testRight.vue') },
       { path: 'domain', component: () => import('pages/TenantDomain.vue') },
       { path: 'userdomain', component: () => import('pages/UserDomain.vue')},
+      { path: 'user', component: () => import('pages/UserManagement.vue')},
       { path: 'condition', component: () => import('pages/conditionPage.vue') }
     ],
   },

From b5fa5cdf576b109eb7b0f0f8836ed735039e8b12 Mon Sep 17 00:00:00 2001
From: Mouriya <mouriya@bu.edu>
Date: Mon, 19 Aug 2024 21:44:53 +0900
Subject: [PATCH 10/12] =?UTF-8?q?=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC?=
 =?UTF-8?q?=E3=83=89=E3=83=A1=E3=82=A4=E3=83=B3=E3=83=9A=E3=83=BC=E3=82=B8?=
 =?UTF-8?q?=E3=82=92=E8=AA=BF=E6=95=B4=E3=81=97=E3=80=81=E3=83=A6=E3=83=BC?=
 =?UTF-8?q?=E3=82=B6=E3=83=BC=E3=81=8C=E3=82=B7=E3=82=B9=E3=83=86=E3=83=A0?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=80=85=E3=81=AE=E5=A0=B4=E5=90=88=E3=80=81?=
 =?UTF-8?q?=E4=BB=96=E3=81=AE=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC=E3=81=AE?=
 =?UTF-8?q?=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC=E3=83=89=E3=83=A1=E3=82=A4?=
 =?UTF-8?q?=E3=83=B3=E3=82=92=E7=AE=A1=E7=90=86=E3=81=A7=E3=81=8D=E3=82=8B?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/pages/UserDomain.vue | 200 ++++++++++++++++++++----------
 1 file changed, 132 insertions(+), 68 deletions(-)

diff --git a/frontend/src/pages/UserDomain.vue b/frontend/src/pages/UserDomain.vue
index 519cd31..dbfd692 100644
--- a/frontend/src/pages/UserDomain.vue
+++ b/frontend/src/pages/UserDomain.vue
@@ -1,17 +1,28 @@
 <template>
   <div class="q-pa-lg">
-    <q-table grid grid-header title="Domain" selection="single" :rows="rows" :columns="columns"
-      v-model:selected="selected" row-key="name" :filter="filter" virtual-scroll v-model:pagination="pagination">
+    <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>
-        <div class="q-gutter-sm">
-          <q-btn class="q-mx-none" color="primary" label="追加" @click="newDomain()" />
-        </div>
+
+        <q-btn class="q-mx-none" color="primary" label="追加" @click="clickAddDomain()" />
+
         <q-space />
-        <q-input borderless dense filled debounce="300" v-model="filter" placeholder="Search">
-          <template v-slot:append>
-            <q-icon name="search" />
-          </template>
-        </q-input>
+        <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-section>
+            <q-item-section avatar>
+              {{ currentUserName }}
+            </q-item-section>
+          </q-item>
+
+          <q-input borderless dense filled debounce="300" v-model="userDomainTableFilter" placeholder="Search">
+            <template v-slot:append>
+              <q-icon name="search" />
+            </template>
+          </q-input>
+        </div>
       </template>
 
       <template v-slot:header>
@@ -46,7 +57,7 @@
                   <div class="col-auto">
                     <q-btn v-if="isActive(props.row.id) !== 'Active'" flat
                       @click="activeDomain(props.row.id)">有効</q-btn>
-                    <q-btn flat @click="deleteConfirm(props.row)">削除</q-btn>
+                    <q-btn flat @click="clickDeleteConfirm(props.row)">削除</q-btn>
                   </div>
                 </div>
               </div>
@@ -56,11 +67,35 @@
       </template>
     </q-table>
 
-    <show-dialog v-model:visible="show" name="ドメイン" @close="closeDg">
-      <domain-select ref="domainDg" name="ドメイン" type="multiple"></domain-select>
+    <show-dialog v-model:visible="showAddDomainDg" name="ドメイン" @close="addUserDomainFinished">
+      <domain-select ref="addDomainRef" name="ドメイン" type="multiple"></domain-select>
     </show-dialog>
 
-    <q-dialog v-model="confirm" persistent>
+    <show-dialog v-model:visible="showSwitchUserDd" name="ドメイン" minWidth="35vw" @close="switchUserFinished">
+      <template v-slot:toolbar>
+        <q-input dense placeholder="検索" v-model="switchUserFilter">
+          <template v-slot:append>
+            <q-icon name="search" />
+          </template>
+        </q-input>
+      </template>
+      <div class="q-gutter-md">
+        <q-item tag="label" class="q-pl-sm q-pr-none q-py-xs">
+          <q-item-section>
+            <q-item-label>他のユーザーを選択する</q-item-label>
+          </q-item-section>
+          <q-item-section avatar>
+            <q-toggle v-model="useOtherUser" />
+          </q-item-section>
+        </q-item>
+        <div v-if="useOtherUser">
+          <user-list ref="switchUserRef" name="ドメイン" :filter="switchUserFilter" />
+        </div>
+      </div>
+
+    </show-dialog>
+
+    <q-dialog v-model="showDeleteConfirm" persistent>
       <q-card>
         <q-card-section class="row items-center">
           <div class="q-ma-sm q-mt-md">
@@ -71,7 +106,7 @@
 
         <q-card-actions align="right">
           <q-btn flat label="Cancel" color="primary" v-close-popup />
-          <q-btn flat label="OK" color="primary" v-close-popup @click="deleteDomain()" />
+          <q-btn flat label="OK" color="primary" v-close-popup @click="deleteDomainFinished()" />
         </q-card-actions>
       </q-card>
     </q-dialog>
@@ -79,24 +114,17 @@
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted } from 'vue'
-import ShowDialog from 'components/ShowDialog.vue';
-import DomainSelect from 'components/DomainSelect.vue';
+import { ref, onMounted, computed } from 'vue'
+import { api } from 'boot/axios';
 import { useAuthStore } from 'stores/useAuthStore';
 
+import ShowDialog from 'components/ShowDialog.vue';
+import DomainSelect from 'components/DomainSelect.vue';
+import UserList from 'components/UserList.vue';
+
 const authStore = useAuthStore();
-import { api } from 'boot/axios';
-const domainDg = ref();
-const selected = ref([])
-
-const show = ref(false);
-const confirm = ref(false)
-const filter = ref()
-
-let editId = ref(0);
-let activedomainid = ref(0);
-
-const pagination = ref({ rowsPerPage: 0 });
+const pagination = ref({ sortBy: 'id', rowsPerPage: 0 });
+const rows = ref([] as any[]);
 
 const columns = [
   { name: 'id' },
@@ -106,63 +134,99 @@ const columns = [
   { name: 'kintonepwd' },
   { name: 'active', field: 'active' }
 ]
+const userDomainTableFilter = ref()
 
-const rows = ref([] as any[]);
+const currentUserName = ref('')
+const useOtherUser = ref(false);
+const otherUserId = ref('')
 
-const isActive = (id: number) => {
-  if (id == activedomainid.value)
-    return "Active";
-  else
-    return "Inactive";
-}
+let editId = ref(0);
 
-const newDomain = () => {
+const showAddDomainDg = ref(false);
+const addDomainRef = ref();
+
+const clickAddDomain = () => {
   editId.value = 0;
-  show.value = true;
+  showAddDomainDg.value = true;
 };
 
-
-const activeDomain = (id: number) => {
-  api.put(`api/activedomain/` + id).then(() => {
-    getDomain();
-  })
-};
-
-const deleteConfirm = (row: object) => {
-  confirm.value = true;
-  editId.value = row.id;
-};
-
-const deleteDomain = () => {
-  console.log(authStore.getCurrentDomain);
-
-  api.delete(`api/domain/${editId.value}/${authStore.userId}`).then(() => {
-    getDomain();
-  })
-  editId.value = 0;
-};
-
-const closeDg = (val: string) => {
+const addUserDomainFinished = (val: string) => {
   if (val == 'OK') {
     let dodmainids = [];
-    let domains = JSON.parse(JSON.stringify(domainDg.value.selected));
+    let domains = JSON.parse(JSON.stringify(addDomainRef.value.selected));
     for (var key in domains) {
       dodmainids.push(domains[key].id);
     }
-    api.post(`api/domain/${authStore.userId}`, dodmainids).then(() => { getDomain(); });
+    api.post(`api/domain/${useOtherUser.value ? otherUserId.value : authStore.userId}`, dodmainids)
+      .then(() => { getDomain(useOtherUser.value ? otherUserId.value : undefined); });
   }
-
 };
-const getDomain = async () => {
-  const resp = await api.get(`api/activedomain`);
-  activedomainid.value = resp.data.id;
-  const domainResult = await api.get(`api/domain`);
+
+const showDeleteConfirm = ref(false)
+
+const clickDeleteConfirm = (row: any) => {
+  showDeleteConfirm.value = true;
+  editId.value = row.id;
+};
+
+const deleteDomainFinished = () => {
+  api.delete(`api/domain/${editId.value}/${useOtherUser.value ? otherUserId.value : authStore.userId}`).then(() => {
+    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); })
+};
+
+let activeDomainId = ref(0);
+
+const isActive = computed(() => (id: number) => {
+  if (id == activeDomainId.value)
+    return "Active";
+  else
+    return "Inactive";
+})
+
+
+const showSwitchUserDd = ref(false);
+const switchUserRef = ref();
+const switchUserFilter = ref('')
+
+const clickSwitchUser = () => {
+  showSwitchUserDd.value = true;
+  useOtherUser.value = false;
+};
+
+const switchUserFinished = async (val: string) => {
+  if (val == 'OK') {
+    if (useOtherUser.value) {
+      const user = switchUserRef.value.selected[0]
+      currentUserName.value = user.email;
+      otherUserId.value = user.id
+      await getDomain(user.id)
+    } else {
+      currentUserName.value = authStore.userInfo.email
+      await getDomain();
+    }
+
+  }
+};
+
+const getDomain = async (userId? : string) => {
+  const resp = await api.get(`api/activedomain${useOtherUser.value ? `?userId=${otherUserId.value}` : ''}`);
+  activeDomainId.value = resp?.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) => {
     return { id: item.id, name: item.name, url: item.url, kintoneuser: item.kintoneuser, kintonepwd: item.kintonepwd }
   });
 }
+
 onMounted(async () => {
+  currentUserName.value = authStore.userInfo.email
   await getDomain();
 })
 

From 1cbb519c927498af765101f645ebbdb16f5752c1 Mon Sep 17 00:00:00 2001
From: Mouriya <mouriya@bu.edu>
Date: Mon, 19 Aug 2024 21:54:02 +0900
Subject: [PATCH 11/12] =?UTF-8?q?=E3=82=A8=E3=83=A9=E3=83=BC=E3=82=92?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/layouts/MainLayout.vue | 2 +-
 frontend/src/stores/useAuthStore.ts | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/layouts/MainLayout.vue b/frontend/src/layouts/MainLayout.vue
index 462ed91..4c346dd 100644
--- a/frontend/src/layouts/MainLayout.vue
+++ b/frontend/src/layouts/MainLayout.vue
@@ -19,7 +19,7 @@
         </q-item-label>
 
         <EssentialLink v-for="link in essentialLinks" :key="link.title" v-bind="link" />
-        <div v-if="isAdmin">
+        <div v-if="isAdmin()">
           <EssentialLink v-for="link in adminLinks" :key="link.title" v-bind="link" />
         </div>
       </q-list>
diff --git a/frontend/src/stores/useAuthStore.ts b/frontend/src/stores/useAuthStore.ts
index 7deb2cb..8887ddd 100644
--- a/frontend/src/stores/useAuthStore.ts
+++ b/frontend/src/stores/useAuthStore.ts
@@ -51,7 +51,7 @@ export const useAuthStore = defineStore('auth', {
         this.permissions = (tokenJson as any).permissions ?? 'user';
         api.defaults.headers['Authorization'] = 'Bearer ' + this.token;
         this.currentDomain = await this.getCurrentDomain();
-        this.userInfo = await this.getUserInfo(this.userId!);
+        this.userInfo = await this.getUserInfo();
         router.push(this.returnUrl || '/');
         return true;
       } catch (e) {
@@ -76,8 +76,8 @@ export const useAuthStore = defineStore('auth', {
         kintoneUrl: data.url,
       }));
     },
-    async getUserInfo(id:string):Promise<UserInfo>{
-      const resp = (await api.get(`api/v1/users/${id}`)).data;
+    async getUserInfo():Promise<UserInfo>{
+      const resp = (await api.get(`api/v1/users/me`)).data;
       return {
         firstName: resp.first_name,
         lastName: resp.last_name,

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 12/12] =?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" />