Upgrade to latest ADF (#3797)

* upgrade to latest ADF

* upgrade to latest ADF

* remove useless import

* update CLI as well

* remove useless imports that are already covered by the routes
This commit is contained in:
Denys Vuika 2024-04-17 09:35:07 -04:00 committed by GitHub
parent 8fbc22b9d6
commit 1bb7df3850
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 50 additions and 82 deletions

View File

@ -22,13 +22,13 @@
* from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
*/
import { AppConfigModule, LoginComponent } from '@alfresco/adf-core';
import { AppConfigPipe, LoginComponent } from '@alfresco/adf-core';
import { Component, ViewEncapsulation } from '@angular/core';
import { TranslateModule } from '@ngx-translate/core';
@Component({
standalone: true,
imports: [LoginComponent, AppConfigModule, TranslateModule],
imports: [LoginComponent, TranslateModule, AppConfigPipe],
templateUrl: './app-login.component.html',
encapsulation: ViewEncapsulation.None
})

60
package-lock.json generated
View File

@ -10,11 +10,11 @@
"hasInstallScript": true,
"license": "LGPL-3.0",
"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",
"@alfresco/adf-content-services": "6.9.0-8705449785",
"@alfresco/adf-core": "6.9.0-8705449785",
"@alfresco/adf-extensions": "6.9.0-8705449785",
"@alfresco/eslint-plugin-eslint-angular": "6.9.0-8705449785",
"@alfresco/js-api": "7.8.0-8705449785",
"@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.9.0-8694813215",
"@alfresco/adf-cli": "6.9.0-8705449785",
"@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.9.0-8694813215",
"resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-6.9.0-8694813215.tgz",
"integrity": "sha512-QOt8J0SEhHj7qZWOiM1CEaIOUmOZt4MAeNzCA3+1FsuvoYEDmE0hmBCH/9/uj1gG0dvxViLgOyX744cZjtMjGQ==",
"version": "6.9.0-8705449785",
"resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-6.9.0-8705449785.tgz",
"integrity": "sha512-nr9I/anYsnZ8FDMrGJoYWV1XoaetrkTJfRZIx/RbtUrwib9+pkvEnrVYW+a+7cG7OTPxFp7I8EiufH9Ui8ot1Q==",
"dev": true,
"dependencies": {
"@alfresco/js-api": ">=7.8.0-8694813215",
"@alfresco/js-api": ">=7.8.0-8705449785",
"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.9.0-8694813215",
"resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-6.9.0-8694813215.tgz",
"integrity": "sha512-/p80hXaa4SuuXf0XhJrHIk2pIC6B1+XxEb+ocJZvB1ru9aegQEPd+2oUKekiOo5LMB+I6/GerloOocb8OA9bPg==",
"version": "6.9.0-8705449785",
"resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-6.9.0-8705449785.tgz",
"integrity": "sha512-/w9t9ya381asUVgFR1+L6LA6m8Oos6wWxlIeGksgsI5cjO3s1BB6dEC0/RmmCZ5ZyRzLsCd7cjsvyEvwHrEZJw==",
"dependencies": {
"tslib": "^2.3.0"
},
"peerDependencies": {
"@alfresco/adf-core": ">=6.9.0-8694813215",
"@alfresco/js-api": ">=7.8.0-8694813215",
"@alfresco/adf-core": ">=6.9.0-8705449785",
"@alfresco/js-api": ">=7.8.0-8705449785",
"@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.9.0-8694813215",
"resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-6.9.0-8694813215.tgz",
"integrity": "sha512-f0keJswEtk+kwHvto+StTvP//p4X1klmRv9jzp6QWjsregHI66wFvO2/YpA8iP7z/EEUcYSo1kwOpulx2g72Cw==",
"version": "6.9.0-8705449785",
"resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-6.9.0-8705449785.tgz",
"integrity": "sha512-6KSaC6UbiSI7cESf12mebW2PSOG3daCuehBvhKkC4xEhUrdrKq75NfQQO+XEicmBgJ5IcjGOnOZAijmk1JpvtA==",
"dependencies": {
"angular-oauth2-oidc": "^13.0.1",
"angular-oauth2-oidc-jwks": "^13.0.1",
@ -178,8 +178,8 @@
"tslib": "^2.3.0"
},
"peerDependencies": {
"@alfresco/adf-extensions": ">=6.9.0-8694813215",
"@alfresco/js-api": ">=7.8.0-8694813215",
"@alfresco/adf-extensions": ">=6.9.0-8705449785",
"@alfresco/js-api": ">=7.8.0-8705449785",
"@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.9.0-8694813215",
"resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-6.9.0-8694813215.tgz",
"integrity": "sha512-dZAxoFKoWAv7+MayxSeYsvhuZ2bdgm9AW5eiZFQGvjg4UYuIaGUIUvDCmXdzrWzWAI6zcLhG/ah160yN5WWKvA==",
"version": "6.9.0-8705449785",
"resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-6.9.0-8705449785.tgz",
"integrity": "sha512-qpPz/2IVO7TjFsS8d8JQeqT4X3VhU4jENGiR1Eac35ATRg/YNmUpjHsSGEoq/EsPDQRGWzXtbryKMbdKdjc8ww==",
"dependencies": {
"tslib": "^2.3.0"
},
"peerDependencies": {
"@alfresco/js-api": ">=7.8.0-8694813215",
"@alfresco/js-api": ">=7.8.0-8705449785",
"@angular/common": ">=14.1.3",
"@angular/core": ">=14.1.3"
}
},
"node_modules/@alfresco/eslint-plugin-eslint-angular": {
"version": "6.9.0-8694813215",
"resolved": "https://registry.npmjs.org/@alfresco/eslint-plugin-eslint-angular/-/eslint-plugin-eslint-angular-6.9.0-8694813215.tgz",
"integrity": "sha512-FHOi1E+dk2V5Im/mVtgYWv7AJ1X1DEkLS2ncGWBhetL5qDzllA8+DNAeHiGbLMjq7Ej0ulU/zD/RyoFobm7Uyg=="
"version": "6.9.0-8705449785",
"resolved": "https://registry.npmjs.org/@alfresco/eslint-plugin-eslint-angular/-/eslint-plugin-eslint-angular-6.9.0-8705449785.tgz",
"integrity": "sha512-L8EplHOg5M2X3wXo2YrIqVV5yo+W+VkCG/M+NPrSBVF/tna4pxM99xFQrikZX2l1BKuJ4Breka7LsDG7mojukA=="
},
"node_modules/@alfresco/js-api": {
"version": "7.8.0-8694813215",
"resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-7.8.0-8694813215.tgz",
"integrity": "sha512-Qgw2deXHNbU7wyXhRA+D6V1+4JurK3Sg3bZAhR4N1ZO/Ri8grJ1xQZoyDaocNbGgvxh6OdxE4Lc8X6ShTHn7Pg==",
"version": "7.8.0-8705449785",
"resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-7.8.0-8705449785.tgz",
"integrity": "sha512-eIc+ggDybefIixleZJG7uOilkC1zqI4SlvfuKgGYHZSlVemPcjkvqakOzI5Kody7VqlVREnM/+3y0/vVXbB36g==",
"dependencies": {
"event-emitter": "^0.3.5",
"superagent": "^8.0.9",

View File

@ -34,11 +34,11 @@
},
"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",
"@alfresco/adf-content-services": "6.9.0-8705449785",
"@alfresco/adf-core": "6.9.0-8705449785",
"@alfresco/adf-extensions": "6.9.0-8705449785",
"@alfresco/eslint-plugin-eslint-angular": "6.9.0-8705449785",
"@alfresco/js-api": "7.8.0-8705449785",
"@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.9.0-8694813215",
"@alfresco/adf-cli": "6.9.0-8705449785",
"@angular-devkit/build-angular": "14.2.11",
"@angular-devkit/core": "14.1.2",
"@angular-devkit/schematics": "14.1.2",

View File

@ -34,11 +34,8 @@ import {
LibraryStatusColumnComponent,
TrashcanNameColumnComponent
} from '@alfresco/adf-content-services';
import { DocumentBasePageService, ExtensionsDataLoaderGuard, GenericErrorComponent, OpenInAppComponent } from '@alfresco/aca-shared';
import { DocumentBasePageService, ExtensionsDataLoaderGuard, OpenInAppComponent } from '@alfresco/aca-shared';
import * as rules from '@alfresco/aca-shared/rules';
import { FilesComponent } from './components/files/files.component';
import { LibrariesComponent } from './components/libraries/libraries.component';
import { FavoriteLibrariesComponent } from './components/favorite-libraries/favorite-libraries.component';
import { AppStoreModule } from './store/app-store.module';
import { CoreExtensionsModule } from './extensions/core.extensions.module';
import { AppInfoDrawerModule } from './components/info-drawer/info.drawer.module';
@ -47,13 +44,8 @@ import { APP_TOOLBAR_DIRECTIVES } from './components/toolbar';
import { APP_SIDENAV_DIRECTIVES } from './components/sidenav';
import { APP_COMMON_DIRECTIVES } from './components/common';
import { APP_SEARCH_DIRECTIVES } from './components/search';
import { FavoritesComponent } from './components/favorites/favorites.component';
import { RecentFilesComponent } from './components/recent-files/recent-files.component';
import { SharedFilesComponent } from './components/shared-files/shared-files.component';
import { CreateFromTemplateDialogComponent } from './dialogs/node-template/create-from-template.dialog';
import { DetailsComponent } from './components/details/details.component';
import { ContentUrlService } from './services/content-url.service';
import { HomeComponent } from './components/home/home.component';
import { CommonModule } from '@angular/common';
import { LocationLinkComponent } from './components/common/location-link/location-link.component';
import { LogoutComponent } from './components/common/logout/logout.component';
@ -82,9 +74,6 @@ import { ContentManagementService } from './services/content-management.service'
import { ShellLayoutComponent, SHELL_NAVBAR_MIN_WIDTH } from '@alfresco/adf-core/shell';
import { UserMenuComponent } from './components/sidenav/user-menu/user-menu.component';
import { ContextMenuComponent } from './components/context-menu/context-menu.component';
import { ViewProfileComponent } from './components/view-profile/view-profile.component';
import { TrashcanComponent } from './components/trashcan/trashcan.component';
import { SharedLinkViewComponent } from './components/shared-link-view/shared-link-view.component';
import { MAT_DIALOG_DEFAULT_OPTIONS } from '@angular/material/dialog';
import { SearchResultsRowComponent } from './components/search/search-results-row/search-results-row.component';
@ -105,21 +94,9 @@ import { SearchResultsRowComponent } from './components/search/search-results-ro
ContextMenuComponent,
AppInfoDrawerModule,
HammerModule,
ViewProfileComponent,
TrashcanComponent,
SharedLinkViewComponent,
AcaFolderRulesModule,
GenericErrorComponent,
DetailsComponent,
CreateFromTemplateDialogComponent,
OpenInAppComponent,
SharedFilesComponent,
FilesComponent,
FavoriteLibrariesComponent,
FavoritesComponent,
RecentFilesComponent,
LibrariesComponent,
HomeComponent,
UploadFilesDialogComponent
],
providers: [

View File

@ -28,11 +28,11 @@ import { SetSelectedNodesAction } from '@alfresco/aca-shared/store';
import { TranslateModule } from '@ngx-translate/core';
import { MatIconModule } from '@angular/material/icon';
import { MatMenuModule } from '@angular/material/menu';
import { DirectiveModule } from '@alfresco/adf-core';
import { LogoutDirective } from '@alfresco/adf-core';
@Component({
standalone: true,
imports: [TranslateModule, MatIconModule, MatMenuModule, DirectiveModule],
imports: [TranslateModule, MatIconModule, MatMenuModule, LogoutDirective],
selector: 'aca-logout',
template: `
<button mat-menu-item (click)="onLogoutEvent()" adf-logout>

View File

@ -26,13 +26,13 @@ import { Component, Input, OnChanges, OnInit, ViewEncapsulation } from '@angular
import { Node } from '@alfresco/js-api';
import { CommonModule } from '@angular/common';
import { VersionManagerModule } from '@alfresco/adf-content-services';
import { AppConfigModule } from '@alfresco/adf-core';
import { MatIconModule } from '@angular/material/icon';
import { TranslateModule } from '@ngx-translate/core';
import { AppConfigPipe } from '@alfresco/adf-core';
@Component({
standalone: true,
imports: [CommonModule, VersionManagerModule, AppConfigModule, MatIconModule, TranslateModule],
imports: [CommonModule, VersionManagerModule, MatIconModule, TranslateModule, AppConfigPipe],
selector: 'app-versions-tab',
template: `
<ng-container *ngIf="isFileSelected; else empty">

View File

@ -30,7 +30,6 @@ import {
TranslationMock,
AuthenticationService,
AlfrescoApiService,
PipeModule,
AlfrescoApiServiceMock,
PageTitleService
} from '@alfresco/adf-core';
@ -63,10 +62,9 @@ import { STORE_INITIAL_APP_DATA } from '@alfresco/aca-shared/store';
}
}
),
EffectsModule.forRoot([]),
PipeModule
EffectsModule.forRoot([])
],
exports: [RouterTestingModule, PipeModule, TranslateModule],
exports: [RouterTestingModule, TranslateModule],
providers: [
SearchQueryBuilderService,
{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock },

View File

@ -46,7 +46,7 @@ import { ContentActionRef, SelectionState } from '@alfresco/adf-extensions';
import { Node, VersionEntry, VersionsApi } from '@alfresco/js-api';
import { Component, HostListener, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core';
import { ActivatedRoute, PRIMARY_OUTLET, Router } from '@angular/router';
import { AlfrescoApiService, AppConfigModule, ViewerModule } from '@alfresco/adf-core';
import { AlfrescoApiService, AppConfigPipe, ViewerModule } from '@alfresco/adf-core';
import { Store } from '@ngrx/store';
import { from, Observable, Subject } from 'rxjs';
import { debounceTime, takeUntil } from 'rxjs/operators';
@ -57,7 +57,7 @@ import { ViewerService } from '../../services/viewer.service';
@Component({
standalone: true,
imports: [CommonModule, ViewerModule, AlfrescoViewerModule, InfoDrawerComponent, AppConfigModule, ToolbarMenuItemComponent, ToolbarComponent],
imports: [CommonModule, ViewerModule, AlfrescoViewerModule, InfoDrawerComponent, ToolbarMenuItemComponent, ToolbarComponent, AppConfigPipe],
selector: 'aca-viewer',
templateUrl: './viewer.component.html',
styleUrls: ['./viewer.component.scss'],

View File

@ -25,14 +25,7 @@
import { Injectable, NgModule } from '@angular/core';
import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import {
AlfrescoApiService,
AlfrescoApiServiceMock,
PipeModule,
TranslateLoaderService,
TranslationMock,
TranslationService
} from '@alfresco/adf-core';
import { AlfrescoApiService, AlfrescoApiServiceMock, TranslateLoaderService, TranslationMock, TranslationService } from '@alfresco/adf-core';
import { HttpClientModule } from '@angular/common/http';
import { RouterTestingModule } from '@angular/router/testing';
import { EffectsModule } from '@ngrx/effects';
@ -92,6 +85,7 @@ export class DocumentBasePageServiceMock extends DocumentBasePageService {
canUpdateNode(): boolean {
return true;
}
canUploadContent(): boolean {
return true;
}
@ -122,8 +116,7 @@ export class DocumentBasePageServiceMock extends DocumentBasePageService {
provide: TranslateLoader,
useClass: TranslateLoaderService
}
}),
PipeModule
})
],
exports: [TranslateModule],
providers: [