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
@@ -17,10 +17,10 @@
|
||||
|
||||
import { Injectable } from '@angular/core';
|
||||
import { NodePaging, SharedLinkEntry } 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 'rxjs/add/observable/fromPromise';
|
||||
import { catchError } from 'rxjs/operators';
|
||||
|
||||
@Injectable()
|
||||
export class SharedLinksApiService {
|
||||
@@ -39,19 +39,17 @@ export class SharedLinksApiService {
|
||||
* @returns List of shared links
|
||||
*/
|
||||
getSharedLinks(options: any = {}): Observable<NodePaging> {
|
||||
const { sharedLinksApi, handleError } = this;
|
||||
const defaultOptions = {
|
||||
maxItems: this.preferences.paginationSize,
|
||||
skipCount: 0,
|
||||
include: ['properties', 'allowableOperations']
|
||||
};
|
||||
const queryOptions = Object.assign({}, defaultOptions, options);
|
||||
const promise = sharedLinksApi
|
||||
.findSharedLinks(queryOptions);
|
||||
const promise = this.sharedLinksApi.findSharedLinks(queryOptions);
|
||||
|
||||
return Observable
|
||||
.fromPromise(promise)
|
||||
.catch(handleError);
|
||||
return from(promise).pipe(
|
||||
catchError(err => of(err))
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -61,13 +59,11 @@ export class SharedLinksApiService {
|
||||
* @returns The shared link just created
|
||||
*/
|
||||
createSharedLinks(nodeId: string, options: any = {}): Observable<SharedLinkEntry> {
|
||||
const { sharedLinksApi, handleError } = this;
|
||||
const promise = this.sharedLinksApi.addSharedLink({ nodeId: nodeId });
|
||||
|
||||
const promise = sharedLinksApi.addSharedLink({ nodeId: nodeId });
|
||||
|
||||
return Observable
|
||||
.fromPromise(promise)
|
||||
.catch(handleError);
|
||||
return from(promise).pipe(
|
||||
catchError(err => of(err))
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -76,16 +72,10 @@ export class SharedLinksApiService {
|
||||
* @returns Null response notifying when the operation is complete
|
||||
*/
|
||||
deleteSharedLink(sharedId: string): Observable<SharedLinkEntry> {
|
||||
const { sharedLinksApi, handleError } = this;
|
||||
const promise = this.sharedLinksApi.deleteSharedLink(sharedId);
|
||||
|
||||
const promise = sharedLinksApi.deleteSharedLink(sharedId);
|
||||
|
||||
return Observable
|
||||
.fromPromise(promise)
|
||||
.catch(handleError);
|
||||
}
|
||||
|
||||
private handleError(error: any): Observable<any> {
|
||||
return Observable.of(error);
|
||||
return from(promise).pipe(
|
||||
catchError(err => of(err))
|
||||
);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user