Skip to content

Commit

Permalink
Merge branch 'main' into fix/check-for-multiple-permissions
Browse files Browse the repository at this point in the history
  • Loading branch information
KimFFVII authored Nov 12, 2024
2 parents e5e82d4 + 488a4d8 commit a25cc75
Show file tree
Hide file tree
Showing 17 changed files with 36 additions and 15 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
## [5.23.6](https://github.com/onecx/onecx-portal-ui-libs/compare/v5.23.5...v5.23.6) (2024-11-12)

### Bug Fixes

* dates using default comparator for sorting ([#591](https://github.com/onecx/onecx-portal-ui-libs/issues/591)) ([2940931](https://github.com/onecx/onecx-portal-ui-libs/commit/2940931ba811da6bc2b0b5960436c3d6ffc9c143))
* filter view state change initialized ([#592](https://github.com/onecx/onecx-portal-ui-libs/issues/592)) ([d6df36a](https://github.com/onecx/onecx-portal-ui-libs/commit/d6df36acbfa8408e72ccf48798b83918d3f0d2c0))
* if permission should use else block for undefined permissions ([#589](https://github.com/onecx/onecx-portal-ui-libs/issues/589)) ([137a2a1](https://github.com/onecx/onecx-portal-ui-libs/commit/137a2a10198b6890af8eb90f45a002d4a13138ec))

## [5.23.5](https://github.com/onecx/onecx-portal-ui-libs/compare/v5.23.4...v5.23.5) (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.5",
"version": "5.23.6",
"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.5",
"version": "5.23.6",
"license": "Apache-2.0",
"peerDependencies": {
"@angular/common": "^18.0.5",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@ export class FilterViewComponent implements OnInit {
.sort((a, b) => columnIds.indexOf(a.valueColumnId) - columnIds.indexOf(b.valueColumnId))
})
)
this.componentStateChanged.emit({
filters: this.filters,
})
}

@ViewChild(OverlayPanel) panel!: OverlayPanel
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -446,13 +446,23 @@ export class InteractiveDataViewComponent implements OnInit, AfterContentInit {
)
}

let filterViewComponentState$: Observable<FilterViewComponentState | Record<string, never>> =
this.filterViewComponentState$
if (this.disableFilterView) {
filterViewComponentState$ = filterViewComponentState$.pipe(
startWith({
filters: this.filters,
})
)
}

combineLatest([
columnGroupSelectionComponentState$.pipe(timestamp()),
customGroupColumnSelectorComponentState$.pipe(timestamp()),
this.dataLayoutComponentState$.pipe(timestamp()),
dataListGridSortingComponentState$.pipe(timestamp()),
this.dataViewComponentState$.pipe(timestamp()),
this.filterViewComponentState$.pipe(timestamp()),
filterViewComponentState$.pipe(timestamp()),
])
.pipe(
map((componentStates) => {
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.5",
"version": "5.23.6",
"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.5",
"version": "5.23.6",
"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.5",
"version": "5.23.6",
"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.5",
"version": "5.23.6",
"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.5",
"version": "5.23.6",
"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.5",
"version": "5.23.6",
"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.5",
"version": "5.23.6",
"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.5",
"version": "5.23.6",
"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.5",
"version": "5.23.6",
"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.5",
"version": "5.23.6",
"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.5",
"version": "5.23.6",
"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.5",
"version": "5.23.6",
"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 a25cc75

Please sign in to comment.