[AAE-11496] Make aca-shared buildable (#2916)

Alfresco · Jan 24, 2023 · 87c1c2b · 87c1c2b
1 parent 113b5a8
commit 87c1c2b
Show file tree

Hide file tree

Showing 18 changed files with 124 additions and 41 deletions.
diff --git a/projects/aca-content/src/lib/aca-content.module.ts b/projects/aca-content/src/lib/aca-content.module.ts
@@ -44,7 +44,7 @@ import {
   LibraryStatusColumnComponent,
   TrashcanNameColumnComponent
 } from '@alfresco/adf-content-services';
-import { ExtensionsDataLoaderGuard, RouterExtensionService, SharedModule } from '@alfresco/aca-shared';
+import { DocumentBasePageService, ExtensionsDataLoaderGuard, RouterExtensionService, SharedModule } from '@alfresco/aca-shared';
 import * as rules from '@alfresco/aca-shared/rules';
 
 import { FilesComponent } from './components/files/files.component';
@@ -181,6 +181,7 @@ registerLocaleData(localeSv);
   providers: [
     { provide: AppConfigService, useClass: DebugAppConfigService },
     { provide: ContentVersionService, useClass: ContentUrlService },
+    { provide: DocumentBasePageService, useExisting: ContentVersionService },
     {
       provide: TRANSLATION_PROVIDER,
       multi: true,

diff --git a/projects/aca-content/src/lib/components/details/details.component.ts b/projects/aca-content/src/lib/components/details/details.component.ts
@@ -25,8 +25,7 @@
 
 import { Component, OnInit, ViewEncapsulation, OnDestroy } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { PageComponent } from '../page.component';
-import { AppExtensionService, ContentApiService } from '@alfresco/aca-shared';
+import { AppExtensionService, ContentApiService, PageComponent } from '@alfresco/aca-shared';
 import { AppStore, NavigateToPreviousPage, SetSelectedNodesAction } from '@alfresco/aca-shared/store';
 import { Store } from '@ngrx/store';
 import { ContentManagementService } from '../../services/content-management.service';

diff --git a/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.ts b/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.ts
@@ -28,9 +28,8 @@ import { Component, OnInit, ChangeDetectorRef } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { SiteEntry, FavoritePaging, Pagination } from '@alfresco/js-api';
 import { ContentManagementService } from '../../services/content-management.service';
-import { AppExtensionService, AppHookService, ContentApiService } from '@alfresco/aca-shared';
+import { AppExtensionService, AppHookService, ContentApiService, PageComponent } from '@alfresco/aca-shared';
 import { NavigateLibraryAction } from '@alfresco/aca-shared/store';
-import { PageComponent } from '../page.component';
 import { UserPreferencesService } from '@alfresco/adf-core';
 import { DocumentListPresetRef } from '@alfresco/adf-extensions';
 

diff --git a/projects/aca-content/src/lib/components/favorites/favorites.component.ts b/projects/aca-content/src/lib/components/favorites/favorites.component.ts
@@ -23,7 +23,7 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { AppExtensionService, ContentApiService } from '@alfresco/aca-shared';
+import { AppExtensionService, ContentApiService, PageComponent } from '@alfresco/aca-shared';
 import { AppStore } from '@alfresco/aca-shared/store';
 import { UploadService } from '@alfresco/adf-core';
 import { MinimalNodeEntity, MinimalNodeEntryEntity, PathElementEntity, PathInfo } from '@alfresco/js-api';
@@ -33,7 +33,6 @@ import { Router } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { debounceTime, map } from 'rxjs/operators';
 import { ContentManagementService } from '../../services/content-management.service';
-import { PageComponent } from '../page.component';
 import { DocumentListPresetRef } from '@alfresco/adf-extensions';
 
 @Component({

diff --git a/projects/aca-content/src/lib/components/files/files.component.ts b/projects/aca-content/src/lib/components/files/files.component.ts
@@ -30,8 +30,7 @@ import { Store } from '@ngrx/store';
 import { MinimalNodeEntity, MinimalNodeEntryEntity, PathElement, PathElementEntity } from '@alfresco/js-api';
 import { ContentManagementService } from '../../services/content-management.service';
 import { NodeActionsService } from '../../services/node-actions.service';
-import { PageComponent } from '../page.component';
-import { AppExtensionService, ContentApiService } from '@alfresco/aca-shared';
+import { AppExtensionService, ContentApiService, PageComponent } from '@alfresco/aca-shared';
 import { SetCurrentFolderAction, isAdmin, AppStore, UploadFileVersionAction, showLoaderSelector } from '@alfresco/aca-shared/store';
 import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout';
 import { debounceTime, takeUntil } from 'rxjs/operators';

diff --git a/projects/aca-content/src/lib/components/libraries/libraries.component.ts b/projects/aca-content/src/lib/components/libraries/libraries.component.ts
@@ -29,8 +29,7 @@ import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout';
 import { Component, OnInit } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { ContentManagementService } from '../../services/content-management.service';
-import { PageComponent } from '../page.component';
-import { AppExtensionService, AppHookService } from '@alfresco/aca-shared';
+import { AppExtensionService, AppHookService, PageComponent } from '@alfresco/aca-shared';
 import { DocumentListPresetRef } from '@alfresco/adf-extensions';
 
 @Component({

diff --git a/projects/aca-content/src/lib/components/preview/preview.component.ts b/projects/aca-content/src/lib/components/preview/preview.component.ts
@@ -30,8 +30,7 @@ import { debounceTime, map, takeUntil } from 'rxjs/operators';
 import { UserPreferencesService, ObjectUtils, UploadService, NodesApiService } from '@alfresco/adf-core';
 import { Store } from '@ngrx/store';
 import { AppStore, ClosePreviewAction, ViewerActionTypes, SetSelectedNodesAction } from '@alfresco/aca-shared/store';
-import { PageComponent } from '../page.component';
-import { AppExtensionService, AppHookService, ContentApiService } from '@alfresco/aca-shared';
+import { AppExtensionService, AppHookService, ContentApiService, PageComponent } from '@alfresco/aca-shared';
 import { ContentManagementService } from '../../services/content-management.service';
 import { ContentActionRef, ViewerExtensionRef } from '@alfresco/adf-extensions';
 import { SearchRequest } from '@alfresco/js-api';

diff --git a/projects/aca-content/src/lib/components/recent-files/recent-files.component.ts b/projects/aca-content/src/lib/components/recent-files/recent-files.component.ts
@@ -27,13 +27,12 @@ import { Component, OnInit } from '@angular/core';
 import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout';
 import { MinimalNodeEntity } from '@alfresco/js-api';
 import { ContentManagementService } from '../../services/content-management.service';
-import { PageComponent } from '../page.component';
 import { Store } from '@ngrx/store';
 import { AppStore } from '@alfresco/aca-shared/store';
 import { UploadService } from '@alfresco/adf-core';
 import { debounceTime } from 'rxjs/operators';
 import { Router } from '@angular/router';
-import { AppExtensionService } from '@alfresco/aca-shared';
+import { AppExtensionService, PageComponent } from '@alfresco/aca-shared';
 import { DocumentListPresetRef } from '@alfresco/adf-extensions';
 
 @Component({

diff --git a/.../src/lib/components/search/search-libraries-results/search-libraries-results.component.ts b/.../src/lib/components/search/search-libraries-results/search-libraries-results.component.ts
@@ -30,9 +30,8 @@ import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Params } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { ContentManagementService } from '../../../services/content-management.service';
-import { PageComponent } from '../../page.component';
 import { SearchLibrariesQueryBuilderService } from './search-libraries-query-builder.service';
-import { AppExtensionService, AppHookService } from '@alfresco/aca-shared';
+import { AppExtensionService, AppHookService, PageComponent } from '@alfresco/aca-shared';
 import { DocumentListPresetRef } from '@alfresco/adf-extensions';
 
 @Component({

diff --git a/projects/aca-content/src/lib/components/search/search-results/search-results.component.ts b/projects/aca-content/src/lib/components/search/search-results/search-results.component.ts
@@ -27,7 +27,6 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core';
 import { MinimalNodeEntity, Pagination, ResultSetPaging } from '@alfresco/js-api';
 import { ActivatedRoute, Params, Router } from '@angular/router';
 import { SearchQueryBuilderService } from '@alfresco/adf-content-services';
-import { PageComponent } from '../../page.component';
 import { Store } from '@ngrx/store';
 import {
   AppStore,
@@ -42,7 +41,7 @@ import {
 import { ContentManagementService } from '../../../services/content-management.service';
 import { TranslationService } from '@alfresco/adf-core';
 import { combineLatest, Observable } from 'rxjs';
-import { AppExtensionService } from '@alfresco/aca-shared';
+import { AppExtensionService, PageComponent } from '@alfresco/aca-shared';
 import { SearchSortingDefinition } from '@alfresco/adf-content-services/lib/search/models/search-sorting-definition.interface';
 import { takeUntil } from 'rxjs/operators';
 import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout';

diff --git a/projects/aca-content/src/lib/components/shared-files/shared-files.component.ts b/projects/aca-content/src/lib/components/shared-files/shared-files.component.ts
@@ -26,13 +26,12 @@
 import { Component, OnInit } from '@angular/core';
 import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout';
 import { ContentManagementService } from '../../services/content-management.service';
-import { PageComponent } from '../page.component';
 import { Store } from '@ngrx/store';
 import { debounceTime } from 'rxjs/operators';
 import { UploadService } from '@alfresco/adf-core';
 import { Router } from '@angular/router';
 import { MinimalNodeEntity } from '@alfresco/js-api';
-import { AppExtensionService, AppHookService } from '@alfresco/aca-shared';
+import { AppExtensionService, AppHookService, PageComponent } from '@alfresco/aca-shared';
 import { DocumentListPresetRef } from '@alfresco/adf-extensions';
 
 @Component({

diff --git a/projects/aca-content/src/lib/components/trashcan/trashcan.component.ts b/projects/aca-content/src/lib/components/trashcan/trashcan.component.ts
@@ -30,8 +30,7 @@ import { Component, OnInit } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { ContentManagementService } from '../../services/content-management.service';
-import { PageComponent } from '../page.component';
-import { AppExtensionService } from '@alfresco/aca-shared';
+import { AppExtensionService, PageComponent } from '@alfresco/aca-shared';
 
 @Component({
   templateUrl: './trashcan.component.html'

diff --git a/projects/aca-shared/ng-package.json b/projects/aca-shared/ng-package.json
@@ -1,5 +1,5 @@
 {
-  "dest": "../../dist/aca-shared",
+  "dest": "../../dist/@alfresco/aca-shared",
   "lib": {
     "entryFile": "src/public-api.ts"
   }

diff --git a/...tent/src/lib/components/page.component.ts → ...base-page/document-base-page.component.ts b/...tent/src/lib/components/page.component.ts → ...base-page/document-base-page.component.ts
@@ -31,7 +31,7 @@ import { Store } from '@ngrx/store';
 import { MinimalNodeEntity, MinimalNodeEntryEntity, NodePaging } from '@alfresco/js-api';
 import { Observable, Subject, Subscription } from 'rxjs';
 import { takeUntil, map } from 'rxjs/operators';
-import { ContentManagementService } from '../services/content-management.service';
+import { DocumentBasePageService } from './document-base-page.service';
 import {
   AppStore,
   ReloadDocumentListAction,
@@ -44,7 +44,8 @@ import {
   ViewNodeExtras,
   SetSelectedNodesAction
 } from '@alfresco/aca-shared/store';
-import { isLocked, isLibrary, AppExtensionService } from '@alfresco/aca-shared';
+import { AppExtensionService } from '../../services/app.extension.service';
+import { isLibrary, isLocked } from '../../utils/node.utils';
 
 /* eslint-disable @angular-eslint/directive-class-suffix */
 @Directive()
@@ -70,7 +71,7 @@ export abstract class PageComponent implements OnInit, OnDestroy, OnChanges {
 
   protected subscriptions: Subscription[] = [];
 
-  protected constructor(protected store: Store<AppStore>, protected extensions: AppExtensionService, protected content: ContentManagementService) {}
+  protected constructor(protected store: Store<AppStore>, protected extensions: AppExtensionService, protected content: DocumentBasePageService) {}
 
   ngOnInit() {
     this.sharedPreviewUrl$ = this.store.select(getSharedUrl);

diff --git a/projects/aca-shared/src/lib/components/document-base-page/document-base-page.service.ts b/projects/aca-shared/src/lib/components/document-base-page/document-base-page.service.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright © 2005 - 2021 Alfresco Software, Ltd. All rights reserved.
+ *
+ * License rights for this program may be obtained from Alfresco Software, Ltd.
+ * pursuant to a written agreement and any use of this program without such an
+ * agreement is prohibited.
+ */
+
+import { MinimalNodeEntity, MinimalNodeEntryEntity } from '@alfresco/js-api';
+
+export abstract class DocumentBasePageService {
+  abstract canUpdateNode(node: MinimalNodeEntity): boolean;
+  abstract canUploadContent(node: MinimalNodeEntryEntity): boolean;
+}
diff --git a/...src/lib/components/page.component.spec.ts → ...ment-base-page/document-base-page.spec.ts b/...src/lib/components/page.component.spec.ts → ...ment-base-page/document-base-page.spec.ts
@@ -24,18 +24,69 @@
  */
 
 import { TestBed, ComponentFixture } from '@angular/core/testing';
-import { PageComponent } from './page.component';
+import { PageComponent } from './document-base-page.component';
 import { ReloadDocumentListAction, SetSelectedNodesAction, AppState, AppStore, ViewNodeAction } from '@alfresco/aca-shared/store';
 import { AppExtensionService } from '@alfresco/aca-shared';
-import { MinimalNodeEntity, NodePaging } from '@alfresco/js-api';
-import { ContentManagementService } from '../services/content-management.service';
-import { EffectsModule } from '@ngrx/effects';
-import { ViewerEffects } from '../store/effects';
-import { Store } from '@ngrx/store';
-import { AppTestingModule } from '../testing/app-testing.module';
-import { Component } from '@angular/core';
+import { MinimalNodeEntity, Node, NodePaging } from '@alfresco/js-api';
+import { DocumentBasePageService } from './document-base-page.service';
+import { Store, StoreModule } from '@ngrx/store';
+import { Component, Injectable } from '@angular/core';
 import { DocumentListComponent } from '@alfresco/adf-content-services';
 import { MockStore, provideMockStore } from '@ngrx/store/testing';
+import { MaterialModule, PipeModule } from '@alfresco/adf-core';
+import { HttpClientModule } from '@angular/common/http';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { RouterTestingModule } from '@angular/router/testing';
+import { EffectsModule } from '@ngrx/effects';
+
+export const INITIAL_APP_STATE: AppState = {
+  appName: 'Alfresco Content Application',
+  headerColor: '#ffffff',
+  headerTextColor: '#000000',
+  logoPath: 'assets/images/alfresco-logo-white.svg',
+  headerImagePath: 'assets/images/mastHead-bg-shapesPattern.svg',
+  customCssPath: '',
+  webFontPath: '',
+  sharedUrl: '',
+  user: {
+    isAdmin: null,
+    id: null,
+    firstName: '',
+    lastName: ''
+  },
+  selection: {
+    nodes: [],
+    libraries: [],
+    isEmpty: true,
+    count: 0
+  },
+  navigation: {
+    currentFolder: null
+  },
+  currentNodeVersion: null,
+  infoDrawerOpened: false,
+  infoDrawerPreview: false,
+  infoDrawerMetadataAspect: '',
+  showFacetFilter: true,
+  fileUploadingDialog: true,
+  documentDisplayMode: 'list',
+  showLoader: false,
+  repository: {
+    status: {
+      isQuickShareEnabled: true
+    }
+  } as any
+};
+
+@Injectable()
+class DocumentBasePageServiceMock extends DocumentBasePageService {
+  canUpdateNode(_node: MinimalNodeEntity): boolean {
+    return true;
+  }
+  canUploadContent(_node: Node): boolean {
+    return true;
+  }
+}
 
 @Component({
   selector: 'aca-test',
@@ -44,7 +95,7 @@ import { MockStore, provideMockStore } from '@ngrx/store/testing';
 class TestComponent extends PageComponent {
   node: any;
 
-  constructor(store: Store<AppStore>, extensions: AppExtensionService, content: ContentManagementService) {
+  constructor(store: Store<AppStore>, extensions: AppExtensionService, content: DocumentBasePageService) {
     super(store, extensions, content);
   }
 }
@@ -56,9 +107,34 @@ describe('PageComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [AppTestingModule, EffectsModule.forRoot([ViewerEffects])],
+      imports: [
+        NoopAnimationsModule,
+        HttpClientModule,
+        RouterTestingModule,
+        MaterialModule,
+        StoreModule.forRoot(
+          { app: (state) => state },
+          {
+            initialState: {
+              app: INITIAL_APP_STATE
+            },
+            runtimeChecks: {
+              strictStateImmutability: false,
+              strictActionImmutability: false
+            }
+          }
+        ),
+        EffectsModule.forRoot([]),
+        PipeModule
+      ],
       declarations: [TestComponent],
-      providers: [ContentManagementService, AppExtensionService]
+      providers: [
+        {
+          provide: DocumentBasePageService,
+          useClass: DocumentBasePageServiceMock
+        },
+        AppExtensionService
+      ]
     });
 
     store = TestBed.inject(Store);
@@ -202,10 +278,10 @@ describe('Info Drawer state', () => {
     };
 
     TestBed.configureTestingModule({
-      imports: [AppTestingModule, EffectsModule.forRoot([ViewerEffects])],
+      imports: [NoopAnimationsModule, HttpClientModule, RouterTestingModule],
       declarations: [TestComponent],
       providers: [
-        ContentManagementService,
+        { provide: DocumentBasePageService, useClass: DocumentBasePageServiceMock },
         AppExtensionService,
         provideMockStore({
           initialState: { app: appState }

diff --git a/projects/aca-shared/src/lib/services/app.extension.service.ts b/projects/aca-shared/src/lib/services/app.extension.service.ts
@@ -57,7 +57,7 @@ import { ViewerRules } from '../models/viewer.rules';
 import { SettingsGroupRef } from '../models/types';
 import { NodePermissionService } from '../services/node-permission.service';
 import { filter, map } from 'rxjs/operators';
-import { ModalConfiguration } from '@alfresco/aca-shared';
+import { ModalConfiguration } from '../models/modal-configuration';
 
 @Injectable({
   providedIn: 'root'

diff --git a/projects/aca-shared/src/public-api.ts b/projects/aca-shared/src/public-api.ts
@@ -40,6 +40,8 @@ export * from './lib/components/tool-bar/toolbar-menu/toolbar-menu.component';
 export * from './lib/components/tool-bar/toolbar-menu-item/toolbar-menu-item.component';
 export * from './lib/components/info-drawer/info-drawer.component';
 export * from './lib/components/info-drawer/shared-info-drawer.module';
+export * from './lib/components/document-base-page/document-base-page.component';
+export * from './lib/components/document-base-page/document-base-page.service';
 
 export * from './lib/directives/contextmenu/contextmenu.directive';
 export * from './lib/directives/contextmenu/contextmenu.module';