From fc25ec214da27c48820340751fda4c548305f397 Mon Sep 17 00:00:00 2001
From: markuczy <129275100+markuczy@users.noreply.github.com>
Date: Mon, 28 Oct 2024 14:41:46 +0100
Subject: [PATCH 1/3] fix: data-view-controls translations (#563)
* fix: data-view-controls sort translations
* fix: replaced translations with data-view-controls translations
---
.../assets/i18n/de.json | 17 +++++++++++++++++
.../assets/i18n/en.json | 17 +++++++++++++++++
.../data-view-controls.component.html | 12 ++++++------
.../data-view-controls.component.ts | 14 +++++++-------
4 files changed, 47 insertions(+), 13 deletions(-)
diff --git a/libs/portal-integration-angular/assets/i18n/de.json b/libs/portal-integration-angular/assets/i18n/de.json
index 3b923f78..897a9c91 100644
--- a/libs/portal-integration-angular/assets/i18n/de.json
+++ b/libs/portal-integration-angular/assets/i18n/de.json
@@ -115,6 +115,23 @@
"TABLE": "Tabelle"
}
},
+ "OCX_DATA_VIEW_CONTROLS" : {
+ "NO_GROUP_SELECTED": "Keine Gruppe ausgewählt",
+ "OPEN_BUTTON_DETAIL": "Dialog zur Auswahl einer benutzerdefinierten Gruppe öffnen",
+ "DROPDOWN": {
+ "ARIA_LABEL": "Sortieren nach"
+ },
+ "TOGGLE_BUTTON": {
+ "ASCENDING_TOOLTIP": "Aufsteigend",
+ "DESCENDING_TOOLTIP": "Absteigend"
+ },
+ "LAYOUT": {
+ "LIST": "Liste",
+ "GRID": "Raster",
+ "TABLE": "Tabelle"
+ },
+ "DIALOG_TITLE": "Spalten für benutzerdefinierte Gruppe auswählen"
+ },
"OCX_INTERACTIVE_DATA_VIEW": {
"DEFAULT_GROUP": "Standardgruppe",
"CUSTOM_GROUP": "Benutzerdefinierte Gruppe",
diff --git a/libs/portal-integration-angular/assets/i18n/en.json b/libs/portal-integration-angular/assets/i18n/en.json
index bf8467d7..b904b231 100644
--- a/libs/portal-integration-angular/assets/i18n/en.json
+++ b/libs/portal-integration-angular/assets/i18n/en.json
@@ -115,6 +115,23 @@
"TABLE": "Table"
}
},
+ "OCX_DATA_VIEW_CONTROLS" : {
+ "NO_GROUP_SELECTED": "No group selected",
+ "OPEN_BUTTON_DETAIL": "Open custom group selection dialog",
+ "DROPDOWN": {
+ "ARIA_LABEL": "Sort by"
+ },
+ "TOGGLE_BUTTON": {
+ "ASCENDING_TOOLTIP": "Ascending",
+ "DESCENDING_TOOLTIP": "Descending"
+ },
+ "LAYOUT": {
+ "LIST": "List",
+ "GRID": "Grid",
+ "TABLE": "Table"
+ },
+ "DIALOG_TITLE": "Custom group column selection"
+ },
"OCX_INTERACTIVE_DATA_VIEW": {
"DEFAULT_GROUP": "Default group",
"CUSTOM_GROUP": "Custom group",
diff --git a/libs/portal-integration-angular/src/lib/core/components/data-view-controls/data-view-controls.component.html b/libs/portal-integration-angular/src/lib/core/components/data-view-controls/data-view-controls.component.html
index f3685348..c07cb5ec 100644
--- a/libs/portal-integration-angular/src/lib/core/components/data-view-controls/data-view-controls.component.html
+++ b/libs/portal-integration-angular/src/lib/core/components/data-view-controls/data-view-controls.component.html
@@ -20,7 +20,7 @@
*ngIf="columnTemplates.length > 0 && toggleColumnActive"
(templateChanged)="handleTemplateChange($event)"
(templateReset)="handleTemplateReset()"
- [placeholder]="translations?.templatePickerDropdownPlaceholder || dropdownPlaceholderText || ('OCX_INTERACTIVE_DATA_VIEW.NO_GROUP_SELECTED' | translate)"
+ [placeholder]="translations?.templatePickerDropdownPlaceholder || dropdownPlaceholderText || ('OCX_DATA_VIEW_CONTROLS.NO_GROUP_SELECTED' | translate)"
>
@@ -73,7 +73,7 @@
styleClass="data-view-control-border min-w-min w-7rem"
[options]="sortingOptions"
(onChange)="selectSorting($event)"
- [ariaLabel]="('OCX_LIST_GRID_SORT.DROPDOWN.ARIA_LABEL' | translate)"
+ [ariaLabel]="('OCX_DATA_VIEW_CONTROLS.DROPDOWN.ARIA_LABEL' | translate)"
>
diff --git a/libs/portal-integration-angular/src/lib/core/components/data-view-controls/data-view-controls.component.ts b/libs/portal-integration-angular/src/lib/core/components/data-view-controls/data-view-controls.component.ts
index c30c749e..b639e23f 100644
--- a/libs/portal-integration-angular/src/lib/core/components/data-view-controls/data-view-controls.component.ts
+++ b/libs/portal-integration-angular/src/lib/core/components/data-view-controls/data-view-controls.component.ts
@@ -30,22 +30,22 @@ const ALL_VIEW_MODES: ViewMode[] = [
id: 'ocx-data-layout-selection-list',
icon: PrimeIcons.LIST,
mode: 'list',
- tooltipKey: 'OCX_DATA_LAYOUT_SELECTION.LAYOUT.LIST',
- labelKey: 'OCX_DATA_LAYOUT_SELECTION.LAYOUT.LIST',
+ tooltipKey: 'OCX_DATA_VIEW_CONTROLS.LAYOUT.LIST',
+ labelKey: 'OCX_DATA_VIEW_CONTROLS.LAYOUT.LIST',
},
{
id: 'ocx-data-layout-selection-grid',
icon: PrimeIcons.TH_LARGE,
mode: 'grid',
- tooltipKey: 'OCX_DATA_LAYOUT_SELECTION.LAYOUT.GRID',
- labelKey: 'OCX_DATA_LAYOUT_SELECTION.LAYOUT.GRID',
+ tooltipKey: 'OCX_DATA_VIEW_CONTROLS.LAYOUT.GRID',
+ labelKey: 'OCX_DATA_VIEW_CONTROLS.LAYOUT.GRID',
},
{
id: 'ocx-data-layout-selection-table',
icon: PrimeIcons.TABLE,
mode: 'table',
- tooltipKey: 'OCX_DATA_LAYOUT_SELECTION.LAYOUT.TABLE',
- labelKey: 'OCX_DATA_LAYOUT_SELECTION.LAYOUT.TABLE',
+ tooltipKey: 'OCX_DATA_VIEW_CONTROLS.LAYOUT.TABLE',
+ labelKey: 'OCX_DATA_VIEW_CONTROLS.LAYOUT.TABLE',
},
]
@@ -216,7 +216,7 @@ export class DataViewControlsComponent implements OnInit, OnChanges {
},
header:
this.translations?.columnDialogHeaderText ||
- this.translate.instant('OCX_CUSTOM_GROUP_COLUMN_SELECTOR.DIALOG_TITLE'),
+ this.translate.instant('OCX_DATA_VIEW_CONTROLS.DIALOG_TITLE'),
width: '70%',
contentStyle: { 'max-height': '500px', overflow: 'auto', padding: 0 },
})
From 9e61f055add7aadb737c4ae9ea06533e3e0022fb Mon Sep 17 00:00:00 2001
From: markuczy <129275100+markuczy@users.noreply.github.com>
Date: Tue, 29 Oct 2024 07:42:25 +0100
Subject: [PATCH 2/3] fix: dialog service right aligned buttons pushed to right
(#565)
* buttons right aligned buttons pushed to right
* fix: button wrapping logic
---
.../components/button-dialog/button-dialog.component.html | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/libs/portal-integration-angular/src/lib/core/components/button-dialog/button-dialog.component.html b/libs/portal-integration-angular/src/lib/core/components/button-dialog/button-dialog.component.html
index d4c2a8ef..ecab425b 100644
--- a/libs/portal-integration-angular/src/lib/core/components/button-dialog/button-dialog.component.html
+++ b/libs/portal-integration-angular/src/lib/core/components/button-dialog/button-dialog.component.html
@@ -3,9 +3,7 @@