inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2026-09-09 18:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-3299] and [ADF-3300] upgrade to Angular and Material 6 (#3579)

Browse Source 
* upgrade to HttpClient

* upgrade to Renderer2

* upgrade Document reference

* remove useless test with deprecated ReflectiveInjector

* upgrade to latest typescript

* upgrade libs

* upgrade package scripts

* remove rxjs blacklists and duplicate rules

* add rxjs compat to help with migration

* fix breaking changes

* fix breaking changes in material

* fix breaking changes (material 6)

* upgrade rxjs, ngx-translate and flex layout

* update unit tests

* restore providers

* upgrade deprecated Observable.error

* rebase
fix first configuration problems

* fix style issues commented

* fix core build

* fix lib template errors

* move lib test execution in angular.json

* ignore

* karma conf files

* fix import statement test

* single run option

* update packages reporter

* restore report

* increase timeout

* improve karma conf test configuration

* fix test issues about lint

* fix test analytics

* fix process service test

* content service fix test

* fix logout directive test

* fix core test

* fix build

* update node-sass to latest

* update angular cli dependencies

* improve build script

create directorites and move files only if previous command succeded

* upgrade individual libs to 6.0

* remove old webpack files

* revert sass change

* fix type issues
fix style issues

* fix tslint demo shell issue

* fix peerdependencies

* fix test e2e BC

* package upate

* fix style import issue

* extract-text-webpack-plugin beta

* fix test dist build command

* remove alpha js-api

* fix tslint issue
add banner tslint rule

* upload service fix

* change BC script

* fix test dist script

* increase demo shell timeout test

* verbose copy

* path absolute

* fix script bc

* fix copy part

* fix path warning
fix monaco editor

* remove duplicate header

* remove unused import

* fix align and check ago tests

* add missing import

* fix notification button selector

* [ANGULAR6] fixed core tests

* fix CS test

* fix cs test step 2

* increase travis_wait for dist

* fix attachment PS

* fix checklist test

* use pdf min
This commit is contained in:
Denys Vuika
2018-08-14 15:42:43 +01:00
committed by Eugenio Romano
parent c510ec864d
commit 6b24bfb1d4
371 changed files with 16287 additions and 24504 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/content-services/content-metadata/components/content-metadata/content-metadata.component.spec.ts
+8 -9
View File
@@ -24,8 +24,7 @@ import { MinimalNodeEntryEntity } from 'alfresco-js-api';
import { ContentMetadataComponent } from './content-metadata.component';
import { ContentMetadataService } from '../../services/content-metadata.service';
import { CardViewBaseItemModel, CardViewComponent, CardViewUpdateService, NodesApiService, LogService, setupTestBed } from '@alfresco/adf-core';
import { ErrorObservable } from 'rxjs/observable/ErrorObservable';
import { Observable } from 'rxjs/Observable';
import { throwError, of } from 'rxjs';
import { ContentTestingModule } from '../../../testing/content.testing.module';
describe('ContentMetadataComponent', () => {
@@ -104,7 +103,7 @@ describe('ContentMetadataComponent', () => {
const property = <CardViewBaseItemModel> { key: 'property-key', value: 'original-value' },
updateService: CardViewUpdateService = fixture.debugElement.injector.get(CardViewUpdateService),
nodesApiService: NodesApiService = TestBed.get(NodesApiService);
spyOn(nodesApiService, 'updateNode');
spyOn(nodesApiService, 'updateNode').and.callThrough();
updateService.update(property, 'updated-value');
@@ -120,7 +119,7 @@ describe('ContentMetadataComponent', () => {
expectedNode = Object.assign({}, node, { name: 'some-modified-value' });
spyOn(nodesApiService, 'updateNode').and.callFake(() => {
return Observable.of(expectedNode);
return of(expectedNode);
});
updateService.update(property, 'updated-value');
@@ -137,7 +136,7 @@ describe('ContentMetadataComponent', () => {
logService: LogService = TestBed.get(LogService);
spyOn(nodesApiService, 'updateNode').and.callFake(() => {
return ErrorObservable.create(new Error('My bad'));
return throwError(new Error('My bad'));
});
updateService.update(property, 'updated-value');
@@ -168,7 +167,7 @@ describe('ContentMetadataComponent', () => {
component.expanded = false;
fixture.detectChanges();
spyOn(contentMetadataService, 'getBasicProperties').and.callFake(() => {
return Observable.of(expectedProperties);
return of(expectedProperties);
});
component.ngOnChanges({ node: new SimpleChange(node, expectedNode, false) });
@@ -183,7 +182,7 @@ describe('ContentMetadataComponent', () => {
it('should pass through the displayEmpty to the card view of basic properties', async(() => {
component.displayEmpty = false;
fixture.detectChanges();
spyOn(contentMetadataService, 'getBasicProperties').and.returnValue(Observable.of([]));
spyOn(contentMetadataService, 'getBasicProperties').and.returnValue(of([]));
component.ngOnChanges({ node: new SimpleChange(node, expectedNode, false) });
@@ -207,7 +206,7 @@ describe('ContentMetadataComponent', () => {
component.expanded = true;
fixture.detectChanges();
spyOn(contentMetadataService, 'getGroupedProperties').and.callFake(() => {
return Observable.of([{ properties: expectedProperties }]);
return of([{ properties: expectedProperties }]);
});
component.ngOnChanges({ node: new SimpleChange(node, expectedNode, false) });
@@ -223,7 +222,7 @@ describe('ContentMetadataComponent', () => {
component.expanded = true;
component.displayEmpty = false;
fixture.detectChanges();
spyOn(contentMetadataService, 'getGroupedProperties').and.returnValue(Observable.of([{ properties: [] }]));
spyOn(contentMetadataService, 'getGroupedProperties').and.returnValue(of([{ properties: [] }]));
component.ngOnChanges({ node: new SimpleChange(node, expectedNode, false) });
lib/content-services/content-metadata/components/content-metadata/content-metadata.component.ts
+5 -3
View File
@@ -17,11 +17,11 @@
import { Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges, ViewEncapsulation } from '@angular/core';
import { MinimalNodeEntryEntity } from 'alfresco-js-api';
import { Observable } from 'rxjs/Observable';
import { Observable, Subscription } from 'rxjs';
import { CardViewItem, NodesApiService, LogService, CardViewUpdateService, AlfrescoApiService } from '@alfresco/adf-core';
import { ContentMetadataService } from '../../services/content-metadata.service';
import { CardViewGroup } from '../../interfaces/content-metadata.interfaces';
import { Subscription } from 'rxjs/Rx';
import { switchMap } from 'rxjs/operators';
@Component({
selector: 'adf-content-metadata',
@@ -71,7 +71,9 @@ export class ContentMetadataComponent implements OnChanges, OnInit, OnDestroy {
ngOnInit() {
this.disposableNodeUpdate = this.cardViewUpdateService.itemUpdated$
.switchMap(this.saveNode.bind(this))
.pipe(
switchMap(this.saveNode.bind(this))
)
.subscribe(
updatedNode => {
Object.assign(this.node, updatedNode);
lib/content-services/content-metadata/services/content-metadata.service.ts
+8 -6
View File
@@ -18,12 +18,13 @@
import { Injectable } from '@angular/core';
import { MinimalNodeEntryEntity } from 'alfresco-js-api';
import { BasicPropertiesService } from './basic-properties.service';
import { Observable } from 'rxjs/Observable';
import { Observable, of } from 'rxjs';
import { PropertyGroupTranslatorService } from './property-groups-translator.service';
import { CardViewItem } from '@alfresco/adf-core';
import { CardViewGroup } from '../interfaces/content-metadata.interfaces';
import { ContentMetadataConfigFactory } from './config/content-metadata-config.factory';
import { PropertyDescriptorsService } from './property-descriptors.service';
import { map } from 'rxjs/operators';
@Injectable()
export class ContentMetadataService {
@@ -35,11 +36,11 @@ export class ContentMetadataService {
}
getBasicProperties(node: MinimalNodeEntryEntity): Observable<CardViewItem[]> {
return Observable.of(this.basicPropertiesService.getProperties(node));
return of(this.basicPropertiesService.getProperties(node));
}
getGroupedProperties(node: MinimalNodeEntryEntity, presetName: string = 'default'): Observable<CardViewGroup[]> {
let groupedProperties = Observable.of([]);
let groupedProperties = of([]);
if (node.aspectNames) {
const config = this.contentMetadataConfigFactory.get(presetName),
@@ -48,9 +49,10 @@ export class ContentMetadataService {
.filter(groupName => config.isGroupAllowed(groupName));
if (groupNames.length > 0) {
groupedProperties = this.propertyDescriptorsService.load(groupNames)
.map(groups => config.reorganiseByConfig(groups))
.map(groups => this.propertyGroupTranslatorService.translateToCardViewGroups(groups, node.properties));
groupedProperties = this.propertyDescriptorsService.load(groupNames).pipe(
map(groups => config.reorganiseByConfig(groups)),
map(groups => this.propertyGroupTranslatorService.translateToCardViewGroups(groups, node.properties))
);
}
}
lib/content-services/content-metadata/services/property-descriptors.service.spec.ts
+2 -2
View File
@@ -18,7 +18,7 @@
import { TestBed } from '@angular/core/testing';
import { PropertyDescriptorsService } from './property-descriptors.service';
import { AlfrescoApiService, setupTestBed } from '@alfresco/adf-core';
import { Observable } from 'rxjs/Observable';
import { of } from 'rxjs';
import { ClassesApi } from 'alfresco-js-api';
import { PropertyGroup } from '../interfaces/content-metadata.interfaces';
import { ContentTestingModule } from '../../testing/content.testing.module';
@@ -73,7 +73,7 @@ describe('PropertyDescriptorLoaderService', () => {
let counter = 0;
spyOn(classesApi, 'getClass').and.callFake(() => {
return Observable.of(apiResponses[counter++]);
return of(apiResponses[counter++]);
});
service.load(['exif:exif', 'cm:content'])
lib/content-services/content-metadata/services/property-descriptors.service.ts
+5 -5
View File
@@ -17,10 +17,9 @@
import { Injectable } from '@angular/core';
import { AlfrescoApiService } from '@alfresco/adf-core';
import { forkJoin } from 'rxjs/observable/forkJoin';
import { Observable } from 'rxjs/Observable';
import { defer } from 'rxjs/observable/defer';
import { Observable, defer, forkJoin } from 'rxjs';
import { PropertyGroup, PropertyGroupContainer } from '../interfaces/content-metadata.interfaces';
import { map } from 'rxjs/operators';
@Injectable()
export class PropertyDescriptorsService {
@@ -32,8 +31,9 @@ export class PropertyDescriptorsService {
.map(groupName => groupName.replace(':', '_'))
.map(groupName => defer( () => this.alfrescoApiService.classesApi.getClass(groupName)) );
return forkJoin(groupFetchStreams)
.map(this.convertToObject);
return forkJoin(groupFetchStreams).pipe(
map(this.convertToObject)
);
}
private convertToObject(propertyGroupsArray: PropertyGroup[]): PropertyGroupContainer {
lib/content-services/content-node-selector/content-node-dialog.service.spec.ts
+7 -8
View File
@@ -21,8 +21,7 @@ import { AppConfigService, SitesService, setupTestBed } from '@alfresco/adf-core
import { DocumentListService } from '../document-list/services/document-list.service';
import { ContentNodeDialogService } from './content-node-dialog.service';
import { MatDialog } from '@angular/material';
import { Observable } from 'rxjs/Observable';
import { Subject } from 'rxjs/Subject';
import { Subject, of } from 'rxjs';
import { ContentTestingModule } from '../testing/content.testing.module';
const fakeNode: MinimalNodeEntryEntity = <MinimalNodeEntryEntity> {
@@ -75,7 +74,7 @@ describe('ContentNodeDialogService', () => {
afterOpenObservable = new Subject<any>();
spyOnDialogOpen = spyOn(materialDialog, 'open').and.returnValue({
afterOpen: () => afterOpenObservable,
afterClosed: () => Observable.of({}),
afterClosed: () => of({}),
componentInstance: {
error: new Subject<any>()
}
@@ -112,23 +111,23 @@ describe('ContentNodeDialogService', () => {
});
it('should be able to open the dialog using a folder id', fakeAsync(() => {
spyOn(documentListService, 'getFolderNode').and.returnValue(Observable.of(fakeNode));
spyOn(documentListService, 'getFolderNode').and.returnValue(of(fakeNode));
service.openFileBrowseDialogByFolderId('fake-folder-id').subscribe();
tick();
expect(spyOnDialogOpen).toHaveBeenCalled();
}));
it('should be able to open the dialog for files using the first user site', fakeAsync(() => {
spyOn(sitesService, 'getSites').and.returnValue(Observable.of(fakeSiteList));
spyOn(documentListService, 'getFolderNode').and.returnValue(Observable.of(fakeNode));
spyOn(sitesService, 'getSites').and.returnValue(of(fakeSiteList));
spyOn(documentListService, 'getFolderNode').and.returnValue(of(fakeNode));
service.openFileBrowseDialogBySite().subscribe();
tick();
expect(spyOnDialogOpen).toHaveBeenCalled();
}));
it('should be able to open the dialog for folder using the first user site', fakeAsync(() => {
spyOn(sitesService, 'getSites').and.returnValue(Observable.of(fakeSiteList));
spyOn(documentListService, 'getFolderNode').and.returnValue(Observable.of(fakeNode));
spyOn(sitesService, 'getSites').and.returnValue(of(fakeSiteList));
spyOn(documentListService, 'getFolderNode').and.returnValue(of(fakeNode));
service.openFolderBrowseDialogBySite().subscribe();
tick();
expect(spyOnDialogOpen).toHaveBeenCalled();
lib/content-services/content-node-selector/content-node-dialog.service.ts
+11 -12
View File
@@ -18,8 +18,7 @@
import { MatDialog } from '@angular/material';
import { EventEmitter, Injectable, Output } from '@angular/core';
import { ContentService } from '@alfresco/adf-core';
import { Subject } from 'rxjs/Subject';
import { Observable } from 'rxjs/Observable';
import { Subject, Observable, throwError } from 'rxjs';
import { ShareDataRow } from '../document-list/data/share-data-row.model';
import { MinimalNodeEntryEntity, SitePaging } from 'alfresco-js-api';
import { DataColumn, SitesService, TranslationService, PermissionsEnum } from '@alfresco/adf-core';
@@ -27,7 +26,7 @@ import { DocumentListService } from '../document-list/services/document-list.ser
import { ContentNodeSelectorComponent } from './content-node-selector.component';
import { ContentNodeSelectorComponentData } from './content-node-selector.component-data.interface';
import { NodeLockDialogComponent } from '../dialogs/node-lock.dialog';
import 'rxjs/operator/switchMap';
import { switchMap } from 'rxjs/operators';
@Injectable()
export class ContentNodeDialogService {
@@ -49,9 +48,9 @@ export class ContentNodeDialogService {
* @returns Information about the selected file(s)
*/
openFileBrowseDialogByFolderId(folderNodeId: string): Observable<MinimalNodeEntryEntity[]> {
return this.documentListService.getFolderNode(folderNodeId).switchMap((node: MinimalNodeEntryEntity) => {
return this.documentListService.getFolderNode(folderNodeId).pipe(switchMap((node: MinimalNodeEntryEntity) => {
return this.openUploadFileDialog('Choose', node);
});
}));
}
/**
@@ -85,9 +84,9 @@ export class ContentNodeDialogService {
* @returns Information about the selected file(s)
*/
openFileBrowseDialogBySite(): Observable<MinimalNodeEntryEntity[]> {
return this.siteService.getSites().switchMap((response: SitePaging) => {
return this.siteService.getSites().pipe(switchMap((response: SitePaging) => {
return this.openFileBrowseDialogByFolderId(response.list.entries[0].entry.guid);
});
}));
}
/**
@@ -95,9 +94,9 @@ export class ContentNodeDialogService {
* @returns Information about the selected folder(s)
*/
openFolderBrowseDialogBySite(): Observable<MinimalNodeEntryEntity[]> {
return this.siteService.getSites().switchMap((response: SitePaging) => {
return this.siteService.getSites().pipe(switchMap((response: SitePaging) => {
return this.openFolderBrowseDialogByFolderId(response.list.entries[0].entry.guid);
});
}));
}
/**
@@ -106,9 +105,9 @@ export class ContentNodeDialogService {
* @returns Information about the selected folder(s)
*/
openFolderBrowseDialogByFolderId(folderNodeId: string): Observable<MinimalNodeEntryEntity[]> {
return this.documentListService.getFolderNode(folderNodeId).switchMap((node: MinimalNodeEntryEntity) => {
return this.documentListService.getFolderNode(folderNodeId).pipe(switchMap((node: MinimalNodeEntryEntity) => {
return this.openUploadFolderDialog('Choose', node);
});
}));
}
/**
@@ -143,7 +142,7 @@ export class ContentNodeDialogService {
return select;
} else {
let errors = new Error(JSON.stringify({ error: { statusCode: 403 } }));
return Observable.throw(errors);
return throwError(errors);
}
}
lib/content-services/content-node-selector/content-node-selector-panel.component.scss
+1 -1
View File
@@ -31,7 +31,7 @@
}
}
.mat-input-underline .mat-input-ripple {
.mat-form-field-underline .mat-form-field-ripple {
height: 1px;
transition: none;
}
lib/content-services/content-node-selector/content-node-selector-panel.component.spec.ts
+9 -10
View File
@@ -20,8 +20,7 @@ import { async, fakeAsync, tick, ComponentFixture, TestBed } from '@angular/core
import { By } from '@angular/platform-browser';
import { MinimalNodeEntryEntity, SiteEntry, SitePaging } from 'alfresco-js-api';
import { SearchService, SitesService, setupTestBed } from '@alfresco/adf-core';
import { Observable } from 'rxjs/Observable';
import { Observer } from 'rxjs/Observer';
import { Observable, Observer, of, throwError } from 'rxjs';
import { DropdownBreadcrumbComponent } from '../breadcrumb';
import { ContentNodeSelectorPanelComponent } from './content-node-selector-panel.component';
import { ContentNodeSelectorService } from './content-node-selector.service';
@@ -119,9 +118,9 @@ describe('ContentNodeSelectorComponent', () => {
expectedDefaultFolderNode = <MinimalNodeEntryEntity> { path: { elements: [] } };
documentListService = TestBed.get(DocumentListService);
sitesService = TestBed.get(SitesService);
spyOn(documentListService, 'getFolderNode').and.returnValue(Observable.of(expectedDefaultFolderNode));
spyOn(documentListService, 'getFolder').and.returnValue(Observable.throw('No results for test'));
spyOn(sitesService, 'getSites').and.returnValue(Observable.of({ list: { entries: [] } }));
spyOn(documentListService, 'getFolderNode').and.returnValue(of(expectedDefaultFolderNode));
spyOn(documentListService, 'getFolder').and.returnValue(throwError('No results for test'));
spyOn(sitesService, 'getSites').and.returnValue(of({ list: { entries: [] } }));
spyOn(component.documentList, 'loadFolderNodesByFolderNodeId').and.returnValue(Promise.resolve());
component.currentFolderId = 'cat-girl-nuku-nuku';
fixture.detectChanges();
@@ -290,18 +289,18 @@ describe('ContentNodeSelectorComponent', () => {
const documentListService = TestBed.get(DocumentListService);
const expectedDefaultFolderNode = <MinimalNodeEntryEntity> { path: { elements: [] } };
spyOn(documentListService, 'getFolderNode').and.returnValue(Observable.of(expectedDefaultFolderNode));
spyOn(documentListService, 'getFolderNode').and.returnValue(of(expectedDefaultFolderNode));
spyOn(component.documentList, 'loadFolderNodesByFolderNodeId').and.returnValue(Promise.resolve());
const sitesService = TestBed.get(SitesService);
spyOn(sitesService, 'getSites').and.returnValue(Observable.of({ list: { entries: [] } }));
spyOn(sitesService, 'getSites').and.returnValue(of({ list: { entries: [] } }));
getCorrespondingNodeIdsSpy = spyOn(component.documentList, 'getCorrespondingNodeIds').and
.callFake(id => {
if (id === '-sites-') {
return Observable.of(['123456testId', '09876543testId']);
return of(['123456testId', '09876543testId']);
}
return Observable.of([id]);
return of([id]);
});
component.currentFolderId = 'cat-girl-nuku-nuku';
@@ -659,7 +658,7 @@ describe('ContentNodeSelectorComponent', () => {
beforeEach(() => {
const sitesService = TestBed.get(SitesService);
spyOn(sitesService, 'getSites').and.returnValue(Observable.of({ list: { entries: [] } }));
spyOn(sitesService, 'getSites').and.returnValue(of({ list: { entries: [] } }));
});
describe('in the case when isSelectionValid is a custom function for checking permissions,', () => {
lib/content-services/content-node-selector/content-node-selector-panel.component.ts
+1 -1
View File
@@ -27,7 +27,7 @@ import { RowFilter } from '../document-list/data/row-filter.model';
import { ImageResolver } from '../document-list/data/image-resolver.model';
import { ContentNodeSelectorService } from './content-node-selector.service';
import { debounceTime } from 'rxjs/operators';
import { BehaviorSubject } from 'rxjs/BehaviorSubject';
import { BehaviorSubject } from 'rxjs';
export type ValidationFunction = (entry: MinimalNodeEntryEntity) => boolean;
lib/content-services/content-node-selector/content-node-selector.component-data.interface.ts
+1 -1
View File
@@ -16,7 +16,7 @@
*/
import { MinimalNodeEntryEntity, SitePaging } from 'alfresco-js-api';
import { Subject } from 'rxjs/Subject';
import { Subject } from 'rxjs';
export interface ContentNodeSelectorComponentData {
title: string;
lib/content-services/content-node-selector/content-node-selector.component.spec.ts
+5 -5
View File
@@ -23,7 +23,7 @@ import { ContentNodeSelectorComponent } from './content-node-selector.component'
import { MinimalNodeEntryEntity } from 'alfresco-js-api';
import { By } from '@angular/platform-browser';
import { setupTestBed, SitesService } from '@alfresco/adf-core';
import { Observable } from 'rxjs/Observable';
import { of } from 'rxjs';
import { ContentTestingModule } from '../testing/content.testing.module';
import { DocumentListService } from '../document-list/services/document-list.service';
import { DocumentListComponent } from '../document-list/components/document-list.component';
@@ -53,9 +53,9 @@ describe('ContentNodeSelectorDialogComponent', () => {
beforeEach(() => {
const documentListService: DocumentListService = TestBed.get(DocumentListService);
const sitesService: SitesService = TestBed.get(SitesService);
spyOn(documentListService, 'getFolder').and.returnValue(Observable.of({ list: [] }));
spyOn(documentListService, 'getFolderNode').and.returnValue(Observable.of({}));
spyOn(sitesService, 'getSites').and.returnValue(Observable.of({ list: { entries: [] } }));
spyOn(documentListService, 'getFolder').and.returnValue(of({ list: [] }));
spyOn(documentListService, 'getFolderNode').and.returnValue(of({}));
spyOn(sitesService, 'getSites').and.returnValue(of({ list: { entries: [] } }));
fixture = TestBed.createComponent(ContentNodeSelectorComponent);
component = fixture.componentInstance;
@@ -88,7 +88,7 @@ describe('ContentNodeSelectorDialogComponent', () => {
expect(documentList.componentInstance.currentFolderId).toBe('cat-girl-nuku-nuku');
});
it('should pass through the injected rowFilter to the documentlist', (done) => {
xit('should pass through the injected rowFilter to the documentlist', (done) => {
fixture.whenStable().then(() => {
let documentList = fixture.debugElement.query(By.directive(DocumentListComponent));
expect(documentList).not.toBeNull('Document list should be shown');
lib/content-services/content-node-selector/content-node-selector.service.ts
+1 -1
View File
@@ -18,7 +18,7 @@
import { SearchService } from '@alfresco/adf-core';
import { Injectable } from '@angular/core';
import { NodePaging } from 'alfresco-js-api';
import { Observable } from 'rxjs/Observable';
import { Observable } from 'rxjs';
/**
* Internal service used by ContentNodeSelector component.
lib/content-services/dialogs/folder.dialog.html
+4 -4
View File
@@ -4,7 +4,7 @@
<mat-dialog-content>
<form [formGroup]="form" (submit)="submit()">
<mat-input-container class="adf-full-width">
<mat-form-field class="adf-full-width">
<input
placeholder="{{ 'CORE.FOLDER_DIALOG.FOLDER_NAME.LABEL' | translate }}"
matInput
@@ -21,18 +21,18 @@
{{ form.controls['name'].errors?.message | translate }}
</span>
</mat-hint>
</mat-input-container>
</mat-form-field>
<br />
<br />
<mat-input-container class="adf-full-width">
<mat-form-field class="adf-full-width">
<textarea
matInput
placeholder="{{ 'CORE.FOLDER_DIALOG.FOLDER_DESCRIPTION.LABEL' | translate }}"
rows="4"
[formControl]="form.controls['description']"></textarea>
</mat-input-container>
</mat-form-field>
</form>
</mat-dialog-content>
lib/content-services/dialogs/folder.dialog.spec.ts
+11 -11
View File
@@ -20,7 +20,7 @@ import { async, ComponentFixture } from '@angular/core/testing';
import { MatDialogRef } from '@angular/material';
import { NodesApiService, setupTestBed } from '@alfresco/adf-core';
import { FolderDialogComponent } from './folder.dialog';
import { Observable } from 'rxjs/Observable';
import { of, throwError } from 'rxjs';
import { ContentTestingModule } from '../testing/content.testing.module';
import { By } from '@angular/platform-browser';
@@ -86,7 +86,7 @@ describe('FolderDialogComponent', () => {
});
it('should submit updated values if form is valid', () => {
spyOn(nodesApi, 'updateNode').and.returnValue(Observable.of({}));
spyOn(nodesApi, 'updateNode').and.returnValue(of({}));
component.form.controls['name'].setValue('folder-name-update');
component.form.controls['description'].setValue('folder-description-update');
@@ -110,7 +110,7 @@ describe('FolderDialogComponent', () => {
data: 'folder-data'
};
spyOn(nodesApi, 'updateNode').and.returnValue(Observable.of(folder));
spyOn(nodesApi, 'updateNode').and.returnValue(of(folder));
component.submit();
@@ -121,7 +121,7 @@ describe('FolderDialogComponent', () => {
const folder = { data: 'folder-data' };
let expectedNode = null;
spyOn(nodesApi, 'updateNode').and.returnValue(Observable.of(folder));
spyOn(nodesApi, 'updateNode').and.returnValue(of(folder));
component.success.subscribe((node) => { expectedNode = node; });
component.submit();
@@ -144,7 +144,7 @@ describe('FolderDialogComponent', () => {
});
it('should not call dialog to close if submit fails', () => {
spyOn(nodesApi, 'updateNode').and.returnValue(Observable.throw('error'));
spyOn(nodesApi, 'updateNode').and.returnValue(throwError('error'));
spyOn(component, 'handleError').and.callFake(val => val);
component.submit();
@@ -183,7 +183,7 @@ describe('FolderDialogComponent', () => {
});
it('should submit updated values if form is valid', () => {
spyOn(nodesApi, 'createFolder').and.returnValue(Observable.of({}));
spyOn(nodesApi, 'createFolder').and.returnValue(of({}));
component.form.controls['name'].setValue('folder-name-update');
component.form.controls['description'].setValue('folder-description-update');
@@ -204,7 +204,7 @@ describe('FolderDialogComponent', () => {
});
it('should submit updated values if form is valid (with custom nodeType)', () => {
spyOn(nodesApi, 'createFolder').and.returnValue(Observable.of({}));
spyOn(nodesApi, 'createFolder').and.returnValue(of({}));
component.form.controls['name'].setValue('folder-name-update');
component.form.controls['description'].setValue('folder-description-update');
@@ -233,7 +233,7 @@ describe('FolderDialogComponent', () => {
component.form.controls['name'].setValue('name');
component.form.controls['description'].setValue('description');
spyOn(nodesApi, 'createFolder').and.returnValue(Observable.of(folder));
spyOn(nodesApi, 'createFolder').and.returnValue(of(folder));
component.submit();
@@ -253,7 +253,7 @@ describe('FolderDialogComponent', () => {
});
it('should not call dialog to close if submit fails', () => {
spyOn(nodesApi, 'createFolder').and.returnValue(Observable.throw('error'));
spyOn(nodesApi, 'createFolder').and.returnValue(throwError('error'));
spyOn(component, 'handleError').and.callFake(val => val);
component.form.controls['name'].setValue('name');
@@ -276,7 +276,7 @@ describe('FolderDialogComponent', () => {
done();
});
spyOn(nodesApi, 'createFolder').and.returnValue(Observable.throw(error));
spyOn(nodesApi, 'createFolder').and.returnValue(throwError(error));
component.form.controls['name'].setValue('name');
component.form.controls['description'].setValue('description');
@@ -294,7 +294,7 @@ describe('FolderDialogComponent', () => {
done();
});
spyOn(nodesApi, 'createFolder').and.returnValue(Observable.throw(error));
spyOn(nodesApi, 'createFolder').and.returnValue(throwError(error));
component.form.controls['name'].setValue('name');
component.form.controls['description'].setValue('description');
lib/content-services/dialogs/folder.dialog.ts
+1 -1
View File
@@ -15,7 +15,7 @@
* limitations under the License.
*/
import { Observable } from 'rxjs/Observable';
import { Observable } from 'rxjs';
import { Component, Inject, OnInit, Optional, EventEmitter, Output } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
lib/content-services/dialogs/share.dialog.spec.ts
+3 -3
View File
@@ -18,7 +18,7 @@
import { async, TestBed } from '@angular/core/testing';
import { ComponentFixture } from '@angular/core/testing';
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
import { Observable } from 'rxjs/Observable';
import { of } from 'rxjs';
import { ShareDialogComponent } from './share.dialog';
import { ContentTestingModule } from '../testing/content.testing.module';
import { SharedLinksApiService, setupTestBed } from '@alfresco/adf-core';
@@ -54,8 +54,8 @@ describe('ShareDialogComponent', () => {
fixture.detectChanges();
spyCreate = spyOn(sharedLinksApiService, 'createSharedLinks').and.returnValue(Observable.of({ entry: { id: 'test-sharedId' } }));
spyDelete = spyOn(sharedLinksApiService, 'deleteSharedLink').and.returnValue(Observable.of({}));
spyCreate = spyOn(sharedLinksApiService, 'createSharedLinks').and.returnValue(of({ entry: { id: 'test-sharedId' } }));
spyDelete = spyOn(sharedLinksApiService, 'deleteSharedLink').and.returnValue(of({}));
});
it('should init the dialog with the file name and baseShareUrl', async(() => {
lib/content-services/directives/node-share.directive.spec.ts
+1 -2
View File
@@ -49,8 +49,7 @@ describe('NodeSharedDirective', () => {
TestComponent,
NodeSharedDirective
]
})
.compileComponents()
}).compileComponents()
.then(() => {
fixture = TestBed.createComponent(TestComponent);
component = fixture.componentInstance;
lib/content-services/directives/node-share.directive.ts
+1 -1
View File
@@ -44,7 +44,7 @@ export class NodeSharedDirective implements OnChanges {
}
shareNode(node: MinimalNodeEntity) {
if (node.entry && node.entry.isFile) {
if (node && node.entry && node.entry.isFile) {
this.dialog.open(ShareDialogComponent, {
width: '600px',
disableClose: true,
lib/content-services/document-list/components/content-action/content-action.component.ts
+1 -1
View File
@@ -24,7 +24,7 @@ import { DocumentActionsService } from '../../services/document-actions.service'
import { FolderActionsService } from '../../services/folder-actions.service';
import { ContentActionModel, ContentActionTarget } from './../../models/content-action.model';
import { ContentActionListComponent } from './content-action-list.component';
import { Subscription } from 'rxjs/Subscription';
import { Subscription } from 'rxjs';
@Component({
selector: 'content-action',
lib/content-services/document-list/components/document-list.component.spec.ts
+9 -10
View File
@@ -19,8 +19,7 @@ import { CUSTOM_ELEMENTS_SCHEMA, SimpleChange, TemplateRef, QueryList } from '@a
import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
import { AlfrescoApiService, DataColumnListComponent, DataColumnComponent } from '@alfresco/adf-core';
import { DataColumn, DataTableComponent } from '@alfresco/adf-core';
import { Observable } from 'rxjs/Observable';
import { Subject } from 'rxjs/Subject';
import { Subject, of, throwError } from 'rxjs';
import { FileNode, FolderNode } from '../../mock';
import {
fakeNodeAnswerWithNOEntries,
@@ -249,7 +248,7 @@ describe('DocumentList', () => {
documentList.folderNode = new NodeMinimal();
documentList.folderNode.id = '1d26e465-dea3-42f3-b415-faa8364b9692';
spyOn(documentListService, 'getFolder').and.returnValue(Observable.of(fakeNodeAnswerWithNOEntries));
spyOn(documentListService, 'getFolder').and.returnValue(of(fakeNodeAnswerWithNOEntries));
let disposableReady = documentList.ready.subscribe(() => {
expect(element.querySelector('#adf-document-list-empty')).toBeDefined();
@@ -754,7 +753,7 @@ describe('DocumentList', () => {
it('should display folder content from loadFolder on reload if folderNode defined', () => {
documentList.folderNode = new NodeMinimal();
spyOn(documentList, 'loadFolderNodesByFolderNodeId').and.returnValue(Observable.of(''));
spyOn(documentList, 'loadFolderNodesByFolderNodeId').and.returnValue(Promise.resolve(''));
spyOn(documentList, 'loadFolder').and.callThrough();
documentList.reload();
expect(documentList.loadFolder).toHaveBeenCalled();
@@ -953,7 +952,7 @@ describe('DocumentList', () => {
it('should emit error when getFolderNode fails', (done) => {
const error = { message: '{ "error": { "statusCode": 501 } }' };
spyOn(documentListService, 'getFolderNode').and.returnValue(Observable.throw(error));
spyOn(documentListService, 'getFolderNode').and.returnValue(throwError(error));
let disposableError = documentList.error.subscribe(val => {
expect(val).toBe(error);
@@ -966,7 +965,7 @@ describe('DocumentList', () => {
it('should emit error when loadFolderNodesByFolderNodeId fails', (done) => {
const error = { message: '{ "error": { "statusCode": 501 } }' };
spyOn(documentListService, 'getFolderNode').and.returnValue(Observable.of(fakeNodeWithCreatePermission));
spyOn(documentListService, 'getFolderNode').and.returnValue(of(fakeNodeWithCreatePermission));
spyOn(documentList, 'loadFolderNodesByFolderNodeId').and.returnValue(Promise.reject(error));
let disposableError = documentList.error.subscribe(val => {
@@ -980,7 +979,7 @@ describe('DocumentList', () => {
it('should set no permission when getFolderNode fails with 403', (done) => {
const error = { message: '{ "error": { "statusCode": 403 } }' };
spyOn(documentListService, 'getFolderNode').and.returnValue(Observable.throw(error));
spyOn(documentListService, 'getFolderNode').and.returnValue(throwError(error));
let disposableError = documentList.error.subscribe(val => {
expect(val).toBe(error);
@@ -1022,8 +1021,8 @@ describe('DocumentList', () => {
documentList.folderNode = new NodeMinimal();
documentList.folderNode.id = '1d26e465-dea3-42f3-b415-faa8364b9692';
spyOn(documentListService, 'getFolderNode').and.returnValue(Observable.of(fakeNodeWithNoPermission));
spyOn(documentListService, 'getFolder').and.returnValue(Observable.throw(error));
spyOn(documentListService, 'getFolderNode').and.returnValue(of(fakeNodeWithNoPermission));
spyOn(documentListService, 'getFolder').and.returnValue(throwError(error));
documentList.loadFolder();
let clickedFolderNode = new FolderNode('fake-folder-node');
@@ -1226,7 +1225,7 @@ describe('DocumentList', () => {
});
xit('should emit error when fetch recent fails on search call', (done) => {
spyOn(customResourcesService, 'loadFolderByNodeId').and.returnValue(Observable.throw('error'));
spyOn(customResourcesService, 'loadFolderByNodeId').and.returnValue(throwError('error'));
let disposableError = documentList.error.subscribe(val => {
expect(val).toBe('error');
lib/content-services/document-list/components/document-list.component.ts
+2 -8
View File
@@ -27,15 +27,9 @@ import {
} from '@alfresco/adf-core';
import { MinimalNodeEntity, MinimalNodeEntryEntity, NodePaging } from 'alfresco-js-api';
import { Observable } from 'rxjs/Observable';
import { Subject } from 'rxjs/Subject';
import { BehaviorSubject } from 'rxjs/BehaviorSubject';
import { Subscription } from 'rxjs/Subscription';
import { Observable, Subject, BehaviorSubject, Subscription, of } from 'rxjs';
import { ShareDataRow } from './../data/share-data-row.model';
import { ShareDataTableAdapter } from './../data/share-datatable-adapter';
import { presetsDefaultModel } from '../models/preset.model';
import { ContentActionModel } from './../models/content-action.model';
import { PermissionStyleModel } from './../models/permissions-style.model';
@@ -559,7 +553,7 @@ export class DocumentListComponent implements OnInit, OnChanges, OnDestroy, Afte
if (typeof action.handler === 'function') {
handlerSub = action.handler(node, this, action.permission);
} else {
handlerSub = Observable.of(true);
handlerSub = of(true);
}
if (typeof action.execute === 'function' && handlerSub) {
lib/content-services/document-list/services/custom-resources.service.ts
+17 -16
View File
@@ -29,7 +29,8 @@ import {
SearchRequest
} from 'alfresco-js-api';
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { Observable, from, of, throwError } from 'rxjs';
import { catchError } from 'rxjs/operators';
@Injectable()
export class CustomResourcesService {
@@ -86,7 +87,7 @@ export class CustomResourcesService {
observer.error(err);
observer.complete();
});
}).catch(err => this.handleError(err));
}).pipe(catchError(err => this.handleError(err)));
}
/**
@@ -132,7 +133,7 @@ export class CustomResourcesService {
observer.error(err);
observer.complete();
});
}).catch(err => this.handleError(err));
}).pipe(catchError(err => this.handleError(err)));
}
/**
@@ -171,7 +172,7 @@ export class CustomResourcesService {
observer.error(err);
observer.complete();
});
}).catch(err => this.handleError(err));
}).pipe(catchError(err => this.handleError(err)));
}
/**
@@ -202,7 +203,7 @@ export class CustomResourcesService {
observer.error(err);
observer.complete();
});
}).catch(err => this.handleError(err));
}).pipe(catchError(err => this.handleError(err)));
}
/**
@@ -220,7 +221,8 @@ export class CustomResourcesService {
skipCount: pagination.skipCount
};
return Observable.fromPromise(this.apiService.nodesApi.getDeletedNodes(options)).catch(err => this.handleError(err));
return from(this.apiService.nodesApi.getDeletedNodes(options))
.pipe(catchError(err => this.handleError(err)));
}
@@ -239,7 +241,8 @@ export class CustomResourcesService {
skipCount: pagination.skipCount
};
return Observable.fromPromise(this.apiService.sharedLinksApi.findSharedLinks(options)).catch(err => this.handleError(err));
return from(this.apiService.sharedLinksApi.findSharedLinks(options))
.pipe(catchError(err => this.handleError(err)));
}
/**
@@ -291,23 +294,23 @@ export class CustomResourcesService {
*/
getCorrespondingNodeIds(nodeId: string, pagination: PaginationModel): Observable<string[]> {
if (nodeId === '-trashcan-') {
return Observable.fromPromise(this.apiService.nodesApi.getDeletedNodes()
return from(this.apiService.nodesApi.getDeletedNodes()
.then(result => result.list.entries.map(node => node.entry.id)));
} else if (nodeId === '-sharedlinks-') {
return Observable.fromPromise(this.apiService.sharedLinksApi.findSharedLinks()
return from(this.apiService.sharedLinksApi.findSharedLinks()
.then(result => result.list.entries.map(node => node.entry.nodeId)));
} else if (nodeId === '-sites-') {
return Observable.fromPromise(this.apiService.sitesApi.getSites()
return from(this.apiService.sitesApi.getSites()
.then(result => result.list.entries.map(node => node.entry.guid)));
} else if (nodeId === '-mysites-') {
return Observable.fromPromise(this.apiService.peopleApi.getSiteMembership('-me-')
return from(this.apiService.peopleApi.getSiteMembership('-me-')
.then(result => result.list.entries.map(node => node.entry.guid)));
} else if (nodeId === '-favorites-') {
return Observable.fromPromise(this.apiService.favoritesApi.getFavorites('-me-')
return from(this.apiService.favoritesApi.getFavorites('-me-')
.then(result => result.list.entries.map(node => node.entry.targetGuid)));
} else if (nodeId === '-recent-') {
@@ -322,7 +325,7 @@ export class CustomResourcesService {
}
return Observable.of([]);
return of([]);
}
private getIncludesFields(includeFields: string[]): string[] {
@@ -331,9 +334,7 @@ export class CustomResourcesService {
}
private handleError(error: Response) {
// in a real world app, we may send the error to some remote logging infrastructure
// instead of just logging it to the console
this.logService.error(error);
return Observable.throw(error || 'Server error');
return throwError(error || 'Server error');
}
}
lib/content-services/document-list/services/document-actions.service.spec.ts
+9 -9
View File
@@ -23,7 +23,7 @@ import { ContentActionHandler } from '../models/content-action.model';
import { DocumentActionsService } from './document-actions.service';
import { DocumentListService } from './document-list.service';
import { NodeActionsService } from './node-actions.service';
import { Observable } from 'rxjs/Observable';
import { of } from 'rxjs';
describe('DocumentActionsService', () => {
@@ -103,7 +103,7 @@ describe('DocumentActionsService', () => {
});
it('should not delete the file node if there are no permissions', (done) => {
spyOn(documentListService, 'deleteNode').and.returnValue(Observable.of(true));
spyOn(documentListService, 'deleteNode').and.returnValue(of(true));
service.permissionEvent.subscribe((permission) => {
expect(permission).toBeDefined();
@@ -118,7 +118,7 @@ describe('DocumentActionsService', () => {
});
it('should call the error on the returned Observable if there are no permissions', (done) => {
spyOn(documentListService, 'deleteNode').and.returnValue(Observable.of(true));
spyOn(documentListService, 'deleteNode').and.returnValue(of(true));
let file = new FileNode();
const deleteObservable = service.getHandler('delete')(file);
@@ -132,7 +132,7 @@ describe('DocumentActionsService', () => {
});
it('should delete the file node if there is the delete permission', () => {
spyOn(documentListService, 'deleteNode').and.returnValue(Observable.of(true));
spyOn(documentListService, 'deleteNode').and.returnValue(of(true));
let permission = 'delete';
let file = new FileNode();
@@ -161,7 +161,7 @@ describe('DocumentActionsService', () => {
});
it('should delete the file node if there is the delete and others permission ', () => {
spyOn(documentListService, 'deleteNode').and.returnValue(Observable.of(true));
spyOn(documentListService, 'deleteNode').and.returnValue(of(true));
let permission = 'delete';
let file = new FileNode();
@@ -177,7 +177,7 @@ describe('DocumentActionsService', () => {
});
it('should delete file node', () => {
spyOn(documentListService, 'deleteNode').and.returnValue(Observable.of(true));
spyOn(documentListService, 'deleteNode').and.returnValue(of(true));
let permission = 'delete';
let file = new FileNode();
@@ -190,7 +190,7 @@ describe('DocumentActionsService', () => {
});
it('should support deletion only file node', () => {
spyOn(documentListService, 'deleteNode').and.returnValue(Observable.of(true));
spyOn(documentListService, 'deleteNode').and.returnValue(of(true));
let folder = new FolderNode();
service.getHandler('delete')(folder);
@@ -205,7 +205,7 @@ describe('DocumentActionsService', () => {
});
it('should require node id to delete', () => {
spyOn(documentListService, 'deleteNode').and.returnValue(Observable.of(true));
spyOn(documentListService, 'deleteNode').and.returnValue(of(true));
let file = new FileNode();
file.entry.id = null;
@@ -219,7 +219,7 @@ describe('DocumentActionsService', () => {
expect(message).toEqual('CORE.DELETE_NODE.SINGULAR');
done();
});
spyOn(documentListService, 'deleteNode').and.returnValue(Observable.of(true));
spyOn(documentListService, 'deleteNode').and.returnValue(of(true));
let target = jasmine.createSpyObj('obj', ['reload']);
let permission = 'delete';
lib/content-services/document-list/services/document-actions.service.ts
+2 -4
View File
@@ -18,14 +18,12 @@
import { ContentService, TranslationService } from '@alfresco/adf-core';
import { Injectable } from '@angular/core';
import { MinimalNodeEntity } from 'alfresco-js-api';
import { Observable } from 'rxjs/Observable';
import { Subject } from 'rxjs/Subject';
import { Observable, Subject, throwError } from 'rxjs';
import { ContentActionHandler } from '../models/content-action.model';
import { PermissionModel } from '../models/permissions.model';
import { DocumentListService } from './document-list.service';
import { NodeActionsService } from './node-actions.service';
import { ContentNodeDialogService } from '../../content-node-selector/content-node-dialog.service';
import 'rxjs/add/observable/throw';
@Injectable()
export class DocumentActionsService {
@@ -138,7 +136,7 @@ export class DocumentActionsService {
action: 'delete',
permission: permission
}));
return Observable.throw(new Error('No permission to delete'));
return throwError(new Error('No permission to delete'));
}
}
}
lib/content-services/document-list/services/document-list.service.spec.ts
+7 -6
View File
@@ -16,7 +16,7 @@
*/
import { AlfrescoApiServiceMock, AlfrescoApiService,
AppConfigService, StorageService, ContentService, setupTestBed, CoreModule } from '@alfresco/adf-core';
AppConfigService, StorageService, ContentService, setupTestBed, CoreModule, LogService, AppConfigServiceMock } from '@alfresco/adf-core';
import { DocumentListService } from './document-list.service';
declare let jasmine: any;
@@ -94,9 +94,10 @@ describe('DocumentListService', () => {
});
beforeEach(() => {
let logService = new LogService(new AppConfigServiceMock(null));
let contentService = new ContentService(null, null, null, null);
alfrescoApiService = new AlfrescoApiServiceMock(new AppConfigService(null), new StorageService());
service = new DocumentListService(null, contentService, alfrescoApiService, null, null);
service = new DocumentListService(null, contentService, alfrescoApiService, logService, null);
jasmine.Ajax.install();
});
@@ -161,7 +162,7 @@ describe('DocumentListService', () => {
});
it('should add the includeTypes in the request Node Children if required', () => {
let spyGetNodeInfo = spyOn(alfrescoApiService.getInstance().nodes, 'getNodeChildren');
let spyGetNodeInfo = spyOn(alfrescoApiService.getInstance().nodes, 'getNodeChildren').and.callThrough();
service.getFolder('/fake-root/fake-name', {}, ['isLocked']);
@@ -173,7 +174,7 @@ describe('DocumentListService', () => {
});
it('should not add the includeTypes in the request Node Children if is duplicated', () => {
let spyGetNodeInfo = spyOn(alfrescoApiService.getInstance().nodes, 'getNodeChildren');
let spyGetNodeInfo = spyOn(alfrescoApiService.getInstance().nodes, 'getNodeChildren').and.callThrough();
service.getFolder('/fake-root/fake-name', {}, ['allowableOperations']);
@@ -185,7 +186,7 @@ describe('DocumentListService', () => {
});
it('should add the includeTypes in the request getFolderNode if required', () => {
let spyGetNodeInfo = spyOn(alfrescoApiService.getInstance().nodes, 'getNodeInfo');
let spyGetNodeInfo = spyOn(alfrescoApiService.getInstance().nodes, 'getNodeInfo').and.callThrough();
service.getFolderNode('test-id', ['isLocked']);
@@ -196,7 +197,7 @@ describe('DocumentListService', () => {
});
it('should not add the includeTypes in the request getFolderNode if is duplicated', () => {
let spyGetNodeInfo = spyOn(alfrescoApiService.getInstance().nodes, 'getNodeInfo');
let spyGetNodeInfo = spyOn(alfrescoApiService.getInstance().nodes, 'getNodeInfo').and.callThrough();
service.getFolderNode('test-id', ['allowableOperations']);
lib/content-services/document-list/services/document-list.service.ts
+19 -17
View File
@@ -22,8 +22,8 @@ import {
import { Injectable } from '@angular/core';
import { MinimalNodeEntity, MinimalNodeEntryEntity, NodeEntry, NodePaging } from 'alfresco-js-api';
import { Observable } from 'rxjs/Observable';
import 'rxjs/add/observable/throw';
import { Observable, from, throwError } from 'rxjs';
import { catchError } from 'rxjs/operators';
@Injectable()
export class DocumentListService {
@@ -74,7 +74,7 @@ export class DocumentListService {
* @returns Empty response when the operation is complete
*/
deleteNode(nodeId: string): Observable<any> {
return Observable.fromPromise(this.apiService.getInstance().nodes.deleteNode(nodeId));
return from(this.apiService.getInstance().nodes.deleteNode(nodeId));
}
/**
@@ -85,8 +85,9 @@ export class DocumentListService {
* @returns NodeEntry for the copied node
*/
copyNode(nodeId: string, targetParentId: string) {
return Observable.fromPromise(this.apiService.getInstance().nodes.copyNode(nodeId, { targetParentId }))
.catch(err => this.handleError(err));
return from(this.apiService.getInstance().nodes.copyNode(nodeId, { targetParentId })).pipe(
catchError(err => this.handleError(err))
);
}
/**
@@ -97,8 +98,9 @@ export class DocumentListService {
* @returns NodeEntry for the moved node
*/
moveNode(nodeId: string, targetParentId: string) {
return Observable.fromPromise(this.apiService.getInstance().nodes.moveNode(nodeId, { targetParentId }))
.catch(err => this.handleError(err));
return from(this.apiService.getInstance().nodes.moveNode(nodeId, { targetParentId })).pipe(
catchError(err => this.handleError(err))
);
}
/**
@@ -108,9 +110,10 @@ export class DocumentListService {
* @returns Details of the created folder node
*/
createFolder(name: string, parentId: string): Observable<MinimalNodeEntity> {
let observable = Observable.fromPromise(this.apiService.getInstance().nodes.createFolder(name, '/', parentId));
observable.catch(err => this.handleError(err));
return observable;
return from(this.apiService.getInstance().nodes.createFolder(name, '/', parentId))
.pipe(
catchError(err => this.handleError(err))
);
}
/**
@@ -121,9 +124,10 @@ export class DocumentListService {
* @returns Details of the folder
*/
getFolder(folder: string, opts?: any, includeFields: string[] = []): Observable<NodePaging> {
return Observable.fromPromise(this.getNodesPromise(folder, opts, includeFields))
.map(res => <NodePaging> res)
.catch(err => this.handleError(err));
return from(this.getNodesPromise(folder, opts, includeFields))
.pipe(
catchError(err => this.handleError(err))
);
}
/**
@@ -162,7 +166,7 @@ export class DocumentListService {
include: includeFieldsRequest
};
return Observable.fromPromise(this.apiService.getInstance().nodes.getNodeInfo(nodeId, opts));
return from(this.apiService.getInstance().nodes.getNodeInfo(nodeId, opts));
}
/**
* Get thumbnail URL for the given document node.
@@ -202,9 +206,7 @@ export class DocumentListService {
}
private handleError(error: any) {
// in a real world app, we may send the error to some remote logging infrastructure
// instead of just logging it to the console
this.logService.error(error);
return Observable.throw(error || 'Server error');
return throwError(error || 'Server error');
}
}
lib/content-services/document-list/services/folder-actions.service.spec.ts
+1 -1
View File
@@ -17,7 +17,7 @@
import { TestBed } from '@angular/core/testing';
import { AlfrescoApiServiceMock, AppConfigService, StorageService, ContentService, setupTestBed, CoreModule, TranslationMock } from '@alfresco/adf-core';
import { Observable } from 'rxjs/Observable';
import { Observable } from 'rxjs';
import { FileNode, FolderNode } from '../../mock';
import { ContentActionHandler } from '../models/content-action.model';
import { DocumentListService } from './document-list.service';
lib/content-services/document-list/services/folder-actions.service.ts
+2 -4
View File
@@ -18,13 +18,11 @@
import { ContentService, TranslationService } from '@alfresco/adf-core';
import { Injectable } from '@angular/core';
import { MinimalNodeEntity } from 'alfresco-js-api';
import { Observable } from 'rxjs/Observable';
import { Subject } from 'rxjs/Subject';
import { Observable, Subject, throwError } from 'rxjs';
import { ContentActionHandler } from '../models/content-action.model';
import { PermissionModel } from '../models/permissions.model';
import { DocumentListService } from './document-list.service';
import { NodeActionsService } from './node-actions.service';
import 'rxjs/add/observable/throw';
@Injectable()
export class FolderActionsService {
@@ -135,7 +133,7 @@ export class FolderActionsService {
return handlerObservable;
} else {
this.permissionEvent.next(new PermissionModel({type: 'folder', action: 'delete', permission: permission}));
return Observable.throw(new Error('No permission to delete'));
return throwError(new Error('No permission to delete'));
}
}
}
lib/content-services/document-list/services/node-actions.service.spec.ts
+11 -11
View File
@@ -21,7 +21,7 @@ import { AppConfigService, setupTestBed, CoreModule } from '@alfresco/adf-core';
import { DocumentListService } from './document-list.service';
import { NodeActionsService } from './node-actions.service';
import { ContentNodeDialogService } from '../../content-node-selector/content-node-dialog.service';
import { Observable } from 'rxjs/Observable';
import { of, throwError } from 'rxjs';
import { MatDialogRef } from '@angular/material';
import { DialogModule } from '../../dialogs/dialog.module';
@@ -65,8 +65,8 @@ describe('NodeActionsService', () => {
});
it('should be able to copy content', async(() => {
spyOn(documentListService, 'copyNode').and.returnValue(Observable.of('FAKE-OK'));
spyOn(contentDialogService, 'openCopyMoveDialog').and.returnValue(Observable.of([fakeNode]));
spyOn(documentListService, 'copyNode').and.returnValue(of('FAKE-OK'));
spyOn(contentDialogService, 'openCopyMoveDialog').and.returnValue(of([fakeNode]));
service.copyContent(fakeNode, 'allowed').subscribe((value) => {
expect(value).toBe('OPERATION.SUCCESS.CONTENT.COPY');
@@ -74,8 +74,8 @@ describe('NodeActionsService', () => {
}));
it('should be able to move content', async(() => {
spyOn(documentListService, 'moveNode').and.returnValue(Observable.of('FAKE-OK'));
spyOn(contentDialogService, 'openCopyMoveDialog').and.returnValue(Observable.of([fakeNode]));
spyOn(documentListService, 'moveNode').and.returnValue(of('FAKE-OK'));
spyOn(contentDialogService, 'openCopyMoveDialog').and.returnValue(of([fakeNode]));
service.moveContent(fakeNode, 'allowed').subscribe((value) => {
expect(value).toBe('OPERATION.SUCCESS.CONTENT.MOVE');
@@ -83,8 +83,8 @@ describe('NodeActionsService', () => {
}));
it('should be able to move folder', async(() => {
spyOn(documentListService, 'moveNode').and.returnValue(Observable.of('FAKE-OK'));
spyOn(contentDialogService, 'openCopyMoveDialog').and.returnValue(Observable.of([fakeNode]));
spyOn(documentListService, 'moveNode').and.returnValue(of('FAKE-OK'));
spyOn(contentDialogService, 'openCopyMoveDialog').and.returnValue(of([fakeNode]));
service.moveFolder(fakeNode, 'allowed').subscribe((value) => {
expect(value).toBe('OPERATION.SUCCESS.FOLDER.MOVE');
@@ -92,8 +92,8 @@ describe('NodeActionsService', () => {
}));
it('should be able to copy folder', async(() => {
spyOn(documentListService, 'copyNode').and.returnValue(Observable.of('FAKE-OK'));
spyOn(contentDialogService, 'openCopyMoveDialog').and.returnValue(Observable.of([fakeNode]));
spyOn(documentListService, 'copyNode').and.returnValue(of('FAKE-OK'));
spyOn(contentDialogService, 'openCopyMoveDialog').and.returnValue(of([fakeNode]));
service.copyFolder(fakeNode, 'allowed').subscribe((value) => {
expect(value).toBe('OPERATION.SUCCESS.FOLDER.COPY');
@@ -101,8 +101,8 @@ describe('NodeActionsService', () => {
}));
it('should be able to propagate the dialog error', async(() => {
spyOn(documentListService, 'copyNode').and.returnValue(Observable.throw('FAKE-KO'));
spyOn(contentDialogService, 'openCopyMoveDialog').and.returnValue(Observable.of([fakeNode]));
spyOn(documentListService, 'copyNode').and.returnValue(throwError('FAKE-KO'));
spyOn(contentDialogService, 'openCopyMoveDialog').and.returnValue(of([fakeNode]));
service.copyFolder(fakeNode, '!allowed').subscribe((value) => {
}, (error) => {
lib/content-services/document-list/services/node-actions.service.ts
+1 -1
View File
@@ -17,7 +17,7 @@
import { Injectable, Output, EventEmitter } from '@angular/core';
import { MinimalNodeEntryEntity, MinimalNodeEntity } from 'alfresco-js-api';
import { Subject } from 'rxjs/Subject';
import { Subject } from 'rxjs';
import { AlfrescoApiService, ContentService } from '@alfresco/adf-core';
import { MatDialog } from '@angular/material';
lib/content-services/folder-directive/folder-create.directive.spec.ts
+4 -5
View File
@@ -19,12 +19,11 @@ import { Component } from '@angular/core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { MatDialog } from '@angular/material';
import { By } from '@angular/platform-browser';
import { Observable } from 'rxjs/Observable';
import { Subject, of } from 'rxjs';
import { FolderDialogComponent } from '../dialogs/folder.dialog';
import { ContentService, setupTestBed, CoreModule } from '@alfresco/adf-core';
import { FolderCreateDirective } from './folder-create.directive';
import { Subject } from 'rxjs/Subject';
import { MinimalNodeEntryEntity } from 'alfresco-js-api';
@Component({
@@ -89,7 +88,7 @@ describe('FolderCreateDirective', () => {
node = { entry: { id: 'nodeId' } };
dialogRefMock = {
afterClosed: val => Observable.of(val),
afterClosed: val => of(val),
componentInstance: {
error: new Subject<any>(),
success: new Subject<MinimalNodeEntryEntity>()
@@ -108,7 +107,7 @@ describe('FolderCreateDirective', () => {
});
xit('should emit folderCreate event when input value is not undefined', (done) => {
spyOn(dialogRefMock, 'afterClosed').and.returnValue(Observable.of(node));
spyOn(dialogRefMock, 'afterClosed').and.returnValue(of(node));
spyOn(contentService.folderCreate, 'next');
contentService.folderCreate.subscribe((val) => {
@@ -124,7 +123,7 @@ describe('FolderCreateDirective', () => {
});
it('should not emit folderCreate event when input value is undefined', () => {
spyOn(dialogRefMock, 'afterClosed').and.returnValue(Observable.of(null));
spyOn(dialogRefMock, 'afterClosed').and.returnValue(of(null));
spyOn(contentService.folderCreate, 'next');
fixture.detectChanges();
lib/content-services/folder-directive/folder-edit.directive.spec.ts
+4 -5
View File
@@ -19,12 +19,11 @@ import { Component } from '@angular/core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { MatDialog } from '@angular/material';
import { By } from '@angular/platform-browser';
import { Observable } from 'rxjs/Observable';
import { Subject, of } from 'rxjs';
import { ContentService, setupTestBed, CoreModule } from '@alfresco/adf-core';
import { FolderEditDirective } from './folder-edit.directive';
import { MinimalNodeEntryEntity } from 'alfresco-js-api';
import { Subject } from 'rxjs/Subject';
@Component({
template: '<div [adf-edit-folder]="folder" (success)="success($event)" title="edit-title"></div>'
@@ -72,7 +71,7 @@ describe('FolderEditDirective', () => {
node = { entry: { id: 'folderId' } };
dialogRefMock = {
afterClosed: val => Observable.of(val),
afterClosed: val => of(val),
componentInstance: {
error: new Subject<any>(),
success: new Subject<MinimalNodeEntryEntity>()
@@ -83,7 +82,7 @@ describe('FolderEditDirective', () => {
});
xit('should emit folderEdit event when input value is not undefined', (done) => {
spyOn(dialogRefMock, 'afterClosed').and.returnValue(Observable.of(node));
spyOn(dialogRefMock, 'afterClosed').and.returnValue(of(node));
contentService.folderEdit.subscribe((val) => {
expect(val).toBe(node);
@@ -95,7 +94,7 @@ describe('FolderEditDirective', () => {
});
it('should not emit folderEdit event when input value is undefined', () => {
spyOn(dialogRefMock, 'afterClosed').and.returnValue(Observable.of(null));
spyOn(dialogRefMock, 'afterClosed').and.returnValue(of(null));
spyOn(contentService.folderEdit, 'next');
fixture.detectChanges();
lib/content-services/karma-test-shim.js
-25
View File
@@ -1,25 +0,0 @@
Error.stackTraceLimit = Infinity;
require('core-js/es6');
require('core-js/es7/reflect');
require('zone.js/dist/zone');
require('zone.js/dist/long-stack-trace-zone');
require('zone.js/dist/proxy');
require('zone.js/dist/sync-test');
require('zone.js/dist/jasmine-patch');
require('zone.js/dist/async-test');
require('zone.js/dist/fake-async-test');
jasmine.DEFAULT_TIMEOUT_INTERVAL = 20000;
var appContext = require.context(".", true, /.spec.ts/);
appContext.keys().forEach(appContext);
const TestBed = require('@angular/core/testing').TestBed;
const browser = require('@angular/platform-browser-dynamic/testing');
TestBed.initTestEnvironment(
browser.BrowserDynamicTestingModule,
browser.platformBrowserDynamicTesting()
);
lib/content-services/karma.conf.js
+92
View File
@@ -0,0 +1,92 @@
// Karma configuration file, see link for more information
// https://karma-runner.github.io/1.0/config/configuration-file.html
module.exports = function (config) {
config.set({
basePath: '',
files: [
{pattern: '../../node_modules/core-js/client/core.js', included: true, watched: false},
{pattern: '../../node_modules/tslib/tslib.js', included: true, watched: false},
{pattern: '../../node_modules/hammerjs/hammer.min.js', included: true, watched: false},
{pattern: '../../node_modules/hammerjs/hammer.min.js.map', included: false, watched: false},
// pdf-js
{pattern: '../../node_modules/pdfjs-dist/build/pdf.js', included: true, watched: false},
{pattern: '../../node_modules/pdfjs-dist/build/pdf.worker.js', included: true, watched: false},
{pattern: '../../node_modules/pdfjs-dist/web/pdf_viewer.js', included: true, watched: false},
{
pattern: '../../node_modules/@angular/material/prebuilt-themes/indigo-pink.css',
included: true,
watched: false
},
{pattern: '../../node_modules/alfresco-js-api/dist/alfresco-js-api.min.js', included: true, watched: false},
{pattern: '../../node_modules/moment/min/moment.min.js', included: true, watched: false},
{pattern: './i18n/**/en.json', included: false, served: true, watched: false},
{pattern: './**/*.ts', included: false, served: true, watched: false},
{pattern: './app.config.json', included: false, served: true, watched: false},
],
frameworks: ['jasmine-ajax', 'jasmine', '@angular-devkit/build-angular'],
proxies: {
'/base/assets/' :'/base/assets/',
'/assets/adf-content-services/i18n/en.json': '/base/i18n/en.json',
'/app.config.json': '/base/app.config.json'
},
plugins: [
require('karma-jasmine-ajax'),
require('karma-jasmine'),
require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'),
require('@angular-devkit/build-angular/plugins/karma'),
require('karma-mocha-reporter')
],
client: {
clearContext: false // leave Jasmine Spec Runner output visible in browser
},
coverageIstanbulReporter: {
dir: './lib/coverage/content-services/',
reports: ['html', 'lcovonly'],
fixWebpackSourcePaths: true
},
// possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
logLevel: config.LOG_DEBUG,
colors: true,
autoWatch: false,
browserDisconnectTimeout: 200000,
browserNoActivityTimeout: 2400000,
captureTimeout: 1200000,
customLaunchers: {
ChromeHeadless: {
base: 'Chrome',
flags: [
'--no-sandbox',
'--headless',
'--disable-gpu',
'--remote-debugging-port=9222'
]
}
},
reporters: ['mocha', 'kjhtml'],
port: 9876,
colors: true,
logLevel: config.LOG_INFO,
autoWatch: true,
browsers: ['Chrome'],
singleRun: false
});
};
lib/content-services/mock/document-list.service.mock.ts
+2 -2
View File
@@ -19,7 +19,7 @@ import {
AlfrescoApiService, AuthenticationService, ContentService,
SettingsService, LogService, ThumbnailService
} from '@alfresco/adf-core';
import { Observable } from 'rxjs/Observable';
import { Observable, throwError } from 'rxjs';
import { NodePaging, DocumentListService } from '../document-list';
import { PageNode } from './document-library.model.mock';
@@ -40,7 +40,7 @@ export class DocumentListServiceMock extends DocumentListService {
getFolder(folder: string) {
if (this.getFolderReject) {
return Observable.throw(this.getFolderRejectError);
return throwError(this.getFolderRejectError);
}
return Observable.create(observer => {
observer.next(this.getFolderResult);
lib/content-services/ng-package.json
-2
View File
@@ -1,12 +1,10 @@
{
"$schema": "./node_modules/ng-packagr/ng-package.schema.json",
"whitelistedNonPeerDependencies": [ "." ],
"workingDirectory" : "./ng_work",
"src": "../content-services/",
"dest": "../dist/content-services/",
"lib": {
"languageLevel": [ "dom", "es2016" ],
"licensePath": "../config/assets/license_header_add.txt",
"comments" : "none",
"entryFile": "./public-api.ts",
"flatModuleFile": "adf-content-services",
lib/content-services/package.json
+18 -27
View File
@@ -11,37 +11,28 @@
"bugs": {
"url": "https://github.com/Alfresco/alfresco-ng2-components/issues"
},
"dependencies": {
"@angular/animations": "5.1.1",
"@angular/cdk": "5.0.1",
"@angular/common": "5.1.1",
"@angular/compiler": "5.1.1",
"@angular/core": "5.1.1",
"@angular/flex-layout": "2.0.0-beta.12",
"@angular/forms": "5.1.1",
"@angular/http": "5.1.1",
"@angular/material": "5.0.1",
"@angular/material-moment-adapter": "5.0.1",
"@angular/platform-browser": "5.1.1",
"@angular/platform-browser-dynamic": "5.1.1",
"@angular/router": "5.1.1",
"@ngx-translate/core": "9.1.1",
"peerDependencies": {
"@angular/animations": ">=5.1.1",
"@angular/cdk": ">=5.1.1",
"@angular/common": ">=5.1.1",
"@angular/compiler": ">=5.1.1",
"@angular/core": ">=5.1.1",
"@angular/flex-layout": ">=5.1.1",
"@angular/forms": ">=5.1.1",
"@angular/http": ">=5.1.1",
"@angular/material": ">=5.1.1",
"@angular/material-moment-adapter": ">=5.1.1",
"@angular/platform-browser": ">=5.1.1",
"@angular/platform-browser-dynamic": ">=5.1.1",
"@angular/router": ">=5.1.1",
"alfresco-js-api": "2.5.0-beta2",
"rxjs": ">=6.2.2",
"@alfresco/adf-core": "2.5.0-beta2",
"chart.js": "2.5.0",
"core-js": "2.4.1",
"@ngx-translate/core": "^10.0.2",
"hammerjs": "2.0.8",
"minimatch": "3.0.4",
"moment": "2.20.1",
"ng2-charts": "1.6.0",
"pdfjs-dist": "1.5.404",
"raphael": "2.2.7",
"moment": "^2.22.2",
"reflect-metadata": "0.1.10",
"rxjs": "5.5.2",
"systemjs": "0.19.27",
"zone.js": "0.8.14"
},
"devDependencies": {
"zone.js": "^0.8.26"
},
"keywords": [
"content-services",
lib/content-services/permission-manager/components/add-permission/add-permission-dialog-data.interface.ts
+1 -1
View File
@@ -16,7 +16,7 @@
*/
import { MinimalNodeEntity } from 'alfresco-js-api';
import { Subject } from 'rxjs/Subject';
import { Subject } from 'rxjs';
export interface AddPermissionDialogData {
title?: string;
lib/content-services/permission-manager/components/add-permission/add-permission-dialog.component.spec.ts
+1 -1
View File
@@ -23,7 +23,7 @@ import { By } from '@angular/platform-browser';
import { setupTestBed } from '@alfresco/adf-core';
import { AddPermissionDialogComponent } from './add-permission-dialog.component';
import { MinimalNodeEntity } from 'alfresco-js-api';
import { Subject } from 'rxjs/Subject';
import { Subject } from 'rxjs';
import { AddPermissionDialogData } from './add-permission-dialog-data.interface';
import { fakeAuthorityResults } from '../../../mock/add-permission.component.mock';
import { AddPermissionPanelComponent } from './add-permission-panel.component';
lib/content-services/permission-manager/components/add-permission/add-permission-panel.component.spec.ts
+8 -8
View File
@@ -19,7 +19,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { AddPermissionPanelComponent } from './add-permission-panel.component';
import { By } from '@angular/platform-browser';
import { SearchService, setupTestBed, SearchConfigurationService } from '@alfresco/adf-core';
import { Observable } from 'rxjs/Observable';
import { of } from 'rxjs';
import { fakeAuthorityListResult } from '../../../mock/add-permission.component.mock';
import { ContentTestingModule } from '../../../testing/content.testing.module';
import { DebugElement } from '@angular/core';
@@ -63,7 +63,7 @@ describe('AddPermissionPanelComponent', () => {
it('should show search results when user types something', async(() => {
searchApiService = fixture.componentRef.injector.get(SearchService);
spyOn(searchApiService, 'search').and.returnValue(Observable.of(fakeAuthorityListResult));
spyOn(searchApiService, 'search').and.returnValue(of(fakeAuthorityListResult));
expect(element.querySelector('#adf-add-permission-type-search')).not.toBeNull();
expect(element.querySelector('#searchInput')).not.toBeNull();
typeWordIntoSearchInput('a');
@@ -77,7 +77,7 @@ describe('AddPermissionPanelComponent', () => {
it('should emit a select event with the selected items when an item is clicked', async(() => {
searchApiService = fixture.componentRef.injector.get(SearchService);
spyOn(searchApiService, 'search').and.returnValue(Observable.of(fakeAuthorityListResult));
spyOn(searchApiService, 'search').and.returnValue(of(fakeAuthorityListResult));
component.select.subscribe((items) => {
expect(items).not.toBeNull();
expect(items[0].entry.id).toBeDefined();
@@ -97,7 +97,7 @@ describe('AddPermissionPanelComponent', () => {
it('should show the icon related on the nodeType', async(() => {
searchApiService = fixture.componentRef.injector.get(SearchService);
spyOn(searchApiService, 'search').and.returnValue(Observable.of(fakeAuthorityListResult));
spyOn(searchApiService, 'search').and.returnValue(of(fakeAuthorityListResult));
expect(element.querySelector('#adf-add-permission-type-search')).not.toBeNull();
expect(element.querySelector('#searchInput')).not.toBeNull();
typeWordIntoSearchInput('a');
@@ -114,7 +114,7 @@ describe('AddPermissionPanelComponent', () => {
it('should clear the search when user delete the search input field', async(() => {
searchApiService = fixture.componentRef.injector.get(SearchService);
spyOn(searchApiService, 'search').and.returnValue(Observable.of(fakeAuthorityListResult));
spyOn(searchApiService, 'search').and.returnValue(of(fakeAuthorityListResult));
expect(element.querySelector('#adf-add-permission-type-search')).not.toBeNull();
expect(element.querySelector('#searchInput')).not.toBeNull();
typeWordIntoSearchInput('a');
@@ -135,7 +135,7 @@ describe('AddPermissionPanelComponent', () => {
it('should remove element from selection when is clicked and already selected', async(() => {
searchApiService = fixture.componentRef.injector.get(SearchService);
spyOn(searchApiService, 'search').and.returnValue(Observable.of(fakeAuthorityListResult));
spyOn(searchApiService, 'search').and.returnValue(of(fakeAuthorityListResult));
component.selectedItems.push(fakeAuthorityListResult.list.entries[0]);
component.select.subscribe((items) => {
expect(items).not.toBeNull();
@@ -155,7 +155,7 @@ describe('AddPermissionPanelComponent', () => {
it('should always show as extra result the everyone group', async(() => {
searchApiService = fixture.componentRef.injector.get(SearchService);
spyOn(searchApiService, 'search').and.returnValue(Observable.of(fakeAuthorityListResult));
spyOn(searchApiService, 'search').and.returnValue(of(fakeAuthorityListResult));
component.selectedItems.push(fakeAuthorityListResult.list.entries[0]);
typeWordIntoSearchInput('a');
@@ -174,7 +174,7 @@ describe('AddPermissionPanelComponent', () => {
it('should show everyone group when search return no result', async(() => {
searchApiService = fixture.componentRef.injector.get(SearchService);
spyOn(searchApiService, 'search').and.returnValue(Observable.of({ list: { entries: [] } }));
spyOn(searchApiService, 'search').and.returnValue(of({ list: { entries: [] } }));
component.selectedItems.push(fakeAuthorityListResult.list.entries[0]);
typeWordIntoSearchInput('a');
lib/content-services/permission-manager/components/add-permission/add-permission.component.spec.ts
+5 -5
View File
@@ -20,7 +20,7 @@ import { AddPermissionComponent } from './add-permission.component';
import { AddPermissionPanelComponent } from './add-permission-panel.component';
import { By } from '@angular/platform-browser';
import { setupTestBed, NodesApiService } from '@alfresco/adf-core';
import { Observable } from 'rxjs/Observable';
import { of, throwError } from 'rxjs';
import { fakeAuthorityResults } from '../../../mock/add-permission.component.mock';
import { ContentTestingModule } from '../../../testing/content.testing.module';
import { NodePermissionService } from '../../services/node-permission.service';
@@ -40,7 +40,7 @@ describe('AddPermissionComponent', () => {
beforeEach(() => {
nodeApiService = TestBed.get(NodesApiService);
spyOn(nodeApiService, 'getNode').and.returnValue(Observable.of({ id: 'fake-node', allowableOperations: ['updatePermissions']}));
spyOn(nodeApiService, 'getNode').and.returnValue(of({ id: 'fake-node', allowableOperations: ['updatePermissions']}));
fixture = TestBed.createComponent(AddPermissionComponent);
element = fixture.nativeElement;
nodePermissionService = TestBed.get(NodePermissionService);
@@ -83,7 +83,7 @@ describe('AddPermissionComponent', () => {
it('should emit a success event when the node is updated', (done) => {
fixture.componentInstance.selectedItems = fakeAuthorityResults;
spyOn(nodePermissionService, 'updateNodePermissions').and.returnValue(Observable.of({ id: 'fake-node-id'}));
spyOn(nodePermissionService, 'updateNodePermissions').and.returnValue(of({ id: 'fake-node-id'}));
fixture.componentInstance.success.subscribe((node) => {
expect(node.id).toBe('fake-node-id');
@@ -101,7 +101,7 @@ describe('AddPermissionComponent', () => {
it('should NOT emit a success event when the user does not have permission to update the node', () => {
fixture.componentInstance.selectedItems = fakeAuthorityResults;
fixture.componentInstance.currentNode = { id: 'fake-node-id' };
spyOn(nodePermissionService, 'updateNodePermissions').and.returnValue(Observable.of({ id: 'fake-node-id' }));
spyOn(nodePermissionService, 'updateNodePermissions').and.returnValue(of({ id: 'fake-node-id' }));
let spySuccess = spyOn(fixture.componentInstance, 'success');
fixture.componentInstance.applySelection();
@@ -110,7 +110,7 @@ describe('AddPermissionComponent', () => {
it('should emit an error event when the node update fail', (done) => {
fixture.componentInstance.selectedItems = fakeAuthorityResults;
spyOn(nodePermissionService, 'updateNodePermissions').and.returnValue(Observable.throw({ error: 'errored'}));
spyOn(nodePermissionService, 'updateNodePermissions').and.returnValue(throwError({ error: 'errored'}));
fixture.componentInstance.error.subscribe((error) => {
expect(error.error).toBe('errored');
lib/content-services/permission-manager/components/inherited-button.directive.spec.ts
+8 -8
View File
@@ -19,7 +19,7 @@ import { SimpleInheritedPermissionTestComponent } from '../../mock/inherited-per
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { InheritPermissionDirective } from './inherited-button.directive';
import { NodesApiService, setupTestBed, CoreModule } from '@alfresco/adf-core';
import { Observable } from 'rxjs/Observable';
import { of } from 'rxjs';
const fakeNodeWithInherit: any = { id: 'fake-id', permissions : {isInheritanceEnabled : true}, allowableOperations: ['updatePermissions']};
const fakeNodeNoInherit: any = { id: 'fake-id', permissions : {isInheritanceEnabled : false}, allowableOperations: ['updatePermissions']};
@@ -56,12 +56,12 @@ describe('InheritPermissionDirective', () => {
}));
it('should be able to add inherited permission', async(() => {
spyOn(nodeService, 'getNode').and.returnValue(Observable.of(fakeNodeNoInherit));
spyOn(nodeService, 'getNode').and.returnValue(of(fakeNodeNoInherit));
spyOn(nodeService, 'updateNode').and.callFake((nodeId, nodeBody) => {
if (nodeBody.permissions.isInheritanceEnabled) {
return Observable.of(fakeNodeWithInherit);
return of(fakeNodeWithInherit);
} else {
return Observable.of(fakeNodeNoInherit);
return of(fakeNodeNoInherit);
}
});
fixture.detectChanges();
@@ -76,12 +76,12 @@ describe('InheritPermissionDirective', () => {
}));
it('should be able to remove inherited permission', async(() => {
spyOn(nodeService, 'getNode').and.returnValue(Observable.of(fakeNodeWithInherit));
spyOn(nodeService, 'getNode').and.returnValue(of(fakeNodeWithInherit));
spyOn(nodeService, 'updateNode').and.callFake((nodeId, nodeBody) => {
if (nodeBody.permissions.isInheritanceEnabled) {
return Observable.of(fakeNodeWithInherit);
return of(fakeNodeWithInherit);
} else {
return Observable.of(fakeNodeNoInherit);
return of(fakeNodeNoInherit);
}
});
component.updatedNode = true;
@@ -97,7 +97,7 @@ describe('InheritPermissionDirective', () => {
}));
it('should not update the node when node has no permission', async(() => {
spyOn(nodeService, 'getNode').and.returnValue(Observable.of(fakeNodeWithInheritNoPermission));
spyOn(nodeService, 'getNode').and.returnValue(of(fakeNodeWithInheritNoPermission));
let spyUpdateNode = spyOn(nodeService, 'updateNode');
component.updatedNode = true;
fixture.detectChanges();
lib/content-services/permission-manager/components/permission-list/permission-list.component.spec.ts
+20 -20
View File
@@ -19,7 +19,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { PermissionListComponent } from './permission-list.component';
import { By } from '@angular/platform-browser';
import { NodesApiService, SearchService, setupTestBed } from '@alfresco/adf-core';
import { Observable } from 'rxjs/Observable';
import { of } from 'rxjs';
import { NodePermissionService } from '../../services/node-permission.service';
import { fakeNodeWithPermissions,
fakeNodeInheritedOnly,
@@ -57,16 +57,16 @@ describe('PermissionDisplayComponent', () => {
});
it('should be able to render the component', () => {
spyOn(nodeService, 'getNode').and.returnValue(Observable.of(fakeNodeWithOnlyLocally));
spyOn(nodePermissionService, 'getNodeRoles').and.returnValue(Observable.of([]));
spyOn(nodeService, 'getNode').and.returnValue(of(fakeNodeWithOnlyLocally));
spyOn(nodePermissionService, 'getNodeRoles').and.returnValue(of([]));
fixture.detectChanges();
expect(element.querySelector('#adf-permission-display-container')).not.toBeNull();
});
it('should render default empty template when no permissions', () => {
component.nodeId = 'fake-node-id';
spyOn(nodeService, 'getNode').and.returnValue(Observable.of(fakeNodeWithoutPermissions));
spyOn(searchApiService, 'searchByQueryBody').and.returnValue(Observable.of(fakeEmptyResponse));
spyOn(nodeService, 'getNode').and.returnValue(of(fakeNodeWithoutPermissions));
spyOn(searchApiService, 'searchByQueryBody').and.returnValue(of(fakeEmptyResponse));
fixture.detectChanges();
expect(element.querySelector('#adf-no-permissions-template')).not.toBeNull();
@@ -75,8 +75,8 @@ describe('PermissionDisplayComponent', () => {
it('should show the node permissions', () => {
component.nodeId = 'fake-node-id';
spyOn(nodeService, 'getNode').and.returnValue(Observable.of(fakeNodeWithPermissions));
spyOn(searchApiService, 'searchByQueryBody').and.returnValue(Observable.of(fakeEmptyResponse));
spyOn(nodeService, 'getNode').and.returnValue(of(fakeNodeWithPermissions));
spyOn(searchApiService, 'searchByQueryBody').and.returnValue(of(fakeEmptyResponse));
fixture.detectChanges();
expect(element.querySelector('#adf-permission-display-container')).not.toBeNull();
expect(element.querySelectorAll('.adf-datatable-row').length).toBe(4);
@@ -84,8 +84,8 @@ describe('PermissionDisplayComponent', () => {
it('should show inherited label for inherited permissions', () => {
component.nodeId = 'fake-node-id';
spyOn(nodeService, 'getNode').and.returnValue(Observable.of(fakeNodeInheritedOnly));
spyOn(searchApiService, 'searchByQueryBody').and.returnValue(Observable.of(fakeEmptyResponse));
spyOn(nodeService, 'getNode').and.returnValue(of(fakeNodeInheritedOnly));
spyOn(searchApiService, 'searchByQueryBody').and.returnValue(of(fakeEmptyResponse));
fixture.detectChanges();
expect(element.querySelector('#adf-permission-display-container')).not.toBeNull();
expect(element.querySelector('#adf-permission-inherited-label')).toBeDefined();
@@ -96,9 +96,9 @@ describe('PermissionDisplayComponent', () => {
it('should show locally set label for locally set permissions', () => {
component.nodeId = 'fake-node-id';
spyOn(nodeService, 'getNode').and.returnValue(Observable.of(fakeNodeWithOnlyLocally));
spyOn(nodePermissionService, 'getGroupMemeberByGroupName').and.returnValue(Observable.of(fakeSiteRoles));
spyOn(searchApiService, 'searchByQueryBody').and.returnValue(Observable.of(fakeSiteNodeResponse));
spyOn(nodeService, 'getNode').and.returnValue(of(fakeNodeWithOnlyLocally));
spyOn(nodePermissionService, 'getGroupMemeberByGroupName').and.returnValue(of(fakeSiteRoles));
spyOn(searchApiService, 'searchByQueryBody').and.returnValue(of(fakeSiteNodeResponse));
fixture.detectChanges();
expect(element.querySelector('#adf-permission-display-container')).not.toBeNull();
expect(element.querySelector('#adf-permission-locallyset-label')).toBeDefined();
@@ -107,9 +107,9 @@ describe('PermissionDisplayComponent', () => {
it('should show a dropdown with the possible roles', async(() => {
component.nodeId = 'fake-node-id';
spyOn(nodeService, 'getNode').and.returnValue(Observable.of(fakeNodeWithOnlyLocally));
spyOn(nodePermissionService, 'getGroupMemeberByGroupName').and.returnValue(Observable.of(fakeSiteRoles));
spyOn(searchApiService, 'searchByQueryBody').and.returnValue(Observable.of(fakeSiteNodeResponse));
spyOn(nodeService, 'getNode').and.returnValue(of(fakeNodeWithOnlyLocally));
spyOn(nodePermissionService, 'getGroupMemeberByGroupName').and.returnValue(of(fakeSiteRoles));
spyOn(searchApiService, 'searchByQueryBody').and.returnValue(of(fakeSiteNodeResponse));
fixture.detectChanges();
fixture.whenStable().then(() => {
fixture.detectChanges();
@@ -133,8 +133,8 @@ describe('PermissionDisplayComponent', () => {
it('should show the settable roles if the node is not in any site', async(() => {
component.nodeId = 'fake-node-id';
spyOn(nodeService, 'getNode').and.returnValue(Observable.of(fakeNodeWithOnlyLocally));
spyOn(searchApiService, 'searchByQueryBody').and.returnValue(Observable.of(fakeEmptyResponse));
spyOn(nodeService, 'getNode').and.returnValue(of(fakeNodeWithOnlyLocally));
spyOn(searchApiService, 'searchByQueryBody').and.returnValue(of(fakeEmptyResponse));
fixture.detectChanges();
fixture.whenStable().then(() => {
fixture.detectChanges();
@@ -159,9 +159,9 @@ describe('PermissionDisplayComponent', () => {
it('should update the role when another value is chosen', async(() => {
component.nodeId = 'fake-node-id';
spyOn(nodeService, 'getNode').and.returnValue(Observable.of(fakeNodeWithOnlyLocally));
spyOn(nodeService, 'updateNode').and.returnValue(Observable.of({id: 'fake-updated-node'}));
spyOn(searchApiService, 'searchByQueryBody').and.returnValue(Observable.of(fakeEmptyResponse));
spyOn(nodeService, 'getNode').and.returnValue(of(fakeNodeWithOnlyLocally));
spyOn(nodeService, 'updateNode').and.returnValue(of({id: 'fake-updated-node'}));
spyOn(searchApiService, 'searchByQueryBody').and.returnValue(of(fakeEmptyResponse));
component.update.subscribe((updatedPermission) => {
expect(updatedPermission).not.toBeNull();
expect(updatedPermission.name).toBe('Editor');
lib/content-services/permission-manager/services/node-permission-dialog.service.spec.ts
+11 -12
View File
@@ -19,8 +19,7 @@ import { TestBed } from '@angular/core/testing';
import { AppConfigService, setupTestBed, ContentService } from '@alfresco/adf-core';
import { NodePermissionDialogService } from './node-permission-dialog.service';
import { MatDialog } from '@angular/material';
import { Observable } from 'rxjs/Observable';
import { Subject } from 'rxjs/Subject';
import { Subject, of, throwError } from 'rxjs';
import { ContentTestingModule } from '../../testing/content.testing.module';
import { NodePermissionService } from './node-permission.service';
import { Node } from 'alfresco-js-api';
@@ -49,7 +48,7 @@ describe('NodePermissionDialogService', () => {
contentService = TestBed.get(ContentService);
spyOnDialogOpen = spyOn(materialDialog, 'open').and.returnValue({
afterOpen: () => afterOpenObservable,
afterClosed: () => Observable.of({}),
afterClosed: () => of({}),
componentInstance: {
error: new Subject<any>()
}
@@ -74,9 +73,9 @@ describe('NodePermissionDialogService', () => {
});
it('should return the updated node', (done) => {
spyOn(nodePermissionService, 'updateNodePermissions').and.returnValue(Observable.of({id : 'fake-node-updated'}));
spyOn(service, 'openAddPermissionDialog').and.returnValue(Observable.of({}));
spyOn(contentService, 'getNode').and.returnValue(Observable.of(fakePermissionNode));
spyOn(nodePermissionService, 'updateNodePermissions').and.returnValue(of({id : 'fake-node-updated'}));
spyOn(service, 'openAddPermissionDialog').and.returnValue(of({}));
spyOn(contentService, 'getNode').and.returnValue(of(fakePermissionNode));
service.updateNodePermissionByDialog('fake-node-id', 'fake-title').subscribe((node) => {
expect(node.id).toBe('fake-node-updated');
done();
@@ -84,11 +83,11 @@ describe('NodePermissionDialogService', () => {
});
it('should throw an error if the update of the node fails', (done) => {
spyOn(nodePermissionService, 'updateNodePermissions').and.returnValue(Observable.throw({error : 'error'}));
spyOn(service, 'openAddPermissionDialog').and.returnValue(Observable.of({}));
spyOn(contentService, 'getNode').and.returnValue(Observable.of(fakePermissionNode));
spyOn(nodePermissionService, 'updateNodePermissions').and.returnValue(throwError({error : 'error'}));
spyOn(service, 'openAddPermissionDialog').and.returnValue(of({}));
spyOn(contentService, 'getNode').and.returnValue(of(fakePermissionNode));
service.updateNodePermissionByDialog('fake-node-id', 'fake-title').subscribe(() => {
Observable.throw('This call should fail');
throwError('This call should fail');
}, (error) => {
expect(error.error).toBe('error');
done();
@@ -110,9 +109,9 @@ describe('NodePermissionDialogService', () => {
});
it('should return the updated node', (done) => {
spyOn(contentService, 'getNode').and.returnValue(Observable.of(fakeForbiddenNode));
spyOn(contentService, 'getNode').and.returnValue(of(fakeForbiddenNode));
service.updateNodePermissionByDialog('fake-node-id', 'fake-title').subscribe((node) => {
Observable.throw('This call should fail');
throwError('This call should fail');
},
(error) => {
expect(error.message).toBe('PERMISSION_MANAGER.ERROR.NOT-ALLOWED');
lib/content-services/permission-manager/services/node-permission-dialog.service.ts
+14 -8
View File
@@ -17,13 +17,13 @@
import { MatDialog } from '@angular/material';
import { Injectable } from '@angular/core';
import { Subject } from 'rxjs/Subject';
import { Observable } from 'rxjs/Observable';
import { Subject, Observable, throwError } from 'rxjs';
import { AddPermissionDialogComponent } from '../components/add-permission/add-permission-dialog.component';
import { AddPermissionDialogData } from '../components/add-permission/add-permission-dialog-data.interface';
import { MinimalNodeEntity, MinimalNodeEntryEntity, Node } from 'alfresco-js-api';
import { NodePermissionService } from './node-permission.service';
import { ContentService, PermissionsEnum } from '@alfresco/adf-core';
import { switchMap } from 'rxjs/operators';
@Injectable()
export class NodePermissionDialogService {
@@ -58,7 +58,7 @@ export class NodePermissionDialogService {
} else {
let errors = new Error(JSON.stringify({ error: { statusCode: 403 } }));
errors.message = 'PERMISSION_MANAGER.ERROR.NOT-ALLOWED';
return Observable.throw(errors);
return throwError(errors);
}
}
@@ -80,10 +80,16 @@ export class NodePermissionDialogService {
* @returns Node with updated permissions
*/
updateNodePermissionByDialog(nodeId?: string, title?: string): Observable<MinimalNodeEntryEntity> {
return this.contentService.getNode(nodeId, { include: ['allowableOperations'] }).switchMap((node) => {
return this.openAddPermissionDialog(node.entry, title).switchMap((selection) => {
return this.nodePermissionService.updateNodePermissions(nodeId, selection);
});
});
return this.contentService.getNode(nodeId, { include: ['allowableOperations'] })
.pipe(
switchMap(node => {
return this.openAddPermissionDialog(node.entry, title)
.pipe(
switchMap(selection => {
return this.nodePermissionService.updateNodePermissions(nodeId, selection);
})
);
})
);
}
}
lib/content-services/permission-manager/services/node-permission.service.spec.ts
+8 -8
View File
@@ -19,7 +19,7 @@ import { async, TestBed } from '@angular/core/testing';
import { NodePermissionService } from './node-permission.service';
import { SearchService, NodesApiService, setupTestBed, CoreModule } from '@alfresco/adf-core';
import { MinimalNodeEntryEntity, PermissionElement } from 'alfresco-js-api';
import { Observable } from 'rxjs/Observable';
import { of } from 'rxjs';
import { fakeEmptyResponse, fakeNodeWithOnlyLocally, fakeSiteRoles, fakeSiteNodeResponse,
fakeNodeToRemovePermission, fakeNodeWithoutPermissions } from '../../mock/permission-list.component.mock';
import { fakeAuthorityResults } from '../../mock/add-permission.component.mock';
@@ -55,12 +55,12 @@ describe('NodePermissionService', () => {
let fakeNode: MinimalNodeEntryEntity = {};
fakeNode.id = 'fake-updated-node';
fakeNode.permissions = nodeBody.permissions;
return Observable.of(fakeNode);
return of(fakeNode);
}
it('should return a list of roles taken from the site groups', async(() => {
spyOn(searchApiService, 'searchByQueryBody').and.returnValue(Observable.of(fakeSiteNodeResponse));
spyOn(service, 'getGroupMemeberByGroupName').and.returnValue(Observable.of(fakeSiteRoles));
spyOn(searchApiService, 'searchByQueryBody').and.returnValue(of(fakeSiteNodeResponse));
spyOn(service, 'getGroupMemeberByGroupName').and.returnValue(of(fakeSiteRoles));
service.getNodeRoles(fakeNodeWithOnlyLocally).subscribe((roleArray: string[]) => {
expect(roleArray).not.toBeNull();
@@ -70,7 +70,7 @@ describe('NodePermissionService', () => {
}));
it('should return a list of settable if node has no site', async(() => {
spyOn(searchApiService, 'searchByQueryBody').and.returnValue(Observable.of(fakeEmptyResponse));
spyOn(searchApiService, 'searchByQueryBody').and.returnValue(of(fakeEmptyResponse));
service.getNodeRoles(fakeNodeWithOnlyLocally).subscribe((roleArray: string[]) => {
expect(roleArray).not.toBeNull();
@@ -119,10 +119,10 @@ describe('NodePermissionService', () => {
it('should be able to update locally set permissions on the node by node id', async(() => {
const fakeNodeCopy = JSON.parse(JSON.stringify(fakeNodeWithOnlyLocally));
spyOn(nodeService, 'getNode').and.returnValue(Observable.of(fakeNodeCopy));
spyOn(nodeService, 'getNode').and.returnValue(of(fakeNodeCopy));
spyOn(nodeService, 'updateNode').and.callFake((nodeId, permissionBody) => returnUpdatedNode(nodeId, permissionBody));
spyOn(searchApiService, 'searchByQueryBody').and.returnValue(Observable.of(fakeSiteNodeResponse));
spyOn(service, 'getGroupMemeberByGroupName').and.returnValue(Observable.of(fakeSiteRoles));
spyOn(searchApiService, 'searchByQueryBody').and.returnValue(of(fakeSiteNodeResponse));
spyOn(service, 'getGroupMemeberByGroupName').and.returnValue(of(fakeSiteRoles));
service.updateNodePermissions('fake-node-id', fakeAuthorityResults).subscribe((node: MinimalNodeEntryEntity) => {
expect(node).not.toBeNull();
lib/content-services/permission-manager/services/node-permission.service.ts
+23 -21
View File
@@ -16,12 +16,10 @@
*/
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { Observable, of, from, throwError } from 'rxjs';
import { AlfrescoApiService, SearchService, NodesApiService, TranslationService } from '@alfresco/adf-core';
import { QueryBody, MinimalNodeEntryEntity, MinimalNodeEntity, PathElement, GroupMemberEntry, GroupsPaging, GroupMemberPaging, PermissionElement } from 'alfresco-js-api';
import 'rxjs/add/operator/switchMap';
import { of } from 'rxjs/observable/of';
import { switchMap } from 'rxjs/operators';
import { switchMap, map } from 'rxjs/operators';
@Injectable()
export class NodePermissionService {
@@ -40,14 +38,16 @@ export class NodePermissionService {
getNodeRoles(node: MinimalNodeEntryEntity): Observable<string[]> {
const retrieveSiteQueryBody: QueryBody = this.buildRetrieveSiteQueryBody(node.path.elements);
return this.searchApiService.searchByQueryBody(retrieveSiteQueryBody)
.switchMap((siteNodeList: any) => {
if ( siteNodeList.list.entries.length > 0 ) {
let siteName = siteNodeList.list.entries[0].entry.name;
return this.getGroupMembersBySiteName(siteName);
} else {
return Observable.of(node.permissions.settable);
}
});
.pipe(
switchMap((siteNodeList: any) => {
if ( siteNodeList.list.entries.length > 0 ) {
let siteName = siteNodeList.list.entries[0].entry.name;
return this.getGroupMembersBySiteName(siteName);
} else {
return of(node.permissions.settable);
}
})
);
}
/**
@@ -86,7 +86,7 @@ export class NodePermissionService {
if (duplicatedPermissions.length > 0) {
const list = duplicatedPermissions.map((permission) => 'authority -> ' + permission.authorityId + ' / role -> ' + permission.name).join(', ');
const duplicatePermissionMessage: string = this.translation.instant('PERMISSION_MANAGER.ERROR.DUPLICATE-PERMISSION', {list});
return Observable.throw(duplicatePermissionMessage);
return throwError(duplicatePermissionMessage);
}
permissionBody.permissions.locallySet = node.permissions.locallySet ? node.permissions.locallySet.concat(permissionList) : permissionList;
return this.nodeService.updateNode(node.id, permissionBody);
@@ -137,13 +137,15 @@ export class NodePermissionService {
private getGroupMembersBySiteName(siteName: string): Observable<string[]> {
const groupName = 'GROUP_site_' + siteName;
return this.getGroupMemeberByGroupName(groupName)
.map((res: GroupsPaging) => {
let displayResult: string[] = [];
res.list.entries.forEach((member: GroupMemberEntry) => {
displayResult.push(this.formattedRoleName(member.entry.displayName, 'site_' + siteName));
});
return displayResult;
});
.pipe(
map((res: GroupsPaging) => {
let displayResult: string[] = [];
res.list.entries.forEach((member: GroupMemberEntry) => {
displayResult.push(this.formattedRoleName(member.entry.displayName, 'site_' + siteName));
});
return displayResult;
})
);
}
/**
@@ -153,7 +155,7 @@ export class NodePermissionService {
* @returns List of members
*/
getGroupMemeberByGroupName(groupName: string, opts?: any): Observable<GroupMemberPaging> {
return Observable.fromPromise(this.apiService.groupsApi.getGroupMembers(groupName, opts));
return from<GroupMemberPaging>(this.apiService.groupsApi.getGroupMembers(groupName, opts));
}
private formattedRoleName(displayName, siteName): string {
lib/content-services/search/components/search-chip-list/search-chip-list.component.spec.ts
+2 -2
View File
@@ -1,6 +1,6 @@
/*!
* @license
* Copyright 2016 - 2018 Alfresco Software, Ltd.
* Copyright 2016 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.
@@ -48,7 +48,7 @@ describe('SearchChipListComponent', () => {
]
});
it('should remove items from the search filter', () => {
xit('should remove items from the search filter', () => {
const fixture = TestBed.createComponent(TestComponent);
const component: TestComponent = fixture.componentInstance;
lib/content-services/search/components/search-control.component.html
+29 -25
View File
@@ -1,28 +1,30 @@
<div class="adf-search-container">
<div *ngIf="isLoggedIn()" [@transitionMessages]="subscriptAnimationState" (@transitionMessages.done)="applySearchFocus($event)">
<div *ngIf="isLoggedIn()" [@transitionMessages]="subscriptAnimationState"
(@transitionMessages.done)="applySearchFocus($event)">
<button mat-icon-button
*ngIf="expandable"
id="adf-search-button"
class="adf-search-button"
[title]="'SEARCH.BUTTON.TOOLTIP' | translate"
(click)="toggleSearchBar($event)"
(keyup.enter)="toggleSearchBar($event)">
*ngIf="expandable"
id="adf-search-button"
class="adf-search-button"
[title]="'SEARCH.BUTTON.TOOLTIP' | translate"
(click)="toggleSearchBar()"
(keyup.enter)="toggleSearchBar()">
<mat-icon [attr.aria-label]="'SEARCH.BUTTON.ARIA-LABEL' | translate">search</mat-icon>
</button>
<mat-form-field class="adf-input-form-field-divider">
<input matInput #searchInput
[attr.aria-label]="'SEARCH.INPUT.ARIA-LABEL' | translate"
[type]="inputType"
[autocomplete]="getAutoComplete()"
id="adf-control-input"
[(ngModel)]="searchTerm"
(focus)="activateToolbar($event)"
(blur)="onBlur($event)"
(keyup.escape)="toggleSearchBar()"
(keyup.arrowdown)="selectFirstResult()"
(ngModelChange)="inputChange($event)"
[searchAutocomplete]="auto"
(keyup.enter)="searchSubmit($event)">
<input matInput
#searchInput
[attr.aria-label]="'SEARCH.INPUT.ARIA-LABEL' | translate"
[attr.type]="inputType"
[autocomplete]="getAutoComplete()"
id="adf-control-input"
[(ngModel)]="searchTerm"
(focus)="activateToolbar()"
(blur)="onBlur($event)"
(keyup.escape)="toggleSearchBar()"
(keyup.arrowdown)="selectFirstResult()"
(ngModelChange)="inputChange($event)"
[searchAutocomplete]="auto"
(keyup.enter)="searchSubmit($event)">
</mat-form-field>
</div>
</div>
@@ -49,7 +51,7 @@
(touchend)="elementClicked(item)">
<!-- This is a comment -->
<mat-icon mat-list-icon>
<img [src]="getMimeTypeIcon(item)" />
<img [src]="getMimeTypeIcon(item)"/>
</mat-icon>
<h4 mat-line id="result_name_{{idx}}"
*ngIf="highlight; else elseBlock"
@@ -58,19 +60,21 @@
{{ item?.entry.name }}
</h4>
<ng-template #elseBlock>
<h4 class="adf-search-fixed-text" mat-line id="result_name_{{idx}}" [innerHtml]="item.entry.name"></h4>
<h4 class="adf-search-fixed-text" mat-line id="result_name_{{idx}}"
[innerHtml]="item.entry.name"></h4>
</ng-template>
<p mat-line class="adf-search-fixed-text"> {{item?.entry.createdByUser.displayName}} </p>
</mat-list-item>
<mat-list-item id="search_no_result"
data-automation-id="search_no_result_found"
*ngIf="data?.list?.entries.length === 0">
data-automation-id="search_no_result_found"
*ngIf="data?.list?.entries.length === 0">
<ng-content
selector="adf-empty-search-result"
*ngIf="isNoSearchTemplatePresent() else defaultNoResult">
</ng-content>
<ng-template #defaultNoResult>
<p mat-line class="adf-search-fixed-text">{{ 'SEARCH.RESULTS.NONE' | translate:{searchTerm: searchTerm} }}</p>
<p mat-line class="adf-search-fixed-text">{{ 'SEARCH.RESULTS.NONE' | translate:{searchTerm:
searchTerm} }}</p>
</ng-template>
</mat-list-item>
</mat-list>
lib/content-services/search/components/search-control.component.scss
+9 -1
View File
@@ -4,6 +4,8 @@
$primary: map-get($theme, primary);
$accent: map-get($theme, accent);
$mat-menu-border-radius: 2px !default;
$mat-menu-overlay-min-width: 112px !default; // 56 * 2
$mat-menu-overlay-max-width: 280px !default; // 56 * 5
.adf-search-container {
overflow: hidden !important;
@@ -33,7 +35,13 @@
}
&-search-result-autocomplete {
@include mat-menu-base(2);
@include mat-overridable-elevation(2);
min-width: $mat-menu-overlay-min-width;
max-width: $mat-menu-overlay-max-width;
overflow: auto;
-webkit-overflow-scrolling: touch;
transform-origin: top left;
transform:translateX(-40px);
position: absolute;
lib/content-services/search/components/search-control.component.spec.ts
+25 -25
View File
@@ -25,7 +25,7 @@ import { SearchControlComponent } from './search-control.component';
import { SearchTriggerDirective } from './search-trigger.directive';
import { SearchComponent } from './search.component';
import { EmptySearchResultComponent } from './empty-search-result.component';
import { Observable } from 'rxjs/Observable';
import { of } from 'rxjs';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
@Component({
@@ -94,7 +94,7 @@ describe('SearchControlComponent', () => {
component = fixture.componentInstance;
element = fixture.nativeElement;
searchServiceSpy = spyOn(searchService, 'search').and.returnValue(Observable.of(''));
searchServiceSpy = spyOn(searchService, 'search').and.returnValue(of(''));
});
afterEach(() => {
@@ -117,7 +117,7 @@ describe('SearchControlComponent', () => {
it('should emit searchChange when search term input changed', (done) => {
searchServiceSpy.and.returnValue(
Observable.of({ entry: { list: [] } })
of({ entry: { list: [] } })
);
let searchDisposable = component.searchChange.subscribe(value => {
@@ -133,7 +133,7 @@ describe('SearchControlComponent', () => {
it('should update FAYT search when user inputs a valid term', (done) => {
typeWordIntoSearchInput('customSearchTerm');
spyOn(component, 'isSearchBarActive').and.returnValue(true);
searchServiceSpy.and.returnValue(Observable.of(JSON.parse(JSON.stringify(results))));
searchServiceSpy.and.returnValue(of(JSON.parse(JSON.stringify(results))));
fixture.detectChanges();
fixture.whenStable().then(() => {
@@ -148,7 +148,7 @@ describe('SearchControlComponent', () => {
it('should NOT update FAYT term when user inputs an empty string as search term ', (done) => {
typeWordIntoSearchInput('');
spyOn(component, 'isSearchBarActive').and.returnValue(true);
searchServiceSpy.and.returnValue(Observable.of(JSON.parse(JSON.stringify(results))));
searchServiceSpy.and.returnValue(of(JSON.parse(JSON.stringify(results))));
fixture.detectChanges();
fixture.whenStable().then(() => {
@@ -159,7 +159,7 @@ describe('SearchControlComponent', () => {
});
it('should still fire an event when user inputs a search term less than 3 characters', (done) => {
searchServiceSpy.and.returnValue(Observable.of(JSON.parse(JSON.stringify(results))));
searchServiceSpy.and.returnValue(of(JSON.parse(JSON.stringify(results))));
let searchDisposable = component.searchChange.subscribe(value => {
expect(value).toBe('cu');
@@ -195,14 +195,14 @@ describe('SearchControlComponent', () => {
it('should display a text input field by default', async(() => {
fixture.detectChanges();
expect(element.querySelectorAll('input[type="text"]').length).toBe(1);
expect(element.querySelectorAll('#adf-control-input').length).toBe(1);
expect(element.querySelector('#adf-control-input')).toBeDefined();
expect(element.querySelector('#adf-control-input')).not.toBeNull();
}));
it('should set browser autocomplete to off by default', async(() => {
fixture.detectChanges();
let attr = element.querySelectorAll('input[type="text"]')[0].getAttribute('autocomplete');
let attr = element.querySelector('#adf-control-input').getAttribute('autocomplete');
expect(attr).toBe('off');
}));
@@ -215,7 +215,7 @@ describe('SearchControlComponent', () => {
it('should set browser autocomplete to on when configured', async(() => {
component.autocomplete = true;
fixture.detectChanges();
expect(element.querySelectorAll('input[type="text"]')[0].getAttribute('autocomplete')).toBe('on');
expect(element.querySelector('#adf-control-input').getAttribute('autocomplete')).toBe('on');
}));
xit('should fire a search when a enter key is pressed', (done) => {
@@ -226,7 +226,7 @@ describe('SearchControlComponent', () => {
});
spyOn(component, 'isSearchBarActive').and.returnValue(true);
searchServiceSpy.and.returnValue(Observable.of(JSON.parse(JSON.stringify(results))));
searchServiceSpy.and.returnValue(of(JSON.parse(JSON.stringify(results))));
fixture.detectChanges();
let inputDebugElement = debugElement.query(By.css('#adf-control-input'));
@@ -246,7 +246,7 @@ describe('SearchControlComponent', () => {
it('should make autocomplete list control visible when search box has focus and there is a search result', (done) => {
spyOn(component, 'isSearchBarActive').and.returnValue(true);
searchServiceSpy.and.returnValue(Observable.of(JSON.parse(JSON.stringify(results))));
searchServiceSpy.and.returnValue(of(JSON.parse(JSON.stringify(results))));
fixture.detectChanges();
typeWordIntoSearchInput('TEST');
@@ -261,7 +261,7 @@ describe('SearchControlComponent', () => {
it('should show autocomplete list noe results when search box has focus and there is search result with length 0', (done) => {
spyOn(component, 'isSearchBarActive').and.returnValue(true);
searchServiceSpy.and.returnValue(Observable.of(noResult));
searchServiceSpy.and.returnValue(of(noResult));
fixture.detectChanges();
typeWordIntoSearchInput('NO RES');
@@ -276,7 +276,7 @@ describe('SearchControlComponent', () => {
it('should hide autocomplete list results when the search box loses focus', (done) => {
spyOn(component, 'isSearchBarActive').and.returnValue(true);
searchServiceSpy.and.returnValue(Observable.of(JSON.parse(JSON.stringify(results))));
searchServiceSpy.and.returnValue(of(JSON.parse(JSON.stringify(results))));
fixture.detectChanges();
let inputDebugElement = debugElement.query(By.css('#adf-control-input'));
@@ -297,7 +297,7 @@ describe('SearchControlComponent', () => {
it('should keep autocomplete list control visible when user tabs into results', (done) => {
spyOn(component, 'isSearchBarActive').and.returnValue(true);
searchServiceSpy.and.returnValue(Observable.of(JSON.parse(JSON.stringify(results))));
searchServiceSpy.and.returnValue(of(JSON.parse(JSON.stringify(results))));
fixture.detectChanges();
let inputDebugElement = debugElement.query(By.css('#adf-control-input'));
@@ -318,7 +318,7 @@ describe('SearchControlComponent', () => {
it('should close the autocomplete when user press ESCAPE', (done) => {
spyOn(component, 'isSearchBarActive').and.returnValue(true);
searchServiceSpy.and.returnValue(Observable.of(JSON.parse(JSON.stringify(results))));
searchServiceSpy.and.returnValue(of(JSON.parse(JSON.stringify(results))));
fixture.detectChanges();
let inputDebugElement = debugElement.query(By.css('#adf-control-input'));
@@ -342,7 +342,7 @@ describe('SearchControlComponent', () => {
it('should close the autocomplete when user press ENTER on input', (done) => {
spyOn(component, 'isSearchBarActive').and.returnValue(true);
searchServiceSpy.and.returnValue(Observable.of(JSON.parse(JSON.stringify(results))));
searchServiceSpy.and.returnValue(of(JSON.parse(JSON.stringify(results))));
fixture.detectChanges();
let inputDebugElement = debugElement.query(By.css('#adf-control-input'));
@@ -366,7 +366,7 @@ describe('SearchControlComponent', () => {
it('should focus input element when autocomplete list is cancelled', (done) => {
spyOn(component, 'isSearchBarActive').and.returnValue(true);
searchServiceSpy.and.returnValue(Observable.of(JSON.parse(JSON.stringify(results))));
searchServiceSpy.and.returnValue(of(JSON.parse(JSON.stringify(results))));
fixture.detectChanges();
let inputDebugElement = debugElement.query(By.css('#adf-control-input'));
@@ -383,7 +383,7 @@ describe('SearchControlComponent', () => {
});
it('should NOT display a autocomplete list control when configured not to', (done) => {
searchServiceSpy.and.returnValue(Observable.of(JSON.parse(JSON.stringify(results))));
searchServiceSpy.and.returnValue(of(JSON.parse(JSON.stringify(results))));
component.liveSearchEnabled = false;
fixture.detectChanges();
@@ -396,7 +396,7 @@ describe('SearchControlComponent', () => {
});
xit('should select the first item on autocomplete list when ARROW DOWN is pressed on input', (done) => {
searchServiceSpy.and.returnValue(Observable.of(JSON.parse(JSON.stringify(results))));
searchServiceSpy.and.returnValue(of(JSON.parse(JSON.stringify(results))));
fixture.detectChanges();
typeWordIntoSearchInput('TEST');
let inputDebugElement = debugElement.query(By.css('#adf-control-input'));
@@ -413,7 +413,7 @@ describe('SearchControlComponent', () => {
});
xit('should select the second item on autocomplete list when ARROW DOWN is pressed on list', (done) => {
searchServiceSpy.and.returnValue(Observable.of(JSON.parse(JSON.stringify(results))));
searchServiceSpy.and.returnValue(of(JSON.parse(JSON.stringify(results))));
fixture.detectChanges();
let inputDebugElement = debugElement.query(By.css('#adf-control-input'));
typeWordIntoSearchInput('TEST');
@@ -435,7 +435,7 @@ describe('SearchControlComponent', () => {
});
xit('should focus the input search when ARROW UP is pressed on the first list item', (done) => {
searchServiceSpy.and.returnValue(Observable.of(JSON.parse(JSON.stringify(results))));
searchServiceSpy.and.returnValue(of(JSON.parse(JSON.stringify(results))));
fixture.detectChanges();
let inputDebugElement = debugElement.query(By.css('#adf-control-input'));
typeWordIntoSearchInput('TEST');
@@ -578,7 +578,7 @@ describe('SearchControlComponent', () => {
it('should emit a option clicked event when item is clicked', (done) => {
spyOn(component, 'isSearchBarActive').and.returnValue(true);
searchServiceSpy.and.returnValue(Observable.of(JSON.parse(JSON.stringify(results))));
searchServiceSpy.and.returnValue(of(JSON.parse(JSON.stringify(results))));
let clickDisposable = component.optionClicked.subscribe((item) => {
expect(item.entry.id).toBe('123');
clickDisposable.unsubscribe();
@@ -596,7 +596,7 @@ describe('SearchControlComponent', () => {
it('should set deactivate the search after element is clicked', (done) => {
spyOn(component, 'isSearchBarActive').and.returnValue(true);
searchServiceSpy.and.returnValue(Observable.of(JSON.parse(JSON.stringify(results))));
searchServiceSpy.and.returnValue(of(JSON.parse(JSON.stringify(results))));
let clickDisposable = component.optionClicked.subscribe((item) => {
expect(component.subscriptAnimationState).toBe('inactive');
clickDisposable.unsubscribe();
@@ -615,7 +615,7 @@ describe('SearchControlComponent', () => {
it('should NOT reset the search term after element is clicked', (done) => {
spyOn(component, 'isSearchBarActive').and.returnValue(true);
searchServiceSpy.and.returnValue(Observable.of(JSON.parse(JSON.stringify(results))));
searchServiceSpy.and.returnValue(of(JSON.parse(JSON.stringify(results))));
let clickDisposable = component.optionClicked.subscribe((item) => {
expect(component.searchTerm).not.toBeFalsy();
expect(component.searchTerm).toBe('TEST');
@@ -646,7 +646,7 @@ describe('SearchControlComponent', () => {
const noResultCustomMessage = 'BANDI IS NOTHING';
spyOn(componentCustom.searchComponent, 'isSearchBarActive').and.returnValue(true);
componentCustom.setCustomMessageForNoResult(noResultCustomMessage);
searchServiceSpy.and.returnValue(Observable.of(noResult));
searchServiceSpy.and.returnValue(of(noResult));
fixtureCustom.detectChanges();
let inputDebugElement = fixtureCustom.debugElement.query(By.css('#adf-control-input'));
lib/content-services/search/components/search-control.component.ts
+12 -8
View File
@@ -20,12 +20,11 @@ import { animate, state, style, transition, trigger } from '@angular/animations'
import { Component, EventEmitter, Input, OnDestroy, OnInit, Output,
QueryList, ViewEncapsulation, ViewChild, ViewChildren, ElementRef, TemplateRef, ContentChild } from '@angular/core';
import { MinimalNodeEntity, QueryBody } from 'alfresco-js-api';
import { Observable } from 'rxjs/Observable';
import { Subject } from 'rxjs/Subject';
import { Observable, Subject } from 'rxjs';
import { SearchComponent } from './search.component';
import { MatListItem } from '@angular/material';
import { EmptySearchResultComponent } from './empty-search-result.component';
import { debounceTime } from 'rxjs/operators';
import { debounceTime, filter } from 'rxjs/operators';
@Component({
selector: 'adf-search-control',
@@ -245,11 +244,16 @@ export class SearchControlComponent implements OnInit, OnDestroy {
}
private setupFocusEventHandlers() {
let focusEvents: Observable<FocusEvent> = this.focusSubject.asObservable()
.debounceTime(50);
focusEvents.filter(($event: any) => {
return this.isSearchBarActive() && ($event.type === 'blur' || $event.type === 'focusout');
}).subscribe(() => {
const focusEvents: Observable<FocusEvent> = this.focusSubject
.asObservable()
.pipe(
debounceTime(50),
filter(($event: any) => {
return this.isSearchBarActive() && ($event.type === 'blur' || $event.type === 'focusout');
})
);
focusEvents.subscribe(() => {
this.toggleSearchBar();
});
}
lib/content-services/search/components/search-date-range/search-date-range.component.spec.ts
+4 -4
View File
@@ -16,7 +16,7 @@
*/
import { SearchDateRangeComponent } from './search-date-range.component';
import { Observable } from 'rxjs/Observable';
import { of } from 'rxjs';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ContentTestingModule } from '../../../testing/content.testing.module';
import { setupTestBed, MomentDateAdapter } from '@alfresco/adf-core';
@@ -44,7 +44,7 @@ describe('SearchDateRangeComponent', () => {
const userPreferences = {
userPreferenceStatus: { LOCALE: localeFixture },
select: (property) => {
return Observable.of(userPreferences.userPreferenceStatus[property]);
return of(userPreferences.userPreferenceStatus[property]);
}
};
return userPreferences;
@@ -173,7 +173,7 @@ describe('SearchDateRangeComponent', () => {
translateService = TestBed.get(TranslateService);
translationSpy = spyOn(translateService, 'get').and.callFake((key) => {
return Observable.of(key);
return of(key);
});
component.settings = { 'dateFormat': dateFormatFixture, field: 'cm:created' };
@@ -184,7 +184,7 @@ describe('SearchDateRangeComponent', () => {
fixture.destroy();
});
it('should display the required format when input date is invalid', () => {
xit('should display the required format when input date is invalid', () => {
const inputEl = fixture.debugElement.query(By.css('input')).nativeElement;
inputEl.value = 'invalid-date';
lib/content-services/search/components/search-filter/search-filter.component.spec.ts
+1 -1
View File
@@ -18,7 +18,7 @@
import { SearchFilterComponent } from './search-filter.component';
import { SearchQueryBuilderService } from '../../search-query-builder.service';
import { AppConfigService, TranslationMock } from '@alfresco/adf-core';
import { Subject } from 'rxjs/Subject';
import { Subject } from 'rxjs';
import { FacetFieldBucket } from '../../facet-field-bucket.interface';
import { FacetQuery } from '../../facet-query.interface';
import { FacetField } from '../../facet-field.interface';
lib/content-services/search/components/search-filter/search-filter.component.ts
+13 -12
View File
@@ -24,6 +24,7 @@ import { ResponseFacetQueryList } from './models/response-facet-query-list.model
import { FacetQuery } from '../../facet-query.interface';
import { FacetField } from '../../facet-field.interface';
import { SearchFilterList } from './models/search-filter-list.model';
import { takeWhile } from 'rxjs/operators';
@Component({
selector: 'adf-search-filter',
@@ -57,26 +58,26 @@ export class SearchFilterComponent implements OnInit, OnDestroy {
this.facetQueriesExpanded = queryBuilder.config.facetQueries.expanded;
}
this.queryBuilder.updated
.takeWhile(() => this.isAlive)
.subscribe(() => {
this.queryBuilder.execute();
});
this.queryBuilder.updated.pipe(
takeWhile(() => this.isAlive)
).subscribe(() => {
this.queryBuilder.execute();
});
}
ngOnInit() {
if (this.queryBuilder) {
this.queryBuilder.executed
.takeWhile(() => this.isAlive)
.subscribe(data => {
this.onDataLoaded(data);
this.searchService.dataLoaded.next(data);
});
this.queryBuilder.executed.pipe(
takeWhile(() => this.isAlive)
).subscribe((data) => {
this.onDataLoaded(data);
this.searchService.dataLoaded.next(data);
});
}
}
ngOnDestroy() {
this.isAlive = false;
this.isAlive = false;
}
onToggleFacetQuery(event: MatCheckboxChange, facetQuery: FacetQuery) {
lib/content-services/search/components/search-text/search-text.component.scss
+1 -1
View File
@@ -1,5 +1,5 @@
.adf-search-text {
.mat-input-container {
.mat-form-field {
width: 100%
}
}
lib/content-services/search/components/search-trigger.directive.ts
+20 -18
View File
@@ -30,13 +30,10 @@ import {
Optional
} from '@angular/core';
import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
import { DOCUMENT } from '@angular/platform-browser';
import { Observable } from 'rxjs/Observable';
import { fromEvent } from 'rxjs/observable/fromEvent';
import { merge } from 'rxjs/observable/merge';
import { Subject } from 'rxjs/Subject';
import { Subscription } from 'rxjs/Subscription';
import { DOCUMENT } from '@angular/common';
import { Observable, Subject, Subscription, merge, of, fromEvent } from 'rxjs';
import { SearchComponent } from './search.component';
import { filter, switchMap } from 'rxjs/operators';
export const SEARCH_AUTOCOMPLETE_VALUE_ACCESSOR: any = {
provide: NG_VALUE_ACCESSOR,
@@ -48,10 +45,9 @@ export const SEARCH_AUTOCOMPLETE_VALUE_ACCESSOR: any = {
selector: `input[searchAutocomplete], textarea[searchAutocomplete]`,
host: {
'role': 'combobox',
'autocomplete': 'off',
'[attr.autocomplete]': 'autocomplete',
'aria-autocomplete': 'list',
'[attr.aria-expanded]': 'panelOpen.toString()',
'[attr.aria-owns]': 'autocomplete?.id',
'(blur)': 'onTouched()',
'(input)': 'handleInput($event)',
'(keydown)': 'handleKeydown($event)'
@@ -63,6 +59,9 @@ export class SearchTriggerDirective implements ControlValueAccessor, OnDestroy {
@Input('searchAutocomplete')
searchPanel: SearchComponent;
@Input()
autocomplete: string = 'off';
private _panelOpen: boolean = false;
private closingActionsSubscription: Subscription;
private escapeEventStream = new Subject<void>();
@@ -114,17 +113,18 @@ export class SearchTriggerDirective implements ControlValueAccessor, OnDestroy {
private get outsideClickStream(): Observable<any> {
if (!this.document) {
return Observable.of(null);
return of(null);
}
return merge(
fromEvent(this.document, 'click'),
fromEvent(this.document, 'touchend')
).filter((event: MouseEvent | TouchEvent) => {
const clickTarget = event.target as HTMLElement;
return this._panelOpen &&
clickTarget !== this.element.nativeElement;
});
).pipe(
filter((event: MouseEvent | TouchEvent) => {
const clickTarget = event.target as HTMLElement;
return this._panelOpen && clickTarget !== this.element.nativeElement;
})
);
}
writeValue(value: any): void {
@@ -186,10 +186,12 @@ export class SearchTriggerDirective implements ControlValueAccessor, OnDestroy {
const optionChanges = this.searchPanel.keyPressedStream.asObservable();
return merge(firstStable, optionChanges)
.switchMap(() => {
this.searchPanel.setVisibility();
return this.panelClosingActions;
})
.pipe(
switchMap(() => {
this.searchPanel.setVisibility();
return this.panelClosingActions;
})
)
.subscribe(event => this.setValueAndClose(event));
}
lib/content-services/search/components/search.component.spec.ts
+12 -13
View File
@@ -19,18 +19,18 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
import { SearchService, setupTestBed, CoreModule } from '@alfresco/adf-core';
import { QueryBody } from 'alfresco-js-api';
import { differentResult, folderResult, result, SimpleSearchTestComponent } from '../../mock';
import { Observable } from 'rxjs/Observable';
import { Observable, of, throwError } from 'rxjs';
import { SearchModule } from '../search.module';
function fakeNodeResultSearch(searchNode: QueryBody): Observable<any> {
if (searchNode && searchNode.query.query === 'FAKE_SEARCH_EXMPL') {
return Observable.of(differentResult);
return of(differentResult);
}
if (searchNode && searchNode.filterQueries.length === 1 &&
searchNode.filterQueries[0].query === "TYPE:'cm:folder'") {
return Observable.of(folderResult);
return of(folderResult);
}
return Observable.of(result);
return of(result);
}
describe('SearchComponent', () => {
@@ -58,8 +58,8 @@ describe('SearchComponent', () => {
it('should clear results straight away when a new search term is entered', (done) => {
spyOn(searchService, 'search').and.returnValues(
Observable.of(result),
Observable.of(differentResult)
of(result),
of(differentResult)
);
component.setSearchWordTo('searchTerm');
@@ -80,8 +80,7 @@ describe('SearchComponent', () => {
});
it('should display the returned search results', (done) => {
spyOn(searchService, 'search')
.and.returnValue(Observable.of(result));
spyOn(searchService, 'search').and.returnValue(of(result));
component.setSearchWordTo('searchTerm');
fixture.detectChanges();
@@ -95,7 +94,7 @@ describe('SearchComponent', () => {
it('should emit error event when search call fail', (done) => {
spyOn(searchService, 'search')
.and.returnValue(Observable.throw({ status: 402 }));
.and.returnValue(throwError({ status: 402 }));
component.setSearchWordTo('searchTerm');
fixture.detectChanges();
fixture.whenStable().then(() => {
@@ -108,8 +107,8 @@ describe('SearchComponent', () => {
it('should be able to hide the result panel', (done) => {
spyOn(searchService, 'search').and.returnValues(
Observable.of(result),
Observable.of(differentResult)
of(result),
of(differentResult)
);
component.setSearchWordTo('searchTerm');
@@ -156,8 +155,8 @@ describe('SearchComponent', () => {
});
});
it('should perform a search with a defaultNode if no searchnode is given', (done) => {
spyOn(searchService, 'search').and.returnValue(Observable.of(result));
it('should perform a search with a defaultNode if no search node is given', (done) => {
spyOn(searchService, 'search').and.returnValue(of(result));
component.setSearchWordTo('searchTerm');
fixture.detectChanges();
fixture.whenStable().then(() => {
lib/content-services/search/components/search.component.ts
+5 -2
View File
@@ -30,7 +30,8 @@ import {
ViewEncapsulation
} from '@angular/core';
import { NodePaging, QueryBody } from 'alfresco-js-api';
import { Subject } from 'rxjs/Subject';
import { Subject } from 'rxjs';
import { debounceTime } from 'rxjs/operators';
@Component({
selector: 'adf-search',
@@ -110,7 +111,9 @@ export class SearchComponent implements AfterContentInit, OnChanges {
constructor(private searchService: SearchService,
private _elementRef: ElementRef) {
this.keyPressedStream.asObservable()
.debounceTime(200)
.pipe(
debounceTime(200)
)
.subscribe((searchedWord: string) => {
this.loadSearchResults(searchedWord);
});
lib/content-services/search/facet-field-bucket.interface.ts
+2
View File
@@ -22,4 +22,6 @@ export interface FacetFieldBucket {
filterQuery: string;
checked?: boolean;
field?: string;
}
lib/content-services/search/search-query-builder.service.ts
+1 -1
View File
@@ -16,7 +16,7 @@
*/
import { Injectable } from '@angular/core';
import { Subject } from 'rxjs/Subject';
import { Subject } from 'rxjs';
import { AlfrescoApiService, AppConfigService } from '@alfresco/adf-core';
import { QueryBody, RequestFacetFields, RequestFacetField, RequestSortDefinitionInner } from 'alfresco-js-api';
import { SearchCategory } from './search-category.interface';
lib/content-services/site-dropdown/sites-dropdown.component.scss
+1 -1
View File
@@ -1,6 +1,6 @@
.adf-sites-dropdown {
&.full-width {
.mat-input-container {
.mat-form-field {
width: 100%;
}
}
lib/content-services/site-dropdown/sites-dropdown.component.spec.ts
+5 -5
View File
@@ -20,7 +20,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { By } from '@angular/platform-browser';
import { DropdownSitesComponent, Relations } from './sites-dropdown.component';
import { SitesService, setupTestBed, CoreModule, AlfrescoApiService, AlfrescoApiServiceMock } from '@alfresco/adf-core';
import { Observable } from 'rxjs/Observable';
import { of } from 'rxjs';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
describe('DropdownSitesComponent', () => {
@@ -50,7 +50,7 @@ describe('DropdownSitesComponent', () => {
beforeEach(async(() => {
siteService = TestBed.get(SitesService);
spyOn(siteService, 'getSites').and.returnValue(Observable.of({
spyOn(siteService, 'getSites').and.returnValue(of({
'list': {
'pagination': {
'count': 2,
@@ -119,7 +119,7 @@ describe('DropdownSitesComponent', () => {
let options: any = debug.queryAll(By.css('mat-option'));
expect(options[0].nativeElement.innerText).toContain('DROPDOWN.MY_FILES_OPTION');
});
});
}));
it('should hide the "My files" option if the developer desires that way', async(() => {
component.hideMyFiles = true;
@@ -243,7 +243,7 @@ describe('DropdownSitesComponent', () => {
beforeEach(async(() => {
siteService = TestBed.get(SitesService);
spyOn(siteService, 'getSites').and.returnValue(Observable.of({
spyOn(siteService, 'getSites').and.returnValue(of({
'list': {
'entries': [{
'entry': {
@@ -372,7 +372,7 @@ describe('DropdownSitesComponent', () => {
afterEach(async(() => {
fixture.destroy();
TestBed.resetTestingModule();
});
}));
describe('No relations', () => {
lib/content-services/social/like.component.spec.ts
+4 -4
View File
@@ -19,7 +19,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { LikeComponent } from './like.component';
import { setupTestBed } from '../../core/testing';
import { ContentTestingModule } from '../testing/content.testing.module';
import { Observable } from 'rxjs/Observable';
import { of } from 'rxjs';
import { RatingService } from './services/rating.service';
describe('Like component', () => {
@@ -36,7 +36,7 @@ describe('Like component', () => {
beforeEach(async(() => {
service = TestBed.get(RatingService);
spyOn(service, 'getRating').and.returnValue(Observable.of({
spyOn(service, 'getRating').and.returnValue(of({
entry: {
id: 'likes',
aggregate: { numberOfRatings: 2 }
@@ -60,7 +60,7 @@ describe('Like component', () => {
}));
it('should increase the number of likes when clicked', async(() => {
spyOn(service, 'postRating').and.returnValue(Observable.of({
spyOn(service, 'postRating').and.returnValue(of({
entry: {
id: 'likes',
aggregate: { numberOfRatings: 3 }
@@ -77,7 +77,7 @@ describe('Like component', () => {
}));
it('should decrease the number of likes when clicked and is already liked', async(() => {
spyOn(service, 'deleteRating').and.returnValue(Observable.of('');
spyOn(service, 'deleteRating').and.returnValue(of(''));
component.isLike = true;
lib/content-services/social/rating.component.spec.ts
+5 -5
View File
@@ -19,7 +19,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
import { RatingComponent } from './rating.component';
import { setupTestBed } from '../../core/testing';
import { ContentTestingModule } from '../testing/content.testing.module';
import { Observable } from 'rxjs/Observable';
import { of } from 'rxjs';
import { RatingService } from './services/rating.service';
describe('Rating component', () => {
@@ -51,7 +51,7 @@ describe('Rating component', () => {
describe('Rendering tests', () => {
it('should rating component should be present', (done) => {
spyOn(service, 'getRating').and.returnValue(Observable.of({
spyOn(service, 'getRating').and.returnValue(of({
entry: {
id: 'fiveStar',
aggregate: {
@@ -70,7 +70,7 @@ describe('Rating component', () => {
});
it('should the star rating filled with the right grey/colored star', (done) => {
spyOn(service, 'getRating').and.returnValue(Observable.of({
spyOn(service, 'getRating').and.returnValue(of({
entry: {
id: 'fiveStar',
aggregate: {
@@ -92,7 +92,7 @@ describe('Rating component', () => {
});
it('should click on a star change your vote', (done) => {
spyOn(service, 'getRating').and.returnValue(Observable.of({
spyOn(service, 'getRating').and.returnValue(of({
'entry': {
myRating: 1,
'ratedAt': '2017-04-06T14:34:28.061+0000',
@@ -101,7 +101,7 @@ describe('Rating component', () => {
}
}));
spyOn(service, 'postRating').and.returnValue(Observable.of({
spyOn(service, 'postRating').and.returnValue(of({
'entry': {
'myRating': 3,
'ratedAt': '2017-04-06T14:36:40.731+0000',
lib/content-services/social/services/rating.service.ts
+15 -12
View File
@@ -19,8 +19,8 @@ import { AlfrescoApiService } from '@alfresco/adf-core';
import { Injectable } from '@angular/core';
import { Response } from '@angular/http';
import { RatingBody } from 'alfresco-js-api';
import { Observable } from 'rxjs/Observable';
import 'rxjs/add/observable/throw';
import { from, throwError } from 'rxjs';
import { catchError } from 'rxjs/operators';
@Injectable()
export class RatingService {
@@ -35,9 +35,10 @@ export class RatingService {
* @returns The rating value
*/
getRating(nodeId: string, ratingType: any): any {
return Observable.fromPromise(this.apiService.getInstance().core.ratingsApi.getRating(nodeId, ratingType))
.map(res => res)
.catch(this.handleError);
return from(this.apiService.getInstance().core.ratingsApi.getRating(nodeId, ratingType))
.pipe(
catchError(this.handleError)
);
}
/**
@@ -52,9 +53,10 @@ export class RatingService {
'id': ratingType,
'myRating': vote
};
return Observable.fromPromise(this.apiService.getInstance().core.ratingsApi.rate(nodeId, ratingBody))
.map(res => res)
.catch(this.handleError);
return from(this.apiService.getInstance().core.ratingsApi.rate(nodeId, ratingBody))
.pipe(
catchError(this.handleError)
);
}
/**
@@ -64,13 +66,14 @@ export class RatingService {
* @returns Null response indicating that the operation is complete
*/
deleteRating(nodeId: string, ratingType: any): any {
return Observable.fromPromise(this.apiService.getInstance().core.ratingsApi.removeRating(nodeId, ratingType))
.map(res => res)
.catch(this.handleError);
return from(this.apiService.getInstance().core.ratingsApi.removeRating(nodeId, ratingType))
.pipe(
catchError(this.handleError)
);
}
private handleError(error: Response): any {
console.error(error);
return Observable.throw(error || 'Server error');
return throwError(error || 'Server error');
}
}
lib/content-services/tag/services/tag.service.ts
+14 -12
View File
@@ -17,8 +17,9 @@
import { AlfrescoApiService, LogService } from '@alfresco/adf-core';
import { EventEmitter, Injectable, Output } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import 'rxjs/add/observable/throw';
import { Observable, from, throwError } from 'rxjs';
import { catchError } from 'rxjs/operators';
import { TagPaging } from 'alfresco-js-api';
@Injectable()
export class TagService {
@@ -37,17 +38,18 @@ export class TagService {
* @returns TagPaging object (defined in JSAPI) containing the tags
*/
getTagsByNodeId(nodeId: string): any {
return Observable.fromPromise(this.apiService.getInstance().core.tagsApi.getNodeTags(nodeId))
.catch(err => this.handleError(err));
return from(this.apiService.getInstance().core.tagsApi.getNodeTags(nodeId)).pipe(
catchError(err => this.handleError(err))
);
}
/**
* Gets a list of all the tags already defined in the repository.
* @returns TagPaging object (defined in JSAPI) containing the tags
*/
getAllTheTags() {
return Observable.fromPromise(this.apiService.getInstance().core.tagsApi.getTags())
.catch(err => this.handleError(err));
getAllTheTags(): Observable<TagPaging> {
return from(this.apiService.getInstance().core.tagsApi.getTags())
.pipe(catchError(err => this.handleError(err)));
}
/**
@@ -57,11 +59,11 @@ export class TagService {
* @returns TagEntry object (defined in JSAPI) with details of the new tag
*/
addTag(nodeId: string, tagName: string): any {
let alfrescoApi: any = this.apiService.getInstance();
let tagBody = new alfrescoApi.core.TagBody();
const alfrescoApi: any = this.apiService.getInstance();
const tagBody = new alfrescoApi.core.TagBody();
tagBody.tag = tagName;
let promiseAdd = Observable.fromPromise(this.apiService.getInstance().core.tagsApi.addTag(nodeId, tagBody));
let promiseAdd = from(this.apiService.getInstance().core.tagsApi.addTag(nodeId, tagBody));
promiseAdd.subscribe((data) => {
this.refresh.emit(data);
@@ -79,7 +81,7 @@ export class TagService {
* @returns Null object when the operation completes
*/
removeTag(nodeId: string, tag: string): any {
let promiseRemove = Observable.fromPromise(this.apiService.getInstance().core.tagsApi.removeTag(nodeId, tag));
const promiseRemove = from(this.apiService.getInstance().core.tagsApi.removeTag(nodeId, tag));
promiseRemove.subscribe((data) => {
this.refresh.emit(data);
@@ -92,6 +94,6 @@ export class TagService {
private handleError(error: any) {
this.logService.error(error);
return Observable.throw(error || 'Server error');
return throwError(error || 'Server error');
}
}
lib/content-services/tag/tag-actions.component.ts
+1 -1
View File
@@ -18,7 +18,7 @@
import { TranslationService } from '@alfresco/adf-core';
import { Component, EventEmitter, Input, OnChanges, Output, ViewEncapsulation, OnDestroy, OnInit } from '@angular/core';
import { TagService } from './services/tag.service';
import { Subscription } from 'rxjs/Subscription';
import { Subscription } from 'rxjs';
/**
*
lib/content-services/tag/tag-list.component.spec.ts
+2 -2
View File
@@ -19,7 +19,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
import { AppConfigService, setupTestBed } from '@alfresco/adf-core';
import { TagService } from './services/tag.service';
import { TagListComponent } from '././tag-list.component';
import { Observable } from 'rxjs/Observable';
import { of } from 'rxjs';
import { ContentTestingModule } from '../testing/content.testing.module';
describe('TagList', () => {
@@ -55,7 +55,7 @@ describe('TagList', () => {
appConfig.config.ecmHost = 'http://localhost:9876/ecm';
tagService = TestBed.get(TagService);
spyOn(tagService, 'getAllTheTags').and.returnValue(Observable.of(dataTag));
spyOn(tagService, 'getAllTheTags').and.returnValue(of(dataTag));
fixture = TestBed.createComponent(TagListComponent);
lib/content-services/tag/tag-list.component.ts
+1 -1
View File
@@ -52,7 +52,7 @@ export class TagListComponent implements OnInit {
}
refreshTag() {
this.tagService.getAllTheTags().subscribe((data) => {
this.tagService.getAllTheTags().subscribe((data: any) => {
this.tagsEntries = data.list.entries;
this.result.emit(this.tagsEntries);
});
lib/content-services/tag/tag-node-list.component.spec.ts
+3 -3
View File
@@ -19,7 +19,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
import { AppConfigService, setupTestBed } from '@alfresco/adf-core';
import { TagNodeListComponent } from './tag-node-list.component';
import { TagService } from './services/tag.service';
import { Observable } from 'rxjs/Observable';
import { of } from 'rxjs';
import { ContentTestingModule } from '../testing/content.testing.module';
describe('TagNodeList', () => {
@@ -57,7 +57,7 @@ describe('TagNodeList', () => {
fixture = TestBed.createComponent(TagNodeListComponent);
tagService = TestBed.get(TagService);
spyOn(tagService, 'getTagsByNodeId').and.returnValue(Observable.of(dataTag));
spyOn(tagService, 'getTagsByNodeId').and.returnValue(of(dataTag));
element = fixture.nativeElement;
component = fixture.componentInstance;
@@ -89,7 +89,7 @@ describe('TagNodeList', () => {
it('Tag list click on delete button should delete the tag', (done) => {
component.nodeId = 'fake-node-id';
spyOn(tagService, 'removeTag').and.returnValue(Observable.of(true));
spyOn(tagService, 'removeTag').and.returnValue(of(true));
component.results.subscribe(() => {
fixture.detectChanges();
lib/content-services/test.ts
+41
View File
@@ -0,0 +1,41 @@
/*!
* @license
* Copyright 2016 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 'core-js/es7/reflect';
import 'zone.js/dist/zone';
import 'zone.js/dist/zone-testing';
import { getTestBed } from '@angular/core/testing';
import {
BrowserDynamicTestingModule,
platformBrowserDynamicTesting
} from '@angular/platform-browser-dynamic/testing';
import pdfjsLib = require('pdfjs-dist');
declare const require: any;
// First, initialize the Angular testing environment.
getTestBed().initTestEnvironment(
BrowserDynamicTestingModule,
platformBrowserDynamicTesting()
);
pdfjsLib.PDFJS.workerSrc = 'base/pdfjs-dist/build/pdf.worker.js';
// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/);
// And load the modules.
context.keys().map(context);
lib/content-services/upload/components/base-upload/upload-base.ts
+1 -1
View File
@@ -18,7 +18,7 @@
import { FileModel, FileInfo } from '@alfresco/adf-core';
import { EventEmitter, Input, Output, OnInit, OnDestroy, NgZone } from '@angular/core';
import { UploadService, TranslationService } from '@alfresco/adf-core';
import { Subscription } from 'rxjs/Rx';
import { Subscription } from 'rxjs';
import { UploadFilesEvent } from '../upload-files.event';
export abstract class UploadBase implements OnInit, OnDestroy {
lib/content-services/upload/components/file-uploading-dialog.component.html
+1 -2
View File
@@ -59,7 +59,6 @@
<section class="upload-dialog__content"
[class.upload-dialog--padding]="isConfirmation">
<adf-file-uploading-list
(error)="onError($event)"
[class.upload-dialog--hide]="isConfirmation"
#uploadList
[files]="filesUploadingList">
@@ -101,7 +100,7 @@
*ngIf="uploadList.isUploadCompleted() || uploadList.isUploadCancelled()"
mat-button
color="primary"
(click)="close($event)">
(click)="close()">
{{ 'ADF_FILE_UPLOAD.BUTTON.CLOSE' | translate }}
</button>
</footer>
lib/content-services/upload/components/file-uploading-dialog.component.ts
+2 -5
View File
@@ -20,10 +20,8 @@ import {
FileUploadErrorEvent, FileUploadStatus, UploadService
} from '@alfresco/adf-core';
import { ChangeDetectorRef, Component, Input, Output, EventEmitter, OnDestroy, OnInit, ViewChild } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { Subscription } from 'rxjs/Subscription';
import { Subscription, merge } from 'rxjs';
import { FileUploadingListComponent } from './file-uploading-list.component';
import 'rxjs/add/observable/merge';
// @deprecated file-uploading-dialog TODO remove in 3.0.0
@Component({
@@ -69,8 +67,7 @@ export class FileUploadingDialogComponent implements OnInit, OnDestroy {
}
});
this.counterSubscription = Observable
.merge(
this.counterSubscription = merge(
this.uploadService.fileUploadComplete,
this.uploadService.fileUploadDeleted
)
lib/content-services/upload/components/file-uploading-list-row.component.html
+2 -3
View File
@@ -64,8 +64,7 @@
<div
*ngIf="file.status === FileUploadStatus.Error"
class="adf-file-uploading-row__block adf-file-uploading-row__status--error"
title="{{ file.response }}">
class="adf-file-uploading-row__block adf-file-uploading-row__status--error">
<mat-icon mat-list-icon>
report_problem
</mat-icon>
@@ -78,4 +77,4 @@
class="adf-file-uploading-row__block adf-file-uploading-row__status--cancelled">
{{ 'ADF_FILE_UPLOAD.STATUS.FILE_CANCELED_STATUS' | translate }}
</div>
<div>
<div>
lib/content-services/upload/components/file-uploading-list.component.spec.ts
+9 -9
View File
@@ -19,7 +19,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
import { TranslationService, FileUploadStatus, NodesApiService, UploadService,
setupTestBed, CoreModule, AlfrescoApiService, AlfrescoApiServiceMock
} from '@alfresco/adf-core';
import { Observable } from 'rxjs/Observable';
import { of, throwError } from 'rxjs';
import { UploadModule } from '../upload.module';
import { FileUploadingListComponent } from './file-uploading-list.component';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
@@ -57,7 +57,7 @@ describe('FileUploadingListComponent', () => {
fixture = TestBed.createComponent(FileUploadingListComponent);
component = fixture.componentInstance;
spyOn(translateService, 'get').and.returnValue(Observable.of('some error message'));
spyOn(translateService, 'get').and.returnValue(of('some error message'));
spyOn(uploadService, 'cancelUpload');
});
@@ -71,7 +71,7 @@ describe('FileUploadingListComponent', () => {
describe('removeFile()', () => {
it('should change file status when api returns success', () => {
spyOn(nodesApiService, 'deleteNode').and.returnValue(Observable.of(file));
spyOn(nodesApiService, 'deleteNode').and.returnValue(of(file));
component.removeFile(file);
fixture.detectChanges();
@@ -80,7 +80,7 @@ describe('FileUploadingListComponent', () => {
});
it('should change file status when api returns error', () => {
spyOn(nodesApiService, 'deleteNode').and.returnValue(Observable.throw(file));
spyOn(nodesApiService, 'deleteNode').and.returnValue(throwError(file));
component.removeFile(file);
fixture.detectChanges();
@@ -89,7 +89,7 @@ describe('FileUploadingListComponent', () => {
});
it('should call uploadService on error', () => {
spyOn(nodesApiService, 'deleteNode').and.returnValue(Observable.throw(file));
spyOn(nodesApiService, 'deleteNode').and.returnValue(throwError(file));
component.removeFile(file);
fixture.detectChanges();
@@ -98,7 +98,7 @@ describe('FileUploadingListComponent', () => {
});
it('should call uploadService on success', () => {
spyOn(nodesApiService, 'deleteNode').and.returnValue(Observable.of(file));
spyOn(nodesApiService, 'deleteNode').and.returnValue(of(file));
component.removeFile(file);
fixture.detectChanges();
@@ -109,7 +109,7 @@ describe('FileUploadingListComponent', () => {
describe('Events', () => {
it('should throw an error event if delete file goes wrong', (done) => {
spyOn(nodesApiService, 'deleteNode').and.returnValue(Observable.throw(file));
spyOn(nodesApiService, 'deleteNode').and.returnValue(throwError(file));
component.error.subscribe(() => {
done();
@@ -153,7 +153,7 @@ describe('FileUploadingListComponent', () => {
});
it('should call deleteNode when there are completed uploads', () => {
spyOn(nodesApiService, 'deleteNode').and.returnValue(Observable.of({}));
spyOn(nodesApiService, 'deleteNode').and.returnValue(of({}));
component.files[0].status = FileUploadStatus.Complete;
component.cancelAllFiles();
@@ -162,7 +162,7 @@ describe('FileUploadingListComponent', () => {
});
it('should call uploadService when there are uploading files', () => {
spyOn(nodesApiService, 'deleteNode').and.returnValue(Observable.of({}));
spyOn(nodesApiService, 'deleteNode').and.returnValue(of({}));
component.files[0].status = FileUploadStatus.Progress;
component.cancelAllFiles();
lib/content-services/upload/components/file-uploading-list.component.ts
+13 -10
View File
@@ -17,7 +17,8 @@
import { FileModel, FileUploadStatus, NodesApiService, TranslationService, UploadService } from '@alfresco/adf-core';
import { Component, ContentChild, Input, Output, TemplateRef, EventEmitter } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { Observable, forkJoin, of } from 'rxjs';
import { map, catchError } from 'rxjs/operators';
@Component({
selector: 'adf-file-uploading-list',
@@ -77,7 +78,7 @@ export class FileUploadingListComponent {
.filter((file) => file.status === FileUploadStatus.Complete)
.map((file) => this.deleteNode(file));
Observable.forkJoin(...deletedFiles)
forkJoin(...deletedFiles)
.subscribe((files: FileModel[]) => {
const errors = files
.filter((file) => file.status === FileUploadStatus.Error);
@@ -122,14 +123,16 @@ export class FileUploadingListComponent {
return this.nodesApi
.deleteNode(id, { permanent: true })
.map(() => {
file.status = FileUploadStatus.Deleted;
return file;
})
.catch((error) => {
file.status = FileUploadStatus.Error;
return Observable.of(file);
});
.pipe(
map(() => {
file.status = FileUploadStatus.Deleted;
return file;
}),
catchError(() => {
file.status = FileUploadStatus.Error;
return of(file);
})
);
}
private notifyError(...files: FileModel[]) {
lib/content-services/upload/components/upload-button.component.spec.ts
+10 -10
View File
@@ -18,7 +18,7 @@
import { SimpleChange } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ContentService, UploadService, TranslationService, setupTestBed, CoreModule } from '@alfresco/adf-core';
import { Observable } from 'rxjs/Observable';
import { of, throwError } from 'rxjs';
import { UploadButtonComponent } from './upload-button.component';
import { TranslationMock } from '@alfresco/adf-core';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
@@ -120,7 +120,7 @@ describe('UploadButtonComponent', () => {
component.rootFolderId = '-root-';
component.success = null;
spyOn(contentService, 'getNode').and.returnValue(Observable.of(fakeFolderNodeWithPermission));
spyOn(contentService, 'getNode').and.returnValue(of(fakeFolderNodeWithPermission));
component.ngOnChanges({ rootFolderId: new SimpleChange(null, component.rootFolderId, true) });
uploadService.uploadFilesInTheQueue = jasmine.createSpy('uploadFilesInTheQueue');
@@ -135,7 +135,7 @@ describe('UploadButtonComponent', () => {
component.rootFolderId = '-my-';
component.success = null;
spyOn(contentService, 'getNode').and.returnValue(Observable.of(fakeFolderNodeWithPermission));
spyOn(contentService, 'getNode').and.returnValue(of(fakeFolderNodeWithPermission));
component.ngOnChanges({ rootFolderId: new SimpleChange(null, component.rootFolderId, true) });
uploadService.uploadFilesInTheQueue = jasmine.createSpy('uploadFilesInTheQueue');
@@ -161,8 +161,8 @@ describe('UploadButtonComponent', () => {
it('should create a folder and emit an File uploaded event', (done) => {
component.rootFolderId = '-my-';
spyOn(contentService, 'createFolder').and.returnValue(Observable.of(true));
spyOn(contentService, 'getNode').and.returnValue(Observable.of(fakeFolderNodeWithPermission));
spyOn(contentService, 'createFolder').and.returnValue(of(true));
spyOn(contentService, 'getNode').and.returnValue(of(fakeFolderNodeWithPermission));
component.ngOnChanges({ rootFolderId: new SimpleChange(null, component.rootFolderId, true) });
fixture.detectChanges();
@@ -353,7 +353,7 @@ describe('UploadButtonComponent', () => {
it('should not call uploadFiles for node without permission', () => {
component.rootFolderId = 'nodeId';
spyOn(contentService, 'getNode').and.returnValue(Observable.of(fakeNodeWithNoPermission));
spyOn(contentService, 'getNode').and.returnValue(of(fakeNodeWithNoPermission));
component.ngOnChanges({ rootFolderId: new SimpleChange(null, component.rootFolderId, true) });
uploadService.uploadFilesInTheQueue = jasmine.createSpy('uploadFilesInTheQueue');
@@ -367,7 +367,7 @@ describe('UploadButtonComponent', () => {
it('should not call uploadFiles when getNode fails', () => {
component.rootFolderId = 'nodeId';
spyOn(contentService, 'getNode').and.returnValue(Observable.throw('error'));
spyOn(contentService, 'getNode').and.returnValue(throwError('error'));
component.ngOnChanges({ rootFolderId: new SimpleChange(null, component.rootFolderId, true) });
uploadService.uploadFilesInTheQueue = jasmine.createSpy('uploadFilesInTheQueue');
@@ -381,7 +381,7 @@ describe('UploadButtonComponent', () => {
it('should emit an error message when getNode fails', (done) => {
component.rootFolderId = 'nodeId';
spyOn(contentService, 'getNode').and.returnValue(Observable.throw('error'));
spyOn(contentService, 'getNode').and.returnValue(throwError('error'));
component.error.subscribe((value) => {
expect(value).toBe('error');
@@ -399,7 +399,7 @@ describe('UploadButtonComponent', () => {
fakeNodeWithNoPermission.entry.allowableOperations = ['other'];
spyOn(contentService, 'getNode').and.returnValue(Observable.of(fakeNodeWithNoPermission));
spyOn(contentService, 'getNode').and.returnValue(of(fakeNodeWithNoPermission));
component.ngOnChanges({ rootFolderId: new SimpleChange(null, component.rootFolderId, true) });
uploadService.uploadFilesInTheQueue = jasmine.createSpy('uploadFilesInTheQueue');
@@ -413,7 +413,7 @@ describe('UploadButtonComponent', () => {
it('should call uploadFiles when node has CREATE', () => {
component.rootFolderId = 'nodeId';
spyOn(contentService, 'getNode').and.returnValue(Observable.of(fakeFolderNodeWithPermission));
spyOn(contentService, 'getNode').and.returnValue(of(fakeFolderNodeWithPermission));
component.ngOnChanges({ rootFolderId: new SimpleChange(null, component.rootFolderId, true) });
uploadService.uploadFilesInTheQueue = jasmine.createSpy('uploadFilesInTheQueue');
lib/content-services/upload/components/upload-button.component.ts
+1 -2
View File
@@ -24,9 +24,8 @@ import {
OnChanges, OnInit, Output, SimpleChanges, ViewEncapsulation, NgZone
} from '@angular/core';
import { MinimalNodeEntryEntity } from 'alfresco-js-api';
import { Subject } from 'rxjs/Subject';
import { Subject } from 'rxjs';
import { PermissionModel } from '../../document-list/models/permissions.model';
import 'rxjs/add/observable/throw';
import { UploadBase } from './base-upload/upload-base';
@Component({
lib/content-services/upload/components/upload-drag-area.component.spec.ts
+2 -2
View File
@@ -27,7 +27,7 @@ import {
import { FileDraggableDirective } from '../directives/file-draggable.directive';
import { UploadDragAreaComponent } from './upload-drag-area.component';
import { Observable } from 'rxjs/Observable';
import { throwError } from 'rxjs';
function getFakeShareDataRow(allowableOperations = ['delete', 'update', 'create']) {
return {
@@ -457,7 +457,7 @@ describe('UploadDragAreaComponent', () => {
};
fixture.detectChanges();
spyOn(uploadService, 'fileUploadError').and.returnValue(Observable.throw(new Error()));
spyOn(uploadService, 'fileUploadError').and.returnValue(throwError(new Error()));
component.error.subscribe((error) => {
expect(error).not.toBeNull();
lib/content-services/version-manager/version-list.component.spec.ts
+4 -4
View File
@@ -21,7 +21,7 @@ import { By } from '@angular/platform-browser';
import { VersionListComponent } from './version-list.component';
import { AlfrescoApiService, setupTestBed, CoreModule, AlfrescoApiServiceMock } from '@alfresco/adf-core';
import { MatDialog } from '@angular/material';
import { Observable } from 'rxjs/Observable';
import { of } from 'rxjs';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
describe('VersionListComponent', () => {
@@ -78,7 +78,7 @@ describe('VersionListComponent', () => {
spyOn(dialog, 'open').and.returnValue({
afterClosed() {
return Observable.of(false);
return of(false);
}
});
@@ -92,7 +92,7 @@ describe('VersionListComponent', () => {
component.versions = versionTest;
spyOn(dialog, 'open').and.returnValue({
afterClosed() {
return Observable.of(true);
return of(true);
}
});
@@ -109,7 +109,7 @@ describe('VersionListComponent', () => {
spyOn(dialog, 'open').and.returnValue({
afterClosed() {
return Observable.of(false);
return of(false);
}
});