[ADF-4125] simplify extension load in extension module (#4214)

* add extension load in extension module * add viewer extensions * fix license header * fix node passed in the viewer extension * fix node passed in the viewer extension * startup factory extension * startup factory extension * fix script * fix beta tag build * fix build * fix build * refactoring configuration files * extension using map * fix build * fix config * fix test * fix test
2025-08-07 17:48:54 +00:00 · 2019-02-22 14:19:41 +00:00
parent bf4d1a2806
commit bda7e07b52
92 changed files with 1035 additions and 785 deletions
--- a/demo-shell/src/app/app-extension.module.ts
+++ b/demo-shell/src/app/app-extension.module.ts
@@ -0,0 +1,27 @@
+/*!
+ * @license
+ * Copyright 2019 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { NgModule } from '@angular/core';
+import { AcaMonacoModule } from 'adf-monaco-extension';
+
+@NgModule({
+    imports: [
+        AcaMonacoModule
+    ]
+})
+export class AppExtensionsModule {
+}
--- a/demo-shell/src/app/app.module.ts
+++ b/demo-shell/src/app/app.module.ts
@@ -24,6 +24,7 @@ import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';

 import { AppConfigService, TRANSLATION_PROVIDER, DebugAppConfigService, CoreModule } from '@alfresco/adf-core';
+import { ExtensionsModule } from '@alfresco/adf-extensions';
 import { AppComponent } from './app.component';
 import { MaterialModule } from './material.module';
 import { LoginComponent } from './components/login/login.component';
@@ -65,7 +66,6 @@ import { ProcessModule } from '@alfresco/adf-process-services';
 import { AuthBearerInterceptor } from './services';
 import { ProcessServicesCloudModule, GroupCloudModule } from '@alfresco/adf-process-services-cloud';
 import { TreeViewSampleComponent } from './components/tree-view/tree-view-sample.component';
-import { AppExtensionsModule } from './extensions/extensions.module';
 import { CloudLayoutComponent } from './components/app-layout/cloud/cloud-layout.component';
 import { AppsCloudDemoComponent } from './components/app-layout/cloud/apps-cloud-demo.component';
 import { ProcessesCloudDemoComponent } from './components/app-layout/cloud/processes-cloud-demo.component';
@@ -78,6 +78,7 @@ import { StartProcessCloudDemoComponent } from './components/app-layout/cloud/st
 import { TemplateDemoComponent } from './components/template-list/template-demo.component';
 import { PeopleGroupCloudDemoComponent } from './components/app-layout/cloud/people-groups-cloud-demo.component';
 import { CloudSettingsComponent } from './components/app-layout/cloud/cloud-settings.component';
+import { AppExtensionsModule } from './app-extension.module';

@NgModule({
    imports: [
@@ -88,16 +89,18 @@ import { CloudSettingsComponent } from './components/app-layout/cloud/cloud-sett
        FormsModule,
        HttpClientModule,
        MaterialModule,
+        AppExtensionsModule,
        FlexLayoutModule,
        CoreModule.forRoot(),
        ContentModule.forRoot(),
        InsightsModule.forRoot(),
        ProcessModule.forRoot(),
+        ProcessServicesCloudModule,
+        ExtensionsModule.forRoot(),
        ThemePickerModule,
        ChartsModule,
        MonacoEditorModule.forRoot(),
        ProcessServicesCloudModule,
-        AppExtensionsModule.forRoot(),
        GroupCloudModule
    ],
    declarations: [
--- a/demo-shell/src/app/components/about/about.component.ts
+++ b/demo-shell/src/app/components/about/about.component.ts
@@ -16,8 +16,7 @@
 */

 import { Component } from '@angular/core';
-import { ExtensionRef } from '@alfresco/adf-extensions';
-import { AppExtensionService } from '../../extensions/extension.service';
+import { AppExtensionService, ExtensionRef } from '@alfresco/adf-extensions';
 import { Observable } from 'rxjs';

@Component({
--- a/demo-shell/src/app/components/app-layout/cloud/start-process-cloud-demo.component.ts
+++ b/demo-shell/src/app/components/app-layout/cloud/start-process-cloud-demo.component.ts
@@ -19,6 +19,7 @@ import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { NotificationService, AppConfigService } from '@alfresco/adf-core';
 import { CloudLayoutService } from './services/cloud-layout.service';
+
@Component({
    templateUrl: './start-process-cloud-demo.component.html',
    styleUrls: ['./start-process-cloud-demo.component.scss']
--- a/demo-shell/src/app/components/file-view/file-view.component.html
+++ b/demo-shell/src/app/components/file-view/file-view.component.html
@@ -4,7 +4,7 @@
        <adf-info-drawer [title]="'APP.INFO_DRAWER.TITLE' | translate">

            <adf-info-drawer-tab [label]="'APP.INFO_DRAWER.COMMENTS' | translate">
-                <adf-comments [nodeId]="nodeId" [readOnly]="isCommentDisabled"></adf-comments>
+                <adf-comments [nodeId]="nodeId" [readOnly]="!isCommentEnabled"></adf-comments>
            </adf-info-drawer-tab>

            <adf-info-drawer-tab [label]="'APP.INFO_DRAWER.PROPERTIES' | translate">
--- a/demo-shell/src/app/components/file-view/file-view.component.scss
+++ b/demo-shell/src/app/components/file-view/file-view.component.scss
@@ -1,3 +1,12 @@
 .adf-viewer__sidebar {
    width: 380px !important;
 }
+
+/* stylelint-disable */
+.monaco-scrollable-element {
+    width: 600px;
+}
+
+adf-preview-extension {
+    width: 600px;
+}
--- a/demo-shell/src/app/components/file-view/file-view.component.ts
+++ b/demo-shell/src/app/components/file-view/file-view.component.ts
@@ -17,7 +17,7 @@

 import { Component, OnInit, ViewEncapsulation } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { ContentService, PermissionsEnum, NodesApiService } from '@alfresco/adf-core';
+import { ContentService, AllowableOperationsEnum, PermissionsEnum, NodesApiService } from '@alfresco/adf-core';
 import { MatSnackBar } from '@angular/material';

@Component({
@@ -52,7 +52,7 @@ export class FileViewComponent implements OnInit {
    showLeftSidebar = null;
    showRightSidebar = false;
    customToolbar = false;
-    isCommentDisabled = false;
+    isCommentEnabled = false;

    constructor(private router: Router,
                private route: ActivatedRoute,
@@ -68,7 +68,8 @@ export class FileViewComponent implements OnInit {
                this.nodeApiService.getNode(id).subscribe(
                    (node) => {
                        if (node && node.isFile) {
-                            this.isCommentDisabled = this.contentServices.hasPermissions(node, PermissionsEnum.CONSUMER);
+                            this.isCommentEnabled = this.contentServices.hasPermissions(node, PermissionsEnum.NOT_CONSUMER) ||
+                                this.contentServices.hasAllowableOperations(node, AllowableOperationsEnum.UPDATE);
                            this.nodeId = id;
                            return;
                        }
--- a/demo-shell/src/app/components/form/form-list.component.ts
+++ b/demo-shell/src/app/components/form/form-list.component.ts
@@ -16,8 +16,7 @@
 */

 import { Component, ViewChild } from '@angular/core';
-import { FormComponent, FormModel, FormService, LogService } from '@alfresco/adf-core';
-import { FormOutcomeEvent } from '../../../../../lib/core/form/components/widgets/core';
+import { FormComponent, FormModel, FormService, LogService, FormOutcomeEvent } from '@alfresco/adf-core';

@Component({
    selector: 'app-form-list',
--- a/demo-shell/src/app/components/process-service/task-attachments.component.ts
+++ b/demo-shell/src/app/components/process-service/task-attachments.component.ts
@@ -22,10 +22,9 @@ import {
    TaskDetailsModel,
    TaskUploadService
 } from '@alfresco/adf-process-services';
-import { UploadService, AlfrescoApiService, AppConfigService } from '@alfresco/adf-core';
+import { UploadService, AlfrescoApiService, AppConfigService, FileUploadCompleteEvent } from '@alfresco/adf-core';
 import { PreviewService } from '../../services/preview.service';
 import { Subscription } from 'rxjs';
-import { FileUploadCompleteEvent } from '../../../../../lib/core/events/file.event';

 export function taskUploadServiceFactory(api: AlfrescoApiService, config: AppConfigService) {
    return new TaskUploadService(api, config);
--- a/demo-shell/src/app/extensions/extension.service.ts
+++ b/demo-shell/src/app/extensions/extension.service.ts
@@ -1,56 +0,0 @@
-/*!
- * @license
- * Copyright 2019 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { Injectable } from '@angular/core';
-import {
-    ExtensionService,
-    ExtensionConfig,
-    ExtensionRef
-} from '@alfresco/adf-extensions';
-import { Observable, BehaviorSubject } from 'rxjs';
-
-@Injectable({
-    providedIn: 'root'
-})
-export class AppExtensionService {
-    private _references = new BehaviorSubject<ExtensionRef[]>([]);
-
-    references$: Observable<ExtensionRef[]>;
-
-    constructor(private extensions: ExtensionService) {
-        this.references$ = this._references.asObservable();
-    }
-
-    async load() {
-        const config = await this.extensions.load();
-        this.setup(config);
-    }
-
-    setup(config: ExtensionConfig) {
-        if (!config) {
-            console.error('Extension configuration not found');
-            return;
-        }
-        // tslint:disable-next-line:no-console
-        console.log('loaded extension config', config);
-
-        const references = (config.$references || [])
-            .filter((entry) => typeof entry === 'object')
-            .map((entry) => <ExtensionRef> entry);
-        this._references.next(references);
-    }
-}
--- a/demo-shell/src/app/extensions/extensions.module.ts
+++ b/demo-shell/src/app/extensions/extensions.module.ts
@@ -1,51 +0,0 @@
-/*!
- * @license
- * Copyright 2019 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { NgModule, ModuleWithProviders, APP_INITIALIZER } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { CoreModule } from '@alfresco/adf-core';
-import { AppExtensionService } from './extension.service';
-import { ExtensionsModule } from '@alfresco/adf-extensions';
-
-export function setupExtensions(service: AppExtensionService): Function {
-    return () => service.load();
-}
-
-@NgModule({
-    imports: [CommonModule, CoreModule.forChild(), ExtensionsModule]
-})
-export class AppExtensionsModule {
-    static forRoot(): ModuleWithProviders {
-        return {
-            ngModule: AppExtensionsModule,
-            providers: [
-                {
-                    provide: APP_INITIALIZER,
-                    useFactory: setupExtensions,
-                    deps: [AppExtensionService],
-                    multi: true
-                }
-            ]
-        };
-    }
-
-    static forChild(): ModuleWithProviders {
-        return {
-            ngModule: AppExtensionsModule
-        };
-    }
-}