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 @@ -
+
From 05d855975e97460e2670c85e370bfd833a9b8305 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 29 Oct 2024 07:05:20 +0000 Subject: [PATCH 3/3] chore(release): -v5.21.0 [skip ci] ## [5.21.0](https://github.com/onecx/onecx-portal-ui-libs/compare/v5.20.1...v5.21.0) (2024-10-29) ### Features * dialog buttons can receive custom id ([#566](https://github.com/onecx/onecx-portal-ui-libs/issues/566)) ([eb78d52](https://github.com/onecx/onecx-portal-ui-libs/commit/eb78d5230aa9ba270463ff548af510607830e3e5)) ### Bug Fixes * calendar month and date items focusable ([#558](https://github.com/onecx/onecx-portal-ui-libs/issues/558)) ([f624545](https://github.com/onecx/onecx-portal-ui-libs/commit/f62454507182ca84b3bb21d9c0b0ce9311be6040)) * custom group selection saved, displaying correct columns on page reload, remove clear column group selection ([#562](https://github.com/onecx/onecx-portal-ui-libs/issues/562)) ([0a8d9c1](https://github.com/onecx/onecx-portal-ui-libs/commit/0a8d9c1c3a61fa5a4aff0d7b085c8834ac824580)) * data-view-controls translations ([#563](https://github.com/onecx/onecx-portal-ui-libs/issues/563)) ([fc25ec2](https://github.com/onecx/onecx-portal-ui-libs/commit/fc25ec214da27c48820340751fda4c548305f397)) * dialog service right aligned buttons pushed to right ([#565](https://github.com/onecx/onecx-portal-ui-libs/issues/565)) ([9e61f05](https://github.com/onecx/onecx-portal-ui-libs/commit/9e61f055add7aadb737c4ae9ea06533e3e0022fb)) * panel icon focus visible ([#557](https://github.com/onecx/onecx-portal-ui-libs/issues/557)) ([6b0d34f](https://github.com/onecx/onecx-portal-ui-libs/commit/6b0d34f0125427783892481b60d7cf3d937c31ff)) * shell translations for MFEs and RCs ([#564](https://github.com/onecx/onecx-portal-ui-libs/issues/564)) ([f5f3ff6](https://github.com/onecx/onecx-portal-ui-libs/commit/f5f3ff64c2a876e4274dc7ed9b0757fe1c1f8684)) --- CHANGELOG.md | 15 +++++++++++++++ libs/accelerator/package.json | 2 +- libs/angular-accelerator/package.json | 2 +- libs/angular-auth/package.json | 2 +- libs/angular-integration-interface/package.json | 2 +- libs/angular-remote-components/package.json | 2 +- libs/angular-testing/package.json | 2 +- libs/angular-webcomponents/package.json | 2 +- libs/integration-interface/package.json | 2 +- libs/keycloak-auth/package.json | 2 +- libs/ngrx-accelerator/package.json | 2 +- libs/portal-integration-angular/package.json | 2 +- libs/portal-layout-styles/package.json | 2 +- libs/shell-core/package.json | 2 +- package.json | 2 +- 15 files changed, 29 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e9f09de..6786e279 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,18 @@ +## [5.21.0](https://github.com/onecx/onecx-portal-ui-libs/compare/v5.20.1...v5.21.0) (2024-10-29) + +### Features + +* dialog buttons can receive custom id ([#566](https://github.com/onecx/onecx-portal-ui-libs/issues/566)) ([eb78d52](https://github.com/onecx/onecx-portal-ui-libs/commit/eb78d5230aa9ba270463ff548af510607830e3e5)) + +### Bug Fixes + +* calendar month and date items focusable ([#558](https://github.com/onecx/onecx-portal-ui-libs/issues/558)) ([f624545](https://github.com/onecx/onecx-portal-ui-libs/commit/f62454507182ca84b3bb21d9c0b0ce9311be6040)) +* custom group selection saved, displaying correct columns on page reload, remove clear column group selection ([#562](https://github.com/onecx/onecx-portal-ui-libs/issues/562)) ([0a8d9c1](https://github.com/onecx/onecx-portal-ui-libs/commit/0a8d9c1c3a61fa5a4aff0d7b085c8834ac824580)) +* data-view-controls translations ([#563](https://github.com/onecx/onecx-portal-ui-libs/issues/563)) ([fc25ec2](https://github.com/onecx/onecx-portal-ui-libs/commit/fc25ec214da27c48820340751fda4c548305f397)) +* dialog service right aligned buttons pushed to right ([#565](https://github.com/onecx/onecx-portal-ui-libs/issues/565)) ([9e61f05](https://github.com/onecx/onecx-portal-ui-libs/commit/9e61f055add7aadb737c4ae9ea06533e3e0022fb)) +* panel icon focus visible ([#557](https://github.com/onecx/onecx-portal-ui-libs/issues/557)) ([6b0d34f](https://github.com/onecx/onecx-portal-ui-libs/commit/6b0d34f0125427783892481b60d7cf3d937c31ff)) +* shell translations for MFEs and RCs ([#564](https://github.com/onecx/onecx-portal-ui-libs/issues/564)) ([f5f3ff6](https://github.com/onecx/onecx-portal-ui-libs/commit/f5f3ff64c2a876e4274dc7ed9b0757fe1c1f8684)) + ## [5.20.1](https://github.com/onecx/onecx-portal-ui-libs/compare/v5.20.0...v5.20.1) (2024-10-24) ### Bug Fixes diff --git a/libs/accelerator/package.json b/libs/accelerator/package.json index e385ceac..95d8fd52 100644 --- a/libs/accelerator/package.json +++ b/libs/accelerator/package.json @@ -1,6 +1,6 @@ { "name": "@onecx/accelerator", - "version": "5.20.1", + "version": "5.21.0", "license": "Apache-2.0", "peerDependencies": { "tslib": "^2.6.3", diff --git a/libs/angular-accelerator/package.json b/libs/angular-accelerator/package.json index 50bbf402..0b6cfa41 100644 --- a/libs/angular-accelerator/package.json +++ b/libs/angular-accelerator/package.json @@ -1,6 +1,6 @@ { "name": "@onecx/angular-accelerator", - "version": "5.20.1", + "version": "5.21.0", "license": "Apache-2.0", "peerDependencies": { "@angular/common": "^18.0.5", diff --git a/libs/angular-auth/package.json b/libs/angular-auth/package.json index 178d689e..6cff25f5 100644 --- a/libs/angular-auth/package.json +++ b/libs/angular-auth/package.json @@ -1,6 +1,6 @@ { "name": "@onecx/angular-auth", - "version": "5.20.1", + "version": "5.21.0", "license": "Apache-2.0", "peerDependencies": { "@angular-architects/module-federation": "^18.0.4", diff --git a/libs/angular-integration-interface/package.json b/libs/angular-integration-interface/package.json index e3995c76..aefd9d2b 100644 --- a/libs/angular-integration-interface/package.json +++ b/libs/angular-integration-interface/package.json @@ -1,6 +1,6 @@ { "name": "@onecx/angular-integration-interface", - "version": "5.20.1", + "version": "5.21.0", "license": "Apache-2.0", "peerDependencies": { "@angular/core": "^18.0.5", diff --git a/libs/angular-remote-components/package.json b/libs/angular-remote-components/package.json index 39f58522..f9d90265 100644 --- a/libs/angular-remote-components/package.json +++ b/libs/angular-remote-components/package.json @@ -1,6 +1,6 @@ { "name": "@onecx/angular-remote-components", - "version": "5.20.1", + "version": "5.21.0", "license": "Apache-2.0", "peerDependencies": { "@angular/common": "^18.0.5", diff --git a/libs/angular-testing/package.json b/libs/angular-testing/package.json index 94a3cba7..d7925d75 100644 --- a/libs/angular-testing/package.json +++ b/libs/angular-testing/package.json @@ -1,6 +1,6 @@ { "name": "@onecx/angular-testing", - "version": "5.20.1", + "version": "5.21.0", "license": "Apache-2.0", "peerDependencies": { "@angular/cdk": "^18.0.5", diff --git a/libs/angular-webcomponents/package.json b/libs/angular-webcomponents/package.json index 3fff1777..c6795574 100644 --- a/libs/angular-webcomponents/package.json +++ b/libs/angular-webcomponents/package.json @@ -1,6 +1,6 @@ { "name": "@onecx/angular-webcomponents", - "version": "5.20.1", + "version": "5.21.0", "license": "Apache-2.0", "peerDependencies": { "@angular/core": "^18.0.5", diff --git a/libs/integration-interface/package.json b/libs/integration-interface/package.json index 05948036..7107ddff 100644 --- a/libs/integration-interface/package.json +++ b/libs/integration-interface/package.json @@ -1,6 +1,6 @@ { "name": "@onecx/integration-interface", - "version": "5.20.1", + "version": "5.21.0", "license": "Apache-2.0", "peerDependencies": { "tslib": "^2.6.3", diff --git a/libs/keycloak-auth/package.json b/libs/keycloak-auth/package.json index 04c65119..38e712b4 100644 --- a/libs/keycloak-auth/package.json +++ b/libs/keycloak-auth/package.json @@ -1,6 +1,6 @@ { "name": "@onecx/keycloak-auth", - "version": "5.20.1", + "version": "5.21.0", "license": "Apache-2.0", "peerDependencies": { "@angular/common": "^18.0.5", diff --git a/libs/ngrx-accelerator/package.json b/libs/ngrx-accelerator/package.json index ba3edafd..aec3fab2 100644 --- a/libs/ngrx-accelerator/package.json +++ b/libs/ngrx-accelerator/package.json @@ -1,6 +1,6 @@ { "name": "@onecx/ngrx-accelerator", - "version": "5.20.1", + "version": "5.21.0", "peerDependencies": { "@angular/core": "^18.0.5", "@angular/router": "^18.0.5", diff --git a/libs/portal-integration-angular/package.json b/libs/portal-integration-angular/package.json index 249aeb9c..9ca8673a 100644 --- a/libs/portal-integration-angular/package.json +++ b/libs/portal-integration-angular/package.json @@ -1,6 +1,6 @@ { "name": "@onecx/portal-integration-angular", - "version": "5.20.1", + "version": "5.21.0", "license": "Apache-2.0", "peerDependencies": { "@angular/common": "^18.0.5", diff --git a/libs/portal-layout-styles/package.json b/libs/portal-layout-styles/package.json index 6cdcbc9a..f6407109 100644 --- a/libs/portal-layout-styles/package.json +++ b/libs/portal-layout-styles/package.json @@ -1,6 +1,6 @@ { "name": "@onecx/portal-layout-styles", - "version": "5.20.1", + "version": "5.21.0", "license": "Apache-2.0", "peerDependencies": { "tslib": "^2.6.3" diff --git a/libs/shell-core/package.json b/libs/shell-core/package.json index 7af60e79..170eadb2 100644 --- a/libs/shell-core/package.json +++ b/libs/shell-core/package.json @@ -1,6 +1,6 @@ { "name": "@onecx/shell-core", - "version": "5.20.1", + "version": "5.21.0", "license": "Apache-2.0", "peerDependencies": { "rxjs": "^7.8.1", diff --git a/package.json b/package.json index 022785ee..2e5d392e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@onecx/onecx-portal-ui-libs", - "version": "5.20.1", + "version": "5.21.0", "license": "Apache-2.0", "scripts": { "sass": "npx sass libs/portal-integration-angular/assets/styles.scss libs/portal-integration-angular/assets/output.css",