From 7075c2a9ebed38e2d5e6ad3c9069cf419e31a2c4 Mon Sep 17 00:00:00 2001 From: "makabe.t" Date: Tue, 16 Jan 2024 10:37:12 +0000 Subject: [PATCH] =?UTF-8?q?Merged=20PR=20686:=20=E3=81=84=E3=82=8D?= =?UTF-8?q?=E3=81=84=E3=82=8D=E6=B6=88=E3=81=99=EF=BC=86=E8=A1=A8=E7=A4=BA?= =?UTF-8?q?=E5=A4=89=E3=81=88=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## 概要 [Task3328: いろいろ消す＆表示変える](https://paruru.nds-tyo.co.jp:8443/tfs/ReciproCollection/fa4924a4-d079-4fab-9fb5-a9a11eb205f0/_workitems/edit/3328) - CCB後回し分の部分について表示を削除、修正しました。 - ユーザー一覧画面の「Delete user」を消す - タスク一覧画面の「Delete dictation」を削す - テンプレートファイル一覧画面の「Delete」を消す - アカウント情報画面の「File Delete Setting」を消す - パートナー一覧画面の「Delete Account」を消す - ライセンスページの「Storage Available」と「Storage Used」の値をハイフン表示に修正 ※変更部分はまた使う予定なのでコメントアウトで対応しています。 ## レビューポイント - 対応箇所は認識通りでしょうか？ - 対応内容は認識通りでしょうか？ ## UIの変更 - [Task3328](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/Task3328?csf=1&web=1&e=9y7y6P) ## 動作確認状況 - ローカルで確認 --- dictation_client/src/pages/AccountPage/index.tsx | 2 ++ dictation_client/src/pages/DictationPage/index.tsx | 4 +++- dictation_client/src/pages/LicensePage/licenseSummary.tsx | 8 ++++++-- dictation_client/src/pages/PartnerPage/index.tsx | 2 ++ dictation_client/src/pages/TemplateFilePage/index.tsx | 2 ++ dictation_client/src/pages/UserListPage/index.tsx | 2 ++ 6 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dictation_client/src/pages/AccountPage/index.tsx b/dictation_client/src/pages/AccountPage/index.tsx index 79963ae..6fd0877 100644 --- a/dictation_client/src/pages/AccountPage/index.tsx +++ b/dictation_client/src/pages/AccountPage/index.tsx @@ -102,6 +102,7 @@ const AccountPage: React.FC = (): JSX.Element => {
+ {/* File Delete Setting は現状不要のため非表示 + */}
diff --git a/dictation_client/src/pages/DictationPage/index.tsx b/dictation_client/src/pages/DictationPage/index.tsx index b2591d3..bb70c47 100644 --- a/dictation_client/src/pages/DictationPage/index.tsx +++ b/dictation_client/src/pages/DictationPage/index.tsx @@ -1149,6 +1149,7 @@ const DictationPage: React.FC = (): JSX.Element => { )} + {/* タスク削除はCCB後回し分なので今は非表示
  • {t( @@ -1157,7 +1158,8 @@ const DictationPage: React.FC = (): JSX.Element => { ) )} -
    • + + */} {displayColumn.JobNumber && ( diff --git a/dictation_client/src/pages/LicensePage/licenseSummary.tsx b/dictation_client/src/pages/LicensePage/licenseSummary.tsx index 058350d..a343fa5 100644 --- a/dictation_client/src/pages/LicensePage/licenseSummary.tsx +++ b/dictation_client/src/pages/LicensePage/licenseSummary.tsx @@ -289,13 +289,17 @@ export const LicenseSummary: React.FC = ( ) )} -
    {licenseSummaryInfo.storageSize}GB
    + {/* Storage Usedの値表示をハイフンに置き換え */} + {/*
    {licenseSummaryInfo.storageSize}GB
    */} +
    -
    {t( getTranslationID("LicenseSummaryPage.label.usedSize") )}
    -
    {licenseSummaryInfo.usedSize}GB
    + {/* Storage Usedの値表示をハイフンに置き換え */} + {/*
    {licenseSummaryInfo.usedSize}GB
    */} +
    -
    {t( getTranslationID( diff --git a/dictation_client/src/pages/PartnerPage/index.tsx b/dictation_client/src/pages/PartnerPage/index.tsx index 7f73f66..835cfa3 100644 --- a/dictation_client/src/pages/PartnerPage/index.tsx +++ b/dictation_client/src/pages/PartnerPage/index.tsx @@ -185,6 +185,7 @@ const PartnerPage: React.FC = (): JSX.Element => {
      + {/* パートナーアカウント削除はCCB後回し分なので非表示 {isVisibleButton && (
    • @@ -196,6 +197,7 @@ const PartnerPage: React.FC = (): JSX.Element => {
      • )} + */} {isVisibleDealerManagement && (
    • {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events,jsx-a11y/no-static-element-interactions */} diff --git a/dictation_client/src/pages/TemplateFilePage/index.tsx b/dictation_client/src/pages/TemplateFilePage/index.tsx index d72ef6f..59ef540 100644 --- a/dictation_client/src/pages/TemplateFilePage/index.tsx +++ b/dictation_client/src/pages/TemplateFilePage/index.tsx @@ -101,6 +101,7 @@ export const TemplateFilePage: React.FC = () => { {template.name} diff --git a/dictation_client/src/pages/UserListPage/index.tsx b/dictation_client/src/pages/UserListPage/index.tsx index a1de616..48e0805 100644 --- a/dictation_client/src/pages/UserListPage/index.tsx +++ b/dictation_client/src/pages/UserListPage/index.tsx @@ -243,6 +243,7 @@ const UserListPage: React.FC = (): JSX.Element => {
      • )} + {/* ユーザー削除 CCB後回し分なので今は非表示
    • {t( @@ -252,6 +253,7 @@ const UserListPage: React.FC = (): JSX.Element => { )}
      • + */}
    {user.name}