Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: updated libs 5.32.1 and translation loader #160

Merged
merged 3 commits into from
Mar 7, 2025
Merged

feat: updated libs 5.32.1 and translation loader #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ea9227
feat: updated libs 5.32.1 and translation loader
JordenReuter Mar 6, 2025
5409d36
feat: empty commit
JordenReuter Mar 6, 2025
4da2fd2
feat: reordered imports
JordenReuter Mar 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions angular.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@
"glob": "**/*",
"input": "node_modules/@onecx/portal-integration-angular/assets/",
"output": "/onecx-portal-lib/assets/"
},
{
"glob": "**/*",
"input": "./node_modules/@onecx/angular-accelerator/assets/",
"output": "/onecx-angular-accelerator/assets/"
}
],
"styles": ["src/styles.scss"],
Expand Down
2,837 changes: 1,732 additions & 1,105 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

23 changes: 12 additions & 11 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,17 +52,18 @@
"@ngrx/router-store": "^18.0.1",
"@ngx-translate/core": "^15.0.0",
"@ngx-translate/http-loader": "^8.0.0",
"@onecx/accelerator": "5.30.0",
"@onecx/angular-accelerator": "5.30.0",
"@onecx/angular-auth": "5.30.0",
"@onecx/angular-integration-interface": "5.30.0",
"@onecx/angular-remote-components": "5.30.0",
"@onecx/angular-testing": "5.30.0",
"@onecx/angular-webcomponents": "5.30.0",
"@onecx/integration-interface": "5.30.0",
"@onecx/keycloak-auth": "5.30.0",
"@onecx/portal-integration-angular": "5.30.0",
"@onecx/portal-layout-styles": "5.30.0",
"@onecx/accelerator": "^5.32.1",
"@onecx/angular-accelerator": "^5.32.1",
"@onecx/angular-auth": "^5.32.1",
"@onecx/angular-integration-interface": "^5.32.1",
"@onecx/angular-remote-components": "^5.32.1",
"@onecx/angular-testing": "^5.32.1",
"@onecx/angular-utils": "^5.32.1",
"@onecx/angular-webcomponents": "^5.32.1",
"@onecx/integration-interface": "^5.32.1",
"@onecx/keycloak-auth": "^5.32.1",
"@onecx/portal-integration-angular": "^5.32.1",
"@onecx/portal-layout-styles": "^5.32.1",
"@webcomponents/webcomponentsjs": "2.8.0",
"file-saver": "^2.0.5",
"i18n-iso-countries": "^7.13.0",
Expand Down
10 changes: 3 additions & 7 deletions src/app/app.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core'

import { KeycloakAuthModule } from '@onecx/keycloak-auth'
import { createTranslateLoader } from '@onecx/angular-accelerator'
import { APP_CONFIG, AppStateService, UserService } from '@onecx/angular-integration-interface'
import { createTranslateLoader } from '@onecx/angular-utils'
import { APP_CONFIG, UserService } from '@onecx/angular-integration-interface'
import { translateServiceInitializer, PortalCoreModule } from '@onecx/portal-integration-angular'

import { environment } from 'src/environments/environment'
Expand All @@ -35,11 +35,7 @@ const routes: Routes = [
}),
TranslateModule.forRoot({
isolate: true,
loader: {
provide: TranslateLoader,
useFactory: createTranslateLoader,
deps: [HttpClient, AppStateService]
}
loader: { provide: TranslateLoader, useFactory: createTranslateLoader, deps: [HttpClient] }
})
],
providers: [
Expand Down
14 changes: 8 additions & 6 deletions src/app/onecx-parameter-remote.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { RouterModule, Routes, Router } from '@angular/router'
import { TranslateLoader, TranslateModule, MissingTranslationHandler } from '@ngx-translate/core'

import { AngularAuthModule } from '@onecx/angular-auth'
import { createTranslateLoader } from '@onecx/angular-accelerator'
import { TRANSLATION_PATH, createTranslateLoader, translationPathFactory } from '@onecx/angular-utils'
import { addInitializeModuleGuard, AppStateService, ConfigurationService } from '@onecx/angular-integration-interface'
import { createAppEntrypoint, initializeRouter, startsWith } from '@onecx/angular-webcomponents'

Expand Down Expand Up @@ -40,11 +40,7 @@ const routes: Routes = [
RouterModule.forRoot(addInitializeModuleGuard(routes)),
TranslateModule.forRoot({
isolate: true,
loader: {
provide: TranslateLoader,
useFactory: createTranslateLoader,
deps: [HttpClient, AppStateService]
},
loader: { provide: TranslateLoader, useFactory: createTranslateLoader, deps: [HttpClient] },
missingTranslationHandler: { provide: MissingTranslationHandler, useClass: PortalMissingTranslationHandler }
})
],
Expand All @@ -57,6 +53,12 @@ const routes: Routes = [
multi: true,
deps: [Router, AppStateService]
},
{
provide: TRANSLATION_PATH,
useFactory: (appStateService: AppStateService) => translationPathFactory('assets/i18n/')(appStateService),
multi: true,
deps: [AppStateService]
},
provideHttpClient(withInterceptorsFromDi())
]
})
Expand Down
11 changes: 4 additions & 7 deletions src/app/parameter/parameter-detail/parameter-detail.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ import { TranslateLoader, TranslateModule } from '@ngx-translate/core'
import { of, throwError } from 'rxjs'
import { SelectItem } from 'primeng/api'

import { AppStateService, UserService } from '@onecx/angular-integration-interface'
import { createTranslateLoader, PortalMessageService } from '@onecx/portal-integration-angular'
import { UserService } from '@onecx/angular-integration-interface'
import { PortalMessageService } from '@onecx/portal-integration-angular'
import { createTranslateLoader } from '@onecx/angular-utils'

import { Parameter, ParametersAPIService, Product } from 'src/app/shared/generated'
import { ParameterDetailComponent } from './parameter-detail.component'
Expand Down Expand Up @@ -55,11 +56,7 @@ describe('ParameterDetailComponent', () => {
declarations: [ParameterDetailComponent],
imports: [
TranslateModule.forRoot({
loader: {
provide: TranslateLoader,
useFactory: createTranslateLoader,
deps: [HttpClient, AppStateService]
}
loader: { provide: TranslateLoader, useFactory: createTranslateLoader, deps: [HttpClient] }
})
],
schemas: [NO_ERRORS_SCHEMA],
Expand Down
11 changes: 4 additions & 7 deletions src/app/parameter/parameter-history/parameter-history.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@ import { FormBuilder } from '@angular/forms'
import { TranslateLoader, TranslateModule } from '@ngx-translate/core'
import { of, throwError } from 'rxjs'

import { AppStateService, UserService } from '@onecx/angular-integration-interface'
import { createTranslateLoader, PortalMessageService } from '@onecx/portal-integration-angular'
import { UserService } from '@onecx/angular-integration-interface'
import { PortalMessageService } from '@onecx/portal-integration-angular'

import { ParametersAPIService, HistoriesAPIService, Parameter } from 'src/app/shared/generated'
import { ParameterHistoryComponent } from './parameter-history.component'
import { createTranslateLoader } from '@onecx/angular-utils'

const productName = 'prod1'
const app = 'app1'
Expand Down Expand Up @@ -46,11 +47,7 @@ xdescribe('HistoryComponent', () => {
declarations: [ParameterHistoryComponent],
imports: [
TranslateModule.forRoot({
loader: {
provide: TranslateLoader,
useFactory: createTranslateLoader,
deps: [HttpClient, AppStateService]
}
loader: { provide: TranslateLoader, useFactory: createTranslateLoader, deps: [HttpClient] }
})
],
schemas: [NO_ERRORS_SCHEMA],
Expand Down
10 changes: 3 additions & 7 deletions src/app/parameter/parameter-search/parameter-criteria/parameter-criteria.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import { FormControl, FormGroup } from '@angular/forms'
import { TranslateLoader, TranslateModule } from '@ngx-translate/core'
import { SelectItem } from 'primeng/api'

import { AppStateService, UserService } from '@onecx/angular-integration-interface'
import { createTranslateLoader } from '@onecx/portal-integration-angular'
import { UserService } from '@onecx/angular-integration-interface'
import { createTranslateLoader } from '@onecx/angular-utils'

import { Product } from 'src/app/shared/generated'
import { ParameterCriteriaComponent, CriteriaForm } from './parameter-criteria.component'
Expand Down Expand Up @@ -42,11 +42,7 @@ describe('ParameterCriteriaComponent', () => {
declarations: [ParameterCriteriaComponent],
imports: [
TranslateModule.forRoot({
loader: {
provide: TranslateLoader,
useFactory: createTranslateLoader,
deps: [HttpClient, AppStateService]
}
loader: { provide: TranslateLoader, useFactory: createTranslateLoader, deps: [HttpClient] }
})
],
schemas: [NO_ERRORS_SCHEMA],
Expand Down
11 changes: 4 additions & 7 deletions src/app/parameter/parameter-search/parameter-search.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ import { provideHttpClientTesting } from '@angular/common/http/testing'
import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core'
import { of, throwError } from 'rxjs'

import { AppStateService, UserService } from '@onecx/angular-integration-interface'
import { Column, createTranslateLoader, PortalMessageService } from '@onecx/portal-integration-angular'
import { UserService } from '@onecx/angular-integration-interface'
import { Column, PortalMessageService } from '@onecx/portal-integration-angular'
import { createTranslateLoader } from '@onecx/angular-utils'

import { Parameter, ParametersAPIService, Product, ProductsAPIService } from 'src/app/shared/generated'
import { TranslateServiceMock } from 'src/app/shared/mocks/TranslateServiceMock'
Expand Down Expand Up @@ -80,11 +81,7 @@ describe('ParameterSearchComponent', () => {
imports: [
TranslateModule.forRoot({
isolate: true,
loader: {
provide: TranslateLoader,
useFactory: createTranslateLoader,
deps: [HttpClient, AppStateService]
}
loader: { provide: TranslateLoader, useFactory: createTranslateLoader, deps: [HttpClient] }
})
],
schemas: [NO_ERRORS_SCHEMA],
Expand Down
1 change: 1 addition & 0 deletions webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ const config = withModuleFederationPlugin({
'@onecx/angular-integration-interface': { requiredVersion: 'auto', includeSecondaries: true },
'@onecx/angular-remote-components': { requiredVersion: 'auto', includeSecondaries: true },
'@onecx/angular-testing': { requiredVersion: 'auto', includeSecondaries: true },
'@onecx/angular-utils': { requiredVersion: 'auto', includeSecondaries: true },
'@onecx/angular-webcomponents': { requiredVersion: 'auto', includeSecondaries: true },
'@onecx/integration-interface': { requiredVersion: 'auto', includeSecondaries: true },
'@onecx/keycloak-auth': { requiredVersion: 'auto', includeSecondaries: true },
Expand Down
Loading