mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-07-24 17:32:15 +00:00
[ADF-3299] and [ADF-3300] upgrade to Angular and Material 6 (#3579)
* 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:
committed by
Eugenio Romano
parent
c510ec864d
commit
6b24bfb1d4
@@ -29,7 +29,8 @@ import {
|
||||
SearchRequest
|
||||
} from 'alfresco-js-api';
|
||||
import { Injectable } from '@angular/core';
|
||||
import { Observable } from 'rxjs/Observable';
|
||||
import { Observable, from, of, throwError } from 'rxjs';
|
||||
import { catchError } from 'rxjs/operators';
|
||||
|
||||
@Injectable()
|
||||
export class CustomResourcesService {
|
||||
@@ -86,7 +87,7 @@ export class CustomResourcesService {
|
||||
observer.error(err);
|
||||
observer.complete();
|
||||
});
|
||||
}).catch(err => this.handleError(err));
|
||||
}).pipe(catchError(err => this.handleError(err)));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -132,7 +133,7 @@ export class CustomResourcesService {
|
||||
observer.error(err);
|
||||
observer.complete();
|
||||
});
|
||||
}).catch(err => this.handleError(err));
|
||||
}).pipe(catchError(err => this.handleError(err)));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -171,7 +172,7 @@ export class CustomResourcesService {
|
||||
observer.error(err);
|
||||
observer.complete();
|
||||
});
|
||||
}).catch(err => this.handleError(err));
|
||||
}).pipe(catchError(err => this.handleError(err)));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -202,7 +203,7 @@ export class CustomResourcesService {
|
||||
observer.error(err);
|
||||
observer.complete();
|
||||
});
|
||||
}).catch(err => this.handleError(err));
|
||||
}).pipe(catchError(err => this.handleError(err)));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -220,7 +221,8 @@ export class CustomResourcesService {
|
||||
skipCount: pagination.skipCount
|
||||
};
|
||||
|
||||
return Observable.fromPromise(this.apiService.nodesApi.getDeletedNodes(options)).catch(err => this.handleError(err));
|
||||
return from(this.apiService.nodesApi.getDeletedNodes(options))
|
||||
.pipe(catchError(err => this.handleError(err)));
|
||||
|
||||
}
|
||||
|
||||
@@ -239,7 +241,8 @@ export class CustomResourcesService {
|
||||
skipCount: pagination.skipCount
|
||||
};
|
||||
|
||||
return Observable.fromPromise(this.apiService.sharedLinksApi.findSharedLinks(options)).catch(err => this.handleError(err));
|
||||
return from(this.apiService.sharedLinksApi.findSharedLinks(options))
|
||||
.pipe(catchError(err => this.handleError(err)));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -291,23 +294,23 @@ export class CustomResourcesService {
|
||||
*/
|
||||
getCorrespondingNodeIds(nodeId: string, pagination: PaginationModel): Observable<string[]> {
|
||||
if (nodeId === '-trashcan-') {
|
||||
return Observable.fromPromise(this.apiService.nodesApi.getDeletedNodes()
|
||||
return from(this.apiService.nodesApi.getDeletedNodes()
|
||||
.then(result => result.list.entries.map(node => node.entry.id)));
|
||||
|
||||
} else if (nodeId === '-sharedlinks-') {
|
||||
return Observable.fromPromise(this.apiService.sharedLinksApi.findSharedLinks()
|
||||
return from(this.apiService.sharedLinksApi.findSharedLinks()
|
||||
.then(result => result.list.entries.map(node => node.entry.nodeId)));
|
||||
|
||||
} else if (nodeId === '-sites-') {
|
||||
return Observable.fromPromise(this.apiService.sitesApi.getSites()
|
||||
return from(this.apiService.sitesApi.getSites()
|
||||
.then(result => result.list.entries.map(node => node.entry.guid)));
|
||||
|
||||
} else if (nodeId === '-mysites-') {
|
||||
return Observable.fromPromise(this.apiService.peopleApi.getSiteMembership('-me-')
|
||||
return from(this.apiService.peopleApi.getSiteMembership('-me-')
|
||||
.then(result => result.list.entries.map(node => node.entry.guid)));
|
||||
|
||||
} else if (nodeId === '-favorites-') {
|
||||
return Observable.fromPromise(this.apiService.favoritesApi.getFavorites('-me-')
|
||||
return from(this.apiService.favoritesApi.getFavorites('-me-')
|
||||
.then(result => result.list.entries.map(node => node.entry.targetGuid)));
|
||||
|
||||
} else if (nodeId === '-recent-') {
|
||||
@@ -322,7 +325,7 @@ export class CustomResourcesService {
|
||||
|
||||
}
|
||||
|
||||
return Observable.of([]);
|
||||
return of([]);
|
||||
}
|
||||
|
||||
private getIncludesFields(includeFields: string[]): string[] {
|
||||
@@ -331,9 +334,7 @@ export class CustomResourcesService {
|
||||
}
|
||||
|
||||
private handleError(error: Response) {
|
||||
// in a real world app, we may send the error to some remote logging infrastructure
|
||||
// instead of just logging it to the console
|
||||
this.logService.error(error);
|
||||
return Observable.throw(error || 'Server error');
|
||||
return throwError(error || 'Server error');
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user