From 698b53d522ccb9ad95d4bafb4dc5104655d9928e Mon Sep 17 00:00:00 2001 From: MichalKinas Date: Wed, 13 Mar 2024 09:19:19 +0100 Subject: [PATCH] [ACS-6693] Angular 15 migration initial point --- app/src/app/app.module.ts | 3 +- package.json | 42 ++++++------ .../actions/rule-action.ui-component.html | 2 +- .../options/rule-options.ui-component.spec.ts | 4 +- .../rule-details.ui-component.html | 4 +- .../rule-details.ui-component.scss | 12 ++-- .../comments-tab/comments-tab.component.ts | 2 +- .../library-metadata-form.component.html | 2 +- .../search-input-control.component.html | 2 +- .../search-input-control.component.scss | 13 ++-- .../search-input/search-input.component.html | 2 +- .../search-input/search-input.component.scss | 6 -- .../aca-content/src/lib/ui/custom-theme.scss | 23 +++---- .../src/lib/ui/overrides/ay11.scss | 65 +++++++++++-------- projects/aca-content/src/lib/ui/theme.scss | 16 ++--- 15 files changed, 101 insertions(+), 97 deletions(-) diff --git a/app/src/app/app.module.ts b/app/src/app/app.module.ts index 19e23f18a..ced53c4df 100644 --- a/app/src/app/app.module.ts +++ b/app/src/app/app.module.ts @@ -92,8 +92,7 @@ registerLocaleData(localeSv); !environment.production ? StoreDevtoolsModule.instrument({ maxAge: 25 }) : [], RouterModule.forRoot(APP_ROUTES, { useHash: true, - enableTracing: false, // enable for debug only - relativeLinkResolution: 'legacy' + enableTracing: false // enable for debug only }), AppExtensionsModule, ShellModule.withRoutes({ diff --git a/package.json b/package.json index d7dcb4d8d..78462810e 100644 --- a/package.json +++ b/package.json @@ -34,24 +34,24 @@ }, "private": true, "dependencies": { - "@alfresco/adf-content-services": "6.9.0-8694813215", - "@alfresco/adf-core": "6.9.0-8694813215", - "@alfresco/adf-extensions": "6.9.0-8694813215", - "@alfresco/eslint-plugin-eslint-angular": "6.9.0-8694813215", - "@alfresco/js-api": "7.8.0-8694813215", - "@angular/animations": "14.1.3", - "@angular/cdk": "14.1.3", - "@angular/common": "14.1.3", - "@angular/compiler": "14.1.3", - "@angular/core": "14.1.3", - "@angular/forms": "14.1.3", - "@angular/material": "14.1.3", - "@angular/material-date-fns-adapter": "14.1.3", - "@angular/platform-browser": "14.1.3", - "@angular/platform-browser-dynamic": "14.1.3", - "@angular/router": "14.1.3", + "@alfresco/adf-content-services": "6.8.0-8186121470", + "@alfresco/adf-core": "6.8.0-8186121470", + "@alfresco/adf-extensions": "6.8.0-8186121470", + "@alfresco/eslint-plugin-eslint-angular": "6.8.0-8186121470", + "@alfresco/js-api": "7.7.0-8186121470", + "@angular/animations": "15.2.10", + "@angular/cdk": "15.2.9", + "@angular/common": "15.2.10", + "@angular/compiler": "15.2.10", + "@angular/core": "15.2.10", + "@angular/forms": "15.2.10", + "@angular/material": "15.2.9", + "@angular/material-date-fns-adapter": "15.2.9", + "@angular/platform-browser": "15.2.10", + "@angular/platform-browser-dynamic": "15.2.10", + "@angular/router": "15.2.10", "@fontsource/open-sans": "^5.0.27", - "@mat-datetimepicker/core": "^10.1.1", + "@mat-datetimepicker/core": "11.0.3", "@ngrx/effects": "^14.2.0", "@ngrx/router-store": "^14.2.0", "@ngrx/store": "^14.2.0", @@ -66,7 +66,7 @@ "zone.js": "0.11.8" }, "devDependencies": { - "@alfresco/adf-cli": "6.9.0-8694813215", + "@alfresco/adf-cli": "6.8.0-8186121470", "@angular-devkit/build-angular": "14.2.11", "@angular-devkit/core": "14.1.2", "@angular-devkit/schematics": "14.1.2", @@ -76,8 +76,8 @@ "@angular-eslint/schematics": "14.4.0", "@angular-eslint/template-parser": "^15.2.1", "@angular/cli": "14.1.3", - "@angular/compiler-cli": "14.1.3", - "@angular/language-service": "14.1.3", + "@angular/compiler-cli": "15.2.10", + "@angular/language-service": "15.2.10", "@cspell/eslint-plugin": "^8.3.2", "@nx/angular": "17.0.2", "@nx/eslint-plugin": "17.0.2", @@ -128,7 +128,7 @@ "stylelint-config-standard-scss": "^7.0.1", "ts-node": "^10.9.2", "tsconfig-paths": "4.2.0", - "typescript": "4.7.4", + "typescript": "4.9.5", "webdriver-manager": "12.1.8" } } diff --git a/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.html b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.html index 1659e66f3..c33ba6fcf 100644 --- a/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.html +++ b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.html @@ -1,6 +1,6 @@
- + { TestBed.configureTestingModule({ schemas: [CUSTOM_ELEMENTS_SCHEMA], imports: [FormsModule, ReactiveFormsModule, CoreTestingModule, RuleOptionsUiComponent], - providers: [{ provide: MAT_FORM_FIELD_DEFAULT_OPTIONS, useValue: { floatLabel: 'never' } }] + providers: [{ provide: MAT_FORM_FIELD_DEFAULT_OPTIONS, useValue: { floatLabel: 'auto' } }] }); fixture = TestBed.createComponent(RuleOptionsUiComponent); @@ -153,7 +153,7 @@ describe('RuleOptionsUiComponent', () => { expect((await matOptions[2].getText()).trim()).toBe('Script 2'); }); - it('should always show a label for the error script dropdown even when MAT_FORM_FIELD_DEFAULT_OPTIONS sets floatLabel to never', () => { + it('should always show a label for the error script dropdown even when MAT_FORM_FIELD_DEFAULT_OPTIONS sets floatLabel to auto', () => { component.writeValue({ isEnabled: true, isInheritable: false, diff --git a/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.html b/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.html index 2946924e8..9852fabc2 100644 --- a/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.html +++ b/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.html @@ -4,7 +4,7 @@
- +
- +