From 4fcbf252337586d6eb0639190d783225bf0e3a5d Mon Sep 17 00:00:00 2001
From: "xiaozhe.ma" <xiaozhe.ma@jp.ricoh.com>
Date: Fri, 9 Aug 2024 16:34:46 +0900
Subject: [PATCH] =?UTF-8?q?BUG582:UI=E3=83=A1=E3=83=83=E3=82=BB=E3=83=BC?=
 =?UTF-8?q?=E3=82=B8=E3=81=AE=E6=94=B9=E5=96=84=E3=81=A8=E7=B5=B1=E4=B8=80?=
 =?UTF-8?q?=EF=BC=88=E7=94=BB=E9=9D=A2=E4=B8=8A=E3=83=86=E3=82=AD=E3=82=B9?=
 =?UTF-8?q?=E3=83=88=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/AppInfo.vue   |  2 +-
 frontend/src/components/DocUpload.vue |  6 +--
 frontend/src/layouts/MainLayout.vue   | 13 +++---
 frontend/src/pages/TenantDomain.vue   | 45 +++++++++----------
 frontend/src/stores/index.ts          |  8 ++--
 frontend/src/stores/useAuthStore.ts   |  1 -
 frontend/src/types/KintoneEvents.ts   | 10 ++---
 frontend/yarn.lock                    | 62 ++++++++++++++++++++++-----
 8 files changed, 96 insertions(+), 51 deletions(-)

diff --git a/frontend/src/components/AppInfo.vue b/frontend/src/components/AppInfo.vue
index 5aacc39..417a651 100644
--- a/frontend/src/components/AppInfo.vue
+++ b/frontend/src/components/AppInfo.vue
@@ -21,7 +21,7 @@
             </div>
           </template>
         </q-field>
-        <q-field  stack-label full-width  label="アプリ説明">
+        <q-field  stack-label full-width  label="アプリの説明">
           <template v-slot:control>
             <div class="self-center full-width no-outline" tabindex="0">
               {{ appinfo?.description }}
diff --git a/frontend/src/components/DocUpload.vue b/frontend/src/components/DocUpload.vue
index 3a89476..38c205f 100644
--- a/frontend/src/components/DocUpload.vue
+++ b/frontend/src/components/DocUpload.vue
@@ -5,7 +5,7 @@
         :url="uploadUrl"
         :label="title"
         :headers="headers"
-        accept=".csv,.xlsx"
+        accept=".xlsx"
         v-on:rejected="onRejected"
         v-on:uploaded="onUploadFinished"
         v-on:failed="onFailed"
@@ -30,7 +30,7 @@ import { ref } from 'vue';
       // https://quasar.dev/quasar-plugins/notify#Installation
       $q.notify({
         type: 'negative',
-        message: `CSVおよびExcelファイルを選択してください。`
+        message: `Excelファイルを選択してください。`
       })
     }
 
@@ -88,7 +88,7 @@ import { ref } from 'vue';
 
     const headers = ref([{name:"Authorization",value:'Bearer ' + authStore.token}]);
     const props = withDefaults(defineProps<Props>(), {
-      title:"設計書から導入する(csv or excel)",
+      title:"設計書から導入する(Excel)",
       uploadUrl: `${process.env.KAB_BACKEND_URL}api/v1/createappfromexcel?format=1`
 
     });
diff --git a/frontend/src/layouts/MainLayout.vue b/frontend/src/layouts/MainLayout.vue
index 837a399..b5a8019 100644
--- a/frontend/src/layouts/MainLayout.vue
+++ b/frontend/src/layouts/MainLayout.vue
@@ -20,7 +20,7 @@
     </q-header>
 
     <q-drawer
-      :model-value="authStore.toggleLeftDrawer"
+      :model-value="authStore.LeftDrawer"
       :show-if-above="false"
       bordered
     >
@@ -28,7 +28,7 @@
         <q-item-label
           header
         >
-          関連リンク
+          メニュー
         </q-item-label>
 
         <EssentialLink
@@ -46,7 +46,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue';
+import { onMounted } from 'vue';
 import EssentialLink, { EssentialLinkProps } from 'components/EssentialLink.vue';
 import DomainSelector from 'components/DomainSelector.vue';
 import { useAuthStore } from 'stores/useAuthStore';
@@ -56,14 +56,14 @@ const authStore = useAuthStore();
 const essentialLinks: EssentialLinkProps[] = [
 {
     title: 'ホーム',
-    caption: 'home',
+    caption: '設計書から導入する',
     icon: 'home',
     link: '/',
     target:'_self'
   },
   {
     title: 'フローエディター',
-    caption: 'flowChart',
+    caption: 'イベントを設定する',
     icon: 'account_tree',
     link: '/#/FlowChart',
     target:'_self'
@@ -153,6 +153,9 @@ const essentialLinks: EssentialLinkProps[] = [
 
 const version = process.env.version;
 const productName = process.env.productName;
+onMounted(() => {
+  authStore.toggleLeftMenu();
+});
 
 function toggleLeftDrawer() {
   authStore.toggleLeftMenu();
diff --git a/frontend/src/pages/TenantDomain.vue b/frontend/src/pages/TenantDomain.vue
index 3b07c72..f440afc 100644
--- a/frontend/src/pages/TenantDomain.vue
+++ b/frontend/src/pages/TenantDomain.vue
@@ -5,7 +5,7 @@
       <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="Search">
+        <q-input borderless dense filled debounce="300" v-model="filter" placeholder="検索">
           <template v-slot:append>
             <q-icon name="search" />
           </template>
@@ -25,7 +25,7 @@
 
     <q-dialog :model-value="show" persistent>
       <q-card style="min-width: 36em">
-        <q-form class="q-gutter-md" @submit="onSubmit">
+        <q-form class="q-gutter-md" @submit="onSubmit" autocomplete="off">
           <q-card-section>
             <div class="text-h6 q-ma-sm">Kintone Account</div>
           </q-card-section>
@@ -34,21 +34,21 @@
             <div class="q-gutter-lg">
 
 
-              <q-input filled v-model="tenantid" label="Tenant" hint="Tenant ID" lazy-rules
-                :rules="[val => val && val.length > 0 || 'Please type something']" />
+              <q-input filled v-model="tenantid" label="テナントID" hint="テナントIDを入力してください。" lazy-rules
+                :rules="[val => val && val.length > 0 || 'テナントIDを入力してください。']" />
 
-              <q-input filled v-model="name" label="Your name *" hint="Kintone envirment name" lazy-rules
-                :rules="[val => val && val.length > 0 || 'Please type something']" />
+              <q-input filled v-model="name" label="環境名 *" hint="kintoneの環境名を入力してください" lazy-rules
+                :rules="[val => val && val.length > 0 || 'kintoneの環境名を入力してください。']" />
 
-              <q-input filled type="url" v-model="url" label="Kintone url" hint="Kintone domain address" lazy-rules
-                :rules="[val => val && val.length > 0, isDomain || 'Please type something']" />
+              <q-input filled type="url" v-model="url" label="Kintone url" hint="KintoneのURLを入力してください" lazy-rules
+                :rules="[val => val && val.length > 0, isDomain || 'KintoneのURLを入力してください']" />
 
-              <q-input filled v-model="kintoneuser" label="Login user " hint="Kintone user name" lazy-rules
-                :rules="[val => val && val.length > 0 || 'Please type something']" />
+              <q-input filled v-model="kintoneuser" label="ログイン名 *" hint="Kintoneのログイン名を入力してください" lazy-rules
+                :rules="[val => val && val.length > 0 || 'Kintoneのログイン名を入力してください']" autocomplete="new-password" />
 
               <q-input v-if="isCreate" v-model="kintonepwd" filled :type="isPwd ? 'password' : 'text'"
-                hint="Password with toggle" label="User password" :disable="!isCreate" lazy-rules
-                :rules="[val => val && val.length > 0 || 'Please type something']">
+                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" />
@@ -60,16 +60,16 @@
 
                 <q-item tag="label" class="q-pl-sm q-pr-none q-py-xs">
                   <q-item-section>
-                    <q-item-label>Reset Password</q-item-label>
+                    <q-item-label>パスワードリセット</q-item-label>
                   </q-item-section>
                   <q-item-section avatar>
                     <q-toggle v-model="resetPsw" @update:model-value="updateResetPsw" />
                   </q-item-section>
                 </q-item>
 
-                <q-input v-model="kintonepwd" filled :type="isPwd ? 'password' : 'text'" hint="Password with toggle"
-                  label="User password" :disable="!resetPsw" lazy-rules
-                  :rules="[val => val && val.length > 0 || 'Please type something']">
+                <q-input v-model="kintonepwd" 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" />
@@ -81,8 +81,8 @@
 
           </q-card-section>
           <q-card-actions align="right" class="text-primary q-mb-md q-mx-sm">
-            <q-btn label="Save" type="submit" color="primary" />
-            <q-btn label="Cancel" type="cancel" color="primary" flat class="q-ml-sm" @click="closeDg()" />
+            <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>
@@ -118,16 +118,16 @@ const columns = [
   {
     name: 'tenantid',
     required: true,
-    label: 'Tenant',
+    label: 'テナントID',
     field: row => row.tenantid,
     format: val => `${val}`,
     align: 'left',
     sortable: true
   },
-  { name: 'name', label: 'Name', field: 'name', align: 'left', sortable: true },
+  { name: 'name', label: '環境名', field: 'name', align: 'left', sortable: true },
   { name: 'url', label: 'URL', field: 'url', align: 'left', sortable: true },
-  { name: 'user', label: 'Account', field: 'user', align: 'left', },
-  { name: 'actions', label: 'Actions', field: 'actions' }
+  { name: 'user', label: 'ログイン名', field: 'user', align: 'left', },
+  { name: 'actions', label: '操作', field: 'actions' }
 ];
 
 
@@ -164,6 +164,7 @@ onMounted(async () => {
 // emulate fetching data from server
 const addRow = () => {
   // editId.value
+  onReset();
   show.value = true;
 }
 
diff --git a/frontend/src/stores/index.ts b/frontend/src/stores/index.ts
index 9dae28c..6e96fd9 100644
--- a/frontend/src/stores/index.ts
+++ b/frontend/src/stores/index.ts
@@ -24,11 +24,11 @@ declare module 'pinia' {
  */
 
 export default store((/* { ssrContext } */) => {
-  const pinia = createPinia()
-  pinia.use(piniaPluginPersistedstate)
+  const pinia = createPinia();
+  pinia.use(piniaPluginPersistedstate);
 
   // You can add Pinia plugins here
   // pinia.use(SomePiniaPlugin)
 
-  return pinia
-})
+  return pinia;
+});
diff --git a/frontend/src/stores/useAuthStore.ts b/frontend/src/stores/useAuthStore.ts
index 566750f..16f6ffc 100644
--- a/frontend/src/stores/useAuthStore.ts
+++ b/frontend/src/stores/useAuthStore.ts
@@ -3,7 +3,6 @@ import { api } from 'boot/axios';
 import { router } from 'src/router';
 import { IDomainInfo } from '../types/ActionTypes';
 import { jwtDecode } from 'jwt-decode';
-
 export interface IUserState {
   token?: string;
   returnUrl: string;
diff --git a/frontend/src/types/KintoneEvents.ts b/frontend/src/types/KintoneEvents.ts
index 1a23c07..69c3d81 100644
--- a/frontend/src/types/KintoneEvents.ts
+++ b/frontend/src/types/KintoneEvents.ts
@@ -194,7 +194,7 @@ export class KintoneEventManager {
           ),
           new kintoneEventGroup(
             'app.record.create.show.customButtonClick',
-            'ボタンをクリックした時',
+            'ボタンをクリックしたとき',
             [],
             'app.record.create'
           ),
@@ -222,7 +222,7 @@ export class KintoneEventManager {
           ),
           new kintoneEventGroup(
             'app.record.detail.show.customButtonClick',
-            'ボタンをクリックした時',
+            'ボタンをクリックしたとき',
             [],
             'app.record.detail'
           ),
@@ -256,7 +256,7 @@ export class KintoneEventManager {
           ),
           new kintoneEventGroup(
             'app.record.edit.show.customButtonClick',
-            'ボタンをクリックした時',
+            'ボタンをクリックしたとき',
             [],
             'app.record.edit'
           ),
@@ -278,7 +278,7 @@ export class KintoneEventManager {
             'app.record.index'
           ),
           new kintoneEvent(
-            'インライン編集の【保存】をクリックしたとき',
+            'インライン編集の保存をクリックしたとき',
             'app.record.index.edit.submit',
             'app.record.index'
           ),
@@ -295,7 +295,7 @@ export class KintoneEventManager {
           // ),
           new kintoneEventGroup(
             'app.record.index.show.customButtonClick',
-            'ボタンをクリックした時',
+            'ボタンをクリックしたとき',
             [],
             'app.record.index'
           ),
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index ad7d842..2126170 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -283,6 +283,11 @@
   resolved "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.3.tgz"
   integrity sha512-taHQQH/3ZyI3zP8M/puluDEIEvtQHVYcC6y3N8ijFtAd28+Ey/G4sg1u2gB01S8MwybLOKAp9/yCMu/uR5l3Ug==
 
+"@types/web-bluetooth@^0.0.20":
+  version "0.0.20"
+  resolved "https://registry.yarnpkg.com/@types/web-bluetooth/-/web-bluetooth-0.0.20.tgz#f066abfcd1cbe66267cdbbf0de010d8a41b41597"
+  integrity sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow==
+
 "@typescript-eslint/eslint-plugin@^5.10.0":
   version "5.61.0"
   resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.61.0.tgz"
@@ -419,6 +424,11 @@
   resolved "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.5.0.tgz"
   integrity sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q==
 
+"@vue/devtools-api@^6.6.3":
+  version "6.6.3"
+  resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.6.3.tgz#b23a588154cba8986bba82b6e1d0248bde3fd1a0"
+  integrity sha512-0MiMsFma/HqA6g3KLKn+AGpL1kgKhFWszC9U29NfpWK5LE7bjeXxySWJrOJ77hBz+TBrBQ7o4QJqbPbqbs8rJw==
+
 "@vue/reactivity-transform@3.3.4":
   version "3.3.4"
   resolved "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.3.4.tgz"
@@ -467,6 +477,28 @@
   resolved "https://registry.npmjs.org/@vue/shared/-/shared-3.3.4.tgz"
   integrity sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==
 
+"@vueuse/core@^10.9.0":
+  version "10.11.1"
+  resolved "https://registry.yarnpkg.com/@vueuse/core/-/core-10.11.1.tgz#15d2c0b6448d2212235b23a7ba29c27173e0c2c6"
+  integrity sha512-guoy26JQktXPcz+0n3GukWIy/JDNKti9v6VEMu6kV2sYBsWuGiTU8OWdg+ADfUbHg3/3DlqySDe7JmdHrktiww==
+  dependencies:
+    "@types/web-bluetooth" "^0.0.20"
+    "@vueuse/metadata" "10.11.1"
+    "@vueuse/shared" "10.11.1"
+    vue-demi ">=0.14.8"
+
+"@vueuse/metadata@10.11.1":
+  version "10.11.1"
+  resolved "https://registry.yarnpkg.com/@vueuse/metadata/-/metadata-10.11.1.tgz#209db7bb5915aa172a87510b6de2ca01cadbd2a7"
+  integrity sha512-IGa5FXd003Ug1qAZmyE8wF3sJ81xGLSqTqtQ6jaVfkeZ4i5kS2mwQF61yhVqojRnenVew5PldLyRgvdl4YYuSw==
+
+"@vueuse/shared@10.11.1":
+  version "10.11.1"
+  resolved "https://registry.yarnpkg.com/@vueuse/shared/-/shared-10.11.1.tgz#62b84e3118ae6e1f3ff38f4fbe71b0c5d0f10938"
+  integrity sha512-LHpC8711VFZlDaYUXEBbFBCQ7GS3dVU9mjOhhMhXP6txTV4EhYQg/KGnQuvt/sPAtoUKq7VVUnL6mVtFoL42sA==
+  dependencies:
+    vue-demi ">=0.14.8"
+
 accepts@~1.3.5, accepts@~1.3.8:
   version "1.3.8"
   resolved "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz"
@@ -1830,6 +1862,11 @@ jsonfile@^6.0.1:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
+jwt-decode@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jwt-decode/-/jwt-decode-4.0.0.tgz#2270352425fd413785b2faf11f6e755c5151bd4b"
+  integrity sha512-+KJGIyHgkGuIq3IEBNftfhW/LfWhXUIY6OmyVWjliu5KH1y0fw7VQ8YndE2O4qZdMSd9SqbnC8GOcZEy0Om7sA==
+
 kind-of@^6.0.2:
   version "6.0.3"
   resolved "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz"
@@ -2212,13 +2249,18 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.3.1:
   resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
-pinia@^2.1.6:
-  version "2.1.6"
-  resolved "https://registry.npmjs.org/pinia/-/pinia-2.1.6.tgz"
-  integrity sha512-bIU6QuE5qZviMmct5XwCesXelb5VavdOWKWaB17ggk++NUwQWWbP5YnsONTk3b752QkW9sACiR81rorpeOMSvQ==
+pinia-plugin-persistedstate@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/pinia-plugin-persistedstate/-/pinia-plugin-persistedstate-3.2.1.tgz#66780602aecd6c7b152dd7e3ddc249a1f7a13fe5"
+  integrity sha512-MK++8LRUsGF7r45PjBFES82ISnPzyO6IZx3CH5vyPseFLZCk1g2kgx6l/nW8pEBKxxd4do0P6bJw+mUSZIEZUQ==
+
+pinia@^2.1.7:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/pinia/-/pinia-2.2.1.tgz#7cf860f6a23981c23e58605cee45496ce46d15d1"
+  integrity sha512-ltEU3xwiz5ojVMizdP93AHi84Rtfz0+yKd8ud75hr9LVyWX2alxp7vLbY1kFm7MXFmHHr/9B08Xf8Jj6IHTEiQ==
   dependencies:
-    "@vue/devtools-api" "^6.5.0"
-    vue-demi ">=0.14.5"
+    "@vue/devtools-api" "^6.6.3"
+    vue-demi "^0.14.10"
 
 postcss-selector-parser@^6.0.9:
   version "6.0.13"
@@ -2792,10 +2834,10 @@ vite@^2.9.13:
   optionalDependencies:
     fsevents "~2.3.2"
 
-vue-demi@>=0.14.5:
-  version "0.14.6"
-  resolved "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.6.tgz"
-  integrity sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==
+vue-demi@>=0.14.8, vue-demi@^0.14.10:
+  version "0.14.10"
+  resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.14.10.tgz#afc78de3d6f9e11bf78c55e8510ee12814522f04"
+  integrity sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==
 
 vue-eslint-parser@^9.3.0:
   version "9.3.1"