[AAE-622] No implicit returns (#5157)

* enable noImplicitReturns rule

* type fixes

* fix return types

* fix return value

* fix tests

* fix visibility service

* update tests

* add missing types

* fix test
This commit is contained in:
Denys Vuika
2019-10-17 09:35:39 +01:00
committed by GitHub
parent 48aca2d30f
commit d7ab0417b8
65 changed files with 366 additions and 319 deletions

View File

@@ -258,13 +258,7 @@ describe('NodeDeleteDirective', () => {
return Promise.reject(null);
}
if (id === '2') {
return Promise.resolve();
}
if (id === '3') {
return Promise.resolve();
}
return Promise.resolve();
});
component.selection = [

View File

@@ -96,7 +96,9 @@ export class NodeDeleteDirective implements OnChanges {
const processedItems: ProcessStatus = this.processStatus(data);
const message = this.getMessage(processedItems);
this.delete.emit(message);
if (message) {
this.delete.emit(message);
}
});
}
}
@@ -108,7 +110,7 @@ export class NodeDeleteDirective implements OnChanges {
private deleteNode(node: NodeEntry | DeletedNodeEntity): Observable<ProcessedNodeData> {
const id = (<any> node.entry).nodeId || node.entry.id;
let promise;
let promise: Promise<any>;
if (node.entry.hasOwnProperty('archivedAt') && node.entry['archivedAt']) {
promise = this.alfrescoApiService.nodesApi.purgeDeletedNode(id);
@@ -166,7 +168,7 @@ export class NodeDeleteDirective implements OnChanges {
);
}
private getMessage(status): string {
private getMessage(status: ProcessStatus): string | null {
if (status.allFailed && !status.oneFailed) {
return this.translation.instant(
'CORE.DELETE_NODE.ERROR_PLURAL',
@@ -214,5 +216,7 @@ export class NodeDeleteDirective implements OnChanges {
{ name: status.success[0].entry.name }
);
}
return null;
}
}

View File

@@ -160,23 +160,17 @@ describe('NodeRestoreDirective', () => {
it('should notify on multiple fails', (done) => {
const error = { message: '{ "error": {} }' };
directiveInstance.restore.subscribe((event) => {
directiveInstance.restore.subscribe((event: any) => {
expect(event.message).toEqual('CORE.RESTORE_NODE.PARTIAL_PLURAL');
done();
});
restoreNodeSpy.and.callFake((id) => {
restoreNodeSpy.and.callFake((id: string) => {
if (id === '1') {
return Promise.resolve();
}
if (id === '2') {
return Promise.reject(error);
}
if (id === '3') {
return Promise.reject(error);
}
return Promise.reject(error);
});
component.selection = [
@@ -232,7 +226,7 @@ describe('NodeRestoreDirective', () => {
restoreNodeSpy.and.returnValue(Promise.reject(error));
directiveInstance.restore.subscribe((event) => {
directiveInstance.restore.subscribe((event: any) => {
expect(event.message).toEqual('CORE.RESTORE_NODE.LOCATION_MISSING');
done();
});
@@ -247,20 +241,14 @@ describe('NodeRestoreDirective', () => {
it('should notify success when restore multiple nodes', (done) => {
directiveInstance.restore.subscribe((event) => {
directiveInstance.restore.subscribe((event: any) => {
expect(event.message).toEqual('CORE.RESTORE_NODE.PLURAL');
done();
});
restoreNodeSpy.and.callFake((id) => {
if (id === '1') {
return Promise.resolve();
}
if (id === '2') {
return Promise.resolve();
}
restoreNodeSpy.and.callFake(() => {
return Promise.resolve();
});
component.selection = [

View File

@@ -182,7 +182,7 @@ export class NodeRestoreDirective {
);
}
private getRestoreMessage(): string {
private getRestoreMessage(): string | null {
const { restoreProcessStatus: status } = this;
if (status.someFailed && !status.oneFailed) {
@@ -233,6 +233,8 @@ export class NodeRestoreDirective {
}
);
}
return null;
}
private notification(): void {