diff --git a/Dockerfile b/Dockerfile index 04c0859..d05f1ca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/onecx/docker-spa-base:1.3.0 +FROM ghcr.io/onecx/docker-spa-base:1.6.0 # Copy nginx configuration COPY nginx/locations.conf $DIR_LOCATION/locations.conf diff --git a/helm/values.yaml b/helm/values.yaml index c4ec5c0..7716797 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -4,7 +4,7 @@ app: repository: 'onecx/onecx-search-config-ui' routing: enabled: true - path: /mfe/onecxSearchConfig/ + path: /mfe/search-config/ operator: # Microfrontend diff --git a/package-lock.json b/package-lock.json index 96ac2aa..35afce3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -29,16 +29,17 @@ "@ngrx/store-devtools": "^18.0.1", "@ngx-translate/core": "^15.0.0", "@ngx-translate/http-loader": "^8.0.0", - "@onecx/accelerator": "^5.2.0", - "@onecx/angular-accelerator": "^5.2.0", - "@onecx/angular-auth": "^5.2.0", - "@onecx/angular-remote-components": "^5.2.0", - "@onecx/angular-webcomponents": "^5.2.0", - "@onecx/integration-interface": "^5.2.0", - "@onecx/keycloak-auth": "^5.2.0", + "@onecx/accelerator": "^5.16.0", + "@onecx/angular-accelerator": "^5.16.0", + "@onecx/angular-auth": "^5.16.0", + "@onecx/angular-integration-interface": "^5.16.0", + "@onecx/angular-remote-components": "^5.16.0", + "@onecx/angular-webcomponents": "^5.16.0", + "@onecx/integration-interface": "^5.16.0", + "@onecx/keycloak-auth": "^5.16.0", "@onecx/nx-plugin": "1.8.1", - "@onecx/portal-integration-angular": "^5.2.0", - "@onecx/portal-layout-styles": "^5.2.0", + "@onecx/portal-integration-angular": "^5.16.0", + "@onecx/portal-layout-styles": "^5.16.0", "@webcomponents/webcomponentsjs": "^2.8.0", "fast-deep-equal": "3.1.3", "keycloak-angular": "^16.0.1", @@ -7943,18 +7944,18 @@ } }, "node_modules/@onecx/accelerator": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@onecx/accelerator/-/accelerator-5.7.0.tgz", - "integrity": "sha512-O6J7hblNmyfx8EUXBnnFCZ9jsHHkad747PbihlfCy9rEni4Otn6J125TV5hheOhsQSAQxjcjGaUB9ZsAtgg0bg==", + "version": "5.17.0", + "resolved": "https://registry.npmjs.org/@onecx/accelerator/-/accelerator-5.17.0.tgz", + "integrity": "sha512-QbfNb0DybFkE5uhHMVKcsqu2Ayi99radLBxKb+RcygVmpbEVP4bkHrvoYQlr8B6QbjE4VfYB0SuBT55xbdwCuA==", "peerDependencies": { - "rxjs": "7.8.1", + "rxjs": "^7.8.1", "tslib": "^2.6.3" } }, "node_modules/@onecx/angular-accelerator": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@onecx/angular-accelerator/-/angular-accelerator-5.7.0.tgz", - "integrity": "sha512-8gaFq5vngvyOZFiQwlj1ZVhAvo2D5qWQekYYG5t5To4G4DgS1t/EmEimtJqqH6sPyfnlItvIzEVrGuIsZYE3DA==", + "version": "5.17.0", + "resolved": "https://registry.npmjs.org/@onecx/angular-accelerator/-/angular-accelerator-5.17.0.tgz", + "integrity": "sha512-j9fdeOQNk5Rg1WGSfGXpzYSQHJo1q/uvLx2isGt5OAWLYg+Vp6kP19ZEQ9E+bOZ39RVRq0rg5ixOCfZQ87a0rA==", "dependencies": { "tslib": "^2.3.0" }, @@ -7968,6 +7969,7 @@ "@ngneat/until-destroy": "^10.0.0", "@ngx-translate/core": "^15.0.0", "@onecx/angular-integration-interface": "^5", + "@onecx/angular-remote-components": "^5", "@onecx/integration-interface": "^5", "chart.js": "^4.4.3", "d3-scale-chromatic": "^3.1.0", @@ -7976,14 +7978,14 @@ } }, "node_modules/@onecx/angular-auth": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@onecx/angular-auth/-/angular-auth-5.7.0.tgz", - "integrity": "sha512-6vnyfv3hqF6b2aqPQjDrEqz8lsB4K1WF/U4nQI5gxf6r8Xm3yfiG7OwvEwjG34wqLcuqpIqgiVQv4P9tTPycCQ==", + "version": "5.17.0", + "resolved": "https://registry.npmjs.org/@onecx/angular-auth/-/angular-auth-5.17.0.tgz", + "integrity": "sha512-2viRgEnGjQTk/2C6LEoPEe3l0E+joD4ceg7ljVypxttsk01LKtAG13LsAnF7ZtYtaq0F5lwH0Q2J9P8pQZV2Uw==", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@angular-architects/module-federation": "18.0.4", + "@angular-architects/module-federation": "^18.0.4", "@angular/common": "^18.0.5", "@angular/core": "^18.0.5", "@onecx/angular-integration-interface": "^5", @@ -7994,10 +7996,9 @@ } }, "node_modules/@onecx/angular-integration-interface": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@onecx/angular-integration-interface/-/angular-integration-interface-5.7.0.tgz", - "integrity": "sha512-eiDgl+4kCChPsseQ206Z//nKHsQAN4nf9LBOCEQt+cNZqRmPoZpChQX77cJ8jQtkP3zzwF/VxNP5uIs7nAPglQ==", - "peer": true, + "version": "5.17.0", + "resolved": "https://registry.npmjs.org/@onecx/angular-integration-interface/-/angular-integration-interface-5.17.0.tgz", + "integrity": "sha512-MSH3BQLbC39HmIT0DC2x/BXFmGiqRgpYj4Oay3P5mtKc318mhVF0tRQyLR655FCUvJhvgY8e9OEoPd+ojZqjfQ==", "dependencies": { "tslib": "^2.3.0" }, @@ -8008,20 +8009,19 @@ } }, "node_modules/@onecx/angular-remote-components": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@onecx/angular-remote-components/-/angular-remote-components-5.7.0.tgz", - "integrity": "sha512-kReFJ0l4f6BXUEi/+bhqf0K9HURIx7mAn3OSoX4VjpV4kI4MrHpwsO01c1Bq5MPc/UaWyReiAjlHa78klhOJUw==", + "version": "5.17.0", + "resolved": "https://registry.npmjs.org/@onecx/angular-remote-components/-/angular-remote-components-5.17.0.tgz", + "integrity": "sha512-RY/FyaLsO+ef4EbySQhB9Wd+7AvgHzeo26T3eKV0i5yTZATdIlVu7h2Aow3UyzUMwXm27gtFuo8y/VZdetHnog==", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@angular-architects/module-federation": "18.0.4", + "@angular-architects/module-federation": "^18.0.4", "@angular/common": "^18.0.5", "@angular/core": "^18.0.5", "@ngx-translate/core": "^15.0.0", - "@onecx/angular-accelerator": "^5", "@onecx/integration-interface": "^5", - "rxjs": "7.8.1" + "rxjs": "^7.8.1" } }, "node_modules/@onecx/angular-testing": { @@ -8038,9 +8038,9 @@ } }, "node_modules/@onecx/angular-webcomponents": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@onecx/angular-webcomponents/-/angular-webcomponents-5.7.0.tgz", - "integrity": "sha512-BzxZxXoOFG5mV86qcrsu7aGi7ImRAAecgeYD9pfFxLQIcKwTSTB7nTirc7QCj0/IvLQyRHobrGdQuGXKv4u7Dw==", + "version": "5.17.0", + "resolved": "https://registry.npmjs.org/@onecx/angular-webcomponents/-/angular-webcomponents-5.17.0.tgz", + "integrity": "sha512-SA9CttnXb3+ijYkAchinBhOn1OxSEVchYcL1jKtSqLo9gt8DY7OzYmo1YZxoDdAJYeUq8gRm+202jU2rEO3evw==", "dependencies": { "tslib": "^2.3.0" }, @@ -8055,19 +8055,19 @@ } }, "node_modules/@onecx/integration-interface": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@onecx/integration-interface/-/integration-interface-5.7.0.tgz", - "integrity": "sha512-bJH9HnqmSoYy6c7XUKW2QZIuipY36C6l+Cmu+mytjdmL2v0ACt3N8foCCKAEvWkxLmke/4tPZBeD+hnQ3GGg3Q==", + "version": "5.17.0", + "resolved": "https://registry.npmjs.org/@onecx/integration-interface/-/integration-interface-5.17.0.tgz", + "integrity": "sha512-fzup2TJB8NX4O/Tl32NyUQNK4ENquoQSJzXASrl9qBonqkhpqkmIHZ2cZyusqrz4Zdguofu//S6/t6P/bB9Z/A==", "peerDependencies": { "@onecx/accelerator": "^5", - "rxjs": "7.8.1", + "rxjs": "^7.8.1", "tslib": "^2.6.3" } }, "node_modules/@onecx/keycloak-auth": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@onecx/keycloak-auth/-/keycloak-auth-5.7.0.tgz", - "integrity": "sha512-9EdAqS7LK3xAWyZETY52cL0osh3yMQIyyseoaZS5+42T62k3OuJjIybZ5lHlPWQUjtBIIez7JRG2AHD5DJXpLg==", + "version": "5.17.0", + "resolved": "https://registry.npmjs.org/@onecx/keycloak-auth/-/keycloak-auth-5.17.0.tgz", + "integrity": "sha512-HCAgnhWkUHTsoYgP++VHZ/6OPk34HV1OXF5Mw+yNpQ6Y0BZQRWNYhcSePtXyUYOjxbDak8HMvfqef/VAyMtvVw==", "dependencies": { "tslib": "^2.3.0" }, @@ -8078,7 +8078,7 @@ "@onecx/integration-interface": "^5", "keycloak-angular": "^16.0.1", "keycloak-js": "^25.0.1", - "rxjs": "7.8.1" + "rxjs": "^7.8.1" } }, "node_modules/@onecx/nx-plugin": { @@ -12118,9 +12118,9 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "node_modules/@onecx/portal-integration-angular": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@onecx/portal-integration-angular/-/portal-integration-angular-5.7.0.tgz", - "integrity": "sha512-fiYDnYYgnPlfoeSM9L2x4PRyCkz7srm5iysFp8DG+axxwbWARL97EwYuJ/BCMOSwR6vh9NxpaHrC9grEML0B2A==", + "version": "5.17.0", + "resolved": "https://registry.npmjs.org/@onecx/portal-integration-angular/-/portal-integration-angular-5.17.0.tgz", + "integrity": "sha512-c8Wn2GYWO4EkOBaniZ6bF2Kmr/28/OuuR40JUx6i/oNIPZq1VBVu8o49oHgsg8gQGtXuXYI9a6waRSxagYciEA==", "dependencies": { "tslib": "^2.3.0" }, @@ -12152,9 +12152,9 @@ } }, "node_modules/@onecx/portal-layout-styles": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@onecx/portal-layout-styles/-/portal-layout-styles-5.7.0.tgz", - "integrity": "sha512-eo+R9CM7XBqVGGjMfeFeg9Dq+MO2yOKc/3cKgj5nVFARulDeFEembDZBaIKQQsr0VRf63UyNtVOo6kDwN9Od4g==", + "version": "5.17.0", + "resolved": "https://registry.npmjs.org/@onecx/portal-layout-styles/-/portal-layout-styles-5.17.0.tgz", + "integrity": "sha512-IszJi+QrJgj+iesZnucblfpcMBYl1Y7few5blY6lws6YLdH1e99TAwsqFPPq0pzgFOeAVW3SovhQdaoIxiJ7kw==", "peerDependencies": { "tslib": "^2.6.3" } diff --git a/package.json b/package.json index ffe4ee5..04ada61 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,8 @@ "lint": "nx lint", "lint:fix": "nx lint --fix", "test": "nx test", - "test:ci": "ng test --watch=false --browsers=ChromeHeadless --code-coverage" + "test:ci": "nx test --watch=false --browsers=ChromeHeadless --code-coverage", + "sonar": "npx sonarqube-scanner -Dproject.settings=sonar-local-project.properties" }, "private": true, "husky": { diff --git a/project.json b/project.json index f595a65..842e1ef 100644 --- a/project.json +++ b/project.json @@ -10,7 +10,7 @@ "executor": "@nx/angular:webpack-browser", "outputs": ["{options.outputPath}"], "options": { - "outputPath": "dist/onecx-search-config", + "outputPath": "dist/onecx-search-config-ui", "index": "./src/index.html", "main": "./src/main.ts", "polyfills": "src/polyfills.ts", diff --git a/src/app/remotes/column-group-selection/column-group-selection.component.spec.ts b/src/app/remotes/column-group-selection/column-group-selection.component.spec.ts index 4e4dd62..c0180cd 100644 --- a/src/app/remotes/column-group-selection/column-group-selection.component.spec.ts +++ b/src/app/remotes/column-group-selection/column-group-selection.component.spec.ts @@ -27,7 +27,6 @@ import { PortalDialogService, PortalMessageService, } from '@onecx/portal-integration-angular'; -import { AppConfigService } from '@onecx/angular-integration-interface'; import { Configuration, SearchConfigAPIService, @@ -74,8 +73,6 @@ describe('OneCXColumnGroupSelectionComponent', () => { })), }); - const appConfigSpy = createSpyObj('appConfig', []) as AppConfigService; - const searchConfigServiceSpy = { ...createSpyObj('searchConfigService', [ 'getSearchConfigInfos', @@ -219,10 +216,6 @@ describe('OneCXColumnGroupSelectionComponent', () => { ], providers: [ DialogService, - { - provide: AppConfigService, - useValue: appConfigSpy, - }, { provide: PortalDialogService, useValue: portalDialogSpy, diff --git a/src/app/remotes/search-config/search-config.component.spec.ts b/src/app/remotes/search-config/search-config.component.spec.ts index e7485a5..415ae60 100644 --- a/src/app/remotes/search-config/search-config.component.spec.ts +++ b/src/app/remotes/search-config/search-config.component.spec.ts @@ -9,10 +9,7 @@ import { BASE_URL, RemoteComponentConfig, } from '@onecx/angular-remote-components'; -import { - AppConfigService, - AppStateService, -} from '@onecx/angular-integration-interface'; +import { AppStateService } from '@onecx/angular-integration-interface'; import { CommonModule } from '@angular/common'; import { NO_ERRORS_SCHEMA, NgModule } from '@angular/core'; import { provideHttpClientTesting } from '@angular/common/http/testing'; @@ -76,8 +73,6 @@ describe('OneCXSearchConfigComponent', () => { })), }); - const appConfigSpy = createSpyObj('appConfig', []) as AppConfigService; - const searchConfigServiceSpy = { ...createSpyObj('searchConfigService', [ 'getSearchConfigInfos', @@ -218,10 +213,6 @@ describe('OneCXSearchConfigComponent', () => { ], providers: [ DialogService, - { - provide: AppConfigService, - useValue: appConfigSpy, - }, { provide: PortalDialogService, useValue: portalDialogSpy,