diff --git a/package-lock.json b/package-lock.json index 48dc8c0..ac83cc1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26,17 +26,17 @@ "@ngrx/router-store": "^15.4.0", "@ngx-translate/core": "^14.0.0", "@ngx-translate/http-loader": "^7.0.0", - "@onecx/accelerator": "^4.41.0", - "@onecx/angular-accelerator": "^4.41.0", - "@onecx/angular-auth": "^4.41.0", - "@onecx/angular-integration-interface": "^4.41.0", - "@onecx/angular-remote-components": "^4.41.0", - "@onecx/angular-testing": "^4.41.0", - "@onecx/angular-webcomponents": "^4.41.0", - "@onecx/integration-interface": "^4.41.0", - "@onecx/keycloak-auth": "^4.41.0", - "@onecx/portal-integration-angular": "^4.41.0", - "@onecx/portal-layout-styles": "^4.41.0", + "@onecx/accelerator": "^4.42.0", + "@onecx/angular-accelerator": "^4.42.0", + "@onecx/angular-auth": "^4.42.0", + "@onecx/angular-integration-interface": "^4.42.0", + "@onecx/angular-remote-components": "^4.42.0", + "@onecx/angular-testing": "^4.42.0", + "@onecx/angular-webcomponents": "^4.42.0", + "@onecx/integration-interface": "^4.42.0", + "@onecx/keycloak-auth": "^4.42.0", + "@onecx/portal-integration-angular": "^4.42.0", + "@onecx/portal-layout-styles": "^4.42.0", "@webcomponents/webcomponentsjs": "^2.8.0", "keycloak-angular": "^13.1.0", "ngx-color": "^8.0.3", @@ -6356,18 +6356,18 @@ } }, "node_modules/@onecx/accelerator": { - "version": "4.41.0", - "resolved": "https://registry.npmjs.org/@onecx/accelerator/-/accelerator-4.41.0.tgz", - "integrity": "sha512-BjVH5OOLY9aKL0N/ZNI8S8/tg7cXYc+MVI2fl2DBEaClUN3cPdQuUUuoztElBZqberkq+lxbI9G7+JxF1Ixb1w==", + "version": "4.42.0", + "resolved": "https://registry.npmjs.org/@onecx/accelerator/-/accelerator-4.42.0.tgz", + "integrity": "sha512-Kq+cE5BwE49/ZTgOBL94TV6jzlaXuBkw90mCdmkC6J0xRXKAtlzv40FrtfTUGBJ6/Pd5G/Y/ZZvHHb6BF5MEbQ==", "peerDependencies": { "rxjs": "7.8.1", "tslib": "^2.3.0" } }, "node_modules/@onecx/angular-accelerator": { - "version": "4.41.0", - "resolved": "https://registry.npmjs.org/@onecx/angular-accelerator/-/angular-accelerator-4.41.0.tgz", - "integrity": "sha512-XG5lpo+1iHchYk5F/jNZDbQcXbHfU/xlG1XlrhPxB/9y9HYRjdf2Kz02/at3o11Toi1e8SUJ1l8H5wXl3awNzw==", + "version": "4.42.0", + "resolved": "https://registry.npmjs.org/@onecx/angular-accelerator/-/angular-accelerator-4.42.0.tgz", + "integrity": "sha512-uGRB0U3D2wNE7OvKqPObE5RgsP9mcBxk1QuNqUBJbVwzmJ5A0PzSA6R7loa2mVqrDwp3C+qF28W3WDRadp8n9w==", "dependencies": { "tslib": "^2.3.0" }, @@ -6389,9 +6389,9 @@ } }, "node_modules/@onecx/angular-auth": { - "version": "4.41.0", - "resolved": "https://registry.npmjs.org/@onecx/angular-auth/-/angular-auth-4.41.0.tgz", - "integrity": "sha512-qDH8gQcJ/giRoD7xC8rr/JNBqBpn6H0PFULvFcTTufouVPwbdIYaEZpevJ1HnD6o5c7L26GJMgTgT20Nyys5ag==", + "version": "4.42.0", + "resolved": "https://registry.npmjs.org/@onecx/angular-auth/-/angular-auth-4.42.0.tgz", + "integrity": "sha512-VBN7XTAKQxgBuwvDwJoN6/Yl5y4VlV+C1xpRXBksIpMQmyBBc/Q7bnx1/xcwUXgU70ftWCMFF4DjSpP4pci4Rg==", "dependencies": { "tslib": "^2.3.0" }, @@ -6407,9 +6407,9 @@ } }, "node_modules/@onecx/angular-integration-interface": { - "version": "4.41.0", - "resolved": "https://registry.npmjs.org/@onecx/angular-integration-interface/-/angular-integration-interface-4.41.0.tgz", - "integrity": "sha512-KaipIQwEUF8R6D+rofUqswabdkcVIu0PuvwjCZHX50pMXOcKrFS1fSiBBXnR+/AUrvjAMdcQ6eY/G3XCQ0eVtQ==", + "version": "4.42.0", + "resolved": "https://registry.npmjs.org/@onecx/angular-integration-interface/-/angular-integration-interface-4.42.0.tgz", + "integrity": "sha512-PdOJMzSalZxjfEbwDIbcOQhCLDBoXPzwuN9JYUyF4n3IenbNJZmOODCNgWo4Kf9/84tJfalemoX+JnmHNQoo/g==", "dependencies": { "tslib": "^2.3.0" }, @@ -6420,9 +6420,9 @@ } }, "node_modules/@onecx/angular-remote-components": { - "version": "4.41.0", - "resolved": "https://registry.npmjs.org/@onecx/angular-remote-components/-/angular-remote-components-4.41.0.tgz", - "integrity": "sha512-R3UvzKtacqChEcMCjbcP+/mWC/hnYjjDwtkKoLQtGNdEDpr5NvyibQJ+DHttlN2c8OXNZ152MjNJFcnPysZ9IQ==", + "version": "4.42.0", + "resolved": "https://registry.npmjs.org/@onecx/angular-remote-components/-/angular-remote-components-4.42.0.tgz", + "integrity": "sha512-sWtPOsvN2SbRtZUi6AIKLR1CJm9cAFMTMoCTs9xenQSYq7joJTnOI3I+1zQhekYvwxuFWxf0vxNINrcP+k7pdQ==", "dependencies": { "tslib": "^2.3.0" }, @@ -6437,9 +6437,9 @@ } }, "node_modules/@onecx/angular-testing": { - "version": "4.41.0", - "resolved": "https://registry.npmjs.org/@onecx/angular-testing/-/angular-testing-4.41.0.tgz", - "integrity": "sha512-a5iwwvwaKrQGX3W/K1U0ly1ug3zIcLZpwLm6XOpERikDm4C8/6AwqeBEbB5JPIo13uazv7Rrq2Q+w+aK3y/IHQ==", + "version": "4.42.0", + "resolved": "https://registry.npmjs.org/@onecx/angular-testing/-/angular-testing-4.42.0.tgz", + "integrity": "sha512-QLTlgKofrSzcgP1DyhKPuhu4RDrUMBdx/nDLJGG6HpzkGXpAna6iGx77R2kU/fsFcJ8uTwEjdgLBVv8Vj2erAQ==", "dependencies": { "tslib": "^2.3.0" }, @@ -6449,9 +6449,9 @@ } }, "node_modules/@onecx/angular-webcomponents": { - "version": "4.41.0", - "resolved": "https://registry.npmjs.org/@onecx/angular-webcomponents/-/angular-webcomponents-4.41.0.tgz", - "integrity": "sha512-so7EZpHasohUu9QzZq38J/BU5Dx4NuUtFBLoVoi4evL+///9GYr+Iv8BPSgF9rUYkPLZFCpUgbyVr57TYEbYlw==", + "version": "4.42.0", + "resolved": "https://registry.npmjs.org/@onecx/angular-webcomponents/-/angular-webcomponents-4.42.0.tgz", + "integrity": "sha512-VeooxAtnfUr4lEonO1JzA4SOpHkp5mxvhRXd2b8tFrIIwzlsLSLrD7TninGQ5+Bn0KXURCyIeamYAiF5B+Sh0g==", "dependencies": { "tslib": "^2.3.0" }, @@ -6466,9 +6466,9 @@ } }, "node_modules/@onecx/integration-interface": { - "version": "4.41.0", - "resolved": "https://registry.npmjs.org/@onecx/integration-interface/-/integration-interface-4.41.0.tgz", - "integrity": "sha512-8wSHOXV+vpKykKEDeXFmGs/T64pzlQeqh739lZk/PCkPa6/cuTvcJUKaFdYkY1qxDthADjyI6uoFLLBw4uQ+hg==", + "version": "4.42.0", + "resolved": "https://registry.npmjs.org/@onecx/integration-interface/-/integration-interface-4.42.0.tgz", + "integrity": "sha512-dXpbxEU4xaln+ABI5DACYGvMnkYHJw6O85YJjhVANYqCERvK5im5wCaP54IFmdFneBKskLYByHUqRzu8Qhs8Xw==", "peerDependencies": { "@onecx/accelerator": "^4", "rxjs": "7.8.1", @@ -6476,9 +6476,9 @@ } }, "node_modules/@onecx/keycloak-auth": { - "version": "4.41.0", - "resolved": "https://registry.npmjs.org/@onecx/keycloak-auth/-/keycloak-auth-4.41.0.tgz", - "integrity": "sha512-CWacxtn+h4cuoQ8IbScWob8rEkviMJQKyuxv4d8GpfNoyiRzOgq/3O6XQc8P4OqPo/QazgnrktKjAi0i+g9VPw==", + "version": "4.42.0", + "resolved": "https://registry.npmjs.org/@onecx/keycloak-auth/-/keycloak-auth-4.42.0.tgz", + "integrity": "sha512-MQF5gpGFf//w6zZrTt2CmRkbWyGATsl279y3MlLp4UkvPFanD5d1wNFE2MKbqKmO03oftOezWM1lzaMgQ5xK4Q==", "dependencies": { "tslib": "^2.3.0" }, @@ -6493,9 +6493,9 @@ } }, "node_modules/@onecx/portal-integration-angular": { - "version": "4.41.0", - "resolved": "https://registry.npmjs.org/@onecx/portal-integration-angular/-/portal-integration-angular-4.41.0.tgz", - "integrity": "sha512-gHBY7bCUMLyj/QZ8jIHFU84sP2PeNLlSq4kOsFnFTTxo8n9zuNSg+KbAyfne1yPMVqFC3G8pc1VVzCyjOsMEBA==", + "version": "4.42.0", + "resolved": "https://registry.npmjs.org/@onecx/portal-integration-angular/-/portal-integration-angular-4.42.0.tgz", + "integrity": "sha512-zVJlDgTsFixZ8GYvMIJ700Tz/ebahYN+Mt44Ge+6bQa4bes15vo22eTZ5fPtGFYh8x+gGsR/2bEkroKKyNeTNg==", "dependencies": { "tslib": "^2.3.0" }, @@ -6526,9 +6526,9 @@ } }, "node_modules/@onecx/portal-layout-styles": { - "version": "4.41.0", - "resolved": "https://registry.npmjs.org/@onecx/portal-layout-styles/-/portal-layout-styles-4.41.0.tgz", - "integrity": "sha512-X0f6pu9PQDSDKVRnV2qtDLeS+Y+g/F9Rp23+8e9JHZi4PuYOoZz+jjTJAGXEd8VJmnDJ9AQ+Oq+4zpF0rVjNIw==", + "version": "4.42.0", + "resolved": "https://registry.npmjs.org/@onecx/portal-layout-styles/-/portal-layout-styles-4.42.0.tgz", + "integrity": "sha512-REw28qQgA3v8V+sVIipO86RH6wP8o2CpOSzd5k+ffQjh1JXXgiVCthndqRGZMCCxgoJAWbF1Y0iU2+PPJWUxcA==", "peerDependencies": { "tslib": "^2.5.0" } diff --git a/package.json b/package.json index 8ecd94e..0dc0a0c 100644 --- a/package.json +++ b/package.json @@ -52,17 +52,17 @@ "@ngrx/router-store": "^15.4.0", "@ngx-translate/core": "^14.0.0", "@ngx-translate/http-loader": "^7.0.0", - "@onecx/accelerator": "^4.41.0", - "@onecx/angular-accelerator": "^4.41.0", - "@onecx/angular-integration-interface": "^4.41.0", - "@onecx/angular-remote-components": "^4.41.0", - "@onecx/angular-webcomponents": "^4.41.0", - "@onecx/angular-testing": "^4.41.0", - "@onecx/integration-interface": "^4.41.0", - "@onecx/keycloak-auth": "^4.41.0", - "@onecx/portal-integration-angular": "^4.41.0", - "@onecx/portal-layout-styles": "^4.41.0", - "@onecx/angular-auth": "^4.41.0", + "@onecx/accelerator": "^4.42.0", + "@onecx/angular-accelerator": "^4.42.0", + "@onecx/angular-integration-interface": "^4.42.0", + "@onecx/angular-remote-components": "^4.42.0", + "@onecx/angular-webcomponents": "^4.42.0", + "@onecx/angular-testing": "^4.42.0", + "@onecx/integration-interface": "^4.42.0", + "@onecx/keycloak-auth": "^4.42.0", + "@onecx/portal-integration-angular": "^4.42.0", + "@onecx/portal-layout-styles": "^4.42.0", + "@onecx/angular-auth": "^4.42.0", "keycloak-angular": "^13.1.0", "@webcomponents/webcomponentsjs": "^2.8.0", "ngx-color": "^8.0.3", diff --git a/src/app/onecx-help-remote.module.ts b/src/app/onecx-help-remote.module.ts index 49e4bb8..529cfc7 100644 --- a/src/app/onecx-help-remote.module.ts +++ b/src/app/onecx-help-remote.module.ts @@ -1,7 +1,6 @@ import { HttpClient, HttpClientModule } from '@angular/common/http' import { BrowserModule } from '@angular/platform-browser' import { APP_INITIALIZER, DoBootstrap, Injector, NgModule } from '@angular/core' -import { createCustomElement } from '@angular/elements' import { Router, RouterModule, Routes } from '@angular/router' import { MissingTranslationHandler, TranslateLoader, TranslateModule } from '@ngx-translate/core' @@ -9,13 +8,12 @@ import { AppStateService, ConfigurationService, createTranslateLoader, - MFE_ID, PortalApiConfiguration, PortalCoreModule, PortalMissingTranslationHandler } from '@onecx/portal-integration-angular' import { addInitializeModuleGuard } from '@onecx/angular-integration-interface' -import { initializeRouter, startsWith } from '@onecx/angular-webcomponents' +import { createAppEntrypoint, initializeRouter, startsWith } from '@onecx/angular-webcomponents' import { AppEntrypointComponent } from './app-entrypoint.component' import { AngularAuthModule } from '@onecx/angular-auth' import { BrowserAnimationsModule } from '@angular/platform-browser/animations' @@ -46,7 +44,7 @@ const routes: Routes = [ loader: { provide: TranslateLoader, useFactory: createTranslateLoader, - deps: [HttpClient, AppStateService, MFE_ID] + deps: [HttpClient, AppStateService] }, missingTranslationHandler: { provide: MissingTranslationHandler, useClass: PortalMissingTranslationHandler } }) @@ -60,11 +58,7 @@ const routes: Routes = [ multi: true, deps: [Router, AppStateService] }, - { provide: Configuration, useFactory: apiConfigProvider, deps: [ConfigurationService, AppStateService] }, - { - provide: MFE_ID, - useValue: 'onecx-help' - } + { provide: Configuration, useFactory: apiConfigProvider, deps: [ConfigurationService, AppStateService] } ], schemas: [] }) @@ -74,9 +68,6 @@ export class OneCXHelpModule implements DoBootstrap { } ngDoBootstrap(): void { - const appEntrypoint = createCustomElement(AppEntrypointComponent, { - injector: this.injector - }) - customElements.define('ocx-help-component', appEntrypoint) + createAppEntrypoint(AppEntrypointComponent, 'ocx-help-component', this.injector) } } 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 f8995ae..b402e38 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 @@ -22,7 +22,6 @@ import { PortalCoreModule, PortalDialogService, PortalMessageService, - REMOTE_COMPONENT_ID, UserService, createRemoteComponentTranslateLoader, providePortalDialogService @@ -58,16 +57,12 @@ import { HelpItemEditorDialogComponent } from './help-item-editor-dialog/help-it provide: BASE_URL, useValue: new ReplaySubject(1) }, - { - provide: REMOTE_COMPONENT_ID, - useValue: 'ocx-help-item-editor-component' - }, provideTranslateServiceForRoot({ isolate: true, loader: { provide: TranslateLoader, useFactory: createRemoteComponentTranslateLoader, - deps: [HttpClient, BASE_URL, REMOTE_COMPONENT_ID] + deps: [HttpClient, BASE_URL] } }) ] diff --git a/src/app/remotes/show-help/show-help.component.ts b/src/app/remotes/show-help/show-help.component.ts index a5236d1..9a6c40c 100644 --- a/src/app/remotes/show-help/show-help.component.ts +++ b/src/app/remotes/show-help/show-help.component.ts @@ -19,7 +19,7 @@ import { ocxRemoteWebcomponent } from '@onecx/angular-remote-components' import { UserService, AppStateService } from '@onecx/angular-integration-interface' -import { REMOTE_COMPONENT_ID, createRemoteComponentTranslateLoader } from '@onecx/angular-accelerator' +import { createRemoteComponentTranslateLoader } from '@onecx/angular-accelerator' import { PortalMessageService, PortalCoreModule } from '@onecx/portal-integration-angular' import { Configuration, Help, HelpsInternalAPIService } from 'src/app/shared/generated' @@ -53,16 +53,12 @@ import { NoHelpItemComponent } from './no-help-item/no-help-item.component' provide: BASE_URL, useValue: new ReplaySubject(1) }, - { - provide: REMOTE_COMPONENT_ID, - useValue: 'ocx-show-help-component' - }, provideTranslateServiceForRoot({ isolate: true, loader: { provide: TranslateLoader, useFactory: createRemoteComponentTranslateLoader, - deps: [HttpClient, BASE_URL, REMOTE_COMPONENT_ID] + deps: [HttpClient, BASE_URL] } }) ]