Merge branch 'main' into fix/panel-icon-focus

markuczy · Oct 25, 2024 · c53265d · c53265d
2 parents f8b3d93 + 0c0bdfe
commit c53265d
Show file tree

Hide file tree

Showing 23 changed files with 92 additions and 69 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,22 @@
+## [5.20.1](https://github.com/onecx/onecx-portal-ui-libs/compare/v5.20.0...v5.20.1) (2024-10-24)
+
+### Bug Fixes
+
+* replace in navigate ([#559](https://github.com/onecx/onecx-portal-ui-libs/issues/559)) ([bb648d1](https://github.com/onecx/onecx-portal-ui-libs/commit/bb648d1b2f60a881d5a1b6ccc4a553d0f2a706b8))
+
+## [5.20.0](https://github.com/onecx/onecx-portal-ui-libs/compare/v5.19.4...v5.20.0) (2024-10-23)
+
+### Features
+
+* NavigatedEvent type created ([#555](https://github.com/onecx/onecx-portal-ui-libs/issues/555)) ([9c9157b](https://github.com/onecx/onecx-portal-ui-libs/commit/9c9157b6a59d08fb3e65ca18a07832646eb2b6d5))
+
+### Bug Fixes
+
+* focus order and alignment of buttons in dialog ([#554](https://github.com/onecx/onecx-portal-ui-libs/issues/554)) ([8b866cc](https://github.com/onecx/onecx-portal-ui-libs/commit/8b866cca57c5cb729cabb452727424151b3b9a31))
+* icons hidden in topbar menu ([#540](https://github.com/onecx/onecx-portal-ui-libs/issues/540)) ([afc34c9](https://github.com/onecx/onecx-portal-ui-libs/commit/afc34c9eb905731c816e8fb2f490c93c72fb2b36))
+* remove history ([#556](https://github.com/onecx/onecx-portal-ui-libs/issues/556)) ([fc123a3](https://github.com/onecx/onecx-portal-ui-libs/commit/fc123a3f7395fa23006b93f8fe62921fb9349c49))
+* simple advanced button correction ([#553](https://github.com/onecx/onecx-portal-ui-libs/issues/553)) ([19f4610](https://github.com/onecx/onecx-portal-ui-libs/commit/19f461093ff3af2b6ba8f931a5fb48352765b227))
+
 ## [5.19.4](https://github.com/onecx/onecx-portal-ui-libs/compare/v5.19.3...v5.19.4) (2024-10-18)
 
 ### Bug Fixes

diff --git a/libs/accelerator/package.json b/libs/accelerator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onecx/accelerator",
-  "version": "5.19.4",
+  "version": "5.20.1",
   "license": "Apache-2.0",
   "peerDependencies": {
     "tslib": "^2.6.3",

diff --git a/libs/angular-accelerator/package.json b/libs/angular-accelerator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onecx/angular-accelerator",
-  "version": "5.19.4",
+  "version": "5.20.1",
   "license": "Apache-2.0",
   "peerDependencies": {
     "@angular/common": "^18.0.5",

diff --git a/libs/angular-accelerator/src/lib/components/search-header/search-header.component.ts b/libs/angular-accelerator/src/lib/components/search-header/search-header.component.ts
@@ -113,6 +113,12 @@ export class SearchHeaderComponent implements AfterContentInit, AfterViewInit {
   @ViewChild('searchParameterFields') searchParameterFields: ElementRef | undefined
 
   hasAdvanced = false
+
+  simpleAdvancedAction: Action = {
+    id: 'simpleAdvancedButton',
+    actionCallback: () => this.toggleViewMode(),
+    show: 'always',
+  }
   headerActions: Action[] = []
 
   fieldValues$: Observable<{ [key: string]: unknown }> | undefined = of({})
@@ -166,19 +172,14 @@ export class SearchHeaderComponent implements AfterContentInit, AfterViewInit {
   updateHeaderActions() {
     const headerActions: Action[] = []
     if (this.hasAdvanced) {
-      headerActions.push({
-        id: 'simpleAdvancedButton',
-        labelKey:
-          this.viewMode === 'basic'
-            ? 'OCX_SEARCH_HEADER.TOGGLE_BUTTON.ADVANCED.TEXT'
-            : 'OCX_SEARCH_HEADER.TOGGLE_BUTTON.SIMPLE.TEXT',
-        actionCallback: () => this.toggleViewMode(),
-        show: 'always',
-        titleKey:
-          this.viewMode === 'basic'
-            ? 'OCX_SEARCH_HEADER.TOGGLE_BUTTON.ADVANCED.DETAIL'
-            : 'OCX_SEARCH_HEADER.TOGGLE_BUTTON.SIMPLE.DETAIL',
-      })
+      this.simpleAdvancedAction.labelKey = this.viewMode === 'basic'
+      ? 'OCX_SEARCH_HEADER.TOGGLE_BUTTON.ADVANCED.TEXT'
+      : 'OCX_SEARCH_HEADER.TOGGLE_BUTTON.SIMPLE.TEXT',
+      this.simpleAdvancedAction.titleKey = this.viewMode === 'basic'
+      ? 'OCX_SEARCH_HEADER.TOGGLE_BUTTON.ADVANCED.DETAIL'
+      : 'OCX_SEARCH_HEADER.TOGGLE_BUTTON.SIMPLE.DETAIL',
+
+      headerActions.push(this.simpleAdvancedAction)
     }
     this.headerActions = headerActions.concat(this.actions)
   }

diff --git a/libs/angular-auth/package.json b/libs/angular-auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onecx/angular-auth",
-  "version": "5.19.4",
+  "version": "5.20.1",
   "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
@@ -1,6 +1,6 @@
 {
   "name": "@onecx/angular-integration-interface",
-  "version": "5.19.4",
+  "version": "5.20.1",
   "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
@@ -1,6 +1,6 @@
 {
   "name": "@onecx/angular-remote-components",
-  "version": "5.19.4",
+  "version": "5.20.1",
   "license": "Apache-2.0",
   "peerDependencies": {
     "@angular/common": "^18.0.5",

diff --git a/libs/angular-testing/package.json b/libs/angular-testing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onecx/angular-testing",
-  "version": "5.19.4",
+  "version": "5.20.1",
   "license": "Apache-2.0",
   "peerDependencies": {
     "@angular/cdk": "^18.0.5",

diff --git a/libs/angular-webcomponents/package.json b/libs/angular-webcomponents/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onecx/angular-webcomponents",
-  "version": "5.19.4",
+  "version": "5.20.1",
   "license": "Apache-2.0",
   "peerDependencies": {
     "@angular/core": "^18.0.5",

diff --git a/libs/angular-webcomponents/src/lib/utils/webcomponent-bootstrap.utils.ts b/libs/angular-webcomponents/src/lib/utils/webcomponent-bootstrap.utils.ts
@@ -172,7 +172,9 @@ function connectRouter(router: Router): Subscription {
     const routerUrl = `${location.pathname.substring(getLocation().deploymentPath.length)}${location.search}${location.hash}`
     if (routerUrl !== lastUrl) {
       lastUrl = routerUrl
-      router.navigateByUrl(routerUrl)
+      router.navigateByUrl(routerUrl, {
+        replaceUrl: true,
+      })
     }
   })
 }
diff --git a/libs/integration-interface/package.json b/libs/integration-interface/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onecx/integration-interface",
-  "version": "5.19.4",
+  "version": "5.20.1",
   "license": "Apache-2.0",
   "peerDependencies": {
     "tslib": "^2.6.3",

diff --git a/libs/integration-interface/src/index.ts b/libs/integration-interface/src/index.ts
@@ -38,4 +38,5 @@ export * from './lib/topics/permissions-rpc/v1/permissions-rpc.model'
 
 export * from './lib/topics/events/v1/events-topic'
 export * from './lib/topics/events/v1/topic-event-type'
+export * from './lib/topics/events/v1/navigated-event-type'
 export * from './lib/topics/events/v1/navigated-event-payload'
diff --git a/libs/integration-interface/src/lib/topics/events/v1/navigated-event-payload.ts b/libs/integration-interface/src/lib/topics/events/v1/navigated-event-payload.ts
@@ -1,5 +1,4 @@
 export type NavigatedEventPayload = {
   url: string | undefined
   isFirst: boolean
-  history: string[]
 }
diff --git a/libs/integration-interface/src/lib/topics/events/v1/navigated-event-type.ts b/libs/integration-interface/src/lib/topics/events/v1/navigated-event-type.ts
@@ -0,0 +1,3 @@
+import { NavigatedEventPayload } from './navigated-event-payload'
+
+export type NavigatedEvent = { type: 'navigated'; payload: NavigatedEventPayload }
diff --git a/libs/integration-interface/src/lib/topics/events/v1/topic-event-type.ts b/libs/integration-interface/src/lib/topics/events/v1/topic-event-type.ts
@@ -1 +1,3 @@
-export type TopicEventType = { type: string; payload?: unknown | undefined }
+import { NavigatedEvent } from './navigated-event-type'
+
+export type TopicEventType = NavigatedEvent | { type: string; payload?: unknown | undefined }
diff --git a/libs/keycloak-auth/package.json b/libs/keycloak-auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onecx/keycloak-auth",
-  "version": "5.19.4",
+  "version": "5.20.1",
   "license": "Apache-2.0",
   "peerDependencies": {
     "@angular/common": "^18.0.5",

diff --git a/libs/ngrx-accelerator/package.json b/libs/ngrx-accelerator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onecx/ngrx-accelerator",
-  "version": "5.19.4",
+  "version": "5.20.1",
   "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
@@ -1,6 +1,6 @@
 {
   "name": "@onecx/portal-integration-angular",
-  "version": "5.19.4",
+  "version": "5.20.1",
   "license": "Apache-2.0",
   "peerDependencies": {
     "@angular/common": "^18.0.5",

diff --git a/...al-integration-angular/src/lib/core/components/button-dialog/button-dialog.component.html b/...al-integration-angular/src/lib/core/components/button-dialog/button-dialog.component.html
@@ -3,43 +3,46 @@
     <ng-container #container></ng-container>
     <ng-content></ng-content>
   </div>
-  <div class="w-full flex flex-row-reverse justify-content-between column-gap-2">
-    <div class="flex flex-row-reverse flex-wrap column-gap-2 row-gap-2">
-      <div>
-        <button
-          id="buttonDialogPrimaryButton"
-          pButton
-          [icon]="dialogData.config.primaryButtonDetails!.icon !== undefined ? dialogData.config.primaryButtonDetails!.icon : ''"
-          (click)="primaryButtonAction()"
-          [label]="dialogData.config.primaryButtonDetails!.key | translate:dialogData.config.primaryButtonDetails?.parameters"
-          [disabled]="primaryButtonDisabled$ | async"
-          [pTooltip]="dialogData.config.primaryButtonDetails!.tooltipKey ? (dialogData.config.primaryButtonDetails!.tooltipKey | translate) : null"
-          [tooltipPosition]="dialogData.config.primaryButtonDetails?.tooltipPosition ?? ''"
-          [attr.aria-label]="dialogData.config.primaryButtonDetails!.key | translate:dialogData.config.primaryButtonDetails?.parameters"
-        ></button>
+  <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"
+  >
+    <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>
       </div>
+    </ng-container>
+    <ng-container *ngFor="let button of rightCustomButtons">
       <div>
-        <button
-          id="buttonDialogSecondaryButton"
-          pButton
-          *ngIf="dialogData.config.secondaryButtonIncluded"
-          [icon]="dialogData.config.secondaryButtonDetails!.icon !== undefined ? dialogData.config.secondaryButtonDetails!.icon : ''"
-          (click)="secondaryButtonAction()"
-          [label]="dialogData.config.secondaryButtonDetails!.key | translate:dialogData.config.secondaryButtonDetails?.parameters"
-          [disabled]="secondaryButtonDisabled$ | async"
-          [pTooltip]="dialogData.config.secondaryButtonDetails!.tooltipKey ? (dialogData.config.secondaryButtonDetails!.tooltipKey | translate) : null"
-          [tooltipPosition]="dialogData.config.secondaryButtonDetails?.tooltipPosition ?? ''"
-          [attr.aria-label]="dialogData.config.secondaryButtonDetails!.key | translate:dialogData.config.secondaryButtonDetails?.parameters"
-        ></button>
-      </div>
-      <div *ngFor="let button of rightCustomButtons">
         <ng-container *ngTemplateOutlet="customButton; context: {button: button}"> </ng-container>
       </div>
+    </ng-container>
+    <div>
+      <button
+        id="buttonDialogSecondaryButton"
+        pButton
+        *ngIf="dialogData.config.secondaryButtonIncluded"
+        [icon]="dialogData.config.secondaryButtonDetails!.icon !== undefined ? dialogData.config.secondaryButtonDetails!.icon : ''"
+        (click)="secondaryButtonAction()"
+        [label]="dialogData.config.secondaryButtonDetails!.key | translate:dialogData.config.secondaryButtonDetails?.parameters"
+        [disabled]="secondaryButtonDisabled$ | async"
+        [pTooltip]="dialogData.config.secondaryButtonDetails!.tooltipKey ? (dialogData.config.secondaryButtonDetails!.tooltipKey | translate) : null"
+        [tooltipPosition]="dialogData.config.secondaryButtonDetails?.tooltipPosition ?? ''"
+        [attr.aria-label]="dialogData.config.secondaryButtonDetails!.key | translate:dialogData.config.secondaryButtonDetails?.parameters"
+      ></button>
     </div>
-    <div class="flex flex-wrap column-gap-2 row-gap-2">
-      <div *ngFor="let button of leftCustomButtons">
-        <ng-container *ngTemplateOutlet="customButton; context: {button: button}"> </ng-container>
-      </div>
+    <div>
+      <button
+        id="buttonDialogPrimaryButton"
+        pButton
+        autofocus
+        [icon]="dialogData.config.primaryButtonDetails!.icon !== undefined ? dialogData.config.primaryButtonDetails!.icon : ''"
+        (click)="primaryButtonAction()"
+        [label]="dialogData.config.primaryButtonDetails!.key | translate:dialogData.config.primaryButtonDetails?.parameters"
+        [disabled]="primaryButtonDisabled$ | async"
+        [pTooltip]="dialogData.config.primaryButtonDetails!.tooltipKey ? (dialogData.config.primaryButtonDetails!.tooltipKey | translate) : null"
+        [tooltipPosition]="dialogData.config.primaryButtonDetails?.tooltipPosition ?? ''"
+        [attr.aria-label]="dialogData.config.primaryButtonDetails!.key | translate:dialogData.config.primaryButtonDetails?.parameters"
+      ></button>
     </div>
   </div>
 </div>

diff --git 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.19.4",
+  "version": "5.20.1",
   "license": "Apache-2.0",
   "peerDependencies": {
     "tslib": "^2.6.3"

diff --git a/libs/portal-layout-styles/src/styles/shell/topbar/_topbar_theme.scss b/libs/portal-layout-styles/src/styles/shell/topbar/_topbar_theme.scss
@@ -56,13 +56,6 @@
             }
           }
         }
-
-        &.p-menubar .p-menuitem {
-          .p-menuitem-icon,
-          .p-menuitem-badge {
-            display: none;
-          }
-        }
       }
     }
 

diff --git a/libs/shell-core/package.json b/libs/shell-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onecx/shell-core",
-  "version": "5.19.4",
+  "version": "5.20.1",
   "license": "Apache-2.0",
   "peerDependencies": {
     "rxjs": "^7.8.1",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onecx/onecx-portal-ui-libs",
-  "version": "5.19.4",
+  "version": "5.20.1",
   "license": "Apache-2.0",
   "scripts": {
     "sass": "npx sass libs/portal-integration-angular/assets/styles.scss libs/portal-integration-angular/assets/output.css",
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import { NavigatedEventPayload } from './navigated-event-payload'

		export type NavigatedEvent = { type: 'navigated'; payload: NavigatedEventPayload }