From 194476b47e16d5065e676e1e82b55e8bffb04383 Mon Sep 17 00:00:00 2001 From: Alfresco Build <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 20 Jun 2024 17:38:05 +0200 Subject: [PATCH] GH Auto: Upstream dependencies ADF:6.10.0-9598220418 JS-API:7.9.0-9598220418 using Tag:6.10.0-9598220418 (#3896) * [ci:force][auto-commit] Update dependencies ADF:6.10.0-9598220418 JS:7.9.0-9598220418 * fix unit tests * update code --------- Co-authored-by: DenysVuika Co-authored-by: Denys Vuika --- package-lock.json | 60 +++++++++---------- package.json | 12 ++-- .../aca-content/src/lib/aca-content.module.ts | 4 +- .../lib/extensions/core.extensions.module.ts | 6 -- .../info-drawer/info-drawer.component.spec.ts | 2 +- .../info-drawer/info-drawer.component.ts | 4 +- 6 files changed, 41 insertions(+), 47 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0d8ff101c..e3d3d781d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,11 +10,11 @@ "hasInstallScript": true, "license": "LGPL-3.0", "dependencies": { - "@alfresco/adf-content-services": "6.10.0-9523211325", - "@alfresco/adf-core": "6.10.0-9523211325", - "@alfresco/adf-extensions": "6.10.0-9523211325", - "@alfresco/eslint-plugin-eslint-angular": "6.10.0-9523211325", - "@alfresco/js-api": "7.9.0-9523211325", + "@alfresco/adf-content-services": "6.10.0-9598220418", + "@alfresco/adf-core": "6.10.0-9598220418", + "@alfresco/adf-extensions": "6.10.0-9598220418", + "@alfresco/eslint-plugin-eslint-angular": "6.10.0-9598220418", + "@alfresco/js-api": "7.9.0-9598220418", "@angular/animations": "14.1.3", "@angular/cdk": "14.1.3", "@angular/common": "14.1.3", @@ -42,7 +42,7 @@ "zone.js": "0.11.8" }, "devDependencies": { - "@alfresco/adf-cli": "6.10.0-9523211325", + "@alfresco/adf-cli": "6.10.0-9598220418", "@angular-devkit/build-angular": "14.2.11", "@angular-devkit/core": "14.1.2", "@angular-devkit/schematics": "14.1.2", @@ -125,12 +125,12 @@ "dev": true }, "node_modules/@alfresco/adf-cli": { - "version": "6.10.0-9523211325", - "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-6.10.0-9523211325.tgz", - "integrity": "sha512-lZei4r42vwjoKJJHN1DX3kzCddS8z9/paWm6TTqVI0rr0D3Zt+omsW1fK/mQ/ryrIWmkDsGQ+3mptXjHMrU04g==", + "version": "6.10.0-9598220418", + "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-6.10.0-9598220418.tgz", + "integrity": "sha512-o02pWQ8HYwtmQxEJgwgzw8sAodK/hZ8GQXcBxTXvgXPRTMcTLVhQ6+K7Qan1uZb0Ofb4UJVAQ2mR8SE97uORvQ==", "dev": true, "dependencies": { - "@alfresco/js-api": ">=7.9.0-9523211325", + "@alfresco/js-api": ">=7.9.0-9598220418", "commander": "^6.2.1", "ejs": "^3.1.9", "license-checker": "^25.0.1", @@ -145,15 +145,15 @@ } }, "node_modules/@alfresco/adf-content-services": { - "version": "6.10.0-9523211325", - "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-6.10.0-9523211325.tgz", - "integrity": "sha512-Rz07Z157msEShijyk4kk0EKzf1rVfO0rnVk6tdH3Y2Lp63Bsh4dqtP3q8inRb2FeE0NQYAfQ7elwLAncZ0WkPg==", + "version": "6.10.0-9598220418", + "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-6.10.0-9598220418.tgz", + "integrity": "sha512-5BQWhSUiK+QLGQ47XReFIvA3T2/HVS06iQd+jgjhgI3gWVzEPAI18Lck+XwPS3CHDKWqZyh5LxKDJ+bqvaY8dw==", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@alfresco/adf-core": ">=6.10.0-9523211325", - "@alfresco/js-api": ">=7.9.0-9523211325", + "@alfresco/adf-core": ">=6.10.0-9598220418", + "@alfresco/js-api": ">=7.9.0-9598220418", "@angular/animations": ">=14.1.3", "@angular/cdk": ">=14.1.2", "@angular/common": ">=14.1.3", @@ -168,9 +168,9 @@ } }, "node_modules/@alfresco/adf-core": { - "version": "6.10.0-9523211325", - "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-6.10.0-9523211325.tgz", - "integrity": "sha512-oS6hR0K1oB+ChVjW8c0cOWtY+HYzs6rcMci6+fT9wB1WbjZsJBGb/gq9uIYcWyCNL8awFHV+pr2Ft4vJOuDhhQ==", + "version": "6.10.0-9598220418", + "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-6.10.0-9598220418.tgz", + "integrity": "sha512-O3XXTL6R38C5+/f7Ph0BA1vdbwDQLWLN5qMibQX+iW6Ink3eEuXBdfdwU2jJcUnX32qMSaQLNEDjkaafmw5O5w==", "dependencies": { "angular-oauth2-oidc": "^13.0.1", "angular-oauth2-oidc-jwks": "^17.0.2", @@ -178,8 +178,8 @@ "tslib": "^2.3.0" }, "peerDependencies": { - "@alfresco/adf-extensions": ">=6.10.0-9523211325", - "@alfresco/js-api": ">=7.9.0-9523211325", + "@alfresco/adf-extensions": ">=6.10.0-9598220418", + "@alfresco/js-api": ">=7.9.0-9598220418", "@angular/animations": ">=14.1.3", "@angular/cdk": ">=14.1.2", "@angular/common": ">=14.1.3", @@ -194,27 +194,27 @@ } }, "node_modules/@alfresco/adf-extensions": { - "version": "6.10.0-9523211325", - "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-6.10.0-9523211325.tgz", - "integrity": "sha512-PWb4QsgzgXdeOpbbb3CKAC6mxOApvY3w/ynvLzC+oAhiVSaI7bwtOj/uClHWv1wMKGoYYg9ptkPYbHIVFqfzhw==", + "version": "6.10.0-9598220418", + "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-6.10.0-9598220418.tgz", + "integrity": "sha512-SchZjda0s2bKr08dhman3vGr9yZqrAB8RPFbi3KG+PmK26qUgFXn7WC59ybNJ5K8h5WUBMaK0fQwte9ZWuhehw==", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@alfresco/js-api": ">=7.9.0-9523211325", + "@alfresco/js-api": ">=7.9.0-9598220418", "@angular/common": ">=14.1.3", "@angular/core": ">=14.1.3" } }, "node_modules/@alfresco/eslint-plugin-eslint-angular": { - "version": "6.10.0-9523211325", - "resolved": "https://registry.npmjs.org/@alfresco/eslint-plugin-eslint-angular/-/eslint-plugin-eslint-angular-6.10.0-9523211325.tgz", - "integrity": "sha512-pDE9cu81eDzT5iwN3Xd0E5jbUOJFMN4HfebDKYam7B/2D3gtomj1xIsjj1KGPJpXXhBi/n7kqdw8JRI3lJX8bQ==" + "version": "6.10.0-9598220418", + "resolved": "https://registry.npmjs.org/@alfresco/eslint-plugin-eslint-angular/-/eslint-plugin-eslint-angular-6.10.0-9598220418.tgz", + "integrity": "sha512-xDgYXvPaA+ES9+HZbAqh81h+23XfxsbvgT/8Hf0BYFgPYM8hXixk1lTIn66kigPu11LzHHE0C+Bs+fq7dvRUIw==" }, "node_modules/@alfresco/js-api": { - "version": "7.9.0-9523211325", - "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-7.9.0-9523211325.tgz", - "integrity": "sha512-MEYDvgGcN/EUNyI/s9LO6AJigaWW02Tz1TbUn03YTflqc4Fv0M2XGOJDMPx1qTDbApr4FougRSZd0FNucRWP3Q==", + "version": "7.9.0-9598220418", + "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-7.9.0-9598220418.tgz", + "integrity": "sha512-5qvoc6TRoaeXGsYv1Ni+jh/xOsUgi5y4RzLyODq39OW55ByqT1mY6ly6pKRr4VUsX4e5pohPB/bqWmomj/aQ/g==", "dependencies": { "event-emitter": "^0.3.5", "superagent": "^9.0.1", diff --git a/package.json b/package.json index 1baefad2a..ddc2127f3 100644 --- a/package.json +++ b/package.json @@ -34,11 +34,11 @@ }, "private": true, "dependencies": { - "@alfresco/adf-content-services": "6.10.0-9523211325", - "@alfresco/adf-core": "6.10.0-9523211325", - "@alfresco/adf-extensions": "6.10.0-9523211325", - "@alfresco/eslint-plugin-eslint-angular": "6.10.0-9523211325", - "@alfresco/js-api": "7.9.0-9523211325", + "@alfresco/adf-content-services": "6.10.0-9598220418", + "@alfresco/adf-core": "6.10.0-9598220418", + "@alfresco/adf-extensions": "6.10.0-9598220418", + "@alfresco/eslint-plugin-eslint-angular": "6.10.0-9598220418", + "@alfresco/js-api": "7.9.0-9598220418", "@angular/animations": "14.1.3", "@angular/cdk": "14.1.3", "@angular/common": "14.1.3", @@ -66,7 +66,7 @@ "zone.js": "0.11.8" }, "devDependencies": { - "@alfresco/adf-cli": "6.10.0-9523211325", + "@alfresco/adf-cli": "6.10.0-9598220418", "@angular-devkit/build-angular": "14.2.11", "@angular-devkit/core": "14.1.2", "@angular-devkit/schematics": "14.1.2", diff --git a/projects/aca-content/src/lib/aca-content.module.ts b/projects/aca-content/src/lib/aca-content.module.ts index 47df9abc1..033ba8880 100644 --- a/projects/aca-content/src/lib/aca-content.module.ts +++ b/projects/aca-content/src/lib/aca-content.module.ts @@ -84,8 +84,8 @@ import { SearchResultsRowComponent } from './components/search/search-results-ro ReactiveFormsModule, ContentModule.forRoot(), RouterModule.forChild(CONTENT_ROUTES), - ExtensionsModule.forChild(), - CoreExtensionsModule.forChild(), + ExtensionsModule, + CoreExtensionsModule, AppStoreModule, ...APP_COMMON_DIRECTIVES, ...APP_TOOLBAR_DIRECTIVES, diff --git a/projects/aca-content/src/lib/extensions/core.extensions.module.ts b/projects/aca-content/src/lib/extensions/core.extensions.module.ts index 0c4b9e321..4b8ad53dd 100644 --- a/projects/aca-content/src/lib/extensions/core.extensions.module.ts +++ b/projects/aca-content/src/lib/extensions/core.extensions.module.ts @@ -47,10 +47,4 @@ export class CoreExtensionsModule { ] }; } - - static forChild(): ModuleWithProviders { - return { - ngModule: CoreExtensionsModule - }; - } } diff --git a/projects/aca-shared/src/lib/components/info-drawer/info-drawer.component.spec.ts b/projects/aca-shared/src/lib/components/info-drawer/info-drawer.component.spec.ts index 61280c773..e14c958f2 100644 --- a/projects/aca-shared/src/lib/components/info-drawer/info-drawer.component.spec.ts +++ b/projects/aca-shared/src/lib/components/info-drawer/info-drawer.component.spec.ts @@ -66,7 +66,7 @@ describe('InfoDrawerComponent', () => { providers: [ { provide: AppExtensionService, useValue: extensionServiceMock }, { provide: Store, useValue: storeMock }, - { provide: RedirectAuthService, useValue: { onLogin: EMPTY } } + { provide: RedirectAuthService, useValue: { onLogin: EMPTY, onTokenReceived: EMPTY } } ], schemas: [NO_ERRORS_SCHEMA] }); diff --git a/projects/aca-shared/src/lib/components/info-drawer/info-drawer.component.ts b/projects/aca-shared/src/lib/components/info-drawer/info-drawer.component.ts index 49ccf2f09..2a9570796 100644 --- a/projects/aca-shared/src/lib/components/info-drawer/info-drawer.component.ts +++ b/projects/aca-shared/src/lib/components/info-drawer/info-drawer.component.ts @@ -24,7 +24,7 @@ import { Component, HostListener, Input, OnChanges, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core'; import { NodeEntry, Node, SiteEntry } from '@alfresco/js-api'; -import { ContentActionRef, ExtensionsModule, SidebarTabRef } from '@alfresco/adf-extensions'; +import { ContentActionRef, DynamicTabComponent, SidebarTabRef } from '@alfresco/adf-extensions'; import { Store } from '@ngrx/store'; import { SetInfoDrawerStateAction, ToggleInfoDrawerAction, infoDrawerPreview } from '@alfresco/aca-shared/store'; import { AppExtensionService } from '../../services/app.extension.service'; @@ -41,7 +41,7 @@ import { ContentService, NodesApiService } from '@alfresco/adf-content-services' @Component({ standalone: true, - imports: [CommonModule, TranslateModule, MatProgressBarModule, InfoDrawerModule, ExtensionsModule, A11yModule, ToolbarComponent], + imports: [CommonModule, TranslateModule, MatProgressBarModule, InfoDrawerModule, A11yModule, ToolbarComponent, DynamicTabComponent], selector: 'aca-info-drawer', templateUrl: './info-drawer.component.html', encapsulation: ViewEncapsulation.None