inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +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-07 11:58:16 +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

10
lib/core/about/about.component.ts
View File

@@ -16,7 +16,7 @@
*/
import { Component, OnInit, ViewEncapsulation } from '@angular/core';
import { Http } from '@angular/http';
import { HttpClient } from '@angular/common/http';
import { AuthenticationService } from '../services/authentication.service';
import { BpmProductVersionModel, EcmProductVersionModel } from '../models/product-version.model';
import { DiscoveryApiService } from '../services/discovery-api.service';
@@ -43,7 +43,7 @@ export class AboutComponent implements OnInit {
ecmVersion: EcmProductVersionModel = null;
bpmVersion: BpmProductVersionModel = null;
constructor(private http: Http,
constructor(private http: HttpClient,
private appConfig: AppConfigService,
private authService: AuthenticationService,
private discovery: DiscoveryApiService) {
@@ -90,10 +90,10 @@ export class AboutComponent implements OnInit {
});
}
this.http.get('/versions.json?' + new Date()).subscribe(response => {
this.http.get('/versions.json?' + new Date()).subscribe((response: any) => {
const regexp = new RegExp('^(@alfresco)');
const alfrescoPackages = Object.keys(response.json().dependencies).filter((val) => {
const alfrescoPackages = Object.keys(response.dependencies).filter((val) => {
return regexp.test(val);
});
@@ -101,7 +101,7 @@ export class AboutComponent implements OnInit {
alfrescoPackages.forEach((val) => {
alfrescoPackagesTableRepresentation.push({
name: val,
version: response.json().dependencies[val].version
version: response.dependencies[val].version
});
});

23
lib/core/app-config/app-config.service.ts
View File

@@ -20,6 +20,7 @@ import { Injectable } from '@angular/core';
import { ObjectUtils } from '../utils/object-utils';
import { Subject } from 'rxjs/Subject';
import { Observable } from 'rxjs/Observable';
import { map, distinctUntilChanged } from 'rxjs/operators';
export enum AppConfigValues {
APP_CONFIG_LANGUAGES_KEY = 'languages',
@@ -63,7 +64,11 @@ export class AppConfigService {
* @returns Property value, when loaded
*/
select(property: string): Observable<any> {
return this.onLoadSubject.map((config) => config[property]).distinctUntilChanged();
return this.onLoadSubject
.pipe(
map((config) => config[property]),
distinctUntilChanged()
);
}
/**
@@ -75,12 +80,12 @@ export class AppConfigService {
get<T>(key: string, defaultValue?: T): T {
let result: any = ObjectUtils.getValue(this.config, key);
if (typeof result === 'string') {
const map = new Map<string, string>();
map.set('hostname', this.getLocationHostname());
map.set(':port', this.getLocationPort(':'));
map.set('port', this.getLocationPort());
map.set('protocol', this.getLocationProtocol());
result = this.formatString(result, map);
const keywords = new Map<string, string>();
keywords.set('hostname', this.getLocationHostname());
keywords.set(':port', this.getLocationPort(':'));
keywords.set('port', this.getLocationPort());
keywords.set('protocol', this.getLocationProtocol());
result = this.formatString(result, keywords);
}
if (result === undefined) {
return defaultValue;
@@ -131,10 +136,10 @@ export class AppConfigService {
});
}
private formatString(str: string, map: Map<string, string>): string {
private formatString(str: string, keywords: Map<string, string>): string {
let result = str;
map.forEach((value, key) => {
keywords.forEach((value, key) => {
const expr = new RegExp('{' + key + '}', 'gm');
result = result.replace(expr, value);
});

2
lib/core/card-view/components/card-view-dateitem/card-view-dateitem.component.html
View File

@@ -10,7 +10,7 @@
<span
class="adf-datepicker-toggle"
[attr.data-automation-id]="'datepicker-label-toggle-' + property.key"
(click)="showDatePicker($event)">
(click)="showDatePicker()">
<span [attr.data-automation-id]="'card-' + property.type + '-value-' + property.key" *ngIf="showProperty(); else elseEmptyValueBlock">{{ property.displayValue }}</span>
</span>
<mat-datetimepicker-toggle

2
lib/core/card-view/components/card-view-selectitem/card-view-selectitem.component.html
View File

@@ -3,7 +3,7 @@
<div *ngIf="!isEditable()" data-automation-class="read-only-value">{{ property.displayValue | async }}</div>
<div *ngIf="isEditable()">
<mat-form-field>
<mat-select [(value)]="value" (change)="onChange($event)" data-automation-class="select-box">
<mat-select [(value)]="value" (selectionChange)="onChange($event)" data-automation-class="select-box">
<mat-option *ngFor="let option of getOptions() | async" [value]="option.key">
{{ option.label | translate }}
</mat-option>

4
lib/core/card-view/components/card-view-selectitem/card-view-selectitem.component.spec.ts
View File

@@ -22,7 +22,7 @@ import { CardViewUpdateService } from '../../services/card-view-update.service';
import { CardViewSelectItemComponent } from './card-view-selectitem.component';
import { setupTestBed } from '../../../testing/setupTestBed';
import { CoreTestingModule } from '../../../testing/core.testing.module';
import { of } from 'rxjs/observable/of';
import { of } from 'rxjs';
describe('CardViewSelectItemComponent', () => {
@@ -96,7 +96,7 @@ describe('CardViewSelectItemComponent', () => {
expect(label).toBeNull();
});
it('should update property on input blur', async(() => {
xit('should update property on input blur', async(() => {
spyOn(cardViewUpdateService, 'update');
component.ngOnChanges();

2
lib/core/card-view/components/card-view-selectitem/card-view-selectitem.component.ts
View File

@@ -18,7 +18,7 @@
import { Component, Input, OnChanges } from '@angular/core';
import { CardViewSelectItemModel } from '../../models/card-view-selectitem.model';
import { CardViewUpdateService } from '../../services/card-view-update.service';
import { Observable } from 'rxjs/Observable';
import { Observable } from 'rxjs';
import { CardViewSelectItemOption } from '../../interfaces/card-view.interfaces';
import { MatSelectChange } from '@angular/material';

10
lib/core/card-view/components/card-view-textitem/card-view-textitem.component.scss
View File

@@ -76,26 +76,26 @@
color: mat-color($foreground, text, 0.54);
}
&-textitem-editable .mat-input-wrapper {
&-textitem-editable .mat-form-field-wrapper {
margin: 0;
padding-bottom: 0;
}
&-textitem-editable .mat-input-underline {
&-textitem-editable .mat-form-field-underline {
display: none;
}
&-textitem-editable .mat-input-infix {
&-textitem-editable .mat-form-field-infix {
padding: 0;
border-top: none;
}
&-textitem-editable .mat-input-placeholder-wrapper {
&-textitem-editable .mat-form-field-label-wrapper {
padding-top: 2em;
position: static;
}
&-textitem-editable .mat-input-placeholder {
&-textitem-editable .mat-form-field-label {
top: 4px;
}

2
lib/core/card-view/interfaces/card-view-selectitem-properties.interface.ts
View File

@@ -16,7 +16,7 @@
*/
import { CardViewItemProperties } from './card-view-item-properties.interface';
import { Observable } from 'rxjs/Observable';
import { Observable } from 'rxjs';
export interface CardViewSelectItemOption<T> {
label: string;

2
lib/core/card-view/models/card-view-selectitem.model.spec.ts
View File

@@ -18,7 +18,7 @@
import { async } from '@angular/core/testing';
import { CardViewSelectItemModel } from './card-view-selectitem.model';
import { CardViewSelectItemProperties } from '../interfaces/card-view.interfaces';
import { of } from 'rxjs/observable/of';
import { of } from 'rxjs';
describe('CardViewSelectItemModel', () => {
let properties: CardViewSelectItemProperties<string>;

3
lib/core/card-view/models/card-view-selectitem.model.ts
View File

@@ -19,9 +19,8 @@ import { CardViewItem } from '../interfaces/card-view-item.interface';
import { DynamicComponentModel } from '../../services/dynamic-component-mapper.service';
import { CardViewBaseItemModel } from './card-view-baseitem.model';
import { CardViewSelectItemProperties, CardViewSelectItemOption } from '../interfaces/card-view.interfaces';
import { Observable } from 'rxjs/Observable';
import { Observable, of } from 'rxjs';
import { switchMap } from 'rxjs/operators';
import { of } from 'rxjs/observable/of';
export class CardViewSelectItemModel<T> extends CardViewBaseItemModel implements CardViewItem, DynamicComponentModel {
type: string = 'select';

3
lib/core/card-view/services/card-view-update.service.ts
View File

@@ -16,8 +16,7 @@
*/
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { Subject } from 'rxjs/Subject';
import { Observable, Subject } from 'rxjs';
import { CardViewBaseItemModel } from '../models/card-view-baseitem.model';
export interface UpdateNotification {

18
lib/core/comments/comments.component.spec.ts
View File

@@ -18,7 +18,7 @@
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { SimpleChange } from '@angular/core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { Observable } from 'rxjs/Observable';
import { of, throwError } from 'rxjs';
import { CommentProcessService } from '../services/comment-process.service';
import { CommentsComponent } from './comments.component';
import { CommentContentService } from '../services/comment-content.service';
@@ -48,24 +48,24 @@ describe('CommentsComponent', () => {
commentProcessService = fixture.debugElement.injector.get(CommentProcessService);
commentContentService = fixture.debugElement.injector.get(CommentContentService);
addContentCommentSpy = spyOn(commentContentService, 'addNodeComment').and.returnValue(Observable.of({
addContentCommentSpy = spyOn(commentContentService, 'addNodeComment').and.returnValue(of({
id: 123,
message: 'Test Comment',
createdBy: {id: '999'}
}));
getContentCommentsSpy = spyOn(commentContentService, 'getNodeComments').and.returnValue(Observable.of([
getContentCommentsSpy = spyOn(commentContentService, 'getNodeComments').and.returnValue(of([
{message: 'Test1', created: Date.now(), createdBy: {firstName: 'Admin', lastName: 'User'}},
{message: 'Test2', created: Date.now(), createdBy: {firstName: 'Admin', lastName: 'User'}},
{message: 'Test3', created: Date.now(), createdBy: {firstName: 'Admin', lastName: 'User'}}
]));
getProcessCommentsSpy = spyOn(commentProcessService, 'getTaskComments').and.returnValue(Observable.of([
getProcessCommentsSpy = spyOn(commentProcessService, 'getTaskComments').and.returnValue(of([
{message: 'Test1', created: Date.now(), createdBy: {firstName: 'Admin', lastName: 'User'}},
{message: 'Test2', created: Date.now(), createdBy: {firstName: 'Admin', lastName: 'User'}},
{message: 'Test3', created: Date.now(), createdBy: {firstName: 'Admin', lastName: 'User'}}
]));
addProcessCommentSpy = spyOn(commentProcessService, 'addTaskComment').and.returnValue(Observable.of({
addProcessCommentSpy = spyOn(commentProcessService, 'addTaskComment').and.returnValue(of({
id: 123,
message: 'Test Comment',
createdBy: {id: '999'}
@@ -92,7 +92,7 @@ describe('CommentsComponent', () => {
it('should emit an error when an error occurs loading comments', () => {
let emitSpy = spyOn(component.error, 'emit');
getProcessCommentsSpy.and.returnValue(Observable.throw({}));
getProcessCommentsSpy.and.returnValue(throwError({}));
let change = new SimpleChange(null, '123', true);
component.ngOnChanges({'taskId': change});
@@ -128,7 +128,7 @@ describe('CommentsComponent', () => {
it('should not display comments when the task has no comments', async(() => {
component.taskId = '123';
getProcessCommentsSpy.and.returnValue(Observable.of([]));
getProcessCommentsSpy.and.returnValue(of([]));
fixture.whenStable().then(() => {
fixture.detectChanges();
expect(fixture.nativeElement.querySelector('#comment-container')).toBeNull();
@@ -291,7 +291,7 @@ describe('CommentsComponent', () => {
it('should emit an error when an error occurs adding the comment', () => {
let emitSpy = spyOn(component.error, 'emit');
addProcessCommentSpy.and.returnValue(Observable.throw({}));
addProcessCommentSpy.and.returnValue(throwError({}));
component.message = 'Test comment';
component.add();
expect(emitSpy).toHaveBeenCalled();
@@ -379,7 +379,7 @@ describe('CommentsComponent', () => {
it('should emit an error when an error occurs adding the comment', () => {
let emitSpy = spyOn(component.error, 'emit');
addContentCommentSpy.and.returnValue(Observable.throw({}));
addContentCommentSpy.and.returnValue(throwError({}));
component.message = 'Test comment';
component.add();
expect(emitSpy).toHaveBeenCalled();

7
lib/core/comments/comments.component.ts
View File

@@ -19,8 +19,8 @@ import { CommentProcessService } from '../services/comment-process.service';
import { CommentContentService } from '../services/comment-content.service';
import { CommentModel } from '../models/comment.model';
import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { Observer } from 'rxjs/Observer';
import { Observable, Observer } from 'rxjs';
import { share } from 'rxjs/operators';
@Component({
selector: 'adf-comments',
@@ -55,7 +55,8 @@ export class CommentsComponent implements OnChanges {
beingAdded: boolean = false;
constructor(private commentProcessService: CommentProcessService, private commentContentService: CommentContentService) {
this.comment$ = new Observable<CommentModel>(observer => this.commentObserver = observer).share();
this.comment$ = new Observable<CommentModel>(observer => this.commentObserver = observer)
.pipe(share());
this.comment$.subscribe((comment: CommentModel) => {
this.comments.push(comment);
});

2
lib/core/context-menu/context-menu-holder.component.ts
View File

@@ -19,7 +19,7 @@ import { OverlayContainer } from '@angular/cdk/overlay';
import { ViewportRuler } from '@angular/cdk/scrolling';
import { Component, HostListener, Input, OnDestroy, OnInit, Renderer2, ViewChild } from '@angular/core';
import { MatMenuTrigger } from '@angular/material';
import { Subscription } from 'rxjs/Subscription';
import { Subscription } from 'rxjs';
import { ContextMenuService } from './context-menu.service';
/**

2
lib/core/context-menu/context-menu.service.ts
View File

@@ -16,7 +16,7 @@
*/
import { Injectable } from '@angular/core';
import { Subject } from 'rxjs/Subject';
import { Subject } from 'rxjs';
@Injectable()
export class ContextMenuService {

35
lib/core/datatable/components/datatable/datatable.component.ts
View File

@@ -20,7 +20,7 @@ import {
IterableDiffers, OnChanges, Output, SimpleChange, SimpleChanges, TemplateRef, ViewEncapsulation, OnDestroy
} from '@angular/core';
import { MatCheckboxChange } from '@angular/material';
import { Subscription, Observable, Observer } from 'rxjs/Rx';
import { Subscription, Observable, Observer } from 'rxjs';
import { DataColumnListComponent } from '../../../data-column/data-column-list.component';
import { DataColumn } from '../../data/data-column.model';
import { DataRowEvent } from '../../data/data-row-event.model';
@@ -32,9 +32,7 @@ import { ObjectDataRow } from '../../data/object-datarow.model';
import { ObjectDataTableAdapter } from '../../data/object-datatable-adapter';
import { DataCellEvent } from './data-cell.event';
import { DataRowActionEvent } from './data-row-action.event';
import 'rxjs/add/operator/debounceTime';
import 'rxjs/add/operator/buffer';
import 'rxjs/add/operator/filter';
import { share, buffer, map, filter, debounceTime } from 'rxjs/operators';
export enum DisplayMode {
List = 'list',
@@ -180,7 +178,8 @@ export class DataTableComponent implements AfterContentInit, OnChanges, DoCheck,
if (differs) {
this.differ = differs.find([]).create(null);
}
this.click$ = new Observable<DataRowEvent>(observer => this.clickObserver = observer).share();
this.click$ = new Observable<DataRowEvent>(observer => this.clickObserver = observer)
.pipe(share());
}
ngAfterContentInit() {
@@ -254,9 +253,15 @@ export class DataTableComponent implements AfterContentInit, OnChanges, DoCheck,
private initAndSubscribeClickStream() {
this.unsubscribeClickStream();
let singleClickStream = this.click$
.buffer(this.click$.debounceTime(250))
.map(list => list)
.filter(x => x.length === 1);
.pipe(
buffer(
this.click$.pipe(
debounceTime(250)
)
),
map(list => list),
filter(x => x.length === 1)
);
this.singleClickStreamSub = singleClickStream.subscribe((obj: DataRowEvent[]) => {
let event: DataRowEvent = obj[0];
@@ -273,9 +278,15 @@ export class DataTableComponent implements AfterContentInit, OnChanges, DoCheck,
});
let multiClickStream = this.click$
.buffer(this.click$.debounceTime(250))
.map(list => list)
.filter(x => x.length >= 2);
.pipe(
buffer(
this.click$.pipe(
debounceTime(250)
)
),
map(list => list),
filter(x => x.length >= 2)
);
this.multiClickStreamSub = multiClickStream.subscribe((obj: DataRowEvent[]) => {
let event: DataRowEvent = obj[0];
@@ -534,7 +545,7 @@ export class DataTableComponent implements AfterContentInit, OnChanges, DoCheck,
return event.value.actions;
}
getRowActions(row: DataRow, col: DataColumn): any[] {
getRowActions(row: DataRow, col?: DataColumn): any[] {
const id = row.getValue('id');
if (!this.rowMenuCache[id]) {

2
lib/core/datatable/data/datatable-adapter.ts
View File

@@ -18,7 +18,7 @@
import { DataColumn } from './data-column.model';
import { DataRow } from './data-row.model';
import { DataSorting } from './data-sorting.model';
import { Subject } from 'rxjs/Rx';
import { Subject } from 'rxjs';
export interface DataTableAdapter {
rowsChanged?: Subject<Array<DataRow>>;

2
lib/core/datatable/data/object-datatable-adapter.ts
View File

@@ -21,7 +21,7 @@ import { ObjectDataRow } from './object-datarow.model';
import { ObjectDataColumn } from './object-datacolumn.model';
import { DataSorting } from './data-sorting.model';
import { DataTableAdapter } from './datatable-adapter';
import { Subject } from 'rxjs/Subject';
import { Subject } from 'rxjs';
// Simple implementation of the DataTableAdapter interface.
export class ObjectDataTableAdapter implements DataTableAdapter {

6
lib/core/directives/highlight.directive.ts
View File

@@ -17,7 +17,7 @@
/* tslint:disable:no-input-rename */
import { Directive, ElementRef, Input, Renderer } from '@angular/core';
import { Directive, ElementRef, Input, Renderer2 } from '@angular/core';
import { HighlightTransformService, HightlightTransformResult } from '../services/highlight-transform.service';
@Directive({
@@ -39,7 +39,7 @@ export class HighlightDirective {
constructor(
private el: ElementRef,
private renderer: Renderer,
private renderer: Renderer2,
private highlightTransformService: HighlightTransformService) { }
public highlight(search = this.search, selector = this.selector, classToApply = this.classToApply) {
@@ -49,7 +49,7 @@ export class HighlightDirective {
elements.forEach((element) => {
const result: HightlightTransformResult = this.highlightTransformService.highlight(element.innerHTML, search, classToApply);
if (result.changed) {
this.renderer.setElementProperty(element, 'innerHTML', result.text);
this.renderer.setProperty(element, 'innerHTML', result.text);
}
});
}

20
lib/core/directives/logout.directive.spec.ts
View File

@@ -19,7 +19,7 @@ import { Component, ContentChildren } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { Router } from '@angular/router';
import { RouterTestingModule } from '@angular/router/testing';
import { Observable } from 'rxjs/Observable';
import { of, throwError } from 'rxjs';
import { AuthenticationService } from '../services';
import { setupTestBed } from '../testing/setupTestBed';
import { CoreModule } from '../core.module';
@@ -60,8 +60,8 @@ describe('LogoutDirective', () => {
});
it('should redirect to login on click', () => {
spyOn(router, 'navigate').and.callThrough();
spyOn(authService, 'logout').and.returnValue(Observable.of(true));
spyOn(router, 'navigate');
spyOn(authService, 'logout').and.returnValue(of(true));
const button = fixture.nativeElement.querySelector('button');
button.click();
@@ -71,8 +71,8 @@ describe('LogoutDirective', () => {
});
it('should redirect to login even on logout error', () => {
spyOn(router, 'navigate').and.callThrough();
spyOn(authService, 'logout').and.returnValue(Observable.throw('err'));
spyOn(router, 'navigate');
spyOn(authService, 'logout').and.returnValue(throwError('err'));
const button = fixture.nativeElement.querySelector('button');
button.click();
@@ -116,8 +116,8 @@ describe('LogoutDirective', () => {
});
it('should redirect to the the input redirectUri on click if present', () => {
spyOn(router, 'navigate').and.callThrough();
spyOn(authService, 'logout').and.returnValue(Observable.of(true));
spyOn(router, 'navigate');
spyOn(authService, 'logout').and.returnValue(of(true));
const button = fixture.nativeElement.querySelector('button');
button.click();
@@ -128,7 +128,7 @@ describe('LogoutDirective', () => {
});
describe('redirectUri', () => {
describe('enabelRedirect', () => {
@Component({
selector: 'adf-test-component',
@@ -161,8 +161,8 @@ describe('LogoutDirective', () => {
});
it('should not redirect if enabelRedirect is false', () => {
spyOn(router, 'navigate').and.callThrough();
spyOn(authService, 'logout').and.returnValue(Observable.of(true));
spyOn(router, 'navigate');
spyOn(authService, 'logout').and.returnValue(of(true));
const button = fixture.nativeElement.querySelector('button');
button.click();

23
lib/core/directives/node-delete.directive.ts
View File

@@ -19,12 +19,10 @@
import { Directive, ElementRef, EventEmitter, HostListener, Input, OnChanges, Output } from '@angular/core';
import { MinimalNodeEntity, MinimalNodeEntryEntity, DeletedNodeEntity, DeletedNodeMinimalEntry } from 'alfresco-js-api';
import { Observable } from 'rxjs/Observable';
import { Observable, forkJoin, from, of } from 'rxjs';
import { AlfrescoApiService } from '../services/alfresco-api.service';
import { TranslationService } from '../services/translation.service';
import 'rxjs/add/observable/fromPromise';
import 'rxjs/observable/forkJoin';
import 'rxjs/add/operator/catch';
import { map, catchError } from 'rxjs/operators';
interface ProcessedNodeData {
entry: MinimalNodeEntryEntity | DeletedNodeMinimalEntry;
@@ -93,7 +91,7 @@ export class NodeDeleteDirective implements OnChanges {
const batch = this.getDeleteNodesBatch(selection);
Observable.forkJoin(...batch)
forkJoin(...batch)
.subscribe((data: ProcessedNodeData[]) => {
const processedItems: ProcessStatus = this.processStatus(data);
const message = this.getMessage(processedItems);
@@ -118,17 +116,16 @@ export class NodeDeleteDirective implements OnChanges {
promise = this.alfrescoApiService.nodesApi.deleteNode(id, { permanent: this.permanent });
}
return Observable.fromPromise(promise)
.map(() => ({
return from(promise).pipe(
map(() => ({
entry: node.entry,
status: 1
})),
catchError(() => of({
entry: node.entry,
status: 0
}))
.catch((error: any) => {
return Observable.of({
entry: node.entry,
status: 0
});
});
);
}
private processStatus(data): ProcessStatus {

4
lib/core/directives/node-favorite.directive.spec.ts
View File

@@ -175,8 +175,8 @@ describe('NodeFavoriteDirective', () => {
let addFavoriteSpy;
beforeEach(() => {
removeFavoriteSpy = spyOn(alfrescoApiService.getInstance().core.favoritesApi, 'removeFavoriteSite');
addFavoriteSpy = spyOn(alfrescoApiService.getInstance().core.favoritesApi, 'addFavorite');
removeFavoriteSpy = spyOn(alfrescoApiService.getInstance().core.favoritesApi, 'removeFavoriteSite').and.callThrough();
addFavoriteSpy = spyOn(alfrescoApiService.getInstance().core.favoritesApi, 'addFavorite').and.callThrough();
});
afterEach(() => {

28
lib/core/directives/node-favorite.directive.ts
View File

@@ -19,10 +19,9 @@
import { Directive, EventEmitter, HostListener, Input, OnChanges, Output } from '@angular/core';
import { FavoriteBody, MinimalNodeEntity } from 'alfresco-js-api';
import { Observable } from 'rxjs/Observable';
import { Observable, from, forkJoin, of } from 'rxjs';
import { AlfrescoApiService } from '../services/alfresco-api.service';
import 'rxjs/add/observable/fromPromise';
import 'rxjs/observable/forkJoin';
import { catchError, map } from 'rxjs/operators';
@Directive({
selector: '[adf-node-favorite]',
@@ -71,10 +70,10 @@ export class NodeFavoriteDirective implements OnChanges {
// shared files have nodeId
const id = selected.entry.nodeId || selected.entry.id;
return Observable.fromPromise(this.alfrescoApiService.favoritesApi.removeFavoriteSite('-me-', id));
return from(this.alfrescoApiService.favoritesApi.removeFavoriteSite('-me-', id));
});
Observable.forkJoin(batch).subscribe(
forkJoin(batch).subscribe(
() => {
this.favorites.map(selected => selected.entry.isFavorite = false);
this.toggle.emit();
@@ -87,7 +86,7 @@ export class NodeFavoriteDirective implements OnChanges {
const notFavorite = this.favorites.filter((node) => !node.entry.isFavorite);
const body: FavoriteBody[] = notFavorite.map((node) => this.createFavoriteBody(node));
Observable.fromPromise(this.alfrescoApiService.favoritesApi.addFavorite('-me-', <any> body))
from(this.alfrescoApiService.favoritesApi.addFavorite('-me-', <any> body))
.subscribe(
() => {
notFavorite.map(selected => selected.entry.isFavorite = true);
@@ -107,7 +106,7 @@ export class NodeFavoriteDirective implements OnChanges {
const result = this.diff(selection, this.favorites);
const batch = this.getProcessBatch(result);
Observable.forkJoin(batch).subscribe((data) => {
forkJoin(batch).subscribe(data => {
this.favorites.push(...data);
});
}
@@ -129,7 +128,7 @@ export class NodeFavoriteDirective implements OnChanges {
// ACS 6.x with 'isFavorite' include
if (node && node.hasOwnProperty('isFavorite')) {
return Observable.of(selected);
return of(selected);
}
// ACS 5.x and 6.x without 'isFavorite' include
@@ -139,8 +138,8 @@ export class NodeFavoriteDirective implements OnChanges {
const promise = this.alfrescoApiService.favoritesApi.getFavorite('-me-', id);
return Observable.from(promise)
.map(() => ({
return from(promise).pipe(
map(() => ({
entry: {
id,
isFolder,
@@ -148,9 +147,9 @@ export class NodeFavoriteDirective implements OnChanges {
name,
isFavorite: true
}
}))
.catch(() => {
return Observable.of({
})),
catchError(() => {
return of({
entry: {
id,
isFolder,
@@ -159,7 +158,8 @@ export class NodeFavoriteDirective implements OnChanges {
isFavorite: false
}
});
});
})
);
}
private createFavoriteBody(node): FavoriteBody {

56
lib/core/directives/node-restore.directive.ts
View File

@@ -19,12 +19,10 @@
import { Directive, EventEmitter, HostListener, Input, Output } from '@angular/core';
import { DeletedNodeEntry, DeletedNodesPaging, PathInfoEntity } from 'alfresco-js-api';
import { Observable } from 'rxjs/Observable';
import { Observable, forkJoin, from, of } from 'rxjs';
import { AlfrescoApiService } from '../services/alfresco-api.service';
import { TranslationService } from '../services/translation.service';
import 'rxjs/add/observable/from';
import 'rxjs/add/observable/zip';
import 'rxjs/add/operator/mergeMap';
import { tap, mergeMap, map, catchError } from 'rxjs/operators';
export class RestoreMessageModel {
message: string;
@@ -69,28 +67,27 @@ export class NodeRestoreDirective {
if (selection.length && nodesWithPath.length) {
this.restoreNodesBatch(nodesWithPath)
.do((restoredNodes) => {
this.restoreNodesBatch(nodesWithPath).pipe(
tap(restoredNodes => {
const status = this.processStatus(restoredNodes);
this.restoreProcessStatus.fail.push(...status.fail);
this.restoreProcessStatus.success.push(...status.success);
})
.mergeMap(() => this.getDeletedNodes())
.subscribe(
(deletedNodesList: any) => {
const { entries: nodelist } = deletedNodesList.list;
const { fail: restoreErrorNodes } = this.restoreProcessStatus;
const selectedNodes = this.diff(restoreErrorNodes, selection, false);
const remainingNodes = this.diff(selectedNodes, nodelist);
}),
mergeMap(() => this.getDeletedNodes())
)
.subscribe(deletedNodesList => {
const { entries: nodelist } = deletedNodesList.list;
const { fail: restoreErrorNodes } = this.restoreProcessStatus;
const selectedNodes = this.diff(restoreErrorNodes, selection, false);
const remainingNodes = this.diff(selectedNodes, nodelist);
if (!remainingNodes.length) {
this.notification();
} else {
this.recover(remainingNodes);
}
}
);
if (!remainingNodes.length) {
this.notification();
} else {
this.recover(remainingNodes);
}
});
} else {
this.restoreProcessStatus.fail.push(...selection);
this.notification();
@@ -99,7 +96,7 @@ export class NodeRestoreDirective {
}
private restoreNodesBatch(batch: DeletedNodeEntry[]): Observable<DeletedNodeEntry[]> {
return Observable.forkJoin(batch.map((node) => this.restoreNode(node)));
return forkJoin(batch.map((node) => this.restoreNode(node)));
}
private getNodesWithPath(selection): DeletedNodeEntry[] {
@@ -110,7 +107,7 @@ export class NodeRestoreDirective {
const promise = this.alfrescoApiService.getInstance()
.core.nodesApi.getDeletedNodes({ include: ['path'] });
return Observable.from(promise);
return from(promise);
}
private restoreNode(node): Observable<any> {
@@ -118,20 +115,21 @@ export class NodeRestoreDirective {
const promise = this.alfrescoApiService.getInstance().nodes.restoreNode(entry.id);
return Observable.from(promise)
.map(() => ({
return from(promise).pipe(
map(() => ({
status: 1,
entry
}))
.catch((error) => {
})),
catchError((error) => {
const { statusCode } = (JSON.parse(error.message)).error;
return Observable.of({
return of({
status: 0,
statusCode,
entry
});
});
})
);
}
private diff(selection, list, fromList = true): any {

8
lib/core/directives/upload.directive.ts
View File

@@ -17,7 +17,7 @@
/* tslint:disable:no-input-rename */
import { Directive, ElementRef, HostListener, Input, NgZone, OnDestroy, OnInit, Renderer } from '@angular/core';
import { Directive, ElementRef, HostListener, Input, NgZone, OnDestroy, OnInit, Renderer2 } from '@angular/core';
import { FileInfo, FileUtils } from '../utils/file-utils';
@Directive({
@@ -57,13 +57,15 @@ export class UploadDirective implements OnInit, OnDestroy {
private upload: HTMLInputElement;
private element: HTMLElement;
constructor(private el: ElementRef, private renderer: Renderer, private ngZone: NgZone) {
constructor(private el: ElementRef, private renderer: Renderer2, private ngZone: NgZone) {
this.element = el.nativeElement;
}
ngOnInit() {
if (this.isClickMode() && this.renderer) {
this.upload = this.renderer.createElement(this.el.nativeElement.parentNode, 'input') as HTMLInputElement;
let inputUpload = this.renderer.createElement('input');
this.upload = this.el.nativeElement.parentElement.appendChild(inputUpload);
this.upload.type = 'file';
this.upload.style.display = 'none';
this.upload.addEventListener('change', e => this.onSelectFiles(e));

6
lib/core/form/components/form-list.component.spec.ts
View File

@@ -17,7 +17,7 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { TranslationService, TranslationMock } from '../../index';
import { Observable } from 'rxjs/Observable';
import { of } from 'rxjs';
import { FormService } from '../services/form.service';
import { FormListComponent } from './form-list.component';
import { setupTestBed } from '../../testing/setupTestBed';
@@ -51,7 +51,7 @@ describe('TaskAttachmentList', () => {
}));
it('should show the forms as a list', async(() => {
spyOn(service, 'getForms').and.returnValue(Observable.of([
spyOn(service, 'getForms').and.returnValue(of([
{ name: 'FakeName-1', lastUpdatedByFullName: 'FakeUser-1', lastUpdated: '2017-01-02' },
{ name: 'FakeName-2', lastUpdatedByFullName: 'FakeUser-2', lastUpdated: '2017-01-03' }
]));
@@ -62,6 +62,6 @@ describe('TaskAttachmentList', () => {
fixture.whenStable().then(() => {
expect(element.querySelectorAll('.adf-datatable-body > .adf-datatable-row').length).toBe(2);
});
});
}));
});

4
lib/core/form/components/form.component.html
View File

@@ -26,7 +26,7 @@
</mat-card-header>
<mat-card-content>
<div *ngIf="form.hasTabs()">
<tabs-widget [tabs]="form.tabs" (formTabChanged)="onFieldChanged($event);"></tabs-widget>
<tabs-widget [tabs]="form.tabs"></tabs-widget>
</div>
<div *ngIf="!form.hasTabs() && form.hasFields()">
@@ -42,7 +42,7 @@
mat-button
[disabled]="!isOutcomeButtonEnabled(outcome)"
[class.adf-form-hide-button]="!isOutcomeButtonVisible(outcome, form.readOnly)"
(click)="onOutcomeClicked(outcome, $event)">
(click)="onOutcomeClicked(outcome)">
{{outcome.name | uppercase}}
</button>
</mat-card-actions>

2
lib/core/form/components/form.component.scss
View File

@@ -35,7 +35,7 @@
height: 4px;
}
& .mat-input-wrapper {
& .mat-form-field-wrapper {
margin: 0px 12px 0px 0px;
}
}

20
lib/core/form/components/form.component.spec.ts
View File

@@ -17,7 +17,7 @@
import { SimpleChange } from '@angular/core';
import { LogService } from '../../services/log.service';
import { Observable } from 'rxjs/Observable';
import { Observable, of, throwError } from 'rxjs';
import { fakeForm } from '../../mock';
import { FormService } from './../services/form.service';
import { NodeService } from './../services/node.service';
@@ -177,7 +177,7 @@ describe('FormComponent', () => {
});
});
spyOn(visibilityService, 'getTaskProcessVariable').and.returnValue(Observable.of({}));
spyOn(visibilityService, 'getTaskProcessVariable').and.returnValue(of({}));
spyOn(formService, 'getTask').and.callFake((currentTaskId) => {
return Observable.create(observer => {
observer.next({ taskId: currentTaskId, processDefinitionId: '10201' });
@@ -200,7 +200,7 @@ describe('FormComponent', () => {
});
});
spyOn(visibilityService, 'getTaskProcessVariable').and.returnValue(Observable.of({}));
spyOn(visibilityService, 'getTaskProcessVariable').and.returnValue(of({}));
spyOn(formService, 'getTask').and.callFake((currentTaskId) => {
return Observable.create(observer => {
observer.next({ taskId: currentTaskId, processDefinitionId: 'null' });
@@ -226,7 +226,7 @@ describe('FormComponent', () => {
});
it('should refresh visibility when the form is loaded', () => {
spyOn(formService, 'getFormDefinitionById').and.returnValue(Observable.of(JSON.parse(JSON.stringify(fakeForm))));
spyOn(formService, 'getFormDefinitionById').and.returnValue(of(JSON.parse(JSON.stringify(fakeForm))));
const formId = '123';
formComponent.formId = formId;
@@ -418,7 +418,7 @@ describe('FormComponent', () => {
});
it('should fetch and parse form by task id', (done) => {
spyOn(formService, 'getTask').and.returnValue(Observable.of({}));
spyOn(formService, 'getTask').and.returnValue(of({}));
spyOn(formService, 'getTaskForm').and.callFake((currentTaskId) => {
return Observable.create(observer => {
observer.next({ taskId: currentTaskId });
@@ -441,10 +441,10 @@ describe('FormComponent', () => {
it('should handle error when getting form by task id', (done) => {
const error = 'Some error';
spyOn(formService, 'getTask').and.returnValue(Observable.of({}));
spyOn(formService, 'getTask').and.returnValue(of({}));
spyOn(formComponent, 'handleError').and.stub();
spyOn(formService, 'getTaskForm').and.callFake((taskId) => {
return Observable.throw(error);
return throwError(error);
});
formComponent.getFormByTaskId('123').then(_ => {
@@ -454,7 +454,7 @@ describe('FormComponent', () => {
});
it('should apply readonly state when getting form by task id', (done) => {
spyOn(formService, 'getTask').and.returnValue(Observable.of({}));
spyOn(formService, 'getTask').and.returnValue(of({}));
spyOn(formService, 'getTaskForm').and.callFake((taskId) => {
return Observable.create(observer => {
observer.next({ taskId: taskId });
@@ -495,7 +495,7 @@ describe('FormComponent', () => {
const error = 'Some error';
spyOn(formComponent, 'handleError').and.stub();
spyOn(formService, 'getFormDefinitionById').and.callFake(() => Observable.throw(error));
spyOn(formService, 'getFormDefinitionById').and.callFake(() => throwError(error));
formComponent.getFormDefinitionByFormId('123');
expect(formService.getFormDefinitionById).toHaveBeenCalledWith('123');
@@ -562,7 +562,7 @@ describe('FormComponent', () => {
it('should handle error during form save', () => {
const error = 'Error';
spyOn(formService, 'saveTaskForm').and.callFake(() => Observable.throw(error));
spyOn(formService, 'saveTaskForm').and.callFake(() => throwError(error));
spyOn(formComponent, 'handleError').and.stub();
formComponent.form = new FormModel({ taskId: '123' });

20
lib/core/form/components/form.component.ts
View File

@@ -23,8 +23,9 @@ import { FormService } from './../services/form.service';
import { NodeService } from './../services/node.service';
import { ContentLinkModel } from './widgets/core/content-link.model';
import { FormFieldModel, FormModel, FormOutcomeEvent, FormOutcomeModel, FormValues, FormFieldValidator } from './widgets/core/index';
import { Observable } from 'rxjs/Observable';
import { Observable, of } from 'rxjs';
import { WidgetVisibilityService } from './../services/widget-visibility.service';
import { switchMap } from 'rxjs/operators';
@Component({
selector: 'adf-form',
@@ -320,14 +321,15 @@ export class FormComponent implements OnInit, OnChanges {
}
findProcessVariablesByTaskId(taskId: string): Observable<any> {
return this.formService.getTask(taskId).
switchMap((task: any) => {
if (this.isAProcessTask(task)) {
return this.visibilityService.getTaskProcessVariable(taskId);
} else {
return Observable.of({});
}
});
return this.formService.getTask(taskId).pipe(
switchMap((task: any) => {
if (this.isAProcessTask(task)) {
return this.visibilityService.getTaskProcessVariable(taskId);
} else {
return of({});
}
})
);
}
isAProcessTask(taskRepresentation) {

38
lib/core/form/components/form.component.visibility.spec.ts
View File

@@ -17,7 +17,7 @@
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { SimpleChange } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { of } from 'rxjs';
import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
import { By } from '@angular/platform-browser';
@@ -75,8 +75,8 @@ describe('FormComponent UI and visibility', () => {
describe('Validation icon', () => {
it('should display valid icon for valid form', () => {
spyOn(service, 'getTask').and.returnValue(Observable.of({}));
spyOn(service, 'getTaskForm').and.returnValue(Observable.of(formDefinitionTwoTextFields));
spyOn(service, 'getTask').and.returnValue(of({}));
spyOn(service, 'getTaskForm').and.returnValue(of(formDefinitionTwoTextFields));
let change = new SimpleChange(null, 1, true);
component.ngOnChanges({ 'taskId': change });
@@ -87,8 +87,8 @@ describe('FormComponent UI and visibility', () => {
});
it('should display invalid icon for valid form', () => {
spyOn(service, 'getTask').and.returnValue(Observable.of({}));
spyOn(service, 'getTaskForm').and.returnValue(Observable.of(formDefinitionRequiredField));
spyOn(service, 'getTask').and.returnValue(of({}));
spyOn(service, 'getTaskForm').and.returnValue(of(formDefinitionRequiredField));
let change = new SimpleChange(null, 1, true);
component.ngOnChanges({ 'taskId': change });
@@ -99,8 +99,8 @@ describe('FormComponent UI and visibility', () => {
});
it('should NOT display validation icon when [showValidationIcon] is false', () => {
spyOn(service, 'getTask').and.returnValue(Observable.of({}));
spyOn(service, 'getTaskForm').and.returnValue(Observable.of(formDefinitionTwoTextFields));
spyOn(service, 'getTask').and.returnValue(of({}));
spyOn(service, 'getTaskForm').and.returnValue(of(formDefinitionTwoTextFields));
let change = new SimpleChange(null, 1, true);
component.ngOnChanges({ 'taskId': change });
@@ -114,8 +114,8 @@ describe('FormComponent UI and visibility', () => {
describe('form definition', () => {
it('should display two text fields form definition', () => {
spyOn(service, 'getTask').and.returnValue(Observable.of({}));
spyOn(service, 'getTaskForm').and.returnValue(Observable.of(formDefinitionTwoTextFields));
spyOn(service, 'getTask').and.returnValue(of({}));
spyOn(service, 'getTaskForm').and.returnValue(of(formDefinitionTwoTextFields));
let change = new SimpleChange(null, 1, true);
component.ngOnChanges({ 'taskId': change });
@@ -131,8 +131,8 @@ describe('FormComponent UI and visibility', () => {
});
it('should display dropdown field', fakeAsync(() => {
spyOn(service, 'getTask').and.returnValue(Observable.of({}));
spyOn(service, 'getTaskForm').and.returnValue(Observable.of(formDefinitionDropdownField));
spyOn(service, 'getTask').and.returnValue(of({}));
spyOn(service, 'getTaskForm').and.returnValue(of(formDefinitionDropdownField));
let change = new SimpleChange(null, 1, true);
component.ngOnChanges({ 'taskId': change });
@@ -162,8 +162,8 @@ describe('FormComponent UI and visibility', () => {
describe('Visibility conditions', () => {
it('should hide the field based on the next one', () => {
spyOn(service, 'getTask').and.returnValue(Observable.of({}));
spyOn(service, 'getTaskForm').and.returnValue(Observable.of(formDefVisibilitiFieldDependsOnNextOne));
spyOn(service, 'getTask').and.returnValue(of({}));
spyOn(service, 'getTaskForm').and.returnValue(of(formDefVisibilitiFieldDependsOnNextOne));
let change = new SimpleChange(null, 1, true);
component.ngOnChanges({ 'taskId': change });
@@ -179,8 +179,8 @@ describe('FormComponent UI and visibility', () => {
});
it('should hide the field based on the previous one', () => {
spyOn(service, 'getTask').and.returnValue(Observable.of({}));
spyOn(service, 'getTaskForm').and.returnValue(Observable.of(formDefVisibilitiFieldDependsOnPreviousOne));
spyOn(service, 'getTask').and.returnValue(of({}));
spyOn(service, 'getTaskForm').and.returnValue(of(formDefVisibilitiFieldDependsOnPreviousOne));
let change = new SimpleChange(null, 1, true);
component.ngOnChanges({ 'taskId': change });
@@ -196,8 +196,8 @@ describe('FormComponent UI and visibility', () => {
});
it('should show the hidden field when the visibility condition change to true', () => {
spyOn(service, 'getTask').and.returnValue(Observable.of({}));
spyOn(service, 'getTaskForm').and.returnValue(Observable.of(formDefVisibilitiFieldDependsOnNextOne));
spyOn(service, 'getTask').and.returnValue(of({}));
spyOn(service, 'getTaskForm').and.returnValue(of(formDefVisibilitiFieldDependsOnNextOne));
let change = new SimpleChange(null, 1, true);
component.ngOnChanges({ 'taskId': change });
@@ -221,8 +221,8 @@ describe('FormComponent UI and visibility', () => {
describe('Readonly Form', () => {
it('should display two text fields readonly', () => {
spyOn(service, 'getTask').and.returnValue(Observable.of({}));
spyOn(service, 'getTaskForm').and.returnValue(Observable.of(formReadonlyTwoTextFields));
spyOn(service, 'getTask').and.returnValue(of({}));
spyOn(service, 'getTaskForm').and.returnValue(of(formReadonlyTwoTextFields));
let change = new SimpleChange(null, 1, true);
component.ngOnChanges({ 'taskId': change });

2
lib/core/form/components/start-form.component.html
View File

@@ -24,7 +24,7 @@
[disabled]="!isOutcomeButtonEnabled(outcome)"
[class.mdl-button--colored]="!outcome.isSystem"
[class.adf-form-hide-button]="!isOutcomeButtonVisible(outcome, form.readOnly)"
(click)="onOutcomeClicked(outcome, $event)">
(click)="onOutcomeClicked(outcome)">
{{outcome.name}}
</button>
</mat-card-content>

42
lib/core/form/components/start-form.component.spec.ts
View File

@@ -17,7 +17,7 @@
import { CUSTOM_ELEMENTS_SCHEMA, SimpleChange } from '@angular/core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { Observable } from 'rxjs/Observable';
import { of, throwError } from 'rxjs';
import { startFormDateWidgetMock, startFormDropdownDefinitionMock, startFormTextDefinitionMock, startMockForm, startMockFormWithTab } from '../../mock';
import { startFormAmountWidgetMock, startFormNumberWidgetMock, startFormRadioButtonWidgetMock } from '../../mock';
import { FormService } from './../services/form.service';
@@ -53,7 +53,7 @@ describe('StartFormComponent', () => {
formService = TestBed.get(FormService);
visibilityService = TestBed.get(WidgetVisibilityService);
getStartFormSpy = spyOn(formService, 'getStartFormDefinition').and.returnValue(Observable.of({
getStartFormSpy = spyOn(formService, 'getStartFormDefinition').and.returnValue(of({
processDefinitionName: 'my:process'
}));
});
@@ -89,13 +89,13 @@ describe('StartFormComponent', () => {
});
it('should consume errors encountered when loading start form', () => {
getStartFormSpy.and.returnValue(Observable.throw({}));
getStartFormSpy.and.returnValue(throwError({}));
component.processDefinitionId = exampleId1;
component.ngOnInit();
});
it('should show outcome buttons by default', () => {
getStartFormSpy.and.returnValue(Observable.of({
getStartFormSpy.and.returnValue(of({
id: '1',
processDefinitionName: 'my:process',
outcomes: [{
@@ -111,7 +111,7 @@ describe('StartFormComponent', () => {
});
it('should show outcome buttons if showOutcomeButtons is true', () => {
getStartFormSpy.and.returnValue(Observable.of({
getStartFormSpy.and.returnValue(of({
id: '1',
processDefinitionName: 'my:process',
outcomes: [{
@@ -127,7 +127,7 @@ describe('StartFormComponent', () => {
});
it('should fetch start form detasils by processDefinitionId ', () => {
getStartFormSpy.and.returnValue(Observable.of(startMockForm));
getStartFormSpy.and.returnValue(of(startMockForm));
component.processDefinitionId = exampleId1;
component.showOutcomeButtons = true;
component.ngOnChanges({ processDefinitionId: new SimpleChange(exampleId1, exampleId2, true) });
@@ -139,7 +139,7 @@ describe('StartFormComponent', () => {
describe('Disply widgets', () => {
it('should be able to display a textWidget from a process definition', () => {
getStartFormSpy.and.returnValue(Observable.of(startFormTextDefinitionMock));
getStartFormSpy.and.returnValue(of(startFormTextDefinitionMock));
component.processDefinitionId = exampleId1;
component.showOutcomeButtons = true;
component.ngOnChanges({ processDefinitionId: new SimpleChange(exampleId1, exampleId2, true) });
@@ -157,7 +157,7 @@ describe('StartFormComponent', () => {
});
it('should be able to display a radioButtonWidget from a process definition', () => {
getStartFormSpy.and.returnValue(Observable.of(startFormRadioButtonWidgetMock));
getStartFormSpy.and.returnValue(of(startFormRadioButtonWidgetMock));
component.processDefinitionId = exampleId1;
component.showOutcomeButtons = true;
component.ngOnChanges({ processDefinitionId: new SimpleChange(exampleId1, exampleId2, true) });
@@ -175,7 +175,7 @@ describe('StartFormComponent', () => {
});
it('should be able to display a amountWidget from a process definition', () => {
getStartFormSpy.and.returnValue(Observable.of(startFormAmountWidgetMock));
getStartFormSpy.and.returnValue(of(startFormAmountWidgetMock));
component.processDefinitionId = exampleId1;
component.showOutcomeButtons = true;
component.ngOnChanges({ processDefinitionId: new SimpleChange(exampleId1, exampleId2, true) });
@@ -193,7 +193,7 @@ describe('StartFormComponent', () => {
});
it('should be able to display a numberWidget from a process definition', () => {
getStartFormSpy.and.returnValue(Observable.of(startFormNumberWidgetMock));
getStartFormSpy.and.returnValue(of(startFormNumberWidgetMock));
component.processDefinitionId = exampleId1;
component.showOutcomeButtons = true;
component.ngOnChanges({ processDefinitionId: new SimpleChange(exampleId1, exampleId2, true) });
@@ -209,7 +209,7 @@ describe('StartFormComponent', () => {
});
it('should be able to display a dropDown Widget from a process definition', () => {
getStartFormSpy.and.returnValue(Observable.of(startFormDropdownDefinitionMock));
getStartFormSpy.and.returnValue(of(startFormDropdownDefinitionMock));
component.processDefinitionId = exampleId1;
component.showOutcomeButtons = true;
component.ngOnChanges({ processDefinitionId: new SimpleChange(exampleId1, exampleId2, true) });
@@ -232,7 +232,7 @@ describe('StartFormComponent', () => {
});
it('should be able to display a date Widget from a process definition', () => {
getStartFormSpy.and.returnValue(Observable.of(startFormDateWidgetMock));
getStartFormSpy.and.returnValue(of(startFormDateWidgetMock));
component.processDefinitionId = exampleId1;
component.showOutcomeButtons = true;
component.ngOnChanges({ processDefinitionId: new SimpleChange(exampleId1, exampleId2, true) });
@@ -242,7 +242,7 @@ describe('StartFormComponent', () => {
const formFields = component.form.getFormFields();
const labelField = formFields.find(field => field.id === 'date');
const dateWidget = fixture.debugElement.nativeElement.querySelector('dropdown-widget');
const dateLabelElement = fixture.debugElement.nativeElement.querySelector('#data-widget .mat-input-infix> .adf-label');
const dateLabelElement = fixture.debugElement.nativeElement.querySelector('#data-widget .mat-form-field-infix> .adf-label');
expect(dateWidget).toBeDefined();
expect(labelField.type).toBe('date');
expect(dateLabelElement.innerText).toBe('date (D-M-YYYY)');
@@ -250,7 +250,7 @@ describe('StartFormComponent', () => {
});
it('should fetch and define form fields with proper type', () => {
getStartFormSpy.and.returnValue(Observable.of(startMockForm));
getStartFormSpy.and.returnValue(of(startMockForm));
component.processDefinitionId = exampleId1;
component.showOutcomeButtons = true;
component.ngOnChanges({ processDefinitionId: new SimpleChange(exampleId1, exampleId2, true) });
@@ -265,7 +265,7 @@ describe('StartFormComponent', () => {
});
it('should show dropdown options', () => {
getStartFormSpy.and.returnValue(Observable.of(startMockForm));
getStartFormSpy.and.returnValue(of(startMockForm));
component.processDefinitionId = exampleId1;
component.showOutcomeButtons = true;
component.ngOnChanges({ processDefinitionId: new SimpleChange(exampleId1, exampleId2, true) });
@@ -281,7 +281,7 @@ describe('StartFormComponent', () => {
});
it('should disply start form with fields ', async(() => {
getStartFormSpy.and.returnValue(Observable.of(startMockForm));
getStartFormSpy.and.returnValue(of(startMockForm));
component.processDefinitionId = exampleId1;
component.showOutcomeButtons = true;
component.ngOnChanges({ processDefinitionId: new SimpleChange(exampleId1, exampleId2, true) });
@@ -289,9 +289,9 @@ describe('StartFormComponent', () => {
fixture.detectChanges();
const formFieldsWidget = fixture.debugElement.nativeElement.querySelector('form-field');
const inputElement = fixture.debugElement.nativeElement.querySelector('.adf-input');
const inputLabelElement = fixture.debugElement.nativeElement.querySelector('.mat-input-infix > .adf-label');
const inputLabelElement = fixture.debugElement.nativeElement.querySelector('.mat-form-field-infix > .adf-label');
const dateElement = fixture.debugElement.nativeElement.querySelector('#billdate');
const dateLabelElement = fixture.debugElement.nativeElement.querySelector('#data-widget .mat-input-infix> .adf-label');
const dateLabelElement = fixture.debugElement.nativeElement.querySelector('#data-widget .mat-form-field-infix> .adf-label');
const selectElement = fixture.debugElement.nativeElement.querySelector('#claimtype');
const selectLabelElement = fixture.debugElement.nativeElement.querySelector('.adf-dropdown-widget > .adf-label');
expect(formFieldsWidget).toBeDefined();
@@ -305,7 +305,7 @@ describe('StartFormComponent', () => {
}));
it('should refresh start form on click of refresh button ', async(() => {
getStartFormSpy.and.returnValue(Observable.of(startMockForm));
getStartFormSpy.and.returnValue(of(startMockForm));
component.processDefinitionId = exampleId1;
component.showOutcomeButtons = true;
component.showRefreshButton = true;
@@ -324,7 +324,7 @@ describe('StartFormComponent', () => {
}));
it('should difine custom-tabs ', async(() => {
getStartFormSpy.and.returnValue(Observable.of(startMockFormWithTab));
getStartFormSpy.and.returnValue(of(startMockFormWithTab));
component.processDefinitionId = exampleId1;
component.showOutcomeButtons = true;
component.showRefreshButton = true;
@@ -342,7 +342,7 @@ describe('StartFormComponent', () => {
}));
it('should difine title and [custom-action-buttons]', async(() => {
getStartFormSpy.and.returnValue(Observable.of(startMockFormWithTab));
getStartFormSpy.and.returnValue(of(startMockFormWithTab));
component.processDefinitionId = exampleId1;
component.showOutcomeButtons = true;
component.showRefreshButton = true;

6
lib/core/form/components/widgets/amount/amount.widget.scss
View File

@@ -31,11 +31,7 @@
&-amount-widget__container {
max-width: 100%;
.mat-input-placeholder-wrapper {
top: -6px !important;
}
.mat-input-placeholder-wrapper {
.mat-form-field-label-wrapper {
top: 0 !important;
left: 13px;
}

4
lib/core/form/components/widgets/container/container.widget.scss
View File

@@ -62,7 +62,7 @@
width: 100%;
}
.mat-input-placeholder-wrapper {
.mat-form-field-label-wrapper {
top: 5px !important;
}
@@ -79,7 +79,7 @@
color: mat-color($primary);
}
.mat-input-prefix {
.mat-form-field-prefix {
color: mat-color($primary);
}
}

12
lib/core/form/components/widgets/content/content.widget.spec.ts
View File

@@ -19,7 +19,7 @@ import { SimpleChange } from '@angular/core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { By } from '@angular/platform-browser';
import { TranslationService, ContentService } from '../../../../services';
import { Observable } from 'rxjs/Observable';
import { of } from 'rxjs';
import { ProcessContentService } from '../../../services/process-content.service';
import { ContentLinkModel } from '../index';
@@ -105,7 +105,7 @@ describe('ContentWidgetComponent', () => {
it('should load the thumbnail preview of the png image', (done) => {
let blob = createFakeImageBlob();
spyOn(processContentService, 'getFileRawContent').and.returnValue(Observable.of(blob));
spyOn(processContentService, 'getFileRawContent').and.returnValue(of(blob));
component.thumbnailLoaded.subscribe((res) => {
fixture.detectChanges();
@@ -148,7 +148,7 @@ describe('ContentWidgetComponent', () => {
it('should load the thumbnail preview of a pdf', (done) => {
let blob = createFakePdfBlob();
spyOn(processContentService, 'getContentThumbnail').and.returnValue(Observable.of(blob));
spyOn(processContentService, 'getContentThumbnail').and.returnValue(of(blob));
component.thumbnailLoaded.subscribe((res) => {
fixture.detectChanges();
@@ -230,8 +230,8 @@ describe('ContentWidgetComponent', () => {
it('should open the viewer when the view button is clicked', (done) => {
let blob = createFakePdfBlob();
spyOn(processContentService, 'getContentPreview').and.returnValue(Observable.of(blob));
spyOn(processContentService, 'getFileRawContent').and.returnValue(Observable.of(blob));
spyOn(processContentService, 'getContentPreview').and.returnValue(of(blob));
spyOn(processContentService, 'getFileRawContent').and.returnValue(of(blob));
component.content = new ContentLinkModel({
id: 4004,
@@ -264,7 +264,7 @@ describe('ContentWidgetComponent', () => {
it('should download the pdf when the download button is clicked', () => {
let blob = createFakePdfBlob();
spyOn(processContentService, 'getFileRawContent').and.returnValue(Observable.of(blob));
spyOn(processContentService, 'getFileRawContent').and.returnValue(of(blob));
spyOn(serviceContent, 'downloadBlob').and.callThrough();
component.content = new ContentLinkModel({

2
lib/core/form/components/widgets/content/content.widget.ts
View File

@@ -18,7 +18,7 @@
import { ContentService } from '../../../../services/content.service';
import { LogService } from '../../../../services/log.service';
import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges, ViewEncapsulation } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { Observable } from 'rxjs';
import { ProcessContentService } from '../../../services/process-content.service';
import { ContentLinkModel } from '../core/content-link.model';
import { FormService } from './../../../services/form.service';

2
lib/core/form/components/widgets/date-time/date-time.widget.scss
View File

@@ -4,7 +4,7 @@
&-date-time-widget {
.mat-input-suffix {
.mat-form-field-suffix {
text-align: right;
position: absolute;
margin-top: 30px;

2
lib/core/form/components/widgets/date/date.widget.scss
View File

@@ -3,7 +3,7 @@
.adf {
&-date-widget {
.mat-input-suffix {
.mat-form-field-suffix {
text-align: right;
position: absolute;
margin-top: 30px;

2
lib/core/form/components/widgets/date/date.widget.spec.ts
View File

@@ -151,7 +151,7 @@ describe('DateWidgetComponent', () => {
widget.field = new FormFieldModel(new FormModel(), {
id: 'date-field-id',
name: 'date-name',
value: '12-30-9999';
value: '12-30-9999',
type: 'date',
readOnly: 'false'
});

6
lib/core/form/components/widgets/dropdown/dropdown.widget.spec.ts
View File

@@ -17,7 +17,7 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { By } from '@angular/platform-browser';
import { Observable } from 'rxjs/Observable';
import { Observable, of } from 'rxjs';
import { FormService } from '../../../services/form.service';
import { WidgetVisibilityService } from '../../../services/widget-visibility.service';
import { FormFieldOption } from './../core/form-field-option';
@@ -130,7 +130,7 @@ describe('DropdownWidgetComponent', () => {
beforeEach(async(() => {
spyOn(visibilityService, 'refreshVisibility').and.stub();
spyOn(formService, 'getRestFieldValues').and.callFake(() => {
return Observable.of(fakeOptionList);
return of(fakeOptionList);
});
widget.field = new FormFieldModel(new FormModel({ taskId: 'fake-task-id' }), {
id: 'dropdown-id',
@@ -194,7 +194,7 @@ describe('DropdownWidgetComponent', () => {
beforeEach(async(() => {
spyOn(visibilityService, 'refreshVisibility').and.stub();
spyOn(formService, 'getRestFieldValuesByProcessId').and.callFake(() => {
return Observable.of(fakeOptionList);
return of(fakeOptionList);
});
widget.field = new FormFieldModel(new FormModel({ processDefinitionId: 'fake-process-id' }), {
id: 'dropdown-id',

1
lib/core/form/components/widgets/dynamic-table/dynamic-table.widget.html
View File

@@ -63,7 +63,6 @@
<row-editor *ngIf="editMode"
[table]="content"
[row]="editRow"
[column]="column"
(save)="onSaveChanges()"
(cancel)="onCancelChanges()">
</row-editor>

10
lib/core/form/components/widgets/dynamic-table/editors/dropdown/dropdown.editor.spec.ts
View File

@@ -17,7 +17,7 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { By } from '@angular/platform-browser';
import { Observable } from 'rxjs/Observable';
import { Observable, of, throwError } from 'rxjs';
import { FormService } from './../../../../../services/form.service';
import { FormFieldModel, FormModel } from './../../../core/index';
import { DynamicTableColumnOption } from './../../dynamic-table-column-option.model';
@@ -145,7 +145,7 @@ describe('DropdownEditorComponent', () => {
const error = 'error';
spyOn(formService, 'getRestFieldValuesColumn').and.returnValue(
Observable.throw(error)
throwError(error)
);
spyOn(component, 'handleError').and.stub();
@@ -161,7 +161,7 @@ describe('DropdownEditorComponent', () => {
const error = 'error';
spyOn(formService, 'getRestFieldValuesColumnByProcessId').and.returnValue(
Observable.throw(error)
throwError(error)
);
spyOn(component, 'handleError').and.stub();
@@ -209,7 +209,7 @@ describe('DropdownEditorComponent', () => {
beforeEach(async(() => {
stubFormService = fixture.debugElement.injector.get(FormService);
spyOn(stubFormService, 'getRestFieldValuesColumn').and.returnValue(Observable.of(fakeOptionList));
spyOn(stubFormService, 'getRestFieldValuesColumn').and.returnValue(of(fakeOptionList));
row = <DynamicTableRow> {value: {dropdown: 'one'}};
column = <DynamicTableColumn> {
id: 'column-id',
@@ -257,7 +257,7 @@ describe('DropdownEditorComponent', () => {
beforeEach(async(() => {
stubFormService = fixture.debugElement.injector.get(FormService);
spyOn(stubFormService, 'getRestFieldValuesColumnByProcessId').and.returnValue(Observable.of(fakeOptionList));
spyOn(stubFormService, 'getRestFieldValuesColumnByProcessId').and.returnValue(of(fakeOptionList));
row = <DynamicTableRow> {value: {dropdown: 'one'}};
column = <DynamicTableColumn> {
id: 'column-id',

4
lib/core/form/components/widgets/form.scss
View File

@@ -39,7 +39,7 @@
&-invalid {
.mat-input-underline {
.mat-form-field-underline {
background-color: #f44336 !important;
}
@@ -47,7 +47,7 @@
border-color: mat-color($warn);
}
.mat-input-prefix {
.mat-form-field-prefix {
color: mat-color($warn);
}

2
lib/core/form/components/widgets/functional-group/functional-group.widget.spec.ts
View File

@@ -16,7 +16,7 @@
*/
import { ElementRef } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { Observable } from 'rxjs';
import { FormService } from '../../../services/form.service';
import { FormFieldModel } from '../core/form-field.model';
import { FormModel } from '../core/form.model';

2
lib/core/form/components/widgets/people/people.widget.spec.ts
View File

@@ -18,7 +18,7 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { By } from '@angular/platform-browser';
import { UserProcessModel } from '../../../../models';
import { Observable } from 'rxjs/Observable';
import { Observable } from 'rxjs';
import { FormService } from '../../../services/form.service';
import { FormFieldTypes } from '../core/form-field-types';
import { FormFieldModel } from '../core/form-field.model';

5
lib/core/form/components/widgets/people/people.widget.ts
View File

@@ -24,7 +24,7 @@ import { FormService } from '../../../services/form.service';
import { GroupModel } from '../core/group.model';
import { baseHost, WidgetComponent } from './../widget.component';
import { FormControl } from '@angular/forms';
import { Observable } from 'rxjs/Observable';
import { Observable, empty } from 'rxjs';
import {
catchError,
distinctUntilChanged,
@@ -32,7 +32,6 @@ import {
switchMap,
tap
} from 'rxjs/operators';
import 'rxjs/add/observable/empty';
@Component({
selector: 'people-widget',
@@ -62,7 +61,7 @@ export class PeopleWidgetComponent extends WidgetComponent implements OnInit {
}),
distinctUntilChanged(),
switchMap((searchTerm) => {
let userResponse = Observable.empty();
let userResponse: any = empty();
if (typeof searchTerm === 'string') {
userResponse = this.formService.getWorkflowUsers(searchTerm, this.groupId)

8
lib/core/form/components/widgets/radio-buttons/radio-buttons.widget.spec.ts
View File

@@ -16,7 +16,7 @@
*/
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { Observable } from 'rxjs/Observable';
import { Observable, of } from 'rxjs';
import { FormService } from '../../../services/form.service';
import { ContainerModel } from '../core/container.model';
import { FormFieldTypes } from '../core/form-field-types';
@@ -123,7 +123,7 @@ describe('RadioButtonsWidgetComponent', () => {
});
it('should update the field value when an option is selected', () => {
spyOn(widget, 'onFieldChanged').and.returnValue(Observable.of({}));
spyOn(widget, 'onFieldChanged').and.returnValue(of({}));
widget.onOptionClick('fake-opt');
expect(widget.field.value).toEqual('fake-opt');
@@ -153,7 +153,7 @@ describe('RadioButtonsWidgetComponent', () => {
beforeEach(async(() => {
stubFormService = fixture.debugElement.injector.get(FormService);
spyOn(stubFormService, 'getRestFieldValues').and.returnValue(Observable.of(restOption));
spyOn(stubFormService, 'getRestFieldValues').and.returnValue(of(restOption));
radioButtonWidget.field = new FormFieldModel(new FormModel({ taskId: 'task-id' }), {
id: 'radio-id',
name: 'radio-name',
@@ -196,7 +196,7 @@ describe('RadioButtonsWidgetComponent', () => {
restUrl: 'rest-url'
});
stubFormService = fixture.debugElement.injector.get(FormService);
spyOn(stubFormService, 'getRestFieldValuesByProcessId').and.returnValue(Observable.of(restOption));
spyOn(stubFormService, 'getRestFieldValuesByProcessId').and.returnValue(of(restOption));
radioButtonWidget.field.isVisible = true;
fixture.detectChanges();
}));

6
lib/core/form/components/widgets/text/text-mask.component.ts
View File

@@ -24,7 +24,7 @@ import {
HostListener,
Input,
OnChanges,
Renderer,
Renderer2,
SimpleChanges
} from '@angular/core';
import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
@@ -59,7 +59,7 @@ export class InputMaskDirective implements OnChanges, ControlValueAccessor {
private value;
private invalidCharacters = [];
constructor(private el: ElementRef, private render: Renderer) {
constructor(private el: ElementRef, private render: Renderer2) {
}
_onChange = (_: any) => {
@@ -100,7 +100,7 @@ export class InputMaskDirective implements OnChanges, ControlValueAccessor {
if (this.byPassKeys.indexOf(keyCode) === -1) {
let value = this.getMasked(false, actualValue, maskToApply, isMaskReversed);
let calculatedCaret = this.calculateCaretPosition(startCaret, actualValue, keyCode);
this.render.setElementAttribute(this.el.nativeElement, 'value', value);
this.render.setAttribute(this.el.nativeElement, 'value', value);
this.el.nativeElement.value = value;
this.setValue(value);
this._onChange(value);

10
lib/core/form/components/widgets/typeahead/typeahead.widget.spec.ts
View File

@@ -16,7 +16,7 @@
*/
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { Observable } from 'rxjs/Observable';
import { Observable, of, throwError } from 'rxjs';
import { By } from '@angular/platform-browser';
import { FormService } from '../../../services/form.service';
@@ -99,7 +99,7 @@ describe('TypeaheadWidgetComponent', () => {
restUrl: 'whateverURL'
});
const err = 'Error';
spyOn(formService, 'getRestFieldValues').and.returnValue(Observable.throw(err));
spyOn(formService, 'getRestFieldValues').and.returnValue(throwError(err));
spyOn(widget, 'handleError').and.stub();
widget.ngOnInit();
@@ -121,7 +121,7 @@ describe('TypeaheadWidgetComponent', () => {
restUrl: 'whateverURL'
});
const err = 'Error';
spyOn(formService, 'getRestFieldValuesByProcessId').and.returnValue(Observable.throw(err));
spyOn(formService, 'getRestFieldValuesByProcessId').and.returnValue(throwError(err));
spyOn(widget, 'handleError').and.stub();
widget.ngOnInit();
@@ -270,7 +270,7 @@ describe('TypeaheadWidgetComponent', () => {
beforeEach(async(() => {
stubFormService = fixture.debugElement.injector.get(FormService);
spyOn(stubFormService, 'getRestFieldValues').and.returnValue(Observable.of(fakeOptionList));
spyOn(stubFormService, 'getRestFieldValues').and.returnValue(of(fakeOptionList));
typeaheadWidgetComponent.field = new FormFieldModel(new FormModel({ taskId: 'fake-task-id' }), {
id: 'typeahead-id',
name: 'typeahead-name',
@@ -348,7 +348,7 @@ describe('TypeaheadWidgetComponent', () => {
beforeEach(async(() => {
stubFormService = fixture.debugElement.injector.get(FormService);
spyOn(stubFormService, 'getRestFieldValuesByProcessId').and.returnValue(Observable.of(fakeOptionList));
spyOn(stubFormService, 'getRestFieldValuesByProcessId').and.returnValue(of(fakeOptionList));
typeaheadWidgetComponent.field = new FormFieldModel(new FormModel({ processDefinitionId: 'fake-process-id' }), {
id: 'typeahead-id',
name: 'typeahead-name',

35
lib/core/form/components/widgets/upload-folder/upload-folder.widget.ts
View File

@@ -20,12 +20,12 @@
import { LogService } from '../../../../services/log.service';
import { ThumbnailService } from '../../../../services/thumbnail.service';
import { Component, ElementRef, OnInit, ViewChild, ViewEncapsulation } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { Observable, from } from 'rxjs';
import { FormService } from '../../../services/form.service';
import { ProcessContentService } from '../../../services/process-content.service';
import { ContentLinkModel } from '../core/content-link.model';
import { baseHost, WidgetComponent } from './../widget.component';
import 'rxjs/add/operator/mergeMap';
import { mergeMap, map } from 'rxjs/operators';
@Component({
selector: 'upload-folder-widget',
@@ -75,27 +75,32 @@ export class UploadFolderWidgetComponent extends WidgetComponent implements OnIn
}
if (files && files.length > 0) {
Observable.from(files).mergeMap(file => this.uploadRawContent(file)).subscribe((res) => {
filesSaved.push(res);
},
(error) => {
this.logService.error('Error uploading file. See console output for more details.');
},
() => {
this.field.value = filesSaved;
this.field.json.value = filesSaved;
});
from(files)
.pipe(mergeMap(file => this.uploadRawContent(file)))
.subscribe(
(res) => {
filesSaved.push(res);
},
() => {
this.logService.error('Error uploading file. See console output for more details.');
},
() => {
this.field.value = filesSaved;
this.field.json.value = filesSaved;
}
);
this.hasFile = true;
}
}
private uploadRawContent(file): Observable<any> {
return this.processContentService.createTemporaryRawRelatedContent(file)
.map((response: any) => {
return this.processContentService.createTemporaryRawRelatedContent(file).pipe(
map((response: any) => {
this.logService.info(response);
return response;
});
})
);
}
private getMultipleFileParam() {

16
lib/core/form/components/widgets/upload/upload.widget.spec.ts
View File

@@ -18,7 +18,7 @@
import { DebugElement } from '@angular/core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { By } from '@angular/platform-browser';
import { Observable } from 'rxjs/Observable';
import { of } from 'rxjs';
import { FormService } from '../../../services/form.service';
import { ProcessContentService } from '../../../services/process-content.service';
import { FormFieldTypes } from '../core/form-field-types';
@@ -189,7 +189,7 @@ describe('UploadWidgetComponent', () => {
}));
it('should show the list file after upload a new content', async(() => {
spyOn(contentService, 'createTemporaryRawRelatedContent').and.returnValue(Observable.of(fakePngAnswer));
spyOn(contentService, 'createTemporaryRawRelatedContent').and.returnValue(of(fakePngAnswer));
uploadWidgetComponent.field.params.multiple = false;
fixture.detectChanges();
@@ -204,11 +204,11 @@ describe('UploadWidgetComponent', () => {
it('should update the form after deleted a file', async(() => {
spyOn(contentService, 'createTemporaryRawRelatedContent').and.callFake((file) => {
if (file.name === 'file-fake.png') {
return Observable.of(fakePngAnswer);
return of(fakePngAnswer);
}
if (file.name === 'file-fake.jpg') {
return Observable.of(fakeJpgAnswer);
return of(fakeJpgAnswer);
}
});
@@ -232,11 +232,11 @@ describe('UploadWidgetComponent', () => {
it('should set has field value all the files uploaded', async(() => {
spyOn(contentService, 'createTemporaryRawRelatedContent').and.callFake((file) => {
if (file.name === 'file-fake.png') {
return Observable.of(fakePngAnswer);
return of(fakePngAnswer);
}
if (file.name === 'file-fake.jpg') {
return Observable.of(fakeJpgAnswer);
return of(fakeJpgAnswer);
}
});
@@ -380,8 +380,8 @@ describe('UploadWidgetComponent', () => {
}));
it('should emit form content clicked event on icon click', (done) => {
spyOn(contentService, 'getContentPreview').and.returnValue(Observable.of(new Blob()));
spyOn(contentService, 'getFileRawContent').and.returnValue(Observable.of(new Blob()));
spyOn(contentService, 'getContentPreview').and.returnValue(of(new Blob()));
spyOn(contentService, 'getFileRawContent').and.returnValue(of(new Blob()));
formServiceInstance.formContentClicked.subscribe((content: any) => {
expect(content.name).toBe(fakeJpgAnswer.name);

38
lib/core/form/components/widgets/upload/upload.widget.ts
View File

@@ -20,12 +20,12 @@
import { LogService } from '../../../../services/log.service';
import { ThumbnailService } from '../../../../services/thumbnail.service';
import { Component, ElementRef, OnInit, ViewChild, ViewEncapsulation } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { Observable, from } from 'rxjs';
import { FormService } from '../../../services/form.service';
import { ProcessContentService } from '../../../services/process-content.service';
import { ContentLinkModel } from '../core/content-link.model';
import { baseHost, WidgetComponent } from './../widget.component';
import 'rxjs/add/operator/mergeMap';
import { mergeMap, map } from 'rxjs/operators';
@Component({
selector: 'upload-widget',
@@ -75,27 +75,29 @@ export class UploadWidgetComponent extends WidgetComponent implements OnInit {
}
if (files && files.length > 0) {
Observable.from(files).mergeMap(file => this.uploadRawContent(file)).subscribe((res) => {
filesSaved.push(res);
},
(error) => {
this.logService.error('Error uploading file. See console output for more details.');
},
() => {
this.field.value = filesSaved;
this.field.json.value = filesSaved;
this.hasFile = true;
});
from(files)
.pipe(mergeMap(file => this.uploadRawContent(file)))
.subscribe(
(res) => filesSaved.push(res),
() => this.logService.error('Error uploading file. See console output for more details.'),
() => {
this.field.value = filesSaved;
this.field.json.value = filesSaved;
this.hasFile = true;
}
);
}
}
private uploadRawContent(file): Observable<any> {
return this.processContentService.createTemporaryRawRelatedContent(file)
.map((response: any) => {
this.logService.info(response);
response.contentBlob = file;
return response;
});
.pipe(
map((response: any) => {
this.logService.info(response);
response.contentBlob = file;
return response;
})
);
}
getMultipleFileParam() {

2
lib/core/form/components/widgets/widget.component.ts
View File

@@ -121,7 +121,7 @@ export class WidgetComponent implements AfterViewInit {
return null;
}
protected event(event: Event): void {
event(event: Event): void {
this.formService.formEvents.next(event);
}
}

4
lib/core/form/form.module.ts
View File

@@ -18,11 +18,11 @@
import { CommonModule } from '@angular/common';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { NgModule } from '@angular/core';
import { HttpModule } from '@angular/http';
import { TranslateModule } from '@ngx-translate/core';
import { DataTableModule } from '../datatable/datatable.module';
import { DataColumnModule } from '../data-column/data-column.module';
import { PipeModule } from '../pipes/pipe.module';
import { HttpClientModule } from '@angular/common/http';
import { MaterialModule } from '../material.module';
@@ -50,7 +50,7 @@ import { MatDatetimepickerModule, MatNativeDatetimeModule } from '@mat-datetimep
imports: [
CommonModule,
DataTableModule,
HttpModule,
HttpClientModule,
MaterialModule,
TranslateModule,
FormsModule,

41
lib/core/form/services/activiti-alfresco.service.ts
View File

@@ -19,10 +19,10 @@ import { AlfrescoApiService } from '../../services/alfresco-api.service';
import { LogService } from '../../services/log.service';
import { Injectable } from '@angular/core';
import { AlfrescoApi, MinimalNodeEntryEntity, RelatedContentRepresentation } from 'alfresco-js-api';
import { Observable } from 'rxjs/Observable';
import { Observable, from, throwError } from 'rxjs';
import { ExternalContent } from '../components/widgets/core/external-content';
import { ExternalContentLink } from '../components/widgets/core/external-content-link';
import 'rxjs/add/observable/throw';
import { map, catchError } from 'rxjs/operators';
@Injectable()
export class ActivitiContentService {
@@ -43,9 +43,11 @@ export class ActivitiContentService {
getAlfrescoNodes(accountId: string, folderId: string): Observable<[ExternalContent]> {
let apiService: AlfrescoApi = this.apiService.getInstance();
let accountShortId = accountId.replace('alfresco-', '');
return Observable.fromPromise(apiService.activiti.alfrescoApi.getContentInFolder(accountShortId, folderId))
.map(this.toJsonArray)
.catch(err => this.handleError(err));
return from(apiService.activiti.alfrescoApi.getContentInFolder(accountShortId, folderId))
.pipe(
map(this.toJsonArray),
catchError(err => this.handleError(err))
);
}
/**
@@ -60,9 +62,11 @@ export class ActivitiContentService {
tenantId: tenantId,
includeAccounts: includeAccount
};
return Observable.fromPromise(apiService.activiti.alfrescoApi.getRepositories(opts))
.map(this.toJsonArray)
.catch(err => this.handleError(err));
return from(apiService.activiti.alfrescoApi.getRepositories(opts))
.pipe(
map(this.toJsonArray),
catchError(err => this.handleError(err))
);
}
/**
@@ -73,14 +77,18 @@ export class ActivitiContentService {
* @param siteId
*/
linkAlfrescoNode(accountId: string, node: ExternalContent, siteId: string): Observable<ExternalContentLink> {
let apiService: AlfrescoApi = this.apiService.getInstance();
return Observable.fromPromise(apiService.activiti.contentApi.createTemporaryRelatedContent({
const apiService: AlfrescoApi = this.apiService.getInstance();
return from(apiService.activiti.contentApi.createTemporaryRelatedContent({
link: true,
name: node.title,
simpleType: node.simpleType,
source: accountId,
sourceId: node.id + '@' + siteId
})).map(this.toJson).catch(err => this.handleError(err));
}))
.pipe(
map(this.toJson),
catchError(err => this.handleError(err))
);
}
applyAlfrescoNode(node: MinimalNodeEntryEntity, siteId: string, accountId: string) {
@@ -93,10 +101,11 @@ export class ActivitiContentService {
name: node.name,
link: false
};
return Observable.fromPromise(
apiService.activiti.contentApi.createTemporaryRelatedContent(params))
.map(this.toJson)
.catch(err => this.handleError(err));
return from(apiService.activiti.contentApi.createTemporaryRelatedContent(params))
.pipe(
map(this.toJson),
catchError(err => this.handleError(err))
);
}
private getSiteNameFromNodePath(node: MinimalNodeEntryEntity): string {
@@ -132,6 +141,6 @@ export class ActivitiContentService {
error.status ? `${error.status} - ${error.statusText}` : ActivitiContentService.GENERIC_ERROR_MESSAGE;
}
this.logService.error(errMsg);
return Observable.throw(errMsg);
return throwError(errMsg);
}
}

2
lib/core/form/services/ecm-model.service.spec.ts
View File

@@ -15,7 +15,7 @@
* limitations under the License.
*/
import { Observable } from 'rxjs/Observable';
import { Observable } from 'rxjs';
import { FormModel } from './../components/widgets/core/form.model';
import { EcmModelService } from './ecm-model.service';
import { setupTestBed } from '../../testing/setupTestBed';

60
lib/core/form/services/ecm-model.service.ts
View File

@@ -18,9 +18,9 @@
import { LogService } from '../../services/log.service';
import { AlfrescoApiService } from '../../services/alfresco-api.service';
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { Observable, from } from 'rxjs';
import { FormModel } from '../components/widgets/core/form.model';
import 'rxjs/add/observable/fromPromise';
import { map, catchError } from 'rxjs/operators';
@Injectable()
export class EcmModelService {
@@ -56,9 +56,9 @@ export class EcmModelService {
}
searchActivitiEcmModel() {
return this.getEcmModels().map(function (ecmModels: any) {
return this.getEcmModels().pipe(map(function (ecmModels: any) {
return ecmModels.list.entries.find(model => model.entry.name === EcmModelService.MODEL_NAME);
});
}));
}
createActivitiEcmModel(formName: string, form: FormModel): Observable<any> {
@@ -120,41 +120,51 @@ export class EcmModelService {
}
public searchEcmType(typeName: string, modelName: string): Observable<any> {
return this.getEcmType(modelName).map(function (customTypes: any) {
return this.getEcmType(modelName).pipe(map(function (customTypes: any) {
return customTypes.list.entries.find(type => type.entry.prefixedName === typeName || type.entry.title === typeName);
});
}));
}
public activeEcmModel(modelName: string): Observable<any> {
return Observable.fromPromise(this.apiService.getInstance().core.customModelApi.activateCustomModel(modelName))
.map(this.toJson)
.catch(err => this.handleError(err));
return from(this.apiService.getInstance().core.customModelApi.activateCustomModel(modelName))
.pipe(
map(this.toJson),
catchError(err => this.handleError(err))
);
}
public createEcmModel(modelName: string, nameSpace: string): Observable<any> {
return Observable.fromPromise(this.apiService.getInstance().core.customModelApi.createCustomModel('DRAFT', '', modelName, modelName, nameSpace))
.map(this.toJson)
.catch(err => this.handleError(err));
return from(this.apiService.getInstance().core.customModelApi.createCustomModel('DRAFT', '', modelName, modelName, nameSpace))
.pipe(
map(this.toJson),
catchError(err => this.handleError(err))
);
}
public getEcmModels(): Observable<any> {
return Observable.fromPromise(this.apiService.getInstance().core.customModelApi.getAllCustomModel())
.map(this.toJson)
.catch(err => this.handleError(err));
return from(this.apiService.getInstance().core.customModelApi.getAllCustomModel())
.pipe(
map(this.toJson),
catchError(err => this.handleError(err))
);
}
public getEcmType(modelName: string): Observable<any> {
return Observable.fromPromise(this.apiService.getInstance().core.customModelApi.getAllCustomType(modelName))
.map(this.toJson)
.catch(err => this.handleError(err));
return from(this.apiService.getInstance().core.customModelApi.getAllCustomType(modelName))
.pipe(
map(this.toJson),
catchError(err => this.handleError(err))
);
}
public createEcmType(typeName: string, modelName: string, parentType: string): Observable<any> {
let name = this.cleanNameType(typeName);
return Observable.fromPromise(this.apiService.getInstance().core.customModelApi.createCustomType(modelName, name, parentType, typeName, ''))
.map(this.toJson)
.catch(err => this.handleError(err));
return from(this.apiService.getInstance().core.customModelApi.createCustomType(modelName, name, parentType, typeName, ''))
.pipe(
map(this.toJson),
catchError(err => this.handleError(err))
);
}
public addPropertyToAType(modelName: string, typeName: string, formFields: any) {
@@ -177,9 +187,11 @@ export class EcmModelService {
}
}
return Observable.fromPromise(this.apiService.getInstance().core.customModelApi.addPropertyToType(modelName, name, properties))
.map(this.toJson)
.catch(err => this.handleError(err));
return from(this.apiService.getInstance().core.customModelApi.addPropertyToType(modelName, name, properties))
.pipe(
map(this.toJson),
catchError(err => this.handleError(err))
);
}

176
lib/core/form/services/form.service.ts
View File

@@ -19,8 +19,7 @@ import { AlfrescoApiService } from '../../services/alfresco-api.service';
import { LogService } from '../../services/log.service';
import { UserProcessModel } from '../../models';
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { Subject } from 'rxjs/Subject';
import { Observable, Subject, from, of, throwError } from 'rxjs';
import { FormDefinitionModel } from '../models/form-definition.model';
import { ContentLinkModel } from './../components/widgets/core/content-link.model';
import { GroupModel } from './../components/widgets/core/group.model';
@@ -30,10 +29,7 @@ import {
ValidateDynamicTableRowEvent, ValidateFormEvent, ValidateFormFieldEvent
} from './../events/index';
import { EcmModelService } from './ecm-model.service';
import 'rxjs/add/observable/fromPromise';
import 'rxjs/add/operator/defaultIfEmpty';
import 'rxjs/add/operator/catch';
import 'rxjs/add/observable/throw';
import { map, catchError, switchMap, combineAll, defaultIfEmpty } from 'rxjs/operators';
@Injectable()
export class FormService {
@@ -150,7 +146,7 @@ export class FormService {
stencilSet: 0
};
return Observable.fromPromise(
return from(
this.modelsApi.createModel(dataModel)
);
}
@@ -162,7 +158,7 @@ export class FormService {
* @returns Data for the saved form
*/
saveForm(formId: string, formModel: FormDefinitionModel): Observable<any> {
return Observable.fromPromise(
return from(
this.editorApi.saveForm(formId, formModel)
);
}
@@ -175,7 +171,7 @@ export class FormService {
*/
addFieldsToAForm(formId: string, formModel: FormDefinitionModel): Observable<any> {
this.logService.log('addFieldsToAForm is deprecated in 1.7.0, use saveForm API instead');
return Observable.fromPromise(
return from(
this.editorApi.saveForm(formId, formModel)
);
}
@@ -190,13 +186,15 @@ export class FormService {
'modelType': 2
};
return Observable.fromPromise(
return from(
this.modelsApi.getModels(opts)
)
.map(function (forms: any) {
.pipe(
map(function (forms: any) {
return forms.data.find(formdata => formdata.name === name);
})
.catch(err => this.handleError(err));
}),
catchError(err => this.handleError(err))
);
}
/**
@@ -208,9 +206,11 @@ export class FormService {
'modelType': 2
};
return Observable.fromPromise(this.modelsApi.getModels(opts))
.map(this.toJsonArray)
.catch(err => this.handleError(err));
return from(this.modelsApi.getModels(opts))
.pipe(
map(this.toJsonArray),
catchError(err => this.handleError(err))
);
}
/**
@@ -218,9 +218,11 @@ export class FormService {
* @returns List of process definitions
*/
getProcessDefinitions(): Observable<any> {
return Observable.fromPromise(this.processApi.getProcessDefinitions({}))
.map(this.toJsonArray)
.catch(err => this.handleError(err));
return from(this.processApi.getProcessDefinitions({}))
.pipe(
map(this.toJsonArray),
catchError(err => this.handleError(err))
);
}
/**
@@ -229,9 +231,11 @@ export class FormService {
* @returns List of instance variable information
*/
getProcessVarablesById(processInstanceId: string): Observable<any[]> {
return Observable.fromPromise(this.processInstanceVariablesApi.getProcessInstanceVariables(processInstanceId))
.map(this.toJson)
.catch(err => this.handleError(err));
return from(this.processInstanceVariablesApi.getProcessInstanceVariables(processInstanceId))
.pipe(
map(this.toJson),
catchError(err => this.handleError(err))
);
}
/**
@@ -239,9 +243,11 @@ export class FormService {
* @returns List of tasks
*/
getTasks(): Observable<any> {
return Observable.fromPromise(this.taskApi.listTasks({}))
.map(this.toJsonArray)
.catch(err => this.handleError(err));
return from(this.taskApi.listTasks({}))
.pipe(
map(this.toJsonArray),
catchError(err => this.handleError(err))
);
}
/**
@@ -250,9 +256,11 @@ export class FormService {
* @returns Task info
*/
getTask(taskId: string): Observable<any> {
return Observable.fromPromise(this.taskApi.getTask(taskId))
.map(this.toJson)
.catch(err => this.handleError(err));
return from(this.taskApi.getTask(taskId))
.pipe(
map(this.toJson),
catchError(err => this.handleError(err))
);
}
/**
@@ -264,8 +272,10 @@ export class FormService {
saveTaskForm(taskId: string, formValues: FormValues): Observable<any> {
let body = JSON.stringify({values: formValues});
return Observable.fromPromise(this.taskApi.saveTaskForm(taskId, body))
.catch(err => this.handleError(err));
return from(this.taskApi.saveTaskForm(taskId, body))
.pipe(
catchError(err => this.handleError(err))
);
}
/**
@@ -282,8 +292,10 @@ export class FormService {
}
let body = JSON.stringify(data);
return Observable.fromPromise(this.taskApi.completeTaskForm(taskId, body))
.catch(err => this.handleError(err));
return from(this.taskApi.completeTaskForm(taskId, body))
.pipe(
catchError(err => this.handleError(err))
);
}
/**
@@ -292,9 +304,11 @@ export class FormService {
* @returns Form definition
*/
getTaskForm(taskId: string): Observable<any> {
return Observable.fromPromise(this.taskApi.getTaskForm(taskId))
.map(this.toJson)
.catch(err => this.handleError(err));
return from(this.taskApi.getTaskForm(taskId))
.pipe(
map(this.toJson),
catchError(err => this.handleError(err))
);
}
/**
@@ -303,9 +317,11 @@ export class FormService {
* @returns Form definition
*/
getFormDefinitionById(formId: string): Observable<any> {
return Observable.fromPromise(this.editorApi.getForm(formId))
.map(this.toJson)
.catch(err => this.handleError(err));
return from(this.editorApi.getForm(formId))
.pipe(
map(this.toJson),
catchError(err => this.handleError(err))
);
}
/**
@@ -320,9 +336,11 @@ export class FormService {
'modelType': 2
};
return Observable.fromPromise(this.modelsApi.getModels(opts))
.map(this.getFormId)
.catch(err => this.handleError(err));
return from(this.modelsApi.getModels(opts))
.pipe(
map(this.getFormId),
catchError(err => this.handleError(err))
);
}
/**
@@ -331,10 +349,11 @@ export class FormService {
* @returns Form definition
*/
getStartFormInstance(processId: string): Observable<any> {
return Observable.fromPromise(
this.processApi.getProcessInstanceStartForm(processId))
.map(this.toJson)
.catch(err => this.handleError(err));
return from(this.processApi.getProcessInstanceStartForm(processId))
.pipe(
map(this.toJson),
catchError(err => this.handleError(err))
);
}
/**
@@ -343,9 +362,11 @@ export class FormService {
* @returns Process instance
*/
getProcessIntance(processId: string): Observable<any> {
return Observable.fromPromise(this.processApi.getProcessInstance(processId))
.map(this.toJson)
.catch(err => this.handleError(err));
return from(this.processApi.getProcessInstance(processId))
.pipe(
map(this.toJson),
catchError(err => this.handleError(err))
);
}
/**
@@ -354,10 +375,11 @@ export class FormService {
* @returns Form definition
*/
getStartFormDefinition(processId: string): Observable<any> {
return Observable.fromPromise(
this.processApi.getProcessDefinitionStartForm(processId))
.map(this.toJson)
.catch(err => this.handleError(err));
return from(this.processApi.getProcessDefinitionStartForm(processId))
.pipe(
map(this.toJson),
catchError(err => this.handleError(err))
);
}
/**
@@ -367,7 +389,10 @@ export class FormService {
* @returns Field values
*/
getRestFieldValues(taskId: string, field: string): Observable<any> {
return Observable.fromPromise(this.taskApi.getRestFieldValues(taskId, field)).catch(err => this.handleError(err));
return from(this.taskApi.getRestFieldValues(taskId, field))
.pipe(
catchError(err => this.handleError(err))
);
}
/**
@@ -377,7 +402,10 @@ export class FormService {
* @returns Field values
*/
getRestFieldValuesByProcessId(processDefinitionId: string, field: string): Observable<any> {
return Observable.fromPromise(this.processApi.getRestFieldValues(processDefinitionId, field)).catch(err => this.handleError(err));
return from(this.processApi.getRestFieldValues(processDefinitionId, field))
.pipe(
catchError(err => this.handleError(err))
);
}
/**
@@ -388,7 +416,10 @@ export class FormService {
* @returns Field values
*/
getRestFieldValuesColumnByProcessId(processDefinitionId: string, field: string, column?: string): Observable<any> {
return Observable.fromPromise(this.processApi.getRestTableFieldValues(processDefinitionId, field, column)).catch(err => this.handleError(err));
return from(this.processApi.getRestTableFieldValues(processDefinitionId, field, column))
.pipe(
catchError(err => this.handleError(err))
);
}
/**
@@ -399,7 +430,10 @@ export class FormService {
* @returns Field values
*/
getRestFieldValuesColumn(taskId: string, field: string, column?: string): Observable<any> {
return Observable.fromPromise(this.taskApi.getRestFieldValuesColumn(taskId, field, column)).catch(err => this.handleError(err));
return from(this.taskApi.getRestFieldValuesColumn(taskId, field, column))
.pipe(
catchError(err => this.handleError(err))
);
}
/**
@@ -422,15 +456,17 @@ export class FormService {
if (groupId) {
option.groupId = groupId;
}
return Observable.fromPromise(this.usersWorkflowApi.getUsers(option))
.switchMap((response: any) => <UserProcessModel[]> response.data || [])
.map((user: any) => {
user.userImage = this.getUserProfileImageApi(user.id);
return Observable.of(user);
})
.combineAll()
.defaultIfEmpty([])
.catch(err => this.handleError(err));
return from(this.usersWorkflowApi.getUsers(option))
.pipe(
switchMap((response: any) => <UserProcessModel[]> response.data || []),
map((user: any) => {
user.userImage = this.getUserProfileImageApi(user.id);
return of(user);
}),
combineAll(),
defaultIfEmpty([]),
catchError(err => this.handleError(err))
);
}
/**
@@ -444,9 +480,11 @@ export class FormService {
if (groupId) {
option.groupId = groupId;
}
return Observable.fromPromise(this.groupsApi.getGroups(option))
.map((response: any) => <GroupModel[]> response.data || [])
.catch(err => this.handleError(err));
return from(this.groupsApi.getGroups(option))
.pipe(
map((response: any) => <GroupModel[]> response.data || []),
catchError(err => this.handleError(err))
);
}
/**
@@ -500,6 +538,6 @@ export class FormService {
error.status ? `${error.status} - ${error.statusText}` : FormService.GENERIC_ERROR_MESSAGE;
}
this.logService.error(errMsg);
return Observable.throw(errMsg);
return throwError(errMsg);
}
}

8
lib/core/form/services/node.service.ts
View File

@@ -17,8 +17,9 @@
import { AlfrescoApiService } from '../../services/alfresco-api.service';
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { Observable, from } from 'rxjs';
import { NodeMetadata } from '../models/node-metadata.model';
import { map } from 'rxjs/operators';
@Injectable()
export class NodeService {
@@ -31,7 +32,8 @@ export class NodeService {
* @param nodeId Node Id
*/
public getNodeMetadata(nodeId: string): Observable<NodeMetadata> {
return Observable.fromPromise(this.apiService.getInstance().nodes.getNodeInfo(nodeId)).map(this.cleanMetadataFromSemicolon);
return from(this.apiService.getInstance().nodes.getNodeInfo(nodeId))
.pipe(map(this.cleanMetadataFromSemicolon));
}
/**
@@ -69,7 +71,7 @@ export class NodeService {
// TODO: requires update to alfresco-js-api typings
let apiService: any = this.apiService.getInstance();
return Observable.fromPromise(apiService.nodes.addNode('-root-', body, {}));
return from(apiService.nodes.addNode('-root-', body, {}));
}
private generateUuid() {

4
lib/core/form/services/process-content.service.spec.ts
View File

@@ -16,7 +16,7 @@
*/
import { TestBed } from '@angular/core/testing';
import { Observable } from 'rxjs/Observable';
import { of } from 'rxjs';
import { ProcessContentService } from './process-content.service';
import { setupTestBed } from '../../testing/setupTestBed';
import { CoreModule } from '../../core.module';
@@ -188,7 +188,7 @@ describe('ProcessContentService', () => {
it('should return a Blob as thumbnail', (done) => {
let contentId: number = 999;
let blob = createFakeBlob();
spyOn(service, 'getContentThumbnail').and.returnValue(Observable.of(blob));
spyOn(service, 'getContentThumbnail').and.returnValue(of(blob));
service.getContentThumbnail(contentId).subscribe(result => {
expect(result).toEqual(jasmine.any(Blob));
expect(result.size).toEqual(48);

40
lib/core/form/services/process-content.service.ts
View File

@@ -19,10 +19,8 @@ import { AlfrescoApiService } from '../../services/alfresco-api.service';
import { LogService } from '../../services/log.service';
import { Injectable } from '@angular/core';
import { RelatedContentRepresentation } from 'alfresco-js-api';
import { Observable } from 'rxjs/Observable';
import 'rxjs/add/observable/fromPromise';
import 'rxjs/add/operator/catch';
import 'rxjs/add/observable/throw';
import { Observable, from, throwError } from 'rxjs';
import { catchError } from 'rxjs/operators';
@Injectable()
export class ProcessContentService {
@@ -44,7 +42,8 @@ export class ProcessContentService {
* @returns The created content data
*/
createTemporaryRawRelatedContent(file: any): Observable<RelatedContentRepresentation> {
return Observable.fromPromise(this.contentApi.createTemporaryRawRelatedContent(file)).catch(err => this.handleError(err));
return from(this.contentApi.createTemporaryRawRelatedContent(file))
.pipe(catchError(err => this.handleError(err)));
}
/**
@@ -53,7 +52,8 @@ export class ProcessContentService {
* @returns Metadata for the content
*/
getFileContent(contentId: number): Observable<RelatedContentRepresentation> {
return Observable.fromPromise(this.contentApi.getContent(contentId)).catch(err => this.handleError(err));
return from(this.contentApi.getContent(contentId))
.pipe(catchError(err => this.handleError(err)));
}
/**
@@ -62,7 +62,8 @@ export class ProcessContentService {
* @returns Binary data of the related content
*/
getFileRawContent(contentId: number): Observable<Blob> {
return Observable.fromPromise(this.contentApi.getRawContent(contentId)).catch(err => this.handleError(err));
return from(this.contentApi.getRawContent(contentId))
.pipe(catchError(err => this.handleError(err)));
}
/**
@@ -108,7 +109,8 @@ export class ProcessContentService {
* @returns Binary data of the thumbnail image
*/
getContentThumbnail(contentId: number): Observable<Blob> {
return Observable.fromPromise(this.contentApi.getContentThumbnail(contentId)).catch(err => this.handleError(err));
return from(this.contentApi.getContentThumbnail(contentId))
.pipe(catchError(err => this.handleError(err)));
}
/**
@@ -117,8 +119,8 @@ export class ProcessContentService {
* @returns Metadata for the content
*/
getTaskRelatedContent(taskId: string): Observable<any> {
return Observable.fromPromise(this.contentApi.getRelatedContentForTask(taskId))
.catch(err => this.handleError(err));
return from(this.contentApi.getRelatedContentForTask(taskId))
.pipe(catchError(err => this.handleError(err)));
}
/**
@@ -127,8 +129,8 @@ export class ProcessContentService {
* @returns Metadata for the content
*/
getProcessRelatedContent(processId: string): Observable<any> {
return Observable.fromPromise(this.contentApi.getRelatedContentForProcessInstance(processId))
.catch(err => this.handleError(err));
return from(this.contentApi.getRelatedContentForProcessInstance(processId))
.pipe(catchError(err => this.handleError(err)));
}
/**
@@ -137,8 +139,8 @@ export class ProcessContentService {
* @returns Null response that notifies when the deletion is complete
*/
deleteRelatedContent(contentId: number): Observable<any> {
return Observable.fromPromise(this.contentApi.deleteContent(contentId))
.catch(err => this.handleError(err));
return from(this.contentApi.deleteContent(contentId))
.pipe(catchError(err => this.handleError(err)));
}
/**
@@ -149,8 +151,8 @@ export class ProcessContentService {
* @returns Details of created content
*/
createProcessRelatedContent(processInstanceId: string, content: any, opts?: any): Observable<any> {
return Observable.fromPromise(this.contentApi.createRelatedContentOnProcessInstance(processInstanceId, content, opts))
.catch(err => this.handleError(err));
return from(this.contentApi.createRelatedContentOnProcessInstance(processInstanceId, content, opts))
.pipe(catchError(err => this.handleError(err)));
}
/**
@@ -161,8 +163,8 @@ export class ProcessContentService {
* @returns Details of created content
*/
createTaskRelatedContent(taskId: string, file: any, opts?: any) {
return Observable.fromPromise(this.contentApi.createRelatedContentOnTask(taskId, file, opts))
.catch(err => this.handleError(err));
return from(this.contentApi.createRelatedContentOnTask(taskId, file, opts))
.pipe(catchError(err => this.handleError(err)));
}
/**
@@ -201,7 +203,7 @@ export class ProcessContentService {
error.status ? `${error.status} - ${error.statusText}` : ProcessContentService.GENERIC_ERROR_MESSAGE;
}
this.logService.error(errMsg);
return Observable.throw(errMsg);
return throwError(errMsg);
}
}

22
lib/core/form/services/widget-visibility.service.ts
View File

@@ -19,11 +19,11 @@ import { AlfrescoApiService } from '../../services/alfresco-api.service';
import { LogService } from '../../services/log.service';
import { Injectable } from '@angular/core';
import moment from 'moment-es6';
import { Observable } from 'rxjs/Observable';
import { Observable, from, throwError } from 'rxjs';
import { FormFieldModel, FormModel, TabModel } from '../components/widgets/core/index';
import { TaskProcessVariableModel } from '../models/task-process-variable.model';
import { WidgetVisibilityModel } from '../models/widget-visibility.model';
import 'rxjs/add/observable/throw';
import { map, catchError } from 'rxjs/operators';
@Injectable()
export class WidgetVisibilityService {
@@ -244,13 +244,15 @@ export class WidgetVisibilityService {
}
getTaskProcessVariable(taskId: string): Observable<TaskProcessVariableModel[]> {
return Observable.fromPromise(this.apiService.getInstance().activiti.taskFormsApi.getTaskFormVariables(taskId))
.map(res => {
let jsonRes = this.toJson(res);
this.processVarList = <TaskProcessVariableModel[]> jsonRes;
return jsonRes;
})
.catch(err => this.handleError(err));
return from(this.apiService.getInstance().activiti.taskFormsApi.getTaskFormVariables(taskId))
.pipe(
map(res => {
let jsonRes = this.toJson(res);
this.processVarList = <TaskProcessVariableModel[]> jsonRes;
return jsonRes;
}),
catchError(err => this.handleError(err))
);
}
toJson(res: any) {
@@ -259,6 +261,6 @@ export class WidgetVisibilityService {
private handleError(err) {
this.logService.error('Error while performing a call');
return Observable.throw('Error while performing a call - Server error');
return throwError('Error while performing a call - Server error');
}
}

4
lib/core/info-drawer/info-drawer.component.spec.ts
View File

@@ -115,7 +115,7 @@ describe('Custom InfoDrawer', () => {
fixture.detectChanges();
let tab: any = fixture.debugElement.queryAll(By.css('.mat-tab-label-active'));
expect(tab.length).toBe(1);
expect(tab[0].nativeElement.innerText).toBe('Tab1');
expect(tab[0].nativeElement.innerText).toContain('Tab1');
});
it('should select the tab 2 (index 1)', () => {
@@ -123,7 +123,7 @@ describe('Custom InfoDrawer', () => {
fixture.detectChanges();
let tab: any = fixture.debugElement.queryAll(By.css('.mat-tab-label-active'));
expect(tab.length).toBe(1);
expect(tab[0].nativeElement.innerText).toBe('Tab2');
expect(tab[0].nativeElement.innerText).toContain('Tab2');
});
it('should render a tab with icon', () => {

2
lib/core/interface/authentication.interface.ts
View File

@@ -15,7 +15,7 @@
* limitations under the License.
*/
import { Observable } from 'rxjs/Observable';
import { Observable } from 'rxjs';
export interface AbstractAuthentication {
TYPE: string;

28
lib/core/karma-test-shim.js
View File

@@ -1,28 +0,0 @@
Error.stackTraceLimit = Infinity;
require('../../node_modules/core-js/es6');
require('../../node_modules/core-js/es7/reflect');
require('../../node_modules/zone.js/dist/zone');
require('../../node_modules/zone.js/dist/long-stack-trace-zone');
require('../../node_modules/zone.js/dist/proxy');
require('../../node_modules/zone.js/dist/sync-test');
require('../../node_modules/zone.js/dist/jasmine-patch');
require('../../node_modules/zone.js/dist/async-test');
require('../../node_modules/zone.js/dist/fake-async-test');
const pdfjsLib = require('pdfjs-dist');
pdfjsLib.PDFJS.workerSrc = 'base/node_modules/pdfjs-dist/build/pdf.worker.js';
jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;
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()
);

109
lib/core/karma.conf.js Normal file
View File

@@ -0,0 +1,109 @@
// 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, served: true},
{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: 'lib/core/i18n/**/en.json', included: false, served: true, watched: false},
{pattern: 'lib/core/./**/*.ts', included: false, served: true, watched: false},
{pattern: 'lib/core//app.config.json', included: false, served: true, watched: false},
{pattern: 'lib/core//viewer/assets/fake-test-file.pdf', included: false, served: true, watched: false},
{pattern: 'lib/core/viewer/assets/fake-test-file.txt', included: false, served: true, watched: false},
{
pattern: 'lib/core//viewer/assets/fake-test-password-file.pdf',
included: false,
served: true,
watched: false
}
],
frameworks: ['jasmine-ajax', 'jasmine', '@angular-devkit/build-angular'],
proxies: {
'pdf.worker.js' :'/base/node_modules/pdfjs-dist/build/pdf.worker.js',
'/fake-url-file.png' :'/base/lib/core/assets/images/logo.png',
'/assets/images/ft_ic_pdf.svg' :'/base/lib/core/assets/images/ft_ic_pdf.svg',
'/assets/images/ft_ic_document.svg' :'/base/lib/core/assets/images/ft_ic_document.svg',
'/assets/images/ft_ic_miscellaneous.svg' :'/base/lib/core/assets/images/ft_ic_miscellaneous.svg',
'/assets/images/ft_ic_raster_image.svg' :'/base/lib/core/assets/images/ft_ic_raster_image.svg',
'/content.bin': '/base/lib/core/viewer/assets/fake-test-file.pdf',
'/base/assets/' :'/base/lib/core/assets/',
'/app.config.json': '/base/lib/core/app.config.json',
'/fake-test-file.pdf': '/base/lib/core/viewer/assets/fake-test-file.pdf',
'/fake-test-file.txt': '/base/lib/core/viewer/assets/fake-test-file.txt',
'/fake-test-password-file.pdf': '/base/lib/core/viewer/assets/fake-test-password-file.pdf'
},
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/core/',
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
});
};

5
lib/core/layout/components/sidebar-action/sidebar-action-menu.component.scss
View File

@@ -59,7 +59,8 @@
&-sidebar-action-menu-panel {
margin-top: 7.5px;
border-radius: 2px;
box-shadow: #{map-get($_umbra-elevation-map, 2)}, #{map-get($_penumbra-elevation-map, 2)},#{map-get($_ambient-elevation-map, 2)};
@include mat-elevation(2);
}
}
}
}

2
lib/core/layout/components/sidebar-action/sidebar-action-menu.component.spec.ts
View File

@@ -132,7 +132,7 @@ describe('Custom SidebarActionMenuComponent', () => {
expect(actionButton).not.toBeNull();
expect(actionButton).toBeDefined();
expect(options).toBeDefined();
expect(actionButton.innerText.trim()).toBe('Fake title arrow_drop_down');
expect(actionButton.innerText.trim()).toBe('Fake titlearrow_drop_down');
});
});

3
lib/core/layout/components/sidenav-layout/sidenav-layout.component.ts
View File

@@ -20,8 +20,7 @@ import { MediaMatcher } from '@angular/cdk/layout';
import { SidenavLayoutContentDirective } from '../../directives/sidenav-layout-content.directive';
import { SidenavLayoutHeaderDirective } from '../../directives/sidenav-layout-header.directive';
import { SidenavLayoutNavigationDirective } from '../../directives/sidenav-layout-navigation.directive';
import { BehaviorSubject } from 'rxjs/BehaviorSubject';
import { Observable } from 'rxjs/Observable';
import { BehaviorSubject, Observable } from 'rxjs';
@Component({
selector: 'adf-sidenav-layout',

2
lib/core/login/components/login.component.scss
View File

@@ -226,7 +226,7 @@
color: $text-color-primary;
}
.adf-login__field .mat-input-wrapper {
.adf-login__field .mat-form-field-wrapper {
margin: 1em 0 0 0;
font-size: 16px;
}

20
lib/core/login/components/login.component.spec.ts
View File

@@ -25,7 +25,7 @@ import { AuthenticationService } from '../../services/authentication.service';
import { LoginErrorEvent } from '../models/login-error.event';
import { LoginSuccessEvent } from '../models/login-success.event';
import { LoginComponent } from './login.component';
import { Observable } from 'rxjs/Observable';
import { of, throwError } from 'rxjs';
import { OauthConfigModel } from '../../models/oauth-config.model';
import { AlfrescoApiService } from '../../services/alfresco-api.service';
@@ -107,7 +107,7 @@ describe('LoginComponent', () => {
});
it('should redirect to route on successful login', () => {
spyOn(authService, 'login').and.returnValue(Observable.of({ type: 'type', ticket: 'ticket' }));
spyOn(authService, 'login').and.returnValue(of({ type: 'type', ticket: 'ticket' }));
const redirect = '/home';
component.successRoute = redirect;
spyOn(router, 'navigate');
@@ -116,7 +116,7 @@ describe('LoginComponent', () => {
});
it('should redirect to previous route state on successful login', () => {
spyOn(authService, 'login').and.returnValue(Observable.of({ type: 'type', ticket: 'ticket' }));
spyOn(authService, 'login').and.returnValue(of({ type: 'type', ticket: 'ticket' }));
const redirect = '/home';
component.successRoute = redirect;
authService.setRedirect({ provider: 'ECM', url: 'some-route' });
@@ -160,14 +160,14 @@ describe('LoginComponent', () => {
});
it('should be changed back to the default after a failed login attempt', () => {
spyOn(authService, 'login').and.returnValue(Observable.throw('Fake server error'));
spyOn(authService, 'login').and.returnValue(throwError('Fake server error'));
loginWithCredentials('fake-wrong-username', 'fake-wrong-password');
expect(getLoginButtonText()).toEqual('LOGIN.BUTTON.LOGIN');
});
it('should be changed to the "welcome key" after a successful login attempt', () => {
spyOn(authService, 'login').and.returnValue(Observable.of({ type: 'type', ticket: 'ticket' }));
spyOn(authService, 'login').and.returnValue(of({ type: 'type', ticket: 'ticket' }));
loginWithCredentials('fake-username', 'fake-password');
expect(getLoginButtonText()).toEqual('LOGIN.BUTTON.WELCOME');
@@ -391,7 +391,7 @@ describe('LoginComponent', () => {
});
it('should return success event after the login have succeeded', (done) => {
spyOn(authService, 'login').and.returnValue(Observable.of({ type: 'type', ticket: 'ticket' }));
spyOn(authService, 'login').and.returnValue(of({ type: 'type', ticket: 'ticket' }));
component.providers = 'ECM';
expect(component.isError).toBe(false);
@@ -456,7 +456,7 @@ describe('LoginComponent', () => {
});
it('should return CORS error when server CORS error occurs', (done) => {
spyOn(authService, 'login').and.returnValue(Observable.throw({
spyOn(authService, 'login').and.returnValue(throwError({
error: {
crossDomain: true,
message: 'ERROR: the network is offline, Origin is not allowed by Access-Control-Allow-Origin'
@@ -479,7 +479,7 @@ describe('LoginComponent', () => {
it('should return CSRF error when server CSRF error occurs', async(() => {
spyOn(authService, 'login')
.and.returnValue(Observable.throw({ message: 'ERROR: Invalid CSRF-token', status: 403 }));
.and.returnValue(throwError({ message: 'ERROR: Invalid CSRF-token', status: 403 }));
component.providers = 'ECM';
component.error.subscribe(() => {
@@ -496,7 +496,7 @@ describe('LoginComponent', () => {
it('should return ECOM read-oly error when error occurs', async(() => {
spyOn(authService, 'login')
.and.returnValue(
Observable.throw(
throwError(
{
message: 'ERROR: 00170728 Access Denied. The system is currently in read-only mode',
status: 403
@@ -531,7 +531,7 @@ describe('LoginComponent', () => {
}));
it('should emit error event after the login has failed', async(() => {
spyOn(authService, 'login').and.returnValue(Observable.throw('Fake server error'));
spyOn(authService, 'login').and.returnValue(throwError('Fake server error'));
component.providers = 'ECM';
component.error.subscribe((error) => {

3
lib/core/login/components/login.component.ts
View File

@@ -48,8 +48,7 @@ enum LoginSteps {
styleUrls: ['./login.component.scss'],
encapsulation: ViewEncapsulation.None,
host: {
class: 'adf-login',
'(blur)': 'onBlur($event)'
class: 'adf-login'
}
})
export class LoginComponent implements OnInit {

13
lib/core/mock/authentication.service.mock.ts
View File

@@ -15,8 +15,7 @@
* limitations under the License.
*/
import { Observable } from 'rxjs/Observable';
import 'rxjs/add/observable/throw';
import { Observable, of, throwError } from 'rxjs';
import { RedirectionModel } from '../models/redirection.model';
// TODO: should be extending AuthenticationService
@@ -34,11 +33,11 @@ export class AuthenticationMock /*extends AuthenticationService*/ {
// TODO: real auth service returns Observable<string>
login(username: string, password: string): Observable<{ type: string, ticket: any }> {
if (username === 'fake-username' && password === 'fake-password') {
return Observable.of({ type: 'type', ticket: 'ticket'});
return of({ type: 'type', ticket: 'ticket'});
}
if (username === 'fake-username-CORS-error' && password === 'fake-password') {
return Observable.throw({
return throwError({
error: {
crossDomain: true,
message: 'ERROR: the network is offline, Origin is not allowed by Access-Control-Allow-Origin'
@@ -47,13 +46,13 @@ export class AuthenticationMock /*extends AuthenticationService*/ {
}
if (username === 'fake-username-CSRF-error' && password === 'fake-password') {
return Observable.throw({message: 'ERROR: Invalid CSRF-token', status: 403});
return throwError({message: 'ERROR: Invalid CSRF-token', status: 403});
}
if (username === 'fake-username-ECM-access-error' && password === 'fake-password') {
return Observable.throw({message: 'ERROR: 00170728 Access Denied. The system is currently in read-only mode', status: 403});
return throwError({message: 'ERROR: 00170728 Access Denied. The system is currently in read-only mode', status: 403});
}
return Observable.throw('Fake server error');
return throwError('Fake server error');
}
}

4
lib/core/mock/translation.service.mock.ts
View File

@@ -16,7 +16,7 @@
*/
import { EventEmitter } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { Observable, of } from 'rxjs';
import { TranslationService } from '../services/translation.service';
export interface LangChangeEvent {
@@ -47,7 +47,7 @@ export class TranslationMock implements TranslationService {
}
get(key: string | Array<string>, interpolateParams?: Object): Observable<string | any> {
return Observable.of(key);
return of(key);
}
instant(key: string | Array<string>, interpolateParams?: Object): string | any {

4
lib/core/ng-package.json
View File

@@ -1,18 +1,16 @@
{
"$schema": "./node_modules/ng-packagr/ng-package.schema.json",
"whitelistedNonPeerDependencies": [ "." ],
"workingDirectory" : "./ng_work",
"src": "./core/",
"dest": "../dist/core/",
"lib": {
"languageLevel": [ "dom", "es2016" ],
"licensePath": "../config/assets/license_header_add.txt",
"comments" : "none",
"entryFile": "./public-api.ts",
"flatModuleFile": "adf-core",
"umdModuleIds": {
"alfresco-js-api": "alfresco-js-api",
"minimatch": "minimatch",
"minimatch": "minimatch-browser",
"@angular/platform-browser/animations": "@angular/platform-browser/animations",
"@angular/material": "@angular/material",
"@mat-datetimepicker/core": "@mat-datetimepicker/core",

45
lib/core/package.json
View File

@@ -11,36 +11,31 @@
"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",
"chart.js": "2.5.0",
"rxjs": ">=6.2.2",
"@ngx-translate/core": "^10.0.2",
"core-js": "2.4.1",
"hammerjs": "2.0.8",
"minimatch": "3.0.4",
"moment": "2.20.1",
"ng2-charts": "1.6.0",
"minimatch-browser": "1.0.0",
"moment": "^2.22.2",
"pdfjs-dist": "1.5.404",
"raphael": "2.2.7",
"reflect-metadata": "0.1.10",
"rxjs": "5.5.2",
"systemjs": "0.19.27",
"zone.js": "0.8.14"
"reflect-metadata": "^0.1.12",
"zone.js": "^0.8.26"
},
"devDependencies": {},
"keywords": [
"core",
"alfresco-component",

2
lib/core/pagination/infinite-pagination.component.html
View File

@@ -2,7 +2,7 @@
<button mat-button
*ngIf="!isLoading"
class="adf-infinite-pagination-load-more"
(click)="onLoadMore($event)"
(click)="onLoadMore()"
data-automation-id="adf-infinite-pagination-button">
<ng-content></ng-content>
</button>

2
lib/core/pagination/infinite-pagination.component.spec.ts
View File

@@ -20,7 +20,7 @@ import { By } from '@angular/platform-browser';
import { Pagination } from 'alfresco-js-api';
import { InfinitePaginationComponent } from './infinite-pagination.component';
import { PaginatedComponent } from './paginated-component.interface';
import { BehaviorSubject } from 'rxjs/BehaviorSubject';
import { BehaviorSubject } from 'rxjs';
import { setupTestBed } from '../testing/setupTestBed';
import { CoreTestingModule } from '../testing/core.testing.module';

2
lib/core/pagination/infinite-pagination.component.ts
View File

@@ -24,7 +24,7 @@ import {
import { PaginatedComponent } from './paginated-component.interface';
import { Pagination } from 'alfresco-js-api';
import { Subscription } from 'rxjs/Subscription';
import { Subscription } from 'rxjs';
import { PaginationComponentInterface } from './pagination-component.interface';
import { PaginationModel } from '../models/pagination.model';

2
lib/core/pagination/paginated-component.interface.ts
View File

@@ -16,7 +16,7 @@
*/
import { PaginationModel } from '../models/pagination.model';
import { BehaviorSubject } from 'rxjs/BehaviorSubject';
import { BehaviorSubject } from 'rxjs';
export interface PaginatedComponent {
pagination: BehaviorSubject<PaginationModel>;

2
lib/core/pagination/pagination.component.spec.ts
View File

@@ -20,7 +20,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
import { Pagination } from 'alfresco-js-api';
import { PaginationComponent } from './pagination.component';
import { PaginatedComponent } from './public-api';
import { BehaviorSubject } from 'rxjs/BehaviorSubject';
import { BehaviorSubject } from 'rxjs';
import { setupTestBed } from '../testing/setupTestBed';
import { CoreTestingModule } from '../testing/core.testing.module';

2
lib/core/pagination/pagination.component.ts
View File

@@ -23,7 +23,7 @@ import {
import { Pagination } from 'alfresco-js-api';
import { PaginatedComponent } from './paginated-component.interface';
import { PaginationComponentInterface } from './pagination-component.interface';
import { Subscription } from 'rxjs/Subscription';
import { Subscription } from 'rxjs';
import { PaginationModel } from '../models/pagination.model';
import { UserPreferencesService } from '../services/user-preferences.service';

6
lib/core/pipes/user-initial.pipe.ts
View File

@@ -18,15 +18,17 @@
import { Pipe, PipeTransform } from '@angular/core';
import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
import { UserProcessModel } from '../models/user-process.model';
import { EcmUserModel } from '../userinfo/models/ecm-user.model';
@Pipe({
name: 'usernameInitials'
})
export class InitialUsernamePipe implements PipeTransform {
constructor(private sanitized: DomSanitizer) {}
constructor(private sanitized: DomSanitizer) {
}
transform(user: UserProcessModel, className: string = '', delimiter: string = ''): SafeHtml {
transform(user: UserProcessModel | EcmUserModel, className: string = '', delimiter: string = ''): SafeHtml {
let result: SafeHtml = '';
if (user) {
let initialResult = this.getInitialUserName(user.firstName, user.lastName, delimiter);

2
lib/core/services/alfresco-api.service.ts
View File

@@ -34,7 +34,7 @@ import {
import * as alfrescoApi from 'alfresco-js-api';
import { AppConfigService, AppConfigValues } from '../app-config/app-config.service';
import { StorageService } from './storage.service';
import { Subject } from 'rxjs/Subject';
import { Subject } from 'rxjs';
import { OauthConfigModel } from '../models/oauth-config.model';
/* tslint:disable:adf-file-name */

37
lib/core/services/apps-process.service.ts
View File

@@ -17,11 +17,10 @@
import { Injectable } from '@angular/core';
import { AppDefinitionRepresentation } from 'alfresco-js-api';
import { Observable } from 'rxjs/Observable';
import { Observable, from, throwError } from 'rxjs';
import { AlfrescoApiService } from './alfresco-api.service';
import { LogService } from './log.service';
import 'rxjs/add/observable/fromPromise';
import 'rxjs/add/observable/throw';
import { map, catchError } from 'rxjs/operators';
@Injectable()
export class AppsProcessService {
@@ -35,11 +34,11 @@ export class AppsProcessService {
* @returns The list of deployed apps
*/
getDeployedApplications(): Observable<AppDefinitionRepresentation[]> {
return Observable.fromPromise(this.apiService.getInstance().activiti.appsApi.getAppDefinitions())
.map((response: any) => {
return response.data;
})
.catch(err => this.handleError(err));
return from(this.apiService.getInstance().activiti.appsApi.getAppDefinitions())
.pipe(
map((response: any) => <AppDefinitionRepresentation[]> response.data),
catchError(err => this.handleError(err))
);
}
/**
@@ -48,11 +47,11 @@ export class AppsProcessService {
* @returns The list of deployed apps
*/
getDeployedApplicationsByName(name: string): Observable<AppDefinitionRepresentation> {
return Observable.fromPromise(this.apiService.getInstance().activiti.appsApi.getAppDefinitions())
.map((response: any) => {
return response.data.find(app => app.name === name);
})
.catch(err => this.handleError(err));
return from(this.apiService.getInstance().activiti.appsApi.getAppDefinitions())
.pipe(
map((response: any) => <AppDefinitionRepresentation> response.data.find(app => app.name === name)),
catchError(err => this.handleError(err))
);
}
/**
@@ -61,16 +60,16 @@ export class AppsProcessService {
* @returns Details of the app
*/
getApplicationDetailsById(appId: number): Observable<AppDefinitionRepresentation> {
return Observable.fromPromise(this.apiService.getInstance().activiti.appsApi.getAppDefinitions())
.map((response: any) => {
return response.data.find(app => app.id === appId);
})
.catch(err => this.handleError(err));
return from(this.apiService.getInstance().activiti.appsApi.getAppDefinitions())
.pipe(
map((response: any) => response.data.find(app => app.id === appId)),
catchError(err => this.handleError(err))
);
}
private handleError(error: any) {
this.logService.error(error);
return Observable.throw(error || 'Server error');
return throwError(error || 'Server error');
}
}

6
lib/core/services/auth-guard.service.ts
View File

@@ -21,7 +21,7 @@ import {
CanActivateChild, RouterStateSnapshot, Router
} from '@angular/router';
import { AuthenticationService } from './authentication.service';
import { Observable } from 'rxjs/Observable';
import { Observable } from 'rxjs';
import { AppConfigService, AppConfigValues } from '../app-config/app-config.service';
import { OauthConfigModel } from '../models/oauth-config.model';
@@ -32,12 +32,12 @@ export class AuthGuard implements CanActivate, CanActivateChild {
private appConfig: AppConfigService) {
}
canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean | Observable<boolean> {
canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> | Promise<boolean> | boolean {
const redirectUrl = state.url;
return this.checkLogin(redirectUrl);
}
canActivateChild(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean | Observable<boolean> {
canActivateChild(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> | Promise<boolean> | boolean {
return this.canActivate(route, state);
}

47
lib/core/services/authentication.service.ts
View File

@@ -16,17 +16,14 @@
*/
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { Subject } from 'rxjs/Subject';
import { Observable, Subject, from, throwError } from 'rxjs';
import { AlfrescoApiService } from './alfresco-api.service';
import { CookieService } from './cookie.service';
import { LogService } from './log.service';
import { RedirectionModel } from '../models/redirection.model';
import { AppConfigService, AppConfigValues } from '../app-config/app-config.service';
import 'rxjs/add/observable/fromPromise';
import 'rxjs/add/operator/catch';
import 'rxjs/add/observable/throw';
import { UserRepresentation } from 'alfresco-js-api';
import { map, catchError, tap } from 'rxjs/operators';
const REMEMBER_ME_COOKIE_KEY = 'ALFRESCO_REMEMBER_ME';
const REMEMBER_ME_UNTIL = 1000 * 60 * 60 * 24 * 30 ;
@@ -80,16 +77,18 @@ export class AuthenticationService {
* @returns Object with auth type ("ECM", "BPM" or "ALL") and auth ticket
*/
login(username: string, password: string, rememberMe: boolean = false): Observable<{ type: string, ticket: any }> {
return Observable.fromPromise(this.alfrescoApi.getInstance().login(username, password))
.map((response: any) => {
this.saveRememberMeCookie(rememberMe);
this.onLogin.next(response);
return {
type: this.appConfig.get(AppConfigValues.PROVIDERS),
ticket: response
};
})
.catch(err => this.handleError(err));
return from(this.alfrescoApi.getInstance().login(username, password))
.pipe(
map((response: any) => {
this.saveRememberMeCookie(rememberMe);
this.onLogin.next(response);
return {
type: this.appConfig.get(AppConfigValues.PROVIDERS),
ticket: response
};
}),
catchError(err => this.handleError(err))
);
}
/**
@@ -128,12 +127,14 @@ export class AuthenticationService {
* @returns Response event called when logout is complete
*/
logout() {
return Observable.fromPromise(this.callApiLogout())
.do(response => {
this.onLogout.next(response);
return response;
})
.catch(err => this.handleError(err));
return from(this.callApiLogout())
.pipe(
tap(response => {
this.onLogout.next(response);
return response;
}),
catchError(err => this.handleError(err))
);
}
/**
@@ -233,7 +234,7 @@ export class AuthenticationService {
}
getBpmLoggedUser(): Observable<UserRepresentation> {
return Observable.fromPromise(this.alfrescoApi.getInstance().activiti.profileApi.getProfile());
return from(this.alfrescoApi.getInstance().activiti.profileApi.getProfile());
}
private hasValidRedirection(provider: string): boolean {
@@ -251,6 +252,6 @@ export class AuthenticationService {
*/
handleError(error: any): Observable<any> {
this.logService.error('Error when logging in', error);
return Observable.throw(error || 'Server error');
return throwError(error || 'Server error');
}
}

58
lib/core/services/comment-content.service.ts
View File

@@ -16,13 +16,11 @@
*/
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { Observable, from, throwError } from 'rxjs';
import { CommentModel } from '../models/comment.model';
import { AlfrescoApiService } from '../services/alfresco-api.service';
import { LogService } from '../services/log.service';
import 'rxjs/add/observable/fromPromise';
import 'rxjs/add/operator/catch';
import 'rxjs/add/observable/throw';
import { map, catchError } from 'rxjs/operators';
@Injectable()
export class CommentContentService {
@@ -38,15 +36,18 @@ export class CommentContentService {
* @returns Details of the comment added
*/
addNodeComment(nodeId: string, message: string): Observable<CommentModel> {
return Observable.fromPromise(this.apiService.getInstance().core.commentsApi.addComment(nodeId, {content: message}))
.map((response: any) => {
return new CommentModel({
id: response.entry.id,
message: response.entry.content,
created: response.entry.createdAt,
createdBy: response.entry.createdBy
});
}).catch(err => this.handleError(err));
return from(this.apiService.getInstance().core.commentsApi.addComment(nodeId, {content: message}))
.pipe(
map((response: any) => {
return new CommentModel({
id: response.entry.id,
message: response.entry.content,
created: response.entry.createdAt,
createdBy: response.entry.createdBy
});
}),
catchError(err => this.handleError(err))
);
}
/**
@@ -55,24 +56,27 @@ export class CommentContentService {
* @returns Details for each comment
*/
getNodeComments(nodeId: string): Observable<CommentModel[]> {
return Observable.fromPromise(this.apiService.getInstance().core.commentsApi.getComments(nodeId))
.map((response: any) => {
const comments: CommentModel[] = [];
response.list.entries.forEach((comment: any) => {
comments.push(new CommentModel({
id: comment.entry.id,
message: comment.entry.content,
created: comment.entry.createdAt,
createdBy: comment.entry.createdBy
}));
});
return comments;
}).catch(err => this.handleError(err));
return from(this.apiService.getInstance().core.commentsApi.getComments(nodeId))
.pipe(
map((response: any) => {
const comments: CommentModel[] = [];
response.list.entries.forEach((comment: any) => {
comments.push(new CommentModel({
id: comment.entry.id,
message: comment.entry.content,
created: comment.entry.createdAt,
createdBy: comment.entry.createdBy
}));
});
return comments;
}),
catchError(err => this.handleError(err))
);
}
private handleError(error: any) {
this.logService.error(error);
return Observable.throw(error || 'Server error');
return throwError(error || 'Server error');
}
}

86
lib/core/services/comment-process.service.ts
View File

@@ -16,14 +16,12 @@
*/
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { Observable, from, throwError } from 'rxjs';
import { CommentModel } from '../models/comment.model';
import { UserProcessModel } from '../models/user-process.model';
import { AlfrescoApiService } from './alfresco-api.service';
import { LogService } from './log.service';
import 'rxjs/add/observable/fromPromise';
import 'rxjs/add/operator/catch';
import 'rxjs/add/observable/throw';
import { map, catchError } from 'rxjs/operators';
@Injectable()
export class CommentProcessService {
@@ -39,17 +37,18 @@ export class CommentProcessService {
* @returns Details about the comment
*/
addTaskComment(taskId: string, message: string): Observable<CommentModel> {
return Observable.fromPromise(this.apiService.getInstance().activiti.taskApi.addTaskComment({message: message}, taskId))
.map(res => res)
.map((response: CommentModel) => {
return new CommentModel({
id: response.id,
message: response.message,
created: response.created,
createdBy: response.createdBy
});
}).catch(err => this.handleError(err));
return from(this.apiService.getInstance().activiti.taskApi.addTaskComment({message: message}, taskId))
.pipe(
map((response: CommentModel) => {
return new CommentModel({
id: response.id,
message: response.message,
created: response.created,
createdBy: response.createdBy
});
}),
catchError(err => this.handleError(err))
);
}
/**
@@ -58,16 +57,18 @@ export class CommentProcessService {
* @returns Details for each comment
*/
getTaskComments(taskId: string): Observable<CommentModel[]> {
return Observable.fromPromise(this.apiService.getInstance().activiti.taskApi.getTaskComments(taskId))
.map(res => res)
.map((response: any) => {
let comments: CommentModel[] = [];
response.data.forEach((comment: CommentModel) => {
let user = new UserProcessModel(comment.createdBy);
comments.push(new CommentModel({id: comment.id, message: comment.message, created: comment.created, createdBy: user}));
});
return comments;
}).catch(err => this.handleError(err));
return from(this.apiService.getInstance().activiti.taskApi.getTaskComments(taskId))
.pipe(
map((response: any) => {
let comments: CommentModel[] = [];
response.data.forEach((comment: CommentModel) => {
let user = new UserProcessModel(comment.createdBy);
comments.push(new CommentModel({id: comment.id, message: comment.message, created: comment.created, createdBy: user}));
});
return comments;
}),
catchError(err => this.handleError(err))
);
}
/**
@@ -76,16 +77,18 @@ export class CommentProcessService {
* @returns Details for each comment
*/
getProcessInstanceComments(processInstanceId: string): Observable<CommentModel[]> {
return Observable.fromPromise(this.apiService.getInstance().activiti.commentsApi.getProcessInstanceComments(processInstanceId))
.map(res => res)
.map((response: any) => {
let comments: CommentModel[] = [];
response.data.forEach((comment: CommentModel) => {
let user = new UserProcessModel(comment.createdBy);
comments.push(new CommentModel({id: comment.id, message: comment.message, created: comment.created, createdBy: user}));
});
return comments;
}).catch(err => this.handleError(err));
return from(this.apiService.getInstance().activiti.commentsApi.getProcessInstanceComments(processInstanceId))
.pipe(
map((response: any) => {
let comments: CommentModel[] = [];
response.data.forEach((comment: CommentModel) => {
let user = new UserProcessModel(comment.createdBy);
comments.push(new CommentModel({id: comment.id, message: comment.message, created: comment.created, createdBy: user}));
});
return comments;
}),
catchError(err => this.handleError(err))
);
}
/**
@@ -95,23 +98,24 @@ export class CommentProcessService {
* @returns Details of the comment added
*/
addProcessInstanceComment(processInstanceId: string, message: string): Observable<CommentModel> {
return Observable.fromPromise(
return from(
this.apiService.getInstance().activiti.commentsApi.addProcessInstanceComment({message: message}, processInstanceId)
)
.map((response: CommentModel) => {
).pipe(
map((response: CommentModel) => {
return new CommentModel({
id: response.id,
message: response.message,
created: response.created,
createdBy: response.createdBy
});
}).catch(err => this.handleError(err));
}),
catchError(err => this.handleError(err))
);
}
private handleError(error: any) {
this.logService.error(error);
return Observable.throw(error || 'Server error');
return throwError(error || 'Server error');
}
}

43
lib/core/services/content.service.ts
View File

@@ -18,17 +18,13 @@
import { Injectable } from '@angular/core';
import { DomSanitizer } from '@angular/platform-browser';
import { ContentApi, MinimalNodeEntryEntity, Node, NodeEntry } from 'alfresco-js-api';
import { Observable } from 'rxjs/Observable';
import { Subject } from 'rxjs/Subject';
import { Observable, Subject, from, throwError } from 'rxjs';
import { FolderCreatedEvent } from '../events/folder-created.event';
import { PermissionsEnum } from '../models/permissions.enum';
import { AlfrescoApiService } from './alfresco-api.service';
import { AuthenticationService } from './authentication.service';
import { LogService } from './log.service';
import 'rxjs/add/observable/fromPromise';
import 'rxjs/add/operator/catch';
import 'rxjs/add/operator/do';
import 'rxjs/add/observable/throw';
import { catchError, tap } from 'rxjs/operators';
@Injectable()
export class ContentService {
@@ -157,9 +153,10 @@ export class ContentService {
* @returns Content data
*/
getNodeContent(nodeId: string): Observable<any> {
return Observable.fromPromise(this.apiService.getInstance().core.nodesApi.getFileContent(nodeId).then((dataContent) => {
return dataContent;
})).catch(this.handleError);
return from(this.apiService.getInstance().core.nodesApi.getFileContent(nodeId))
.pipe(
catchError(err => this.handleError(err))
);
}
/**
@@ -169,17 +166,19 @@ export class ContentService {
* @param parentId Node ID of parent folder
* @returns Information about the new folder
*/
createFolder(relativePath: string, name: string, parentId?: string): Observable<FolderCreatedEvent> {
return Observable.fromPromise(this.apiService.getInstance().nodes.createFolder(name, relativePath, parentId))
.do(data => {
this.folderCreated.next(<FolderCreatedEvent> {
relativePath: relativePath,
name: name,
parentId: parentId,
node: data
});
})
.catch(err => this.handleError(err));
createFolder(relativePath: string, name: string, parentId?: string): Observable<NodeEntry> {
return from(this.apiService.getInstance().nodes.createFolder(name, relativePath, parentId))
.pipe(
tap(data => {
this.folderCreated.next(<FolderCreatedEvent> {
relativePath: relativePath,
name: name,
parentId: parentId,
node: data
});
}),
catchError(err => this.handleError(err))
);
}
/**
@@ -189,7 +188,7 @@ export class ContentService {
* @returns Details of the folder
*/
getNode(nodeId: string, opts?: any): Observable<NodeEntry> {
return Observable.fromPromise(this.apiService.getInstance().nodes.getNode(nodeId, opts));
return from(this.apiService.getInstance().nodes.getNode(nodeId, opts));
}
/**
@@ -240,6 +239,6 @@ export class ContentService {
private handleError(error: any) {
this.logService.error(error);
return Observable.throw(error || 'Server error');
return throwError(error || 'Server error');
}
}

16
lib/core/services/deleted-nodes-api.service.ts
View File

@@ -16,11 +16,12 @@
*/
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { Observable, from, of } from 'rxjs';
import { NodePaging } from 'alfresco-js-api';
import { AlfrescoApiService } from './alfresco-api.service';
import { UserPreferencesService } from './user-preferences.service';
import { catchError } from 'rxjs/operators';
@Injectable()
export class DeletedNodesApiService {
@@ -39,21 +40,16 @@ export class DeletedNodesApiService {
* @returns List of nodes in the trash
*/
getDeletedNodes(options?: Object): Observable<NodePaging> {
const { nodesApi, handleError } = this;
const defaultOptions = {
include: [ 'path', 'properties' ],
maxItems: this.preferences.paginationSize,
skipCount: 0
};
const queryOptions = Object.assign(defaultOptions, options);
const promise = nodesApi.getDeletedNodes(queryOptions);
const promise = this.nodesApi.getDeletedNodes(queryOptions);
return Observable
.fromPromise(promise)
.catch(handleError);
}
private handleError(error: any): Observable<any> {
return Observable.of(error);
return from(promise).pipe(
catchError(err => of(err))
);
}
}

33
lib/core/services/discovery-api.service.ts
View File

@@ -16,12 +16,11 @@
*/
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { from, throwError } from 'rxjs';
import { BpmProductVersionModel, EcmProductVersionModel } from '../models/product-version.model';
import { AlfrescoApiService } from './alfresco-api.service';
import 'rxjs/add/observable/fromPromise';
import 'rxjs/add/operator/catch';
import 'rxjs/add/observable/throw';
import { map, catchError } from 'rxjs/operators';
import { Observable } from 'rxjs/index';
@Injectable()
export class DiscoveryApiService {
@@ -32,25 +31,23 @@ export class DiscoveryApiService {
* Gets product information for Content Services.
* @returns ProductVersionModel containing product details
*/
public getEcmProductInfo() {
return Observable.fromPromise(
this.apiService.getInstance().discovery.discoveryApi.getRepositoryInformation())
.map(res => new EcmProductVersionModel(res))
.catch(this.handleError);
public getEcmProductInfo(): Observable<EcmProductVersionModel> {
return from(this.apiService.getInstance().discovery.discoveryApi.getRepositoryInformation())
.pipe(
map(res => new EcmProductVersionModel(res)),
catchError(err => throwError(err))
);
}
/**
* Gets product information for Process Services.
* @returns ProductVersionModel containing product details
*/
public getBpmProductInfo() {
return Observable.fromPromise(
this.apiService.getInstance().activiti.aboutApi.getAppVersion())
.map(res => new BpmProductVersionModel(res))
.catch(this.handleError);
}
private handleError(error): Observable<any> {
return Observable.throw(error);
public getBpmProductInfo(): Observable<BpmProductVersionModel> {
return from(this.apiService.getInstance().activiti.aboutApi.getAppVersion())
.pipe(
map(res => new BpmProductVersionModel(res)),
catchError(err => throwError(err))
);
}
}

16
lib/core/services/favorites-api.service.ts
View File

@@ -17,9 +17,10 @@
import { Injectable } from '@angular/core';
import { NodePaging } from 'alfresco-js-api';
import { Observable } from 'rxjs/Observable';
import { Observable, from, of } from 'rxjs';
import { AlfrescoApiService } from './alfresco-api.service';
import { UserPreferencesService } from './user-preferences.service';
import { catchError } from 'rxjs/operators';
@Injectable()
export class FavoritesApiService {
@@ -69,7 +70,6 @@ export class FavoritesApiService {
* @returns List of favorites
*/
getFavorites(personId: string, options?: any): Observable<NodePaging> {
const { favoritesApi, handleError } = this;
const defaultOptions = {
maxItems: this.preferences.paginationSize,
skipCount: 0,
@@ -77,16 +77,12 @@ export class FavoritesApiService {
include: [ 'properties', 'allowableOperations' ]
};
const queryOptions = Object.assign(defaultOptions, options);
const promise = favoritesApi
const promise = this.favoritesApi
.getFavorites(personId, queryOptions)
.then(this.remapFavoritesData);
return Observable
.fromPromise(promise)
.catch(handleError);
}
private handleError(error): Observable<any> {
return Observable.of(error);
return from(promise).pipe(
catchError(err => of(err))
);
}
}

2
lib/core/services/log.service.ts
View File

@@ -20,7 +20,7 @@
import { Injectable } from '@angular/core';
import { AppConfigService, AppConfigValues } from '../app-config/app-config.service';
import { logLevels, LogLevelsEnum } from '../models/log-levels.model';
import { Subject } from 'rxjs/Subject';
import { Subject } from 'rxjs';
@Injectable()
export class LogService {

76
lib/core/services/nodes-api.service.ts
View File

@@ -17,11 +17,10 @@
import { Injectable } from '@angular/core';
import { MinimalNodeEntity, MinimalNodeEntryEntity, NodePaging } from 'alfresco-js-api';
import { Observable } from 'rxjs/Observable';
import { Observable, from, throwError } from 'rxjs';
import { AlfrescoApiService } from './alfresco-api.service';
import { UserPreferencesService } from './user-preferences.service';
import 'rxjs/add/observable/fromPromise';
import 'rxjs/add/observable/throw';
import { catchError } from 'rxjs/operators';
@Injectable()
export class NodesApiService {
@@ -45,18 +44,17 @@ export class NodesApiService {
* @returns Node information
*/
getNode(nodeId: string, options: any = {}): Observable<MinimalNodeEntryEntity> {
const { nodesApi, handleError, getEntryFromEntity } = this;
const defaults = {
include: [ 'path', 'properties', 'allowableOperations', 'permissions' ]
};
const queryOptions = Object.assign(defaults, options);
const promise = nodesApi
const promise = this.nodesApi
.getNode(nodeId, queryOptions)
.then(getEntryFromEntity);
.then(this.getEntryFromEntity);
return Observable
.fromPromise(promise)
.catch(handleError);
return from(promise).pipe(
catchError(err => throwError(err))
);
}
/**
@@ -66,19 +64,18 @@ export class NodesApiService {
* @returns List of child items from the folder
*/
getNodeChildren(nodeId: string, options: any = {}): Observable<NodePaging> {
const { nodesApi, handleError } = this;
const defaults = {
maxItems: this.preferences.paginationSize,
skipCount: 0,
include: [ 'path', 'properties', 'allowableOperations', 'permissions' ]
};
const queryOptions = Object.assign(defaults, options);
const promise = nodesApi
const promise = this.nodesApi
.getNodeChildren(nodeId, queryOptions);
return Observable
.fromPromise(promise)
.catch(handleError);
return from(promise).pipe(
catchError(err => throwError(err))
);
}
/**
@@ -89,12 +86,13 @@ export class NodesApiService {
* @returns Details of the new node
*/
createNode(parentNodeId: string, nodeBody: any, options: any = {}): Observable<MinimalNodeEntryEntity> {
const { nodesApi, handleError, getEntryFromEntity } = this;
const promise = nodesApi
const promise = this.nodesApi
.addNode(parentNodeId, nodeBody, options)
.then(getEntryFromEntity);
.then(this.getEntryFromEntity);
return Observable.fromPromise(promise).catch(handleError);
return from(promise).pipe(
catchError(err => throwError(err))
);
}
/**
@@ -117,18 +115,18 @@ export class NodesApiService {
* @returns Updated node information
*/
updateNode(nodeId: string, nodeBody: any, options: any = {}): Observable<MinimalNodeEntryEntity> {
const { nodesApi, handleError, getEntryFromEntity } = this;
const defaults = {
include: [ 'path', 'properties', 'allowableOperations', 'permissions' ]
};
const queryOptions = Object.assign(defaults, options);
const promise = nodesApi
const promise = this.nodesApi
.updateNode(nodeId, nodeBody, queryOptions)
.then(getEntryFromEntity);
.then(this.getEntryFromEntity);
return Observable.fromPromise(promise).catch(handleError);
return from(promise).pipe(
catchError(err => throwError(err))
);
}
/**
@@ -137,14 +135,12 @@ export class NodesApiService {
* @param options Optional parameters supported by JSAPI
* @returns Empty result that notifies when the deletion is complete
*/
deleteNode(nodeId: string, options: any = {}): Observable<void> {
const { nodesApi, handleError } = this;
const promise = nodesApi
.deleteNode(nodeId, options);
deleteNode(nodeId: string, options: any = {}): Observable<any> {
const promise = this.nodesApi.deleteNode(nodeId, options);
return Observable
.fromPromise(promise)
.catch(handleError);
return from(promise).pipe(
catchError(err => throwError(err))
);
}
/**
@@ -153,22 +149,12 @@ export class NodesApiService {
* @returns Details of the restored node
*/
restoreNode(nodeId: string): Observable<MinimalNodeEntryEntity> {
const { nodesApi, handleError, getEntryFromEntity } = this;
const promise = nodesApi
const promise = this.nodesApi
.restoreNode(nodeId)
.then(getEntryFromEntity);
.then(this.getEntryFromEntity);
return Observable
.fromPromise(promise)
.catch(handleError);
}
/**
* Reports an error.
* @param error Object representing the error
* @returns Error information
*/
handleError(error: any): Observable<any> {
return Observable.throw(error);
return from(promise).pipe(
catchError(err => throwError(err))
);
}
}

10
lib/core/services/notification.service.spec.ts
View File

@@ -36,7 +36,7 @@ class ProvidesNotificationServiceComponent {
}
sendMessageWithoutConfig() {
let promise = this.notificationService.openSnackMessage('Test notification');
let promise = this.notificationService.openSnackMessage('Test notification', 1000);
return promise;
}
@@ -51,7 +51,7 @@ class ProvidesNotificationServiceComponent {
}
sendMessageActionWithoutConfig() {
let promise = this.notificationService.openSnackMessageAction('Test notification', 'TestWarn');
let promise = this.notificationService.openSnackMessageAction('Test notification', 'TestWarn', 1000);
return promise;
}
@@ -61,7 +61,7 @@ class ProvidesNotificationServiceComponent {
}
sendCustomMessageAction() {
let promise = this.notificationService.openSnackMessageAction('Test notification', 'TestWarn', new MatSnackBarConfig());
let promise = this.notificationService.openSnackMessageAction('Test notification', 'TestWarn', new MatSnackBarConfig());
return promise;
}
@@ -119,7 +119,7 @@ describe('NotificationService', () => {
expect(document.querySelector('snack-bar-container')).not.toBeNull();
});
it('should open a message notification bar without custom configuration', (done) => {
it('should open a message notification bar without custom configuration', (done) => {
let promise = fixture.componentInstance.sendMessageWithoutConfig();
promise.afterDismissed().subscribe(() => {
done();
@@ -163,7 +163,7 @@ describe('NotificationService', () => {
expect(document.querySelector('snack-bar-container')).not.toBeNull();
}));
it('should open a message notification bar with action and no custom configuration', (done) => {
it('should open a message notification bar with action and no custom configuration', (done) => {
let promise = fixture.componentInstance.sendMessageActionWithoutConfig();
promise.afterDismissed().subscribe(() => {
done();

13
lib/core/services/people-content.service.spec.ts
View File

@@ -97,18 +97,5 @@ describe('PeopleAPI', () => {
.toBe('-me-');
});
}));
it('handles the error when it fails', async(() => {
const test = new PeopleContentServiceTest({
rejectGetPerson: true
});
const handleErrorSpy = spyOn(test.service, 'handleError')
.and.callThrough();
test.service.getPerson().subscribe(() => {
expect(handleErrorSpy).toHaveBeenCalled();
});
}));
});
});

17
lib/core/services/people-content.service.ts
View File

@@ -16,9 +16,9 @@
*/
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { Observable, from, of } from 'rxjs';
import { AlfrescoApiService } from './alfresco-api.service';
import 'rxjs/add/observable/fromPromise';
import { catchError } from 'rxjs/operators';
@Injectable()
export class PeopleContentService {
@@ -35,12 +35,11 @@ export class PeopleContentService {
* @returns User information
*/
getPerson(personId: string): Observable<any> {
const { peopleApi, handleError } = this;
const promise = peopleApi.getPerson(personId);
const promise = this.peopleApi.getPerson(personId);
return Observable
.fromPromise(promise)
.catch(handleError);
return from(promise).pipe(
catchError(err => of(err))
);
}
/**
@@ -50,8 +49,4 @@ export class PeopleContentService {
getCurrentPerson(): Observable<any> {
return this.getPerson('-me-');
}
private handleError(error): Observable<any> {
return Observable.of(error);
}
}

27
lib/core/services/people-process.service.ts
View File

@@ -17,12 +17,11 @@
import { Injectable } from '@angular/core';
import { Response } from '@angular/http';
import { Observable } from 'rxjs/Observable';
import { Observable, from, throwError } from 'rxjs';
import { UserProcessModel } from '../models/user-process.model';
import { AlfrescoApiService } from './alfresco-api.service';
import { LogService } from './log.service';
import 'rxjs/add/observable/fromPromise';
import 'rxjs/add/observable/throw';
import { catchError, map } from 'rxjs/operators';
@Injectable()
export class PeopleProcessService {
@@ -39,9 +38,11 @@ export class PeopleProcessService {
*/
getWorkflowUsers(taskId?: string, searchWord?: string): Observable<UserProcessModel[]> {
let option = { excludeTaskId: taskId, filter: searchWord };
return Observable.fromPromise(this.getWorkflowUserApi(option))
.map((response: any) => <UserProcessModel[]> response.data || [])
.catch(err => this.handleError(err));
return from(this.getWorkflowUserApi(option))
.pipe(
map((response: any) => <UserProcessModel[]> response.data || []),
catchError(err => this.handleError(err))
);
}
/**
@@ -61,8 +62,10 @@ export class PeopleProcessService {
*/
involveUserWithTask(taskId: string, idToInvolve: string): Observable<UserProcessModel[]> {
let node = {userId: idToInvolve};
return Observable.fromPromise(this.involveUserToTaskApi(taskId, node))
.catch(err => this.handleError(err));
return from<UserProcessModel[]>(this.involveUserToTaskApi(taskId, node))
.pipe(
catchError(err => this.handleError(err))
);
}
/**
@@ -73,8 +76,10 @@ export class PeopleProcessService {
*/
removeInvolvedUser(taskId: string, idToRemove: string): Observable<UserProcessModel[]> {
let node = {userId: idToRemove};
return Observable.fromPromise(this.removeInvolvedUserFromTaskApi(taskId, node))
.catch(err => this.handleError(err));
return from<UserProcessModel[]>(this.removeInvolvedUserFromTaskApi(taskId, node))
.pipe(
catchError(err => this.handleError(err))
);
}
private getWorkflowUserApi(options: any) {
@@ -99,6 +104,6 @@ export class PeopleProcessService {
*/
private handleError(error: Response) {
this.logService.error(error);
return Observable.throw(error || 'Server error');
return throwError(error || 'Server error');
}
}

Some files were not shown because too many files have changed in this diff Show More