Skip to content

Commit

Permalink
Merge branch 'main' into fix/data-table-filter-templates
Browse files Browse the repository at this point in the history
  • Loading branch information
SchettlerKoehler authored Nov 13, 2024
2 parents cd8a16b + 412d732 commit 0c0f598
Show file tree
Hide file tree
Showing 16 changed files with 35 additions and 19 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
## [5.24.0](https://github.com/onecx/onecx-portal-ui-libs/compare/v5.23.6...v5.24.0) (2024-11-13)

### Features

* search button order config ([#594](https://github.com/onecx/onecx-portal-ui-libs/issues/594)) ([7aa5231](https://github.com/onecx/onecx-portal-ui-libs/commit/7aa523167e3d95864594d46187797be06e404563))

### Bug Fixes

* list title no longer clickable ([#593](https://github.com/onecx/onecx-portal-ui-libs/issues/593)) ([07a9f63](https://github.com/onecx/onecx-portal-ui-libs/commit/07a9f63b83381e01ef2458f04c0da6b38a066d9f))
* possibility to check for multiple permissions ([#590](https://github.com/onecx/onecx-portal-ui-libs/issues/590)) ([2abc2fd](https://github.com/onecx/onecx-portal-ui-libs/commit/2abc2fde369831943188a203aedd09ed5612b845))
* table header layout improved ([#595](https://github.com/onecx/onecx-portal-ui-libs/issues/595)) ([596aa1f](https://github.com/onecx/onecx-portal-ui-libs/commit/596aa1f0801eeefaa5214620e75610814c28a607))

## [5.23.6](https://github.com/onecx/onecx-portal-ui-libs/compare/v5.23.5...v5.23.6) (2024-11-12)

### 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.23.6",
"version": "5.24.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.23.6",
"version": "5.24.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 @@ -122,9 +122,10 @@
scrollHeight="flex"
[style]="tableStyle"
paginatorDropdownAppendTo="body"
tableStyleClass="h-full"
>
<ng-template pTemplate="header">
<tr>
<tr style="vertical-align: top">
<th style="width: 4rem" scope="col" *ngIf="selectionChangedObserved">
<p-tableHeaderCheckbox
*ngIf="allowSelectAll"
Expand All @@ -136,12 +137,15 @@
</ng-container>
<ng-container *ngFor="let column of columns">
<th *ngIf="column.sortable || column.filterable; else simpleHeader" scope="col">
<div class="table-header-wrapper">
<span id="{{column.id}}-header-name">{{ column.nameKey | translate }}</span>
<span class="icon-button-header-wrapper">
<div
class="table-header-wrapper flex flex-column justify-content-between align-items-start"
style="height: 100%"
>
<span class="flex" id="{{column.id}}-header-name">{{ column.nameKey | translate }}</span>
<span class="flex icon-button-header-wrapper">
<button
*ngIf="column.sortable"
class="pi sortButton"
class="pi sortButton pl-0"
[class.pi-sort-alt]="(column?.id === sortColumn && sortDirection === 'NONE') || column?.id !== sortColumn"
[class.pi-sort-amount-up]="column?.id === sortColumn && sortDirection === 'ASCENDING'"
[class.pi-sort-amount-down]="column?.id === sortColumn && sortDirection === 'DESCENDING'"
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.23.6",
"version": "5.24.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.23.6",
"version": "5.24.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.23.6",
"version": "5.24.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.23.6",
"version": "5.24.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.23.6",
"version": "5.24.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.23.6",
"version": "5.24.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.23.6",
"version": "5.24.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.23.6",
"version": "5.24.0",
"peerDependencies": {
"@angular/core": "^18.0.5",
"@angular/router": "^18.0.5",
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.23.6",
"version": "5.24.0",
"license": "Apache-2.0",
"peerDependencies": {
"@angular/common": "^18.0.5",
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.23.6",
"version": "5.24.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.23.6",
"version": "5.24.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.23.6",
"version": "5.24.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 0c0f598

Please sign in to comment.