From e846d97317e4085a5645b9a587e43fe8080092c2 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Sat, 23 Jun 2018 17:30:20 +0100 Subject: [PATCH] remove electron demo code (#453) * remove electron demo code * remove unused property * cleanup tests * cleanup sidenav tests * cleanup trashcan tests * remove fdescribe --- package-lock.json | 8 --- package.json | 1 - src/app/app.component.ts | 29 ++-------- src/app/app.module.ts | 2 - .../components/sidenav/sidenav.component.html | 15 ------ .../sidenav/sidenav.component.spec.ts | 24 +++------ .../components/sidenav/sidenav.component.ts | 11 +--- .../trashcan/trashcan.component.spec.ts | 54 +++++++------------ src/app/material.module.ts | 14 ++++- src/app/testing/app-testing.module.ts | 3 +- 10 files changed, 45 insertions(+), 116 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8bbe78c5d..9f93b9d75 100644 --- 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", diff --git a/package.json b/package.json index 688d016f7..3bdac297f 100644 --- 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", diff --git a/src/app/app.component.ts b/src/app/app.component.ts index c65451ac0..74d5e6aa4 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -23,12 +23,11 @@ * along with Alfresco. If not, see . */ -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, 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() { diff --git a/src/app/app.module.ts b/src/app/app.module.ts index a5cbd78fc..80542533f 100644 --- 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: [ diff --git a/src/app/components/sidenav/sidenav.component.html b/src/app/components/sidenav/sidenav.component.html index 97a6211a0..00648da12 100644 --- a/src/app/components/sidenav/sidenav.component.html +++ b/src/app/components/sidenav/sidenav.component.html @@ -34,7 +34,6 @@ - - diff --git a/src/app/components/sidenav/sidenav.component.spec.ts b/src/app/components/sidenav/sidenav.component.spec.ts index 84cfa138a..47725c12d 100644 --- 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; 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 diff --git a/src/app/components/sidenav/sidenav.component.ts b/src/app/components/sidenav/sidenav.component.ts index 0df82e90a..b667661a7 100644 --- 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); - } } diff --git a/src/app/components/trashcan/trashcan.component.spec.ts b/src/app/components/trashcan/trashcan.component.spec.ts index b50695abc..441a3af0a 100644 --- 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 . */ 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; @@ -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,22 +87,20 @@ describe('TrashcanComponent', () => { CustomResourcesService ], schemas: [ NO_ERRORS_SCHEMA ] - }) - .compileComponents() - .then(() => { - fixture = TestBed.createComponent(TrashcanComponent); - component = fixture.componentInstance; - - alfrescoApi = TestBed.get(AlfrescoApiService); - alfrescoApi.reset(); - contentService = TestBed.get(ContentManagementService); - - component.documentList = { - reload: jasmine.createSpy('reload'), - resetSelection: jasmine.createSpy('resetSelection') - }; }); - })); + + fixture = TestBed.createComponent(TrashcanComponent); + component = fixture.componentInstance; + + alfrescoApi = TestBed.get(AlfrescoApiService); + alfrescoApi.reset(); + contentService = TestBed.get(ContentManagementService); + + component.documentList = { + reload: jasmine.createSpy('reload'), + resetSelection: jasmine.createSpy('resetSelection') + }; + }); beforeEach(() => { spyOn(alfrescoApi.nodesApi, 'getDeletedNodes').and.returnValue(Promise.resolve(page)); diff --git a/src/app/material.module.ts b/src/app/material.module.ts index 1743d1a70..c0c3e2032 100644 --- 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 {} diff --git a/src/app/testing/app-testing.module.ts b/src/app/testing/app-testing.module.ts index 4768a150e..71be7cb26 100644 --- 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 },