From adab276159d83feaea9ce28d8c99e7f16acb97d4 Mon Sep 17 00:00:00 2001 From: Alfresco Build <8039454+alfresco-build@users.noreply.github.com> Date: Fri, 18 Nov 2022 08:37:13 -0500 Subject: [PATCH] Update branch for ADF 37066 and JS-API 5.2.0-420 [ci:force] (#2792) * [ci:force][auto-commit] Update @alfresco/adf-extensions to 5.2.0-37064 for branch: update-alfresco-dependencies originated from @alfresco/adf-extensions PR: 37066 * [ci:force][auto-commit] Update @alfresco/adf-core to 5.2.0-37065 for branch: update-alfresco-dependencies originated from @alfresco/adf-core PR: 37066 * [ci:force][auto-commit] Update @alfresco/adf-content-services to 5.2.0-37064 for branch: update-alfresco-dependencies originated from @alfresco/adf-content-services PR: 37066 * [ci:force][auto-commit] Update @alfresco/adf-cli to 5.2.0-37065 for branch: update-alfresco-dependencies originated from @alfresco/adf-cli PR: 37066 * [ci:force][auto-commit] Update @alfresco/adf-testing to 5.2.0-37065 for branch: update-alfresco-dependencies originated from @alfresco/adf-testing PR: 37066 * [AAE-11288] Change import from core to content-services due to a ADF directives refactoring * [AAE-11288] Fix content-services directive not found since has been moved from ADF core to content-services package * [AAE-11288] Fix directives imports from core to content-service into the spec files * [AAE-11288] [ci:force] Fix unknown directives, importing the content directive module * [ci:force] Updates @alfresco/adf-extensions and @alfresco/adf-content-services to 5.2.0-37065 Co-authored-by: Amedeo Lepore --- .../favorite-libraries.component.spec.ts | 4 +-- .../favorites/favorites.component.spec.ts | 4 +-- .../components/files/files.component.spec.ts | 4 +-- .../libraries/libraries.component.spec.ts | 4 +-- .../recent-files.component.spec.ts | 4 +-- .../shared-files.component.spec.ts | 4 +-- .../toggle-favorite.component.spec.ts | 3 +- .../toggle-join-library-button.component.ts | 2 +- .../toggle-join-library.component.spec.ts | 3 +- .../trashcan/trashcan.component.spec.ts | 4 +-- app/src/app/directives/directives.module.ts | 5 ++-- package-lock.json | 30 +++++++++---------- package.json | 10 +++---- 13 files changed, 42 insertions(+), 39 deletions(-) diff --git a/app/src/app/components/favorite-libraries/favorite-libraries.component.spec.ts b/app/src/app/components/favorite-libraries/favorite-libraries.component.spec.ts index 7c380e62d..f1070465c 100644 --- a/app/src/app/components/favorite-libraries/favorite-libraries.component.spec.ts +++ b/app/src/app/components/favorite-libraries/favorite-libraries.component.spec.ts @@ -26,8 +26,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { NO_ERRORS_SCHEMA } from '@angular/core'; import { Router } from '@angular/router'; -import { AlfrescoApiService, AppConfigModule, DataTableComponent, NodeFavoriteDirective, UserPreferencesService } from '@alfresco/adf-core'; -import { DocumentListComponent } from '@alfresco/adf-content-services'; +import { AlfrescoApiService, AppConfigModule, DataTableComponent, UserPreferencesService } from '@alfresco/adf-core'; +import { DocumentListComponent, NodeFavoriteDirective } from '@alfresco/adf-content-services'; import { FavoriteLibrariesComponent } from './favorite-libraries.component'; import { AppTestingModule } from '../../testing/app-testing.module'; import { AppHookService, ContentApiService } from '@alfresco/aca-shared'; diff --git a/app/src/app/components/favorites/favorites.component.spec.ts b/app/src/app/components/favorites/favorites.component.spec.ts index 4018dcf88..9d612f909 100644 --- a/app/src/app/components/favorites/favorites.component.spec.ts +++ b/app/src/app/components/favorites/favorites.component.spec.ts @@ -26,8 +26,8 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { Router } from '@angular/router'; import { TestBed, ComponentFixture } from '@angular/core/testing'; -import { NodeFavoriteDirective, DataTableComponent, AppConfigModule } from '@alfresco/adf-core'; -import { CustomResourcesService, DocumentListComponent } from '@alfresco/adf-content-services'; +import { DataTableComponent, AppConfigModule } from '@alfresco/adf-core'; +import { CustomResourcesService, DocumentListComponent, NodeFavoriteDirective } from '@alfresco/adf-content-services'; import { of } from 'rxjs'; import { FavoritesComponent } from './favorites.component'; import { AppTestingModule } from '../../testing/app-testing.module'; diff --git a/app/src/app/components/files/files.component.spec.ts b/app/src/app/components/files/files.component.spec.ts index 227635b3e..8639ba66d 100644 --- a/app/src/app/components/files/files.component.spec.ts +++ b/app/src/app/components/files/files.component.spec.ts @@ -26,8 +26,8 @@ import { TestBed, fakeAsync, tick, ComponentFixture } from '@angular/core/testing'; import { NO_ERRORS_SCHEMA, SimpleChange, SimpleChanges } from '@angular/core'; import { Router, ActivatedRoute, convertToParamMap } from '@angular/router'; -import { NodeFavoriteDirective, DataTableComponent, UploadService, AppConfigModule, DataTableModule, PaginationModule } from '@alfresco/adf-core'; -import { DocumentListComponent, DocumentListService, FilterSearch, PathElementEntity } from '@alfresco/adf-content-services'; +import { DataTableComponent, UploadService, AppConfigModule, DataTableModule, PaginationModule } from '@alfresco/adf-core'; +import { DocumentListComponent, DocumentListService, FilterSearch, PathElementEntity, NodeFavoriteDirective } from '@alfresco/adf-content-services'; import { NodeActionsService } from '../../services/node-actions.service'; import { FilesComponent } from './files.component'; import { AppTestingModule } from '../../testing/app-testing.module'; diff --git a/app/src/app/components/libraries/libraries.component.spec.ts b/app/src/app/components/libraries/libraries.component.spec.ts index 217cdbddc..d475ef783 100644 --- a/app/src/app/components/libraries/libraries.component.spec.ts +++ b/app/src/app/components/libraries/libraries.component.spec.ts @@ -26,8 +26,8 @@ import { TestBed, ComponentFixture } from '@angular/core/testing'; import { NO_ERRORS_SCHEMA } from '@angular/core'; import { Router } from '@angular/router'; -import { AlfrescoApiService, NodeFavoriteDirective, DataTableComponent, AppConfigModule } from '@alfresco/adf-core'; -import { DocumentListComponent } from '@alfresco/adf-content-services'; +import { AlfrescoApiService, DataTableComponent, AppConfigModule } from '@alfresco/adf-core'; +import { DocumentListComponent, NodeFavoriteDirective } from '@alfresco/adf-content-services'; import { LibrariesComponent } from './libraries.component'; import { AppTestingModule } from '../../testing/app-testing.module'; import { EffectsModule } from '@ngrx/effects'; diff --git a/app/src/app/components/recent-files/recent-files.component.spec.ts b/app/src/app/components/recent-files/recent-files.component.spec.ts index 9e57bd7b1..fd3a36417 100644 --- a/app/src/app/components/recent-files/recent-files.component.spec.ts +++ b/app/src/app/components/recent-files/recent-files.component.spec.ts @@ -25,8 +25,8 @@ import { TestBed, ComponentFixture } from '@angular/core/testing'; import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { NodeFavoriteDirective, DataTableComponent, AppConfigModule } from '@alfresco/adf-core'; -import { CustomResourcesService, DocumentListComponent } from '@alfresco/adf-content-services'; +import { DataTableComponent, AppConfigModule } from '@alfresco/adf-core'; +import { CustomResourcesService, DocumentListComponent, NodeFavoriteDirective } from '@alfresco/adf-content-services'; import { RecentFilesComponent } from './recent-files.component'; import { AppTestingModule } from '../../testing/app-testing.module'; import { Router } from '@angular/router'; diff --git a/app/src/app/components/shared-files/shared-files.component.spec.ts b/app/src/app/components/shared-files/shared-files.component.spec.ts index 10b5eb0a8..7a2647750 100644 --- a/app/src/app/components/shared-files/shared-files.component.spec.ts +++ b/app/src/app/components/shared-files/shared-files.component.spec.ts @@ -25,8 +25,8 @@ import { TestBed, ComponentFixture } from '@angular/core/testing'; import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { NodeFavoriteDirective, DataTableComponent, AppConfigModule } from '@alfresco/adf-core'; -import { CustomResourcesService, DocumentListComponent } from '@alfresco/adf-content-services'; +import { DataTableComponent, AppConfigModule } from '@alfresco/adf-core'; +import { CustomResourcesService, DocumentListComponent, NodeFavoriteDirective } from '@alfresco/adf-content-services'; import { SharedFilesComponent } from './shared-files.component'; import { AppTestingModule } from '../../testing/app-testing.module'; import { Router } from '@angular/router'; diff --git a/app/src/app/components/toolbar/toggle-favorite/toggle-favorite.component.spec.ts b/app/src/app/components/toolbar/toggle-favorite/toggle-favorite.component.spec.ts index 763e6faff..929458178 100644 --- a/app/src/app/components/toolbar/toggle-favorite/toggle-favorite.component.spec.ts +++ b/app/src/app/components/toolbar/toggle-favorite/toggle-favorite.component.spec.ts @@ -32,6 +32,7 @@ import { Router } from '@angular/router'; import { of } from 'rxjs'; import { TranslateModule } from '@ngx-translate/core'; import { AppTestingModule } from '../../../testing/app-testing.module'; +import { ContentDirectiveModule } from '@alfresco/adf-content-services'; describe('ToggleFavoriteComponent', () => { let component: ToggleFavoriteComponent; @@ -51,7 +52,7 @@ describe('ToggleFavoriteComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [TranslateModule.forRoot(), CoreModule.forRoot(), AppTestingModule], + imports: [TranslateModule.forRoot(), CoreModule.forRoot(), ContentDirectiveModule, AppTestingModule], declarations: [ToggleFavoriteComponent], providers: [ExtensionService, { provide: Store, useValue: mockStore }, { provide: Router, useValue: mockRouter }] }); diff --git a/app/src/app/components/toolbar/toggle-join-library/toggle-join-library-button.component.ts b/app/src/app/components/toolbar/toggle-join-library/toggle-join-library-button.component.ts index d1d6f50c9..d4ea9ac00 100644 --- a/app/src/app/components/toolbar/toggle-join-library/toggle-join-library-button.component.ts +++ b/app/src/app/components/toolbar/toggle-join-library/toggle-join-library-button.component.ts @@ -36,7 +36,7 @@ import { ProfileState, SelectionState } from '@alfresco/adf-extensions'; import { Component, ViewEncapsulation } from '@angular/core'; import { Store } from '@ngrx/store'; import { Observable } from 'rxjs'; -import { LibraryMembershipErrorEvent, LibraryMembershipToggleEvent } from '@alfresco/adf-core'; +import { LibraryMembershipErrorEvent, LibraryMembershipToggleEvent } from '@alfresco/adf-content-services'; @Component({ selector: 'app-toggle-join-library-button', diff --git a/app/src/app/components/toolbar/toggle-join-library/toggle-join-library.component.spec.ts b/app/src/app/components/toolbar/toggle-join-library/toggle-join-library.component.spec.ts index 51f973ee6..10fdf5e40 100644 --- a/app/src/app/components/toolbar/toggle-join-library/toggle-join-library.component.spec.ts +++ b/app/src/app/components/toolbar/toggle-join-library/toggle-join-library.component.spec.ts @@ -32,6 +32,7 @@ import { SnackbarErrorAction, SnackbarInfoAction } from '@alfresco/aca-shared/st import { AppTestingModule } from '../../../testing/app-testing.module'; import { ToggleJoinLibraryButtonComponent } from './toggle-join-library-button.component'; import { AppHookService, ContentApiService } from '@alfresco/aca-shared'; +import { ContentDirectiveModule } from '@alfresco/adf-content-services'; describe('ToggleJoinLibraryComponent', () => { let component: ToggleJoinLibraryButtonComponent; @@ -50,7 +51,7 @@ describe('ToggleJoinLibraryComponent', () => { }; TestBed.configureTestingModule({ - imports: [AppTestingModule, DirectiveModule], + imports: [AppTestingModule, DirectiveModule, ContentDirectiveModule], declarations: [ToggleJoinLibraryButtonComponent], providers: [ { diff --git a/app/src/app/components/trashcan/trashcan.component.spec.ts b/app/src/app/components/trashcan/trashcan.component.spec.ts index a959eb757..198df4c3d 100644 --- a/app/src/app/components/trashcan/trashcan.component.spec.ts +++ b/app/src/app/components/trashcan/trashcan.component.spec.ts @@ -24,8 +24,8 @@ */ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { TestBed, ComponentFixture } from '@angular/core/testing'; -import { AlfrescoApiService, NodeFavoriteDirective, DataTableComponent, AppConfigModule } from '@alfresco/adf-core'; -import { DocumentListComponent } from '@alfresco/adf-content-services'; +import { AlfrescoApiService, DataTableComponent, AppConfigModule } from '@alfresco/adf-core'; +import { DocumentListComponent, NodeFavoriteDirective } from '@alfresco/adf-content-services'; import { TrashcanComponent } from './trashcan.component'; import { AppTestingModule } from '../../testing/app-testing.module'; diff --git a/app/src/app/directives/directives.module.ts b/app/src/app/directives/directives.module.ts index d6deca086..5fd852500 100644 --- a/app/src/app/directives/directives.module.ts +++ b/app/src/app/directives/directives.module.ts @@ -26,10 +26,11 @@ import { NgModule } from '@angular/core'; import { DocumentListDirective } from './document-list.directive'; import { SharedDirectivesModule } from '@alfresco/aca-shared'; +import { ContentDirectiveModule } from '@alfresco/adf-content-services'; @NgModule({ - imports: [SharedDirectivesModule], + imports: [SharedDirectivesModule, ContentDirectiveModule], declarations: [DocumentListDirective], - exports: [DocumentListDirective, SharedDirectivesModule] + exports: [DocumentListDirective, SharedDirectivesModule, ContentDirectiveModule] }) export class DirectivesModule {} diff --git a/package-lock.json b/package-lock.json index e0d184267..5a0c01845 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,9 +11,9 @@ "dev": true }, "@alfresco/adf-cli": { - "version": "5.2.0-37048", - "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-5.2.0-37048.tgz", - "integrity": "sha512-1FtfCh9R5omP27VrftF5hcB/u/GwCI2rq3dnja6sGlkXjxraHS/LjGhJITBqOzLPNK46cU54UUkf4Go7qmEoew==", + "version": "5.2.0-37065", + "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-5.2.0-37065.tgz", + "integrity": "sha512-mfBXxDNVvhXqAGCSOYoC0XLy6WM0eFhZKJTW0P9Wuom38Aqd5+Z8F4r0HYBg65IoRQlVpYwsDZCgiJwl5RXv7g==", "dev": true, "requires": { "@alfresco/js-api": "5.2.0-420", @@ -28,17 +28,17 @@ } }, "@alfresco/adf-content-services": { - "version": "5.2.0-37048", - "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-5.2.0-37048.tgz", - "integrity": "sha512-9Mehwc9YBnZIfWpk7l4Ny3un3AQeMoNmOevncYtKt/FRIzG3rnC6jvMNkm5SgmxgzDj3B/aA2NFzg51jJyZZEQ==", + "version": "5.2.0-37065", + "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-5.2.0-37065.tgz", + "integrity": "sha512-CpFkrbOIu+6Pp0UrNpDEYh93aEka1mHvP9ft96P/TkWG/kH2dJZaSuFBh4IK7BEUy+tEMhO0OgBqfy0IN9JvSA==", "requires": { "tslib": "^2.3.0" } }, "@alfresco/adf-core": { - "version": "5.2.0-37048", - "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-5.2.0-37048.tgz", - "integrity": "sha512-m4DycBvX7huiMYN5V6NEGPj3SdusslFDZTOuH6gNU7LfBQyM52MTxnyXryshrAfn41F8VeXj/oPbsimZEIzFqA==", + "version": "5.2.0-37065", + "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-5.2.0-37065.tgz", + "integrity": "sha512-wwVRsnAlXKkagbHkfbzDSLmJboDKnHfYGjEqjFpHshevI2KjxTl/zPhvOzsaN7qIuYUQyuf1erWiG3i38w49tQ==", "requires": { "@editorjs/code": "2.7.0", "@editorjs/editorjs": "2.25.0", @@ -56,17 +56,17 @@ } }, "@alfresco/adf-extensions": { - "version": "5.2.0-37048", - "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-5.2.0-37048.tgz", - "integrity": "sha512-zegbUt4otVmbtTXoCbLlZJTJKXWLBiyXtmXu7tCZGD0j8b7sGI7GdiJa02YzzeCKTlvLkK/3L8tMIwa7cZdyiQ==", + "version": "5.2.0-37065", + "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-5.2.0-37065.tgz", + "integrity": "sha512-eqRAtK3KA/qBwjil7Aa7kpP2ZgfVKNr//bC7jut17R5z2d8bf1EXY0nXaXqnL5Jhm1NsspT5rVlyCLeHwih0Fg==", "requires": { "tslib": "^2.3.0" } }, "@alfresco/adf-testing": { - "version": "5.2.0-37048", - "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-5.2.0-37048.tgz", - "integrity": "sha512-f+MDucyKVkjgpZwdiiGRdcOFqFw5GeZdYVLzArJMqD7qjtsgp/UMcitzKvvrT2MNWbw3xDIBZ0+4jAGf+bFTIg==", + "version": "5.2.0-37065", + "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-5.2.0-37065.tgz", + "integrity": "sha512-UNubP1XVr4LHXhGH6zRzd1bFOX94vrruNVTJg5tU//ceso4MrrVTytfmn/B0ydquuAK4dpEd7EMxGthWxUsprA==", "dev": true, "requires": { "@alfresco/js-api": "5.2.0-420", diff --git a/package.json b/package.json index 20f25e0a4..bf657d9fd 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,9 @@ }, "private": true, "dependencies": { - "@alfresco/adf-content-services": "5.2.0-37048", - "@alfresco/adf-core": "5.2.0-37048", - "@alfresco/adf-extensions": "5.2.0-37048", + "@alfresco/adf-content-services": "5.2.0-37065", + "@alfresco/adf-core": "5.2.0-37065", + "@alfresco/adf-extensions": "5.2.0-37065", "@alfresco/js-api": "5.2.0-420", "@angular/animations": "14.1.2", "@angular/cdk": "14.1.2", @@ -58,8 +58,8 @@ "zone.js": "0.11.8" }, "devDependencies": { - "@alfresco/adf-cli": "5.2.0-37048", - "@alfresco/adf-testing": "5.2.0-37048", + "@alfresco/adf-cli": "5.2.0-37065", + "@alfresco/adf-testing": "5.2.0-37065", "@angular-custom-builders/lite-serve": "^0.2.3", "@angular-devkit/build-angular": "14.1.2", "@angular-eslint/builder": "^14.1.2",