From ba7ef1b4c6b111e55cfc7c5eb8ef492595a25b0f Mon Sep 17 00:00:00 2001
From: "oura.a" <oura.a@nds-tyo.co.jp>
Date: Wed, 27 Sep 2023 08:40:26 +0000
Subject: [PATCH] =?UTF-8?q?Merged=20PR=20439:=20[PBI1197=E6=AE=8B]?=
 =?UTF-8?q?=E3=83=89=E3=83=AD=E3=83=83=E3=83=97=E3=83=80=E3=82=A6=E3=83=B3?=
 =?UTF-8?q?=E3=81=AE=E6=8C=99=E5=8B=95=E3=81=AB=E3=81=A4=E3=81=84=E3=81=A6?=
 =?UTF-8?q?=E7=B5=B1=E4=B8=80=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## 概要
[Task2713: [PBI1197残]ドロップダウンの挙動について統一する](https://paruru.nds-tyo.co.jp:8443/tfs/ReciproCollection/fa4924a4-d079-4fab-9fb5-a9a11eb205f0/_workitems/edit/2713)

ドロップダウンの選択肢表示を修正しました。

## レビューポイント
なし

## UIの変更
https://ndstokyo.sharepoint.com/:f:/r/sites/Piranha/Shared%20Documents/General/OMDS/%E3%82%B9%E3%82%AF%E3%83%AA%E3%83%BC%E3%83%B3%E3%82%B7%E3%83%A7%E3%83%83%E3%83%88/Task2713?csf=1&web=1&e=OyuhN1

## 動作確認状況
ローカルで動作確認済み

## 補足
なし
---
 .../src/pages/AccountPage/index.tsx           | 27 ++++++++++++-------
 .../PartnerPage/addPartnerAccountPopup.tsx    |  2 +-
 .../src/pages/SignupPage/constants.ts         |  2 +-
 .../src/pages/SignupPage/signupInput.tsx      | 15 ++++++++---
 .../UserListPage/allocateLicensePopup.tsx     |  7 ++---
 .../src/pages/WorkTypeIdSettingPage/index.tsx | 10 ++++---
 dictation_client/src/translation/de.json      |  4 +--
 dictation_client/src/translation/en.json      |  4 +--
 dictation_client/src/translation/es.json      |  4 +--
 dictation_client/src/translation/fr.json      |  4 +--
 10 files changed, 51 insertions(+), 28 deletions(-)

diff --git a/dictation_client/src/pages/AccountPage/index.tsx b/dictation_client/src/pages/AccountPage/index.tsx
index 50e3f4d..d40d452 100644
--- a/dictation_client/src/pages/AccountPage/index.tsx
+++ b/dictation_client/src/pages/AccountPage/index.tsx
@@ -161,13 +161,16 @@ const AccountPage: React.FC = (): JSX.Element => {
                             );
                           }}
                         >
-                          <option value="">
-                            {t(
+                          <option value="" hidden>
+                            {`-- ${t(
                               getTranslationID("accountPage.label.selectDealer")
-                            )}
+                            )} --`}
+                          </option>
+                          <option value="">
+                            {`-- ${t(
+                              getTranslationID("common.label.notSelected")
+                            )} --`}
                           </option>
-                          {/* eslint-disable-next-line jsx-a11y/control-has-associated-label */}
-                          <option value="Blank" />
                           {dealers.map((x) => (
                             <option key={x.name} value={x.name}>
                               {x.name}
@@ -249,6 +252,7 @@ const AccountPage: React.FC = (): JSX.Element => {
                         }}
                       >
                         <option
+                          hidden
                           value={
                             users.find(
                               (x) =>
@@ -313,6 +317,7 @@ const AccountPage: React.FC = (): JSX.Element => {
                         }}
                       >
                         <option
+                          hidden
                           value={
                             viewInfo.account.secondryAdminUserId
                               ? users.find(
@@ -328,14 +333,17 @@ const AccountPage: React.FC = (): JSX.Element => {
                                 (x) =>
                                   x.id === viewInfo.account.secondryAdminUserId
                               )?.email
-                            : t(
+                            : `-- ${t(
                                 getTranslationID(
                                   "accountPage.label.selectSecondaryAdministrator"
                                 )
-                              )}
+                              )} --`}
+                        </option>
+                        <option value="">
+                          {`-- ${t(
+                            getTranslationID("common.label.notSelected")
+                          )} --`}
                         </option>
-                        {/* eslint-disable-next-line jsx-a11y/control-has-associated-label */}
-                        <option value="Blank" />
                         {users.map((x) => (
                           <option key={x.email} value={x.email}>
                             {x.email}
@@ -367,6 +375,7 @@ const AccountPage: React.FC = (): JSX.Element => {
               {isTier5 && (
                 <ul className={styles.linkBottom}>
                   <li>
+                    {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions */}
                     <a className={styles.linkTx} onClick={onDeleteAccountOpen}>
                       {t(getTranslationID("accountPage.label.deleteAccount"))}
                     </a>
diff --git a/dictation_client/src/pages/PartnerPage/addPartnerAccountPopup.tsx b/dictation_client/src/pages/PartnerPage/addPartnerAccountPopup.tsx
index be022d0..edf782c 100644
--- a/dictation_client/src/pages/PartnerPage/addPartnerAccountPopup.tsx
+++ b/dictation_client/src/pages/PartnerPage/addPartnerAccountPopup.tsx
@@ -159,7 +159,7 @@ export const AddPartnerAccountPopup: React.FC<AddPartnerAccountPopup> = (
                 }
               >
                 {COUNTRY_LIST.map((x) => (
-                  <option key={x.value} value={x.value}>
+                  <option key={x.value} value={x.value} hidden={!x.value}>
                     {x.label}
                   </option>
                 ))}
diff --git a/dictation_client/src/pages/SignupPage/constants.ts b/dictation_client/src/pages/SignupPage/constants.ts
index 83efc51..a4b5196 100644
--- a/dictation_client/src/pages/SignupPage/constants.ts
+++ b/dictation_client/src/pages/SignupPage/constants.ts
@@ -1,5 +1,5 @@
 export const COUNTRY_LIST = [
-  { value: "", label: "Select Country" },
+  { value: "", label: "-- Select Country --" },
   { value: "CA", label: "Canada" },
   { value: "KY", label: "Cayman Islands" },
   { value: "US", label: "U.S.A." },
diff --git a/dictation_client/src/pages/SignupPage/signupInput.tsx b/dictation_client/src/pages/SignupPage/signupInput.tsx
index 0b463db..a6576d2 100644
--- a/dictation_client/src/pages/SignupPage/signupInput.tsx
+++ b/dictation_client/src/pages/SignupPage/signupInput.tsx
@@ -188,7 +188,7 @@ const SignupInput: React.FC = (): JSX.Element => {
                     }
                   >
                     {COUNTRY_LIST.map((x) => (
-                      <option key={x.value} value={x.value}>
+                      <option key={x.value} value={x.value} hidden={!x.value}>
                         {x.label}
                       </option>
                     ))}
@@ -217,15 +217,24 @@ const SignupInput: React.FC = (): JSX.Element => {
                     }}
                     value={dealers.find((x) => x.id === dealer)?.id ?? NaN}
                   >
+                    <option value="">
+                      {`-- ${t(
+                        getTranslationID("common.label.notSelected")
+                      )} --`}
+                    </option>
                     {[
                       {
                         id: NaN,
                         country: "",
-                        name: "Select dealer",
+                        name: "-- Select dealer --",
                       },
                       ...dealers,
                     ].map((x) => (
-                      <option key={x.id} value={x.id}>
+                      <option
+                        key={x.id}
+                        value={x.id}
+                        hidden={Number.isNaN(x.id)}
+                      >
                         {x.name}
                       </option>
                     ))}
diff --git a/dictation_client/src/pages/UserListPage/allocateLicensePopup.tsx b/dictation_client/src/pages/UserListPage/allocateLicensePopup.tsx
index 2d96314..a6baa35 100644
--- a/dictation_client/src/pages/UserListPage/allocateLicensePopup.tsx
+++ b/dictation_client/src/pages/UserListPage/allocateLicensePopup.tsx
@@ -218,12 +218,13 @@ export const AllocateLicensePopup: React.FC<AllocateLicensePopupProps> = (
                 }}
                 value={selectedlicenseId ?? ""}
               >
-                <option value="">
-                  {t(
+                <option value="" hidden>
+                  {`-- 
+                  ${t(
                     getTranslationID(
                       "allocateLicensePopupPage.label.dropDownHeading"
                     )
-                  )}
+                  )} --`}
                 </option>
                 {allocatableLicenses.map((x) => (
                   <option key={x.licenseId} value={x.licenseId}>
diff --git a/dictation_client/src/pages/WorkTypeIdSettingPage/index.tsx b/dictation_client/src/pages/WorkTypeIdSettingPage/index.tsx
index 525c071..1c900ad 100644
--- a/dictation_client/src/pages/WorkTypeIdSettingPage/index.tsx
+++ b/dictation_client/src/pages/WorkTypeIdSettingPage/index.tsx
@@ -151,7 +151,7 @@ const WorktypeIdSettingPage: React.FC = (): JSX.Element => {
                       )}
                     </a>
                   </li>
-                  <li className={styles.selectMenu}>
+                  <li className={`${styles.selectMenu} ${styles.form}`}>
                     {`${t(
                       getTranslationID(
                         "worktypeIdSetting.label.activeWorktypeId"
@@ -166,9 +166,13 @@ const WorktypeIdSettingPage: React.FC = (): JSX.Element => {
                         const active = value === "" ? undefined : Number(value);
                         setSelectedActiveWorktypeId(active);
                       }}
+                      required
                     >
-                      {/* eslint-disable-next-line jsx-a11y/control-has-associated-label */}
-                      <option value="" />
+                      <option value="">
+                        {`-- ${t(
+                          getTranslationID("common.label.notSelected")
+                        )} --`}
+                      </option>
                       {worktypes?.map((worktype) => (
                         <option key={worktype.id} value={worktype.id}>
                           {worktype.worktypeId}
diff --git a/dictation_client/src/translation/de.json b/dictation_client/src/translation/de.json
index 6c41597..1e0ed2c 100644
--- a/dictation_client/src/translation/de.json
+++ b/dictation_client/src/translation/de.json
@@ -21,7 +21,7 @@
       "tier3": "(de)Distributor",
       "tier4": "(de)Dealer",
       "tier5": "(de)Customer",
-      "notSelected": "(de)-- None --"
+      "notSelected": "(de)None"
     }
   },
   "topPage": {
@@ -469,4 +469,4 @@
       "cancelButton": "(de)Cancel"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/dictation_client/src/translation/en.json b/dictation_client/src/translation/en.json
index cd3383f..85f7d51 100644
--- a/dictation_client/src/translation/en.json
+++ b/dictation_client/src/translation/en.json
@@ -21,7 +21,7 @@
       "tier3": "Distributor",
       "tier4": "Dealer",
       "tier5": "Customer",
-      "notSelected": "-- None --"
+      "notSelected": "None"
     }
   },
   "topPage": {
@@ -469,4 +469,4 @@
       "cancelButton": "Cancel"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/dictation_client/src/translation/es.json b/dictation_client/src/translation/es.json
index bba619f..a7fd52c 100644
--- a/dictation_client/src/translation/es.json
+++ b/dictation_client/src/translation/es.json
@@ -21,7 +21,7 @@
       "tier3": "(es)Distributor",
       "tier4": "(es)Dealer",
       "tier5": "(es)Customer",
-      "notSelected": "(es)-- None --"
+      "notSelected": "(es)None"
     }
   },
   "topPage": {
@@ -469,4 +469,4 @@
       "cancelButton": "(es)Cancel"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/dictation_client/src/translation/fr.json b/dictation_client/src/translation/fr.json
index c311289..8bf7f19 100644
--- a/dictation_client/src/translation/fr.json
+++ b/dictation_client/src/translation/fr.json
@@ -21,7 +21,7 @@
       "tier3": "(fr)Distributor",
       "tier4": "(fr)Dealer",
       "tier5": "(fr)Customer",
-      "notSelected": "(fr)-- None --"
+      "notSelected": "(fr)None"
     }
   },
   "topPage": {
@@ -469,4 +469,4 @@
       "cancelButton": "(fr)Cancel"
     }
   }
-}
\ No newline at end of file
+}