From 95fc4d1835df2bb78d399f9de70278cfd3f7bfdd Mon Sep 17 00:00:00 2001 From: Nicoleta Panaghiu Date: Fri, 1 Mar 2024 17:09:11 +0200 Subject: [PATCH] RED-8679: changed html ids to contain names. --- .../dashboard-screen.component.html | 4 +-- .../app/modules/dashboard/dashboard.module.ts | 11 +++++- .../dossier-overview-screen.component.html | 2 ++ .../dossiers-listing-screen.component.html | 2 ++ .../file-actions/file-actions.component.ts | 36 +++++++++---------- libs/common-ui | 2 +- 6 files changed, 35 insertions(+), 22 deletions(-) diff --git a/apps/red-ui/src/app/modules/dashboard/dashboard-screen/dashboard-screen.component.html b/apps/red-ui/src/app/modules/dashboard/dashboard-screen/dashboard-screen.component.html index 60fe18e05..657fc0c93 100644 --- a/apps/red-ui/src/app/modules/dashboard/dashboard-screen/dashboard-screen.component.html +++ b/apps/red-ui/src/app/modules/dashboard/dashboard-screen/dashboard-screen.component.html @@ -2,7 +2,7 @@
@@ -10,7 +10,7 @@
diff --git a/apps/red-ui/src/app/modules/dashboard/dashboard.module.ts b/apps/red-ui/src/app/modules/dashboard/dashboard.module.ts index c89c1929b..76a5d8121 100644 --- a/apps/red-ui/src/app/modules/dashboard/dashboard.module.ts +++ b/apps/red-ui/src/app/modules/dashboard/dashboard.module.ts @@ -7,6 +7,7 @@ import { TemplateStatsComponent } from './components/template-stats/template-sta import { BreadcrumbTypes } from '@red/domain'; import { TranslateModule } from '@ngx-translate/core'; import { IconButtonComponent, IqserHelpModeModule, IqserRoutes } from '@iqser/common-ui'; +import { SnakeCasePipe } from '@common-ui/pipes/snake-case.pipe'; const routes: IqserRoutes = [ { @@ -20,6 +21,14 @@ const routes: IqserRoutes = [ @NgModule({ declarations: [DashboardScreenComponent, TemplateStatsComponent], - imports: [RouterModule.forChild(routes), CommonModule, SharedModule, TranslateModule, IqserHelpModeModule, IconButtonComponent], + imports: [ + RouterModule.forChild(routes), + CommonModule, + SharedModule, + TranslateModule, + IqserHelpModeModule, + IconButtonComponent, + SnakeCasePipe, + ], }) export class DashboardModule {} diff --git a/apps/red-ui/src/app/modules/dossier-overview/screen/dossier-overview-screen.component.html b/apps/red-ui/src/app/modules/dossier-overview/screen/dossier-overview-screen.component.html index 774daaa1e..f5976b5ed 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/screen/dossier-overview-screen.component.html +++ b/apps/red-ui/src/app/modules/dossier-overview/screen/dossier-overview-screen.component.html @@ -26,6 +26,8 @@ [showNoDataButton]="permissionsService.canUploadFiles(dossier)" [tableColumnConfigs]="tableColumnConfigs" [tableItemClasses]="{ disabled: disabledFn, 'last-opened': lastOpenedFn }" + [rowIdPrefix]="'file'" + [namePropertyKey]="'filename'" > diff --git a/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.ts index e468ad1a5..557356d13 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.ts +++ b/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.ts @@ -116,7 +116,7 @@ export class FileActionsComponent implements OnChanges { private get _buttons(): Action[] { const actions: Action[] = [ { - id: 'delete-file-btn', + id: 'btn-delete_file', type: ActionTypes.circleBtn, action: () => this.#openDeleteFileDialog(), tooltip: _('dossier-overview.delete.action'), @@ -125,7 +125,7 @@ export class FileActionsComponent implements OnChanges { helpModeKey: 'delete_file', }, { - id: 'assign-btn', + id: 'btn-assign', type: ActionTypes.circleBtn, action: () => this.#assign(), tooltip: this.assignTooltip, @@ -134,7 +134,7 @@ export class FileActionsComponent implements OnChanges { helpModeKey: 'assign_user', }, { - id: 'assign-to-me-btn', + id: 'btn-assign_to_me', type: ActionTypes.circleBtn, action: () => this.#assignToMe(), tooltip: _('dossier-overview.assign-me'), @@ -143,7 +143,7 @@ export class FileActionsComponent implements OnChanges { helpModeKey: 'assign_user', }, { - id: 'open-import-redactions-dialog-btn', + id: 'btn-open_import_redactions_dialog', type: ActionTypes.circleBtn, action: () => this.#openImportRedactionsDialog(), tooltip: _('dossier-overview.import-redactions'), @@ -152,7 +152,7 @@ export class FileActionsComponent implements OnChanges { helpModeKey: 'import_redactions', }, { - id: 'download-file-btn', + id: 'btn-download_file', type: ActionTypes.downloadBtn, files: [this.file], dossier: this.dossier, @@ -162,7 +162,7 @@ export class FileActionsComponent implements OnChanges { helpModeKey: 'download', }, { - id: 'toggle-document-info-btn', + id: 'btn-toggle_document_info', type: ActionTypes.circleBtn, action: () => this.#toggleDocumentInfo(), tooltip: _('file-preview.document-info'), @@ -172,7 +172,7 @@ export class FileActionsComponent implements OnChanges { helpModeKey: 'document_info', }, { - id: 'toggle-exclude-pages-btn', + id: 'btn-toggle_exclude_pages', type: ActionTypes.circleBtn, action: () => this.#toggleExcludePages(), tooltip: _('file-preview.exclude-pages'), @@ -183,7 +183,7 @@ export class FileActionsComponent implements OnChanges { helpModeKey: 'exclude_pages', }, { - id: 'set-file-to-new-btn', + id: 'btn-set_file_to_new', type: ActionTypes.circleBtn, action: () => this.#setToNew(), tooltip: _('dossier-overview.back-to-new'), @@ -192,7 +192,7 @@ export class FileActionsComponent implements OnChanges { helpModeKey: 'change_status', }, { - id: 'set-file-under-approval-btn', + id: 'btn-set_file_under_approval', type: ActionTypes.circleBtn, action: () => this.#setFileUnderApproval(), tooltip: _('dossier-overview.under-approval'), @@ -201,7 +201,7 @@ export class FileActionsComponent implements OnChanges { helpModeKey: 'change_status', }, { - id: 'set-file-under-review-btn', + id: 'btn-set_file_under_review', type: ActionTypes.circleBtn, action: () => this.#setFileUnderReview(), tooltip: _('dossier-overview.under-review'), @@ -210,7 +210,7 @@ export class FileActionsComponent implements OnChanges { helpModeKey: 'change_status', }, { - id: 'set-file-approved-btn', + id: 'btn-set_file_approved', type: ActionTypes.circleBtn, action: () => this.setFileApproved(), tooltip: this.file.canBeApproved ? _('dossier-overview.approve') : _('dossier-overview.approve-disabled'), @@ -220,7 +220,7 @@ export class FileActionsComponent implements OnChanges { helpModeKey: 'change_status', }, { - id: 'toggle-automatic-analysis-btn', + id: 'btn-toggle_automatic_analysis', type: ActionTypes.circleBtn, action: () => this.#toggleAutomaticAnalysis(), tooltip: _('dossier-overview.stop-auto-analysis'), @@ -229,7 +229,7 @@ export class FileActionsComponent implements OnChanges { helpModeKey: 'stop_analysis', }, { - id: 'reanalyse-file-preview-btn', + id: 'btn-reanalyse_file_preview', type: ActionTypes.circleBtn, action: () => this.#reanalyseFile(), tooltip: _('file-preview.reanalyse-notification'), @@ -240,7 +240,7 @@ export class FileActionsComponent implements OnChanges { helpModeKey: 'stop_analysis', }, { - id: 'toggle-automatic-analysis-btn', + id: 'btn-toggle_automatic_analysis', type: ActionTypes.circleBtn, action: () => this.#toggleAutomaticAnalysis(), tooltip: _('dossier-overview.start-auto-analysis'), @@ -250,7 +250,7 @@ export class FileActionsComponent implements OnChanges { helpModeKey: 'stop_analysis', }, { - id: 'set-under-approval-btn', + id: 'btn-set_under_approval', type: ActionTypes.circleBtn, action: () => this.#setFileUnderApproval(), tooltip: _('dossier-overview.under-approval'), @@ -259,7 +259,7 @@ export class FileActionsComponent implements OnChanges { helpModeKey: 'change_status', }, { - id: 'ocr-file-btn', + id: 'btn-ocr_file', type: ActionTypes.circleBtn, action: () => this.#ocrFile(), tooltip: _('dossier-overview.ocr-file'), @@ -268,7 +268,7 @@ export class FileActionsComponent implements OnChanges { helpModeKey: 'automatic_text_recognition', }, { - id: 'reanalyse-file-btn', + id: 'btn-reanalyse_file', type: ActionTypes.circleBtn, action: () => this.#reanalyseFile(), tooltip: _('dossier-overview.reanalyse.action'), @@ -277,7 +277,7 @@ export class FileActionsComponent implements OnChanges { helpModeKey: 'stop_analysis', }, { - id: 'toggle-analysis-btn', + id: 'btn-toggle_analysis', type: ActionTypes.toggle, action: () => this.#toggleAnalysis(), disabled: !this.canToggleAnalysis, diff --git a/libs/common-ui b/libs/common-ui index 94e0021ed..3ea4e45b8 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 94e0021ed4ec080aec24cf0e963321299513e890 +Subproject commit 3ea4e45b87b94868370492c475864390d984f65d