remove electron demo code (#453)

* remove electron demo code * remove unused property * cleanup tests * cleanup sidenav tests * cleanup trashcan tests * remove fdescribe
2025-07-31 17:38:28 +00:00 · 2018-06-23 17:30:20 +01:00
parent 1bc652d923
commit e846d97317
10 changed files with 45 additions and 116 deletions
--- a/package-lock.json
+++ b/package-lock.json
@@ -467,14 +467,6 @@
      "resolved": "https://registry.npmjs.org/@ngrx/store-devtools/-/store-devtools-5.2.0.tgz",
      "integrity": "sha1-L/+RapqjSTdYJncrNZ27ZLnl1iI="
    },
-    "@ngstack/electron": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/@ngstack/electron/-/electron-0.1.0.tgz",
-      "integrity": "sha512-uqBNDkeATuZQm1eVXjB3rok9zFLMaJzfNl1tVnlqMwfaGA9FIe90nquvIZnL/scHbno89weGGxg4JeHLgsRMLA==",
-      "requires": {
-        "tslib": "^1.7.1"
-      }
-    },
    "@ngtools/json-schema": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/@ngtools/json-schema/-/json-schema-1.2.0.tgz",
--- a/package.json
+++ b/package.json
@@ -46,7 +46,6 @@
    "@ngrx/router-store": "^5.2.0",
    "@ngrx/store": "^5.2.0",
    "@ngrx/store-devtools": "^5.2.0",
-    "@ngstack/electron": "0.1.0",
    "@ngx-translate/core": "9.1.1",
    "alfresco-js-api": "2.4.0-92eae7db59edeb63e2e0dc1e4c2e6b182ff46f2b",
    "core-js": "2.5.3",
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -23,12 +23,11 @@
 * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
 */

-import { Component, OnInit, EventEmitter } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { Router, ActivatedRoute, NavigationEnd } from '@angular/router';
 import {
-    PageTitleService, AppConfigService, FileModel, UploadService,
+    PageTitleService, AppConfigService,
    AuthenticationService, AlfrescoApiService } from '@alfresco/adf-core';
-import { ElectronService } from '@ngstack/electron';
 import { Store } from '@ngrx/store';
 import { AppStore } from './store/states/app.state';
 import { SetHeaderColorAction, SetAppNameAction, SetLogoPathAction, SetLanguagePickerAction } from './store/actions';
@@ -46,9 +45,7 @@ export class AppComponent implements OnInit {
        private store: Store<AppStore>,
        private config: AppConfigService,
        private alfrescoApiService: AlfrescoApiService,
-        private authenticationService: AuthenticationService,
-        private electronService: ElectronService,
-        private uploadService: UploadService) {
+        private authenticationService: AuthenticationService) {
    }

    ngOnInit() {
@@ -80,26 +77,6 @@ export class AppComponent implements OnInit {

                pageTitle.setTitle(data.title || '');
            });
-
-        this.electronService.on('app:navigateRoute', (event: any, ...args: string[]) => {
-            this.router.navigate([...args]);
-        });
-
-        this.electronService.on('app:upload', (event: any, files: any[] = []) => {
-            const models = files.map(fileInfo => {
-                const file = new File([fileInfo.data], fileInfo.name);
-
-                return new FileModel(file, {
-                    path: fileInfo.path,
-                    parentId: fileInfo.parentId
-                });
-            });
-
-            if (models.length > 0) {
-                this.uploadService.addToQueue(...models);
-                this.uploadService.uploadFilesInTheQueue(new EventEmitter());
-            }
-        });
    }

    private loadAppSettings() {
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -30,7 +30,6 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { TRANSLATION_PROVIDER, CoreModule, AppConfigService, PageTitleService, DebugAppConfigService } from '@alfresco/adf-core';
 import { ContentModule } from '@alfresco/adf-content-services';
-import { ElectronModule } from '@ngstack/electron';

 import { AppComponent } from './app.component';
 import { APP_ROUTES } from './app.routes';
@@ -94,7 +93,6 @@ import { ExperimentalDirective } from './directives/experimental.directive';
        MaterialModule,
        CoreModule,
        ContentModule,
-        ElectronModule,
        AppStoreModule
    ],
    declarations: [
--- a/src/app/components/sidenav/sidenav.component.html
+++ b/src/app/components/sidenav/sidenav.component.html
@@ -34,7 +34,6 @@
                </adf-upload-button>

                <adf-upload-button
-                    *ngIf="!isDesktopApp"
                    [tooltip]="
                        (permission.check(node, ['create'])
                            ? 'APP.NEW_MENU.TOOLTIPS.UPLOAD_FOLDERS'
@@ -46,20 +45,6 @@
                    [uploadFolders]="true"
                    [staticTitle]="'APP.NEW_MENU.MENU_ITEMS.UPLOAD_FOLDER' | translate">
                </adf-upload-button>
-
-                <button
-                    *ngIf="isDesktopApp"
-                    mat-menu-item
-                    [title]="
-                        (permission.check(node, ['create'])
-                            ? 'APP.NEW_MENU.TOOLTIPS.UPLOAD_FOLDERS'
-                            : 'APP.NEW_MENU.TOOLTIPS.UPLOAD_FOLDERS_NOT_ALLOWED'
-                        ) | translate"
-                    [disabled]="!permission.check(node, ['create'])"
-                    (click)="uploadFolderDesktop()">
-                    <mat-icon>file_upload</mat-icon>
-                    <span>{{ 'APP.NEW_MENU.MENU_ITEMS.UPLOAD_FOLDER' | translate }}</span>
-                </button>
            </div>
        </adf-sidebar-action-menu>
    </div>
--- a/src/app/components/sidenav/sidenav.component.spec.ts
+++ b/src/app/components/sidenav/sidenav.component.spec.ts
@@ -24,25 +24,20 @@
 */

 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { TestBed, async } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-import { MatMenuModule, MatSnackBarModule } from '@angular/material';
-import { AppConfigService, TranslationService, TranslationMock, CoreModule } from '@alfresco/adf-core';
+import { TestBed, async, ComponentFixture } from '@angular/core/testing';
+import { AppConfigService, CoreModule } from '@alfresco/adf-core';
 import { BrowsingFilesService } from '../../common/services/browsing-files.service';
 import { NodePermissionService } from '../../common/services/node-permission.service';

 import { SidenavComponent } from './sidenav.component';
-import { ElectronModule } from '@ngstack/electron';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { StoreModule } from '@ngrx/store';
-import { appReducer } from '../../store/reducers/app.reducer';
-import { INITIAL_STATE } from '../../store/states/app.state';
 import { EffectsModule } from '@ngrx/effects';
 import { NodeEffects } from '../../store/effects/node.effects';
 import { ContentManagementService } from '../../common/services/content-management.service';
+import { AppTestingModule } from '../../testing/app-testing.module';
+import { MaterialModule } from '../../material.module';

 describe('SidenavComponent', () => {
-    let fixture;
+    let fixture: ComponentFixture<SidenavComponent>;
    let component: SidenavComponent;
    let browsingService: BrowsingFilesService;
    let appConfig: AppConfigService;
@@ -58,20 +53,15 @@ describe('SidenavComponent', () => {
    beforeEach(async(() => {
        TestBed.configureTestingModule({
            imports: [
-                NoopAnimationsModule,
+                AppTestingModule,
+                MaterialModule,
                CoreModule.forRoot(),
-                MatMenuModule,
-                MatSnackBarModule,
-                RouterTestingModule,
-                ElectronModule,
-                StoreModule.forRoot({ app: appReducer }, { initialState: INITIAL_STATE }),
                EffectsModule.forRoot([NodeEffects])
            ],
            declarations: [
                SidenavComponent
            ],
            providers: [
-                { provide: TranslationService, useClass: TranslationMock },
                NodePermissionService,
                BrowsingFilesService,
                ContentManagementService
--- a/src/app/components/sidenav/sidenav.component.ts
+++ b/src/app/components/sidenav/sidenav.component.ts
@@ -31,7 +31,6 @@ import { AppConfigService } from '@alfresco/adf-core';

 import { BrowsingFilesService } from '../../common/services/browsing-files.service';
 import { NodePermissionService } from '../../common/services/node-permission.service';
-import { ElectronService } from '@ngstack/electron';

@Component({
    selector: 'app-sidenav',
@@ -41,7 +40,6 @@ import { ElectronService } from '@ngstack/electron';
 export class SidenavComponent implements OnInit, OnDestroy {
    @Input() showLabel: boolean;

-    isDesktopApp = false;
    node: MinimalNodeEntryEntity = null;
    navigation = [];

@@ -50,8 +48,7 @@ export class SidenavComponent implements OnInit, OnDestroy {
    constructor(
        private browsingFilesService: BrowsingFilesService,
        private appConfig: AppConfigService,
-        public permission: NodePermissionService,
-        private electronService: ElectronService
+        public permission: NodePermissionService
    ) {}

    ngOnInit() {
@@ -61,8 +58,6 @@ export class SidenavComponent implements OnInit, OnDestroy {
            this.browsingFilesService.onChangeParent
                .subscribe((node: MinimalNodeEntryEntity) => this.node = node)
        ]);
-
-        this.isDesktopApp = this.electronService.isDesktopApp;
    }

    ngOnDestroy() {
@@ -75,8 +70,4 @@ export class SidenavComponent implements OnInit, OnDestroy {

        return Object.keys(data).map((key) => data[key]);
    }
-
-    uploadFolderDesktop() {
-        this.electronService.send('core:uploadFolder', this.node.id);
-    }
 }
--- a/src/app/components/trashcan/trashcan.component.spec.ts
+++ b/src/app/components/trashcan/trashcan.component.spec.ts
@@ -23,11 +23,9 @@
 * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
 */
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { RouterTestingModule } from '@angular/router/testing';
-import { HttpClientModule } from '@angular/common/http';
-import { TestBed, async, ComponentFixture } from '@angular/core/testing';
+import { TestBed, ComponentFixture } from '@angular/core/testing';
 import {
-    NotificationService, TranslationService, TranslationMock,
+    NotificationService,
    NodesApiService, AlfrescoApiService, ContentService,
    UserPreferencesService, LogService, AppConfigService,
    StorageService, CookieService, ThumbnailService,
@@ -35,16 +33,12 @@ import {
    NodeFavoriteDirective, DataTableComponent, AppConfigPipe, PeopleContentService
 } from '@alfresco/adf-core';
 import { DocumentListComponent, CustomResourcesService } from '@alfresco/adf-content-services';
-import { TranslateModule } from '@ngx-translate/core';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { MatMenuModule, MatSnackBarModule, MatIconModule } from '@angular/material';
 import { DocumentListService } from '@alfresco/adf-content-services';
 import { ContentManagementService } from '../../common/services/content-management.service';

 import { TrashcanComponent } from './trashcan.component';
-import { StoreModule } from '@ngrx/store';
-import { appReducer } from '../../store/reducers/app.reducer';
-import { INITIAL_STATE } from '../../store/states/app.state';
+import { AppTestingModule } from '../../testing/app-testing.module';
+import { MaterialModule } from '../../material.module';

 describe('TrashcanComponent', () => {
    let fixture: ComponentFixture<TrashcanComponent>;
@@ -62,16 +56,11 @@ describe('TrashcanComponent', () => {
        };
    });

-    beforeEach(async(() => {
+    beforeEach(() => {
        TestBed.configureTestingModule({
            imports: [
-                MatMenuModule,
-                NoopAnimationsModule,
-                HttpClientModule,
-                TranslateModule.forRoot(),
-                RouterTestingModule,
-                MatSnackBarModule, MatIconModule,
-                StoreModule.forRoot({ app: appReducer }, { initialState: INITIAL_STATE })
+                AppTestingModule,
+                MaterialModule,
            ],
            declarations: [
                DataTableComponent,
@@ -83,7 +72,6 @@ describe('TrashcanComponent', () => {
                AppConfigPipe
            ],
            providers: [
-                { provide: TranslationService, useClass: TranslationMock },
                AuthenticationService,
                UserPreferencesService,
                PeopleContentService,
@@ -99,9 +87,8 @@ describe('TrashcanComponent', () => {
                CustomResourcesService
            ],
            schemas: [ NO_ERRORS_SCHEMA ]
-        })
-        .compileComponents()
-        .then(() => {
+        });
+
        fixture = TestBed.createComponent(TrashcanComponent);
        component = fixture.componentInstance;

@@ -114,7 +101,6 @@ describe('TrashcanComponent', () => {
            resetSelection: jasmine.createSpy('resetSelection')
        };
    });
-    }));

    beforeEach(() => {
        spyOn(alfrescoApi.nodesApi, 'getDeletedNodes').and.returnValue(Promise.resolve(page));
--- a/src/app/material.module.ts
+++ b/src/app/material.module.ts
@@ -29,7 +29,8 @@ import {
    MatIconModule,
    MatButtonModule,
    MatDialogModule,
-    MatInputModule
+    MatInputModule,
+    MatSnackBarModule
 } from '@angular/material';

@NgModule({
@@ -38,7 +39,16 @@ import {
        MatIconModule,
        MatButtonModule,
        MatDialogModule,
-        MatInputModule
+        MatInputModule,
+        MatSnackBarModule
+    ],
+    exports: [
+        MatMenuModule,
+        MatIconModule,
+        MatButtonModule,
+        MatDialogModule,
+        MatInputModule,
+        MatSnackBarModule
    ]
 })
 export class MaterialModule {}
--- a/src/app/testing/app-testing.module.ts
+++ b/src/app/testing/app-testing.module.ts
@@ -48,7 +48,8 @@ import { EffectsModule } from '@ngrx/effects';
        TranslatePipeMock
    ],
    exports: [
-        TranslatePipeMock
+        TranslatePipeMock,
+        RouterTestingModule
    ],
    providers: [
        { provide: TranslationService, useClass: TranslationMock },