From cffeab813d8d4b324f82710dfd73953d4cbf8ffe Mon Sep 17 00:00:00 2001 From: Mihajlo Medjedovic Date: Fri, 21 Jun 2024 14:23:13 +0200 Subject: [PATCH] feat(multi load): licence submit limits Icons improvement, ux improvements, matched dataset link to edit table, empty table is visible on the left --- client/src/app/app.component.ts | 4 +- .../multi-dataset.component.html | 73 ++++++++++++----- .../multi-dataset.component.scss | 4 + .../multi-dataset/multi-dataset.component.ts | 82 ++++++++++++++++--- 4 files changed, 126 insertions(+), 37 deletions(-) diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts index 8ee6209..a6737e8 100644 --- a/client/src/app/app.component.ts +++ b/client/src/app/app.component.ts @@ -17,13 +17,13 @@ import '@cds/core/icon/register.js' import { ClarityIcons, exclamationTriangleIcon, - fileIcon, moonIcon, sunIcon, + tableIcon, trashIcon } from '@cds/core/icon' -ClarityIcons.addIcons(moonIcon, sunIcon, exclamationTriangleIcon, fileIcon, trashIcon) +ClarityIcons.addIcons(moonIcon, sunIcon, exclamationTriangleIcon, tableIcon, trashIcon) @Component({ selector: 'my-app', diff --git a/client/src/app/multi-dataset/multi-dataset.component.html b/client/src/app/multi-dataset/multi-dataset.component.html index cb76ccb..80e48d8 100644 --- a/client/src/app/multi-dataset/multi-dataset.component.html +++ b/client/src/app/multi-dataset/multi-dataset.component.html @@ -40,16 +40,11 @@ [class.active]="dataset.active" > - - + {{ dataset.libds }} @@ -75,7 +70,7 @@ status="success" shape="check-circle" > - + {{ dataset.libds }} @@ -114,14 +109,19 @@

- Selected file: {{ selectedFile?.name }} - + Selected file: {{ selectedFile.name }} + + + + Discard the file + +

Paste or type the list of datasets to upload:

- Each row is one dataset. We automatically detected some tables by the sheetname. + Each row is one dataset. We will automatically detect tables by the sheetname and populate if any.

Found in range: - "{{ - activeParsedDataset.parseResult.rangeSheetRes?.sheetName - }}"!{{ - activeParsedDataset.parseResult.rangeSheetRes?.rangeAddress - }} + + + "{{ + activeParsedDataset.parseResult.rangeSheetRes?.sheetName + }}"!{{ + activeParsedDataset.parseResult.rangeSheetRes?.rangeAddress + }} + + + + No data found +

Matched with dataset: - {{ activeParsedDataset.libds }} + + + {{ activeParsedDataset.libds }} + + Click to edit the table + + +

@@ -194,6 +208,7 @@ clrToggle [(ngModel)]="activeParsedDataset.includeInSubmission" name="options" + [disabled]="!(activeParsedDataset.datasource && activeParsedDataset.parseResult)" required value="option1" /> @@ -238,7 +253,14 @@

Matched with dataset: - {{ activeSubmittedDataset.libds }} + + + {{ activeSubmittedDataset.libds }} + + Click to edit the table + + +

Status: @@ -291,11 +313,18 @@

- +