From f95dafe21bbb50557271bf26c8402c4870e2c3c2 Mon Sep 17 00:00:00 2001 From: markuczy <129275100+markuczy@users.noreply.github.com> Date: Wed, 8 May 2024 08:42:03 +0200 Subject: [PATCH] fix: help item editor should be functional now (#78) --- package-lock.json | 94 +++++++++---------- package.json | 18 ++-- .../help-item-editor.component.ts | 8 +- 3 files changed, 59 insertions(+), 61 deletions(-) diff --git a/package-lock.json b/package-lock.json index 94a7070..278147e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23,15 +23,15 @@ "@ngneat/falso": "^6.4.0", "@ngx-translate/core": "^14.0.0", "@ngx-translate/http-loader": "^7.0.0", - "@onecx/accelerator": "^4.14.3", - "@onecx/angular-accelerator": "^4.14.3", - "@onecx/angular-integration-interface": "^4.14.3", - "@onecx/angular-remote-components": "^4.14.3", - "@onecx/angular-testing": "^4.14.3", - "@onecx/integration-interface": "^4.14.3", - "@onecx/keycloak-auth": "^4.14.3", - "@onecx/portal-integration-angular": "^4.14.3", - "@onecx/portal-layout-styles": "^4.14.3", + "@onecx/accelerator": "^4.23.0", + "@onecx/angular-accelerator": "^4.23.0", + "@onecx/angular-integration-interface": "^4.23.0", + "@onecx/angular-remote-components": "^4.23.0", + "@onecx/angular-testing": "^4.23.0", + "@onecx/integration-interface": "^4.23.0", + "@onecx/keycloak-auth": "^4.23.0", + "@onecx/portal-integration-angular": "^4.23.0", + "@onecx/portal-layout-styles": "^4.23.0", "file-saver": "^2.0.5", "i18n-iso-countries": "^7.6.0", "ngx-color": "^8.0.3", @@ -7359,18 +7359,18 @@ } }, "node_modules/@onecx/accelerator": { - "version": "4.14.3", - "resolved": "https://registry.npmjs.org/@onecx/accelerator/-/accelerator-4.14.3.tgz", - "integrity": "sha512-b1liw9i7B7NAG0W/8j+xXnuYZF4J3ZqYkTiY7Klorr99QVGXVw4I2KalANP2NlU0U+TYa00XOKhZ3to2/jIB4w==", + "version": "4.23.0", + "resolved": "https://registry.npmjs.org/@onecx/accelerator/-/accelerator-4.23.0.tgz", + "integrity": "sha512-PdGPpk/rLy8NHXLV/9qh5dejAZeTTXLGYl0rp8FLwl90pDAcIMJa9b98rY1xUotxRw0d5xn6zPZjp1ruFklYzg==", "peerDependencies": { "rxjs": "7.8.1", "tslib": "^2.3.0" } }, "node_modules/@onecx/angular-accelerator": { - "version": "4.14.3", - "resolved": "https://registry.npmjs.org/@onecx/angular-accelerator/-/angular-accelerator-4.14.3.tgz", - "integrity": "sha512-yzuwz/T5y3O1AkBy6MQo1eLlGZRfBajq0i1DjnDq0XIkwVNCSIV0IM1wUTqUTkfrZuA8h9zaKOVWcdpnmkzQDw==", + "version": "4.23.0", + "resolved": "https://registry.npmjs.org/@onecx/angular-accelerator/-/angular-accelerator-4.23.0.tgz", + "integrity": "sha512-Yjq5RZ7+523GC6lyP3cF6bK0yLyN3kol8EVsSS6DpnZibpKawyoznXvGZAi5q+wkzkIgxPhU3p7YGNY+hSgZuA==", "dependencies": { "tslib": "^2.3.0" }, @@ -7382,8 +7382,8 @@ "@angular/platform-browser": "^15.2.7", "@angular/router": "^15.2.7", "@ngx-translate/core": "^14.0.0", - "@onecx/angular-integration-interface": "~4", - "@onecx/integration-interface": "~4", + "@onecx/angular-integration-interface": "^4", + "@onecx/integration-interface": "^4", "chart.js": "^4.4.0", "d3-scale-chromatic": "^3.0.0", "primeng": "^15.2.1", @@ -7391,22 +7391,22 @@ } }, "node_modules/@onecx/angular-integration-interface": { - "version": "4.14.3", - "resolved": "https://registry.npmjs.org/@onecx/angular-integration-interface/-/angular-integration-interface-4.14.3.tgz", - "integrity": "sha512-k2USQE9M8RYo/hs2QBY670xhl+y4v6awh/E0NLYLgTSvEq6GGcmK5OaitcgxGt2KbTO/hAMrrOPsRZsEM8GEmg==", + "version": "4.23.0", + "resolved": "https://registry.npmjs.org/@onecx/angular-integration-interface/-/angular-integration-interface-4.23.0.tgz", + "integrity": "sha512-gZbCsrW7d0dwACZmf3+dZcTSWvyJ1VLwfO95TIJs1dU9NHxOCDtvdRIWecNsVZgUHFjPq7iBuJ2v75hzOf673g==", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { "@angular/core": "^15.2.7", - "@onecx/integration-interface": "~4", + "@onecx/integration-interface": "^4", "rxjs": "~7.8.0" } }, "node_modules/@onecx/angular-remote-components": { - "version": "4.14.3", - "resolved": "https://registry.npmjs.org/@onecx/angular-remote-components/-/angular-remote-components-4.14.3.tgz", - "integrity": "sha512-6CuP6TqU4CaSYA1Yv37KxHMz9xYiLEP4aiIqeIRzd2ElE0If8AOn2uZWzCqJV4/d4QQ2dw+5TYofoC5ZoaIVuQ==", + "version": "4.23.0", + "resolved": "https://registry.npmjs.org/@onecx/angular-remote-components/-/angular-remote-components-4.23.0.tgz", + "integrity": "sha512-LziCxv8JIV4sydNBB+KLz70sRJ6ssxQg3viYwkcMey2nEMLYbNueM7WM4dcSZKF/D2Ews4GxFfCp86e+rFeR2A==", "dependencies": { "tslib": "^2.3.0" }, @@ -7414,14 +7414,14 @@ "@angular/common": "^15.2.7", "@angular/core": "^15.2.7", "@ngx-translate/core": "^14.0.0", - "@onecx/angular-accelerator": "~4", + "@onecx/angular-accelerator": "^4", "rxjs": "~7.8.0" } }, "node_modules/@onecx/angular-testing": { - "version": "4.14.3", - "resolved": "https://registry.npmjs.org/@onecx/angular-testing/-/angular-testing-4.14.3.tgz", - "integrity": "sha512-TFo5KnhrWHnOwoUHtKI4mYhWmYHQPRkrDVroDTjJj7q/N/HgB7vvbUn373YUU+PlSBqDS6IOhEdP68CoD1IBHw==", + "version": "4.23.0", + "resolved": "https://registry.npmjs.org/@onecx/angular-testing/-/angular-testing-4.23.0.tgz", + "integrity": "sha512-lJDUHfxEsk2ZinYOjlTb4UdwvUAe9mV+EkCaa/N7HflQhsWQWKMiOdbEDRfa45hwq4wE36w0s7/IXd3kFWfpHw==", "dependencies": { "tslib": "^2.3.0" }, @@ -7431,36 +7431,36 @@ } }, "node_modules/@onecx/integration-interface": { - "version": "4.14.3", - "resolved": "https://registry.npmjs.org/@onecx/integration-interface/-/integration-interface-4.14.3.tgz", - "integrity": "sha512-C10rwpkm7bf47PEeQq7SsdP3iWFHDFG3t6s9wZBMuz3rVC5tbsAwlm1xrWIwpX1yTMhNyZBP5wQyyWaioMGkrQ==", + "version": "4.23.0", + "resolved": "https://registry.npmjs.org/@onecx/integration-interface/-/integration-interface-4.23.0.tgz", + "integrity": "sha512-hjt1srNl/ZbvmCM4v6xAje5PzFGj7khHbZXb/EYjni/XWyZK1k88qiZ8wEVEPDA0kDVBRYSYWGnx7T19uNDMIg==", "peerDependencies": { - "@onecx/accelerator": "~4", + "@onecx/accelerator": "^4", "rxjs": "7.8.1", "tslib": "^2.3.0" } }, "node_modules/@onecx/keycloak-auth": { - "version": "4.14.3", - "resolved": "https://registry.npmjs.org/@onecx/keycloak-auth/-/keycloak-auth-4.14.3.tgz", - "integrity": "sha512-hl35hy+rF4H3PWcwTzPo+1KLP4Y5lxVK81+kdlh/+Nsyb1jT4i1PF3h1YQ/y6+6yfyicL0ZD7YHBjX3K7wLrhA==", + "version": "4.23.0", + "resolved": "https://registry.npmjs.org/@onecx/keycloak-auth/-/keycloak-auth-4.23.0.tgz", + "integrity": "sha512-TNXNazV9VdG7riTie2dNLg85DZLqIYjKyuEKn/XrRXoF+xBKux5csILoPHC7Cdf/aFqYGVzsNFVGpYqupjkZYA==", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { "@angular/common": ">=15.2.7", "@angular/core": ">=15.2.7", - "@onecx/angular-integration-interface": "~4", - "@onecx/integration-interface": "~4", + "@onecx/angular-integration-interface": "^4", + "@onecx/integration-interface": "^4", "keycloak-angular": "^13.0.0", "keycloak-js": "^18.0.0", "rxjs": "~7.8.0" } }, "node_modules/@onecx/portal-integration-angular": { - "version": "4.14.3", - "resolved": "https://registry.npmjs.org/@onecx/portal-integration-angular/-/portal-integration-angular-4.14.3.tgz", - "integrity": "sha512-MwJ7Z2mIFJsJg5NhrEWa0H+CM3P9GsSMoqw1BuaAGlUKWXGQ6YdoWAcVzAv/3PrDvoXnA60xkYA3sBBd+7bY3w==", + "version": "4.23.0", + "resolved": "https://registry.npmjs.org/@onecx/portal-integration-angular/-/portal-integration-angular-4.23.0.tgz", + "integrity": "sha512-1ACokNOZ9oGuP57aTaEOv6jKbB/NR7kvJo7zzBIc0LQU1kAcjiL0EK1EWkl815OJkRhvgd3Kiez7G+owqDgqJg==", "dependencies": { "tslib": "^2.3.0" }, @@ -7479,10 +7479,10 @@ "@ngrx/store": "^15.4.0", "@ngx-translate/core": "^14.0.0", "@ngx-translate/http-loader": "^7.0.0", - "@onecx/angular-accelerator": "~4", - "@onecx/angular-integration-interface": "~4", - "@onecx/angular-testing": "~4", - "@onecx/integration-interface": "~4", + "@onecx/angular-accelerator": "^4", + "@onecx/angular-integration-interface": "^4", + "@onecx/angular-testing": "^4", + "@onecx/integration-interface": "^4", "fast-deep-equal": "^3.1.3", "msw": "^1.3.2", "primeng": "^15.2.1", @@ -7491,9 +7491,9 @@ } }, "node_modules/@onecx/portal-layout-styles": { - "version": "4.14.3", - "resolved": "https://registry.npmjs.org/@onecx/portal-layout-styles/-/portal-layout-styles-4.14.3.tgz", - "integrity": "sha512-GrEa5FygHBByZSDtjozjxhD83AlZ5Yd+rbpgSq2YIWORF+0aj7vkQihtaFaWIbseizgIge5sukMWEPDh1Nn5fQ==", + "version": "4.23.0", + "resolved": "https://registry.npmjs.org/@onecx/portal-layout-styles/-/portal-layout-styles-4.23.0.tgz", + "integrity": "sha512-2e+B6Wly7WeXXYSaUwdyUQ0h3iGCp//7FOtpui/LVQrPG8enKqdiYniPsf5acboc3HsddHdQNZQZP8TaOELRdQ==", "peerDependencies": { "tslib": "^2.5.0" } diff --git a/package.json b/package.json index d8588c7..a5527fc 100644 --- a/package.json +++ b/package.json @@ -49,15 +49,15 @@ "@ngneat/falso": "^6.4.0", "@ngx-translate/core": "^14.0.0", "@ngx-translate/http-loader": "^7.0.0", - "@onecx/accelerator": "^4.14.3", - "@onecx/angular-accelerator": "^4.14.3", - "@onecx/angular-integration-interface": "^4.14.3", - "@onecx/angular-remote-components": "^4.14.3", - "@onecx/angular-testing": "^4.14.3", - "@onecx/integration-interface": "^4.14.3", - "@onecx/keycloak-auth": "^4.14.3", - "@onecx/portal-integration-angular": "^4.14.3", - "@onecx/portal-layout-styles": "^4.14.3", + "@onecx/accelerator": "^4.23.0", + "@onecx/angular-accelerator": "^4.23.0", + "@onecx/angular-integration-interface": "^4.23.0", + "@onecx/angular-remote-components": "^4.23.0", + "@onecx/angular-testing": "^4.23.0", + "@onecx/integration-interface": "^4.23.0", + "@onecx/keycloak-auth": "^4.23.0", + "@onecx/portal-integration-angular": "^4.23.0", + "@onecx/portal-layout-styles": "^4.23.0", "file-saver": "^2.0.5", "i18n-iso-countries": "^7.6.0", "ngx-color": "^8.0.3", diff --git a/src/app/remotes/help-item-editor/help-item-editor.component.ts b/src/app/remotes/help-item-editor/help-item-editor.component.ts index 1b55d64..3b2e514 100644 --- a/src/app/remotes/help-item-editor/help-item-editor.component.ts +++ b/src/app/remotes/help-item-editor/help-item-editor.component.ts @@ -17,7 +17,8 @@ import { PortalDialogService, PortalMessageService, UserService, - createRemoteComponentTranslateLoader + createRemoteComponentTranslateLoader, + providePortalDialogService } from '@onecx/portal-integration-angular' import { PrimeIcons } from 'primeng/api' import { RippleModule } from 'primeng/ripple' @@ -27,7 +28,6 @@ import { Configuration, Help, HelpsInternalAPIService } from 'src/app/shared/gen import { SharedModule } from 'src/app/shared/shared.module' import { environment } from 'src/environments/environment' import { HelpItemEditorDialogComponent } from './help-item-editor-dialog/help-item-editor-dialog.component' -import { DialogService, DynamicDialogModule } from 'primeng/dynamicdialog' @Component({ selector: 'app-ocx-help-item-editor', @@ -39,7 +39,6 @@ import { DialogService, DynamicDialogModule } from 'primeng/dynamicdialog' HttpClientModule, RippleModule, TooltipModule, - DynamicDialogModule, HelpItemEditorDialogComponent, TranslateModule, SharedModule, @@ -49,8 +48,7 @@ import { DialogService, DynamicDialogModule } from 'primeng/dynamicdialog' providers: [ HelpsInternalAPIService, PortalMessageService, - DialogService, - PortalDialogService, + providePortalDialogService(), { provide: BASE_URL, useValue: new ReplaySubject(1)