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

[ACS-6227] cleanup error handling and fix typing issues (#9035)

Browse Source 
* cleanup audit service, remove useless ajax tests

* cleanup sites service and remove useless ajax tests

* cleanup services

* cleanup services

* fix typings

* code cleanup
This commit is contained in:
Denys Vuika
2023-10-27 13:51:28 +01:00
committed by GitHub
parent 53ad9f729b
commit 2d3175ef4a
24 changed files with 319 additions and 937 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/content-services/src/lib/document-list/services/document-list.service.ts
View File

@@ -15,14 +15,13 @@
* limitations under the License.
*/
import { AlfrescoApiService, LogService, PaginationModel } from '@alfresco/adf-core';
import { AlfrescoApiService, PaginationModel } from '@alfresco/adf-core';
import { NodesApiService } from '../../common/services/nodes-api.service';
import { Injectable } from '@angular/core';
import { Node, NodeEntry, NodePaging, NodesApi } from '@alfresco/js-api';
import { DocumentLoaderNode } from '../models/document-folder.model';
import { Observable, from, throwError, forkJoin } from 'rxjs';
import { catchError, map } from 'rxjs/operators';
import { Observable, from, forkJoin } from 'rxjs';
import { map } from 'rxjs/operators';
import { DocumentListLoader } from '../interfaces/document-list-loader.interface';
import { CustomResourcesService } from './custom-resources.service';
@@ -41,7 +40,6 @@ export class DocumentListService implements DocumentListLoader {
constructor(
private nodesApiService: NodesApiService,
private apiService: AlfrescoApiService,
private logService: LogService,
private customResourcesService: CustomResourcesService
) {}
@@ -63,7 +61,7 @@ export class DocumentListService implements DocumentListLoader {
* @returns NodeEntry for the copied node
*/
copyNode(nodeId: string, targetParentId: string): Observable<NodeEntry> {
return from(this.nodes.copyNode(nodeId, { targetParentId })).pipe(catchError((err) => this.handleError(err)));
return from(this.nodes.copyNode(nodeId, { targetParentId }));
}
/**
@@ -74,7 +72,7 @@ export class DocumentListService implements DocumentListLoader {
* @returns NodeEntry for the moved node
*/
moveNode(nodeId: string, targetParentId: string): Observable<NodeEntry> {
return from(this.nodes.moveNode(nodeId, { targetParentId })).pipe(catchError((err) => this.handleError(err)));
return from(this.nodes.moveNode(nodeId, { targetParentId }));
}
/**
@@ -119,7 +117,7 @@ export class DocumentListService implements DocumentListLoader {
}
}
return from(this.nodes.listNodeChildren(rootNodeId, params)).pipe(catchError((err) => this.handleError(err)));
return from(this.nodes.listNodeChildren(rootNodeId, params));
}
/**
@@ -159,10 +157,10 @@ export class DocumentListService implements DocumentListLoader {
include: includeFieldsRequest
};
return from(this.nodes.getNode(nodeId, opts)).pipe(catchError((err) => this.handleError(err)));
return from(this.nodes.getNode(nodeId, opts));
}
isCustomSourceService(nodeId): boolean {
isCustomSourceService(nodeId: string): boolean {
return this.customResourcesService.isCustomSource(nodeId);
}
@@ -214,9 +212,4 @@ export class DocumentListService implements DocumentListLoader {
)
]).pipe(map((results) => new DocumentLoaderNode(results[0], results[1])));
}
private handleError(error: any) {
this.logService.error(error);
return throwError(error || 'Server error');
}
}