Pre-Angular upgrade fixes (#5709)

* code fixes * code fixes * more code fixes * even more fixes * add missing typescript for cli * rollback info drawer test changes * use npx for cli commands * restore attach providers
2025-07-24 17:32:15 +00:00 · 2020-05-18 14:02:15 +01:00
parent 1def8000f0
commit 347e64fd91
150 changed files with 645 additions and 461 deletions
--- a/demo-shell/e2e/tsconfig.e2e.json
+++ b/demo-shell/e2e/tsconfig.e2e.json
@@ -6,6 +6,7 @@
    "target": "es5",
    "types":[
      "jasmine",
+      "jasminewd2",
      "node"
    ]
  }
--- a/demo-shell/src/app/app.module.ts
+++ b/demo-shell/src/app/app.module.ts
@@ -55,7 +55,6 @@ import { TaskAttachmentsComponent } from './components/process-service/task-atta
 import { ProcessAttachmentsComponent } from './components/process-service/process-attachments.component';
 import { SharedLinkViewComponent } from './components/shared-link-view/shared-link-view.component';
 import { DemoPermissionComponent } from './components/permissions/demo-permissions.component';
-import { PreviewService } from './services/preview.service';
 import { ReportIssueComponent } from './components/report-issue/report-issue.component';
 import { MonacoEditorModule } from 'ngx-monaco-editor';
 import { ContentModule } from '@alfresco/adf-content-services';
@@ -211,9 +210,7 @@ registerLocaleData(localeSv);
                name: 'lazy-loading',
                source: 'resources/lazy-loading'
            }
-        },
-        PreviewService,
-        CoreAutomationService
+        }
    ],
    entryComponents: [
        VersionManagerDialogAdapterComponent,
--- a/demo-shell/src/app/components/cloud/cloud-viewer.component.ts
+++ b/demo-shell/src/app/components/cloud/cloud-viewer.component.ts
@@ -16,8 +16,7 @@
 */

 import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import { Params } from '@angular/router/src/shared';
+import { ActivatedRoute, Params } from '@angular/router';

@Component({
    selector: 'app-cloud-viewer',
--- a/demo-shell/src/app/components/cloud/community/community-processes-cloud.component.html
+++ b/demo-shell/src/app/components/cloud/community/community-processes-cloud.component.html
@@ -17,7 +17,7 @@
            [id]="editedFilter.processInstanceId"
            [status]="editedFilter.status"
            [name]="editedFilter.processName"
-            [businessKey]="editedFilter.businessKey"
+            [businessKey]="editedFilter['businessKey']"
            [lastModifiedFrom]="editedFilter.lastModifiedFrom"
            [lastModifiedTo]="editedFilter.lastModifiedTo"
            [sorting]="sortArray"
--- a/demo-shell/src/app/components/cloud/community/community-processes-cloud.component.ts
+++ b/demo-shell/src/app/components/cloud/community/community-processes-cloud.component.ts
@@ -50,7 +50,7 @@ export class CommunityProcessesCloudDemoComponent implements OnInit, OnDestroy {
    selectedRow: any;
    multiselect: boolean;
    selectionMode: string;
-    selectedRows: string[] = [];
+    selectedRows: any[] = [];
    testingMode: boolean;
    processFilterProperties: any  = { filterProperties: [], sortProperties: [], actions: [] };

--- a/demo-shell/src/app/components/cloud/processes-cloud-demo.component.html
+++ b/demo-shell/src/app/components/cloud/processes-cloud-demo.component.html
@@ -19,7 +19,7 @@
            [id]="editedFilter.processInstanceId"
            [status]="editedFilter.status"
            [name]="editedFilter.processName"
-            [businessKey]="editedFilter.businessKey"
+            [businessKey]="editedFilter['businessKey']"
            [lastModifiedFrom]="editedFilter.lastModifiedFrom"
            [lastModifiedTo]="editedFilter.lastModifiedTo"
            [sorting]="sortArray"
--- a/demo-shell/src/app/components/cloud/processes-cloud-demo.component.ts
+++ b/demo-shell/src/app/components/cloud/processes-cloud-demo.component.ts
@@ -54,7 +54,7 @@ export class ProcessesCloudDemoComponent implements OnInit, OnDestroy {
    selectedRow: any;
    multiselect: boolean;
    selectionMode: string;
-    selectedRows: string[] = [];
+    selectedRows: any[] = [];
    testingMode: boolean;
    actionMenu: boolean;
    contextMenu: boolean;
--- a/demo-shell/src/app/components/file-view/file-view.component.html
+++ b/demo-shell/src/app/components/file-view/file-view.component.html
@@ -108,7 +108,7 @@
                <mat-card>
                    <mat-card-content>
                        <adf-version-manager [node]="node"
-                                             (uploadError)="uploadError($event)">
+                                             (uploadError)="onUploadError($event)">
                        </adf-version-manager>
                    </mat-card-content>
                </mat-card>
--- a/demo-shell/src/app/components/files/files.component.html
+++ b/demo-shell/src/app/components/files/files.component.html
@@ -446,7 +446,7 @@
            <adf-infinite-pagination
                [hidden]="!infiniteScrolling"
                [target]="documentList"
-                [loading]="documentList.infiniteLoading">
+                [loading]="documentList.loading">
                {{ 'ADF-DOCUMENT-LIST.LAYOUT.LOAD_MORE' | translate }}
            </adf-infinite-pagination>
        </adf-upload-drag-area>
--- a/demo-shell/src/app/components/pipes/pipes.component.html
+++ b/demo-shell/src/app/components/pipes/pipes.component.html
@@ -99,7 +99,7 @@
        <div>{{ number | adfDecimalNumber : decimalValues }} </div>
        <br>
        <h3>AdfDecimalNumber Pipe - Custom locale</h3>
-        <div>{{ number | adfDecimalNumber : {} : locale }} </div>
+        <div>{{ number | adfDecimalNumber : null : locale }} </div>
        <br>
        <h3>AdfDecimalNumber Pipe - Custom digits config and locale</h3>
        <div>{{ number | adfDecimalNumber : decimalValues : locale }} </div>
--- a/demo-shell/src/app/components/process-service/process-service.component.html
+++ b/demo-shell/src/app/components/process-service/process-service.component.html
@@ -16,7 +16,7 @@
                            </div>
                        </adf-sidebar-action-menu>
                    </div>
-                    <mat-accordion class="app-accordion-panel" [displayMode]="flat">
+                    <mat-accordion class="app-accordion-panel" displayMode="flat">
                        <mat-expansion-panel class="mat-elevation-z0" [expanded]="true">
                            <mat-expansion-panel-header>
                                <mat-panel-title>
@@ -132,7 +132,7 @@
                            </div>
                        </adf-sidebar-action-menu>
                    </div>
-                    <mat-accordion class="app-accordion-panel" [displayMode]="flat">
+                    <mat-accordion class="app-accordion-panel" displayMode="flat">
                        <mat-expansion-panel class="mat-elevation-z0" [expanded]="true">
                            <mat-expansion-panel-header>
                                <mat-panel-title>
--- a/demo-shell/src/app/components/search/search-config-test.service.ts
+++ b/demo-shell/src/app/components/search/search-config-test.service.ts
@@ -17,12 +17,11 @@

 import { QueryBody } from '@alfresco/js-api';
 import { SearchConfigurationInterface } from '@alfresco/adf-core';
+import { Injectable } from '@angular/core';

+@Injectable()
 export class TestSearchConfigurationService implements SearchConfigurationInterface {

-    constructor() {
-    }
-
    public generateQueryBody(searchTerm: string, maxResults: number, skipCount: number): QueryBody {
        const defaultQueryBody: QueryBody = {
            query: {
--- a/demo-shell/src/app/components/search/search-extended.component.html
+++ b/demo-shell/src/app/components/search/search-extended.component.html
@@ -11,7 +11,7 @@
                  class="app-example-card-search-container">
          <ng-template let-data>
            <mat-card class="app-example-card"
-                 *ngFor="let item of data?.list?.entries; let idx = index" (click)="onClick(item)">
+                 *ngFor="let item of data?.list?.entries; let idx = index">
                <mat-card-header>
                    <div mat-card-avatar class="app-example-header-image"></div>
                    <mat-card-title>{{ item?.entry.name }}</mat-card-title>
--- a/demo-shell/src/app/components/theme-picker/style-manager/style-manager.ts
+++ b/demo-shell/src/app/components/theme-picker/style-manager/style-manager.ts
@@ -21,7 +21,7 @@ import { Injectable } from '@angular/core';
 * Class for managing stylesheets. Stylesheets are loaded into named slots so that they can be
 * removed or changed later.
 */
-@Injectable()
+@Injectable({ providedIn: 'root' })
 export class StyleManager {
  /**
   * Set the stylesheet with the specified key.
--- a/demo-shell/src/app/components/theme-picker/theme-picker.ts
+++ b/demo-shell/src/app/components/theme-picker/theme-picker.ts
@@ -144,8 +144,7 @@ export class ThemePickerComponent {
        CommonModule
    ],
    exports: [ThemePickerComponent],
-    declarations: [ThemePickerComponent],
-    providers: [StyleManager, ThemeStorage]
+    declarations: [ThemePickerComponent]
 })
 export class ThemePickerModule {
 }
--- a/demo-shell/src/app/components/theme-picker/theme-storage/theme-storage.ts
+++ b/demo-shell/src/app/components/theme-picker/theme-storage/theme-storage.ts
@@ -26,13 +26,13 @@ export interface DocsSiteTheme {
  isDefault?: boolean;
 }

-@Injectable()
+@Injectable({ providedIn: 'root' })
 export class ThemeStorage {
  static storageKey = 'docs-theme-storage-current';

-  public onThemeUpdate: EventEmitter<DocsSiteTheme> = new EventEmitter<DocsSiteTheme>();
+  onThemeUpdate = new EventEmitter<DocsSiteTheme>();

-  public storeTheme(theme: DocsSiteTheme) {
+  storeTheme(theme: DocsSiteTheme) {
    try {
      window.localStorage[ThemeStorage.storageKey] = JSON.stringify(theme);
    } catch (e) { }
@@ -40,7 +40,7 @@ export class ThemeStorage {
    this.onThemeUpdate.emit(theme);
  }

-  public getStoredTheme(): DocsSiteTheme {
+  getStoredTheme(): DocsSiteTheme {
    try {
      return JSON.parse(window.localStorage[ThemeStorage.storageKey] || null);
    } catch (e) {
@@ -48,7 +48,7 @@ export class ThemeStorage {
    }
  }

-  public clearStorage() {
+  clearStorage() {
    try {
      window.localStorage.removeItem(ThemeStorage.storageKey);
    } catch (e) { }
--- a/demo-shell/src/app/services/preview.service.ts
+++ b/demo-shell/src/app/services/preview.service.ts
@@ -18,7 +18,7 @@
 import { Injectable } from '@angular/core';
 import { Router } from '@angular/router';

-@Injectable()
+@Injectable({ providedIn: 'root' })
 export class PreviewService {

    public content: Blob = null;