From bc38186231326654c10b3accaafa6df1e7dca554 Mon Sep 17 00:00:00 2001 From: Arnau Giralt Date: Mon, 23 Oct 2023 22:23:33 +0200 Subject: [PATCH 1/3] =?UTF-8?q?LITE-28855:=20Fix=20generic=20feedback=20-?= =?UTF-8?q?=20Truncate=20assistive=20text=20for=20dialog=20tabs=20-=20Fix?= =?UTF-8?q?=20display=20of=20dense=20alerts=20-=20Fix=20display=20of=20ass?= =?UTF-8?q?istive=20placeholders=20("=E2=80=93")=20in=20several=20componen?= =?UTF-8?q?ts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreateDeploymentRequestDialog/MarketplacesTab.vue | 4 ++-- ui/src/components/CreateDeploymentRequestDialog/PprTab.vue | 2 +- ui/src/components/DeploymentMarketplacesTab.vue | 2 +- ui/src/components/DeploymentRequestsTab.vue | 2 +- ui/src/components/PprSummaryDialog.vue | 2 +- ui/src/components/PprTab.vue | 4 ++-- ui/src/components/RequestTasksTab.vue | 4 ++-- ui/src/components/UploadFile.vue | 2 +- ui/src/components/cAlert.vue | 5 ++--- ui/src/components/cDialog.vue | 5 ++++- 10 files changed, 17 insertions(+), 15 deletions(-) diff --git a/ui/src/components/CreateDeploymentRequestDialog/MarketplacesTab.vue b/ui/src/components/CreateDeploymentRequestDialog/MarketplacesTab.vue index 88e515f..b517c6e 100644 --- a/ui/src/components/CreateDeploymentRequestDialog/MarketplacesTab.vue +++ b/ui/src/components/CreateDeploymentRequestDialog/MarketplacesTab.vue @@ -28,11 +28,11 @@ checkbox-table.marketplaces-tab( template(#externalId="{ row }") span(v-if="row.externalId") {{ row.externalId }} - span.assistive-text(v-else) – + span.assistive-color(v-else) — template(#appliedPpr="{ row }") span(v-if="row.appliedPprVersion") Version {{ row.appliedPprVersion }} - span.assistive-text(v-else) – + span.assistive-color(v-else) — diff --git a/ui/src/components/CreateDeploymentRequestDialog/PprTab.vue b/ui/src/components/CreateDeploymentRequestDialog/PprTab.vue index ab58c5d..f5fd7cd 100644 --- a/ui/src/components/CreateDeploymentRequestDialog/PprTab.vue +++ b/ui/src/components/CreateDeploymentRequestDialog/PprTab.vue @@ -18,7 +18,7 @@ radio-table.products-tab( template(#description="{ row }") .truncate-text(v-if="row.description") {{ row.description }} - span.assistive-text(v-else) — + span.assistive-color(v-else) — diff --git a/ui/src/components/DeploymentMarketplacesTab.vue b/ui/src/components/DeploymentMarketplacesTab.vue index d28dd66..f9b7993 100644 --- a/ui/src/components/DeploymentMarketplacesTab.vue +++ b/ui/src/components/DeploymentMarketplacesTab.vue @@ -42,7 +42,7 @@ :key="header.value", ) span(v-if="row.appliedPprVersion") Version {{ row.appliedPprVersion }} - span.assistive-text(v-else) – + span.assistive-color(v-else) — //- Pricing Batch column td.nowrap-cell( diff --git a/ui/src/components/DeploymentRequestsTab.vue b/ui/src/components/DeploymentRequestsTab.vue index 99281a4..e79e596 100644 --- a/ui/src/components/DeploymentRequestsTab.vue +++ b/ui/src/components/DeploymentRequestsTab.vue @@ -50,7 +50,7 @@ :key="header.value", ) span(v-if="row.created") {{ row.created | utcToLocal }} - span.assistive-text(v-else) – + span.assistive-color(v-else) — //- Status column td.nowrap-cell( diff --git a/ui/src/components/PprSummaryDialog.vue b/ui/src/components/PprSummaryDialog.vue index b2aacb2..949c5b9 100644 --- a/ui/src/components/PprSummaryDialog.vue +++ b/ui/src/components/PprSummaryDialog.vue @@ -35,7 +35,7 @@ c-dialog.ppr-summary-dialog( v-if="ppr.description", :content="ppr.description", ) - .assistive-text(v-else) — + .assistive-color(v-else) — diff --git a/ui/src/components/PprTab.vue b/ui/src/components/PprTab.vue index be50c97..26e7d01 100644 --- a/ui/src/components/PprTab.vue +++ b/ui/src/components/PprTab.vue @@ -58,7 +58,7 @@ :key="header.value", ) template(v-if="row.fileSize") {{ row.fileSize }} - span.assistive-text(v-else) — + span.assistive-color(v-else) — //- Description column td.nowrap-cell( @@ -66,7 +66,7 @@ :key="header.value", ) .truncate-text(v-if="row.description") {{ row.description }} - span.assistive-text(v-else) — + span.assistive-color(v-else) — //- Status column td.nowrap-cell( diff --git a/ui/src/components/RequestTasksTab.vue b/ui/src/components/RequestTasksTab.vue index 1138d5f..01f87db 100644 --- a/ui/src/components/RequestTasksTab.vue +++ b/ui/src/components/RequestTasksTab.vue @@ -30,7 +30,7 @@ :key="header.value", ) span(v-if="row.processed") {{ row.processed | utcToLocal }} - span.assistive-text(v-else) – + span.assistive-color(v-else) — //- Elapsed column td.nowrap-cell( @@ -38,7 +38,7 @@ :key="header.value", ) span(v-if="row.elapsed") {{ row.elapsed }} - span.assistive-text(v-else) – + span.assistive-color(v-else) – //- Status column td.nowrap-cell( diff --git a/ui/src/components/UploadFile.vue b/ui/src/components/UploadFile.vue index 7fef4f9..772c3eb 100644 --- a/ui/src/components/UploadFile.vue +++ b/ui/src/components/UploadFile.vue @@ -29,7 +29,7 @@ .dz-default.file-upload__message .file-upload__message-text(v-html="messageText") - .assistive-text._mt_4 {{ uploadHintMessageText }} + .assistive-color._mt_4 {{ uploadHintMessageText }} .file-upload__error(v-if="isErrorShown") | {{ errorMessages[0] }} diff --git a/ui/src/components/cAlert.vue b/ui/src/components/cAlert.vue index 5e51b82..3eef451 100644 --- a/ui/src/components/cAlert.vue +++ b/ui/src/components/cAlert.vue @@ -105,9 +105,8 @@ export default { } .c-alert_dense { - min-height: 56px; - padding-top: 12px; - padding-bottom: 12px; + min-height: 32px; + padding: 6px 24px; } .c-alert_fluid { diff --git a/ui/src/components/cDialog.vue b/ui/src/components/cDialog.vue index a9f3601..32e2558 100644 --- a/ui/src/components/cDialog.vue +++ b/ui/src/components/cDialog.vue @@ -56,7 +56,10 @@ .c-vertical-tab__content .truncate-text {{ tab.label }} - .assistive-text(v-if="tab.assistiveText") {{ tab.assistiveText }} + .truncate-text.assistive-text( + v-if="tab.assistiveText", + :title="tab.assistiveText", + ) {{ tab.assistiveText }} .c-window__right-sidebar.c-window__scroller( v-if="$slots['right-sidebar']", From 994949e0632ac3ee02032c553ccf53e800edd4b0 Mon Sep 17 00:00:00 2001 From: Arnau Giralt Date: Mon, 23 Oct 2023 22:29:20 +0200 Subject: [PATCH 2/3] LITE-28855: Create Deployment Request dialog feedback - Render dialog tabs with preset values, if present - Disable un-checking of radio inputs by user interaction - Add "PPR failed" warning chip on PPR tab for failed PPRs - Fixed styles for PPR column in PPR tab --- ui/src/components/CheckboxTable.vue | 3 +- .../CreateDeploymentRequestDialog/HubsTab.vue | 1 + .../MarketplacesTab.vue | 12 ++++++-- .../CreateDeploymentRequestDialog/PprTab.vue | 30 +++++++++++++++++-- .../ProductsTab.vue | 1 + ui/src/components/RadioTable.vue | 2 +- ui/src/components/cRadio.vue | 6 ++-- 7 files changed, 44 insertions(+), 11 deletions(-) diff --git a/ui/src/components/CheckboxTable.vue b/ui/src/components/CheckboxTable.vue index ef80db2..6ddca5f 100644 --- a/ui/src/components/CheckboxTable.vue +++ b/ui/src/components/CheckboxTable.vue @@ -45,6 +45,7 @@ diff --git a/ui/src/components/CreateDeploymentRequestDialog/ProductsTab.vue b/ui/src/components/CreateDeploymentRequestDialog/ProductsTab.vue index e42cf0b..bb7ed1a 100644 --- a/ui/src/components/CreateDeploymentRequestDialog/ProductsTab.vue +++ b/ui/src/components/CreateDeploymentRequestDialog/ProductsTab.vue @@ -124,6 +124,7 @@ export default { try { this.loading = true; this.products = await getProducts(); + if (this.localValue?.id) this.selectedProductId = this.localValue.id; } catch (e) { this.products = []; this.$emit('error', e); diff --git a/ui/src/components/RadioTable.vue b/ui/src/components/RadioTable.vue index fa45785..d444a9f 100644 --- a/ui/src/components/RadioTable.vue +++ b/ui/src/components/RadioTable.vue @@ -79,7 +79,7 @@ export default { }, data: () => ({ - localValue: false, + localValue: '', localSearch: '', }), diff --git a/ui/src/components/cRadio.vue b/ui/src/components/cRadio.vue index 4040b64..f57e75c 100644 --- a/ui/src/components/cRadio.vue +++ b/ui/src/components/cRadio.vue @@ -1,5 +1,5 @@