Skip to content

Commit

Permalink
Merge branch 'main' into fix/dialog-maximized-on-mobile
Browse files Browse the repository at this point in the history
  • Loading branch information
markuczy authored Oct 29, 2024
2 parents 42f86d5 + 05d8559 commit 8126229
Show file tree
Hide file tree
Showing 20 changed files with 77 additions and 30 deletions.
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion libs/accelerator/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onecx/accelerator",
"version": "5.20.1",
"version": "5.21.0",
"license": "Apache-2.0",
"peerDependencies": {
"tslib": "^2.6.3",
Expand Down
2 changes: 1 addition & 1 deletion libs/angular-accelerator/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion libs/angular-auth/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion libs/angular-integration-interface/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion libs/angular-remote-components/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion libs/angular-testing/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion libs/angular-webcomponents/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion libs/integration-interface/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion libs/keycloak-auth/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion libs/ngrx-accelerator/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
17 changes: 17 additions & 0 deletions libs/portal-integration-angular/assets/i18n/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
17 changes: 17 additions & 0 deletions libs/portal-integration-angular/assets/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion libs/portal-integration-angular/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
<ng-container #container></ng-container>
<ng-content></ng-content>
</div>
<div
class="w-full flex-column sm:flex-row align-content-end sm:align-content-start flex flex-wrap row-gap-2 column-gap-2"
>
<div class="w-full flex-row justify-content-end flex flex-wrap gap-2">
<ng-container *ngFor="let button of leftCustomButtons; index as i">
<div [ngStyle]="{'margin-right': (i === leftCustomButtons.length - 1) ? 'auto' : 0}">
<ng-container *ngTemplateOutlet="customButton; context: {button: button}"> </ng-container>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@
*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)"
>
</ocx-data-view-template-picker>
<button
*ngIf="toggleColumnActive"
type="button"
(click)="toggleColumns()"
pButton
[pTooltip]="translations?.toggleColumnButtonTooltip || ('OCX_CUSTOM_GROUP_COLUMN_SELECTOR.OPEN_BUTTON_DETAIL' | translate)"
[pTooltip]="translations?.toggleColumnButtonTooltip || ('OCX_DATA_VIEW_CONTROLS.OPEN_BUTTON_DETAIL' | translate)"
tooltipPosition="top"
[attr.aria-label]="translations?.toggleColumnButtonTooltip || ('OCX_CUSTOM_GROUP_COLUMN_SELECTOR.OPEN_BUTTON_DETAIL' | translate)"
[attr.aria-label]="translations?.toggleColumnButtonTooltip || ('OCX_DATA_VIEW_CONTROLS.OPEN_BUTTON_DETAIL' | translate)"
icon="pi pi-cog"
></button>
</div>
Expand Down Expand Up @@ -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)"
></p-dropdown>
<label for="data-view-control-sortby" class="white-space-nowrap"
>{{ translations?.sortDropdownTooltip || 'Sort by' }}</label
Expand All @@ -84,9 +84,9 @@
onIcon="pi pi-sort-amount-up"
offIcon="pi pi-sort-amount-down"
(onChange)="sortDirection($event)"
[pTooltip]="!selectedSortDirection ? (translations?.sortOrderTooltips?.ascending || ('OCX_LIST_GRID_SORT.TOGGLE_BUTTON.ASCENDING_TITLE' | translate)) : (translations?.sortOrderTooltips?.descending || ('OCX_LIST_GRID_SORT.TOGGLE_BUTTON.DESCENDING_TITLE' | translate))"
[pTooltip]="!selectedSortDirection ? (translations?.sortOrderTooltips?.ascending || ('OCX_DATA_VIEW_CONTROLS.TOGGLE_BUTTON.ASCENDING_TOOLTIP' | translate)) : (translations?.sortOrderTooltips?.descending || ('OCX_DATA_VIEW_CONTROLS.TOGGLE_BUTTON.DESCENDING_TOOLTIP' | translate))"
tooltipPosition="top"
[ariaLabel]="!selectedSortDirection ? (translations?.sortOrderTooltips?.ascending || ('OCX_LIST_GRID_SORT.TOGGLE_BUTTON.ASCENDING_TITLE' | translate)) : (translations?.sortOrderTooltips?.descending || ('OCX_LIST_GRID_SORT.TOGGLE_BUTTON.DESCENDING_TITLE' | translate))"
[ariaLabel]="!selectedSortDirection ? (translations?.sortOrderTooltips?.ascending || ('OCX_DATA_VIEW_CONTROLS.TOGGLE_BUTTON.ASCENDING_TOOLTIP' | translate)) : (translations?.sortOrderTooltips?.descending || ('OCX_DATA_VIEW_CONTROLS.TOGGLE_BUTTON.DESCENDING_TOOLTIP' | translate))"
></p-toggleButton>
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
]

Expand Down Expand Up @@ -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 },
})
Expand Down
2 changes: 1 addition & 1 deletion libs/portal-layout-styles/package.json
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion libs/shell-core/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down

0 comments on commit 8126229

Please sign in to comment.