From e9350bd297874e83f62c53ed534926ef5af3a92c Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Thu, 18 Jun 2020 17:57:46 +0100 Subject: [PATCH] various code quality fixes (#5792) * various code quality fixes * reduce duplicated code * add safety check --- demo-shell/app.js | 2 +- .../src/app/components/files/files.component.ts | 5 +---- docs/tutorials/working-with-data-table.md | 2 +- e2e/content-services/upload/upload-dialog.e2e.ts | 5 ++--- .../comment-component-processes.e2e.ts | 2 +- lib/cli/scripts/init-aae-env.ts | 15 +++++++++------ .../src/lib/breadcrumb/breadcrumb.component.ts | 2 +- .../content-node-dialog.service.ts | 6 +----- .../content-node-share.directive.spec.ts | 12 ++++++------ .../search/components/search-control.component.ts | 2 +- .../upload/components/base-upload/upload-base.ts | 10 ++++------ .../version-manager/version-upload.component.ts | 2 +- lib/core/buttons-menu/buttons-menu.component.ts | 6 +----- lib/core/comments/comments.component.ts | 6 +++--- .../components/datatable/datatable.component.ts | 4 ++-- lib/core/dialogs/edit-json/edit-json.dialog.ts | 2 +- lib/core/form/components/form-base.component.ts | 2 +- .../components/widgets/core/content-link.model.ts | 8 ++++---- .../widgets/core/error-message.model.ts | 4 ++-- .../widgets/core/form-field-validator.ts | 2 +- .../components/widgets/core/form-field.model.ts | 8 ++------ .../form/components/widgets/core/form.model.ts | 2 +- .../widgets/dropdown/dropdown.widget.ts | 2 +- .../dynamic-table/dynamic-table.widget.model.ts | 2 +- .../form/components/widgets/widget.component.ts | 6 +++--- .../components/header/header.component.spec.ts | 1 - lib/core/models/product-version.model.ts | 12 ++++++------ lib/core/pipes/file-size.pipe.ts | 2 +- lib/core/pipes/file-type.pipe.ts | 2 +- lib/core/services/authentication.service.ts | 2 +- lib/core/services/identity-group.service.ts | 5 +---- lib/core/services/identity-user.service.ts | 5 +---- lib/core/services/upload.service.ts | 2 +- .../components/analytics-generator.component.ts | 4 ++-- .../analytics-report-heat-map.component.ts | 8 ++++---- .../components/analytics-report-list.component.ts | 8 ++++---- .../components/widgets/widget.component.ts | 4 ++-- .../lib/diagram/models/chart/bar-chart.model.ts | 4 ++-- .../models/chart/details-table-chart.model.ts | 4 ++-- .../lib/form/components/form-cloud.component.ts | 6 +----- .../content-cloud-node-selector.service.ts | 6 +----- .../directives/cancel-process.directive.ts | 2 +- .../task/directives/claim-task-cloud.directive.ts | 2 +- .../directives/unclaim-task-cloud.directive.ts | 2 +- .../src/lib/app-list/apps-list.component.ts | 5 +---- .../attach-file-widget-dialog.service.ts | 6 +----- .../src/lib/form/form.component.ts | 7 +------ .../models/process-definition.model.ts | 2 +- .../task-list/components/attach-form.component.ts | 6 +----- .../task-list/components/task-audit.directive.ts | 12 ++---------- .../components/task-form/claim-task.directive.ts | 2 +- .../task-form/unclaim-task.directive.ts | 2 +- .../src/lib/task-list/models/filter.model.ts | 4 ++-- lib/testing/src/lib/core/pages/pagination.page.ts | 4 ---- 54 files changed, 96 insertions(+), 154 deletions(-) diff --git a/demo-shell/app.js b/demo-shell/app.js index f897a59bcc..a589aace6b 100644 --- a/demo-shell/app.js +++ b/demo-shell/app.js @@ -27,7 +27,7 @@ var server = http.createServer(function (req, res) { req.on('end', function() { if (req.url === '/') { log('Received message: ' + body); - } else if (req.url = '/scheduled') { + } else if (req.url === '/scheduled') { log('Received task ' + req.headers['x-aws-sqsd-taskname'] + ' scheduled at ' + req.headers['x-aws-sqsd-scheduled-at']); } diff --git a/demo-shell/src/app/components/files/files.component.ts b/demo-shell/src/app/components/files/files.component.ts index c139bf7898..360cde330d 100644 --- a/demo-shell/src/app/components/files/files.component.ts +++ b/demo-shell/src/app/components/files/files.component.ts @@ -582,10 +582,7 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy { } isCustomActionDisabled(node: MinimalNodeEntity): boolean { - if (node && node.entry && node.entry.name === 'custom') { - return false; - } - return true; + return !(node && node.entry && node.entry.name === 'custom'); } runCustomAction(event: any) { diff --git a/docs/tutorials/working-with-data-table.md b/docs/tutorials/working-with-data-table.md index d394e72b80..b682b4379f 100644 --- a/docs/tutorials/working-with-data-table.md +++ b/docs/tutorials/working-with-data-table.md @@ -394,7 +394,7 @@ To develop the enhancement, edit the `src/app/mydatatable/mydatatable.component. ```ts onExecuteRowAction(event: DataRowActionEvent) { - if (event.value.action.title = "Greetings") { + if (event.value.action.title === "Greetings") { this.apiService.getInstance().webScript.executeWebScript( 'GET', diff --git a/e2e/content-services/upload/upload-dialog.e2e.ts b/e2e/content-services/upload/upload-dialog.e2e.ts index 1977fc9f00..1b6c3b9972 100644 --- a/e2e/content-services/upload/upload-dialog.e2e.ts +++ b/e2e/content-services/upload/upload-dialog.e2e.ts @@ -101,9 +101,8 @@ describe('Upload component', () => { afterEach(async () => { const nbResults = await contentServicesPage.numberOfResultsDisplayed(); if (nbResults > 1) { - const nodesPromise = await contentServicesPage.getElementsDisplayedId(); - for (const node of nodesPromise) { - const nodeId = await node; + const nodeIds = await contentServicesPage.getElementsDisplayedId(); + for (const nodeId of nodeIds) { await uploadActions.deleteFileOrFolder(nodeId); } } diff --git a/e2e/process-services/comment-component-processes.e2e.ts b/e2e/process-services/comment-component-processes.e2e.ts index 57c691e6fd..f5fe778645 100644 --- a/e2e/process-services/comment-component-processes.e2e.ts +++ b/e2e/process-services/comment-component-processes.e2e.ts @@ -91,7 +91,7 @@ describe('Comment component for Processes', () => { const taskId = taskQuery.data[0].id; const taskComments = await apiService.getInstance().activiti.commentsApi.getTaskComments(taskId, { 'latestFirst': true }); - await expect(await taskComments.total).toEqual(0); + await expect(taskComments.total).toEqual(0); }); it('[C260466] Should be able to display comments from Task on the related Process', async () => { diff --git a/lib/cli/scripts/init-aae-env.ts b/lib/cli/scripts/init-aae-env.ts index 5e096bb696..9524671c68 100644 --- a/lib/cli/scripts/init-aae-env.ts +++ b/lib/cli/scripts/init-aae-env.ts @@ -302,13 +302,16 @@ async function checkIfAppIsReleased(absentApps: any []) { async function checkDescriptorExist(name: string) { logger.info(`Check descriptor ${name} exist in the list `); const descriptorList = await getDescriptors(); - descriptorList.list.entries.forEach(async (descriptor: any) => { - if (descriptor.entry.name === name) { - if (descriptor.entry.deployed === false) { - await deleteDescriptor(descriptor.entry.name); + + if (descriptorList && descriptorList.list && descriptorList.entries) { + for (const descriptor of descriptorList.list.entries) { + if (descriptor.entry.name === name) { + if (descriptor.entry.deployed === false) { + await deleteDescriptor(descriptor.entry.name); + } } } - }); + } return false; } @@ -316,7 +319,7 @@ async function importProjectAndRelease(app: any) { await getFileFromRemote(app.file_location, app.name); logger.warn('Project imported ' + app.name); const projectRelease = await importAndReleaseProject(`${app.name}.zip`); - deleteLocalFile(`${app.name}`); + await deleteLocalFile(`${app.name}`); return projectRelease; } diff --git a/lib/content-services/src/lib/breadcrumb/breadcrumb.component.ts b/lib/content-services/src/lib/breadcrumb/breadcrumb.component.ts index 86a1535650..d629f8b809 100644 --- a/lib/content-services/src/lib/breadcrumb/breadcrumb.component.ts +++ b/lib/content-services/src/lib/breadcrumb/breadcrumb.component.ts @@ -136,7 +136,7 @@ export class BreadcrumbComponent implements OnInit, OnChanges, OnDestroy { } hasPreviousNodes(): boolean { - return this.previousNodes ? true : false; + return !!this.previousNodes; } parseRoute(node: Node): PathElementEntity[] { diff --git a/lib/content-services/src/lib/content-node-selector/content-node-dialog.service.ts b/lib/content-services/src/lib/content-node-selector/content-node-dialog.service.ts index 5c80b1b27c..47c828b4ae 100644 --- a/lib/content-services/src/lib/content-node-selector/content-node-dialog.service.ts +++ b/lib/content-services/src/lib/content-node-selector/content-node-dialog.service.ts @@ -210,7 +210,7 @@ export class ContentNodeDialogService { actionName: action, currentFolderId: contentEntry.id, imageResolver: this.imageResolver.bind(this), - isSelectionValid: this.isNodeFile.bind(this), + isSelectionValid: (entry: Node) => entry.isFile, select: select, showFilesInResult }; @@ -234,10 +234,6 @@ export class ContentNodeDialogService { return null; } - private isNodeFile(entry: Node): boolean { - return entry.isFile; - } - private hasAllowableOperationsOnNodeFolder(entry: Node): boolean { return this.isNodeFolder(entry) && this.contentService.hasAllowableOperations(entry, 'create'); } diff --git a/lib/content-services/src/lib/content-node-share/content-node-share.directive.spec.ts b/lib/content-services/src/lib/content-node-share/content-node-share.directive.spec.ts index bfa025b059..c5478d988d 100644 --- a/lib/content-services/src/lib/content-node-share/content-node-share.directive.spec.ts +++ b/lib/content-services/src/lib/content-node-share/content-node-share.directive.spec.ts @@ -87,7 +87,7 @@ describe('NodeSharedDirective', () => { }); it('should have share button disabled when selection is empty', async () => { - fixture.whenStable(); + await fixture.whenStable(); fixture.detectChanges(); expect(shareButtonElement.disabled).toBe(true); }); @@ -96,7 +96,7 @@ describe('NodeSharedDirective', () => { component.documentList.selection = [selection]; fixture.detectChanges(); - fixture.whenStable(); + await fixture.whenStable(); fixture.detectChanges(); expect(shareButtonElement.disabled).toBe(false); }); @@ -106,7 +106,7 @@ describe('NodeSharedDirective', () => { component.documentList.selection = [selection]; fixture.detectChanges(); - fixture.whenStable(); + await fixture.whenStable(); fixture.detectChanges(); expect(shareButtonElement.disabled).toBe(true); }); @@ -115,7 +115,7 @@ describe('NodeSharedDirective', () => { component.documentList.selection = [selection]; fixture.detectChanges(); - fixture.whenStable(); + await fixture.whenStable(); fixture.detectChanges(); expect(shareButtonElement.title).toBe('Not Shared'); }); @@ -124,7 +124,7 @@ describe('NodeSharedDirective', () => { selection.entry.properties['qshare:sharedId'] = 'someId'; component.documentList.selection = [selection]; fixture.detectChanges(); - fixture.whenStable(); + await fixture.whenStable(); fixture.detectChanges(); expect(shareButtonElement.title).toBe('Shared'); @@ -135,7 +135,7 @@ describe('NodeSharedDirective', () => { component.documentList.selection = [selection]; fixture.detectChanges(); - fixture.whenStable(); + await fixture.whenStable(); fixture.detectChanges(); shareButtonElement.click(); diff --git a/lib/content-services/src/lib/search/components/search-control.component.ts b/lib/content-services/src/lib/search/components/search-control.component.ts index d8bf2c1240..926e9a950f 100644 --- a/lib/content-services/src/lib/search/components/search-control.component.ts +++ b/lib/content-services/src/lib/search/components/search-control.component.ts @@ -101,7 +101,7 @@ export class SearchControlComponent implements OnDestroy { ) {} isNoSearchTemplatePresent(): boolean { - return this.emptySearchTemplate ? true : false; + return !!this.emptySearchTemplate; } ngOnDestroy(): void { diff --git a/lib/content-services/src/lib/upload/components/base-upload/upload-base.ts b/lib/content-services/src/lib/upload/components/base-upload/upload-base.ts index 06497f2df5..343b539d32 100644 --- a/lib/content-services/src/lib/upload/components/base-upload/upload-base.ts +++ b/lib/content-services/src/lib/upload/components/base-upload/upload-base.ts @@ -96,7 +96,6 @@ export abstract class UploadBase implements OnInit, OnDestroy { /** * Upload a list of file in the specified path * @param files - * @param path */ uploadFiles(files: File[]): void { const filteredFiles: FileModel[] = files @@ -152,17 +151,16 @@ export abstract class UploadBase implements OnInit, OnDestroy { .split(',') .map((ext) => ext.trim().replace(/^\./, '')); - if (allowedExtensions.indexOf(file.extension) !== -1) { - return true; - } - - return false; + return allowedExtensions.indexOf(file.extension) !== -1; } /** * Creates FileModel from File * * @param file + * @param parentId + * @param path + * @param id */ protected createFileModel(file: File, parentId: string, path: string, id?: string): FileModel { return new FileModel(file, { diff --git a/lib/content-services/src/lib/version-manager/version-upload.component.ts b/lib/content-services/src/lib/version-manager/version-upload.component.ts index 96c2094fd2..70c93216be 100644 --- a/lib/content-services/src/lib/version-manager/version-upload.component.ts +++ b/lib/content-services/src/lib/version-manager/version-upload.component.ts @@ -55,7 +55,7 @@ export class VersionUploadComponent { } isMajorVersion(): boolean { - return this.semanticVersion === 'minor' ? false : true; + return this.semanticVersion !== 'minor'; } cancelUpload() { diff --git a/lib/core/buttons-menu/buttons-menu.component.ts b/lib/core/buttons-menu/buttons-menu.component.ts index 6e7a7684f7..26f19f584f 100644 --- a/lib/core/buttons-menu/buttons-menu.component.ts +++ b/lib/core/buttons-menu/buttons-menu.component.ts @@ -31,11 +31,7 @@ export class ButtonsMenuComponent implements AfterContentInit { isMenuEmpty: boolean; ngAfterContentInit() { - if (this.buttons.length > 0) { - this.isMenuEmpty = false; - } else { - this.isMenuEmpty = true; - } + this.isMenuEmpty = this.buttons.length <= 0; } isMobile(): boolean { diff --git a/lib/core/comments/comments.component.ts b/lib/core/comments/comments.component.ts index 1a2ed3e4b2..065260b6fe 100644 --- a/lib/core/comments/comments.component.ts +++ b/lib/core/comments/comments.component.ts @@ -175,14 +175,14 @@ export class CommentsComponent implements OnChanges { } isATask(): boolean { - return this.taskId ? true : false; + return !!this.taskId; } isANode(): boolean { - return this.nodeId ? true : false; + return !!this.nodeId; } - private sanitize(input: string) { + private sanitize(input: string): string { return input.replace(/<[^>]+>/g, '') .replace(/^\s+|\s+$|\s+(?=\s)/g, '') .replace(/\r?\n/g, '
'); diff --git a/lib/core/datatable/components/datatable/datatable.component.ts b/lib/core/datatable/components/datatable/datatable.component.ts index 6aa062b9f3..4b3f0d61d3 100644 --- a/lib/core/datatable/components/datatable/datatable.component.ts +++ b/lib/core/datatable/components/datatable/datatable.component.ts @@ -285,7 +285,7 @@ export class DataTableComponent implements AfterContentInit, OnChanges, DoCheck, } isPropertyChanged(property: SimpleChange): boolean { - return property && property.currentValue ? true : false; + return !!(property && property.currentValue); } convertToRowsData(rows: any []): ObjectDataRow[] { @@ -375,7 +375,7 @@ export class DataTableComponent implements AfterContentInit, OnChanges, DoCheck, this.rowMenuCache = {}; } - isTableEmpty() { + isTableEmpty(): boolean { return this.data === undefined || this.data === null; } diff --git a/lib/core/dialogs/edit-json/edit-json.dialog.ts b/lib/core/dialogs/edit-json/edit-json.dialog.ts index 7d3308a9bc..46652ee20d 100644 --- a/lib/core/dialogs/edit-json/edit-json.dialog.ts +++ b/lib/core/dialogs/edit-json/edit-json.dialog.ts @@ -44,7 +44,7 @@ export class EditJsonDialogComponent implements OnInit { ngOnInit() { if (this.settings) { - this.editable = this.settings.editable ? true : false; + this.editable = this.settings.editable; this.value = this.settings.value || ''; this.title = this.settings.title || 'JSON'; } diff --git a/lib/core/form/components/form-base.component.ts b/lib/core/form/components/form-base.component.ts index 2d74003809..232cd02fba 100644 --- a/lib/core/form/components/form-base.component.ts +++ b/lib/core/form/components/form-base.component.ts @@ -98,7 +98,7 @@ export abstract class FormBaseComponent { } hasForm(): boolean { - return this.form ? true : false; + return !!this.form; } isTitleEnabled(): boolean { diff --git a/lib/core/form/components/widgets/core/content-link.model.ts b/lib/core/form/components/widgets/core/content-link.model.ts index e2cdb4936c..b9eb0561e4 100644 --- a/lib/core/form/components/widgets/core/content-link.model.ts +++ b/lib/core/form/components/widgets/core/content-link.model.ts @@ -53,19 +53,19 @@ } hasPreviewStatus(): boolean { - return this.previewStatus === 'supported' ? true : false; + return this.previewStatus === 'supported'; } isTypeImage(): boolean { - return this.simpleType === 'image' ? true : false; + return this.simpleType === 'image'; } isTypePdf(): boolean { - return this.simpleType === 'pdf' ? true : false; + return this.simpleType === 'pdf'; } isTypeDoc(): boolean { - return this.simpleType === 'word' || this.simpleType === 'content' ? true : false; + return this.simpleType === 'word' || this.simpleType === 'content'; } isThumbnailReady(): boolean { diff --git a/lib/core/form/components/widgets/core/error-message.model.ts b/lib/core/form/components/widgets/core/error-message.model.ts index 63b62d9bbf..41086f0fd3 100644 --- a/lib/core/form/components/widgets/core/error-message.model.ts +++ b/lib/core/form/components/widgets/core/error-message.model.ts @@ -27,8 +27,8 @@ export class ErrorMessageModel { this.attributes = new Map(); } - isActive() { - return this.message ? true : false; + isActive(): boolean { + return !!this.message; } getAttributesAsJsonObj() { diff --git a/lib/core/form/components/widgets/core/form-field-validator.ts b/lib/core/form/components/widgets/core/form-field-validator.ts index f74743ae39..fe629af6d6 100644 --- a/lib/core/form/components/widgets/core/form-field-validator.ts +++ b/lib/core/form/components/widgets/core/form-field-validator.ts @@ -80,7 +80,7 @@ export class RequiredFieldValidator implements FormFieldValidator { } if (field.type === FormFieldTypes.BOOLEAN) { - return field.value ? true : false; + return !!field.value; } if (field.value === null || field.value === undefined || field.value === '') { diff --git a/lib/core/form/components/widgets/core/form-field.model.ts b/lib/core/form/components/widgets/core/form-field.model.ts index 199c656f6c..57c6a931d8 100644 --- a/lib/core/form/components/widgets/core/form-field.model.ts +++ b/lib/core/form/components/widgets/core/form-field.model.ts @@ -221,7 +221,7 @@ export class FormFieldModel extends FormWidgetModel { } private isTypeaheadFieldType(type: string): boolean { - return type === 'typeahead' ? true : false; + return type === 'typeahead'; } private getFieldNameWithLabel(name: string): string { @@ -419,11 +419,7 @@ export class FormFieldModel extends FormWidgetModel { * @param type */ isInvalidFieldType(type: string) { - if (type === 'container') { - return true; - } else { - return false; - } + return type === 'container'; } getOptionName(): string { diff --git a/lib/core/form/components/widgets/core/form.model.ts b/lib/core/form/components/widgets/core/form.model.ts index ae5476cf78..a4b93756b8 100644 --- a/lib/core/form/components/widgets/core/form.model.ts +++ b/lib/core/form/components/widgets/core/form.model.ts @@ -154,7 +154,7 @@ export class FormModel { } } - this.isValid = errorsField.length > 0 ? false : true; + this.isValid = errorsField.length <= 0; if (this.formService) { validateFormEvent.isValid = this.isValid; diff --git a/lib/core/form/components/widgets/dropdown/dropdown.widget.ts b/lib/core/form/components/widgets/dropdown/dropdown.widget.ts index 03d4d467ba..e05a340bba 100644 --- a/lib/core/form/components/widgets/dropdown/dropdown.widget.ts +++ b/lib/core/form/components/widgets/dropdown/dropdown.widget.ts @@ -110,7 +110,7 @@ export class DropdownWidgetComponent extends WidgetComponent implements OnInit { } isReadOnlyType(): boolean { - return this.field.type === 'readonly' ? true : false; + return this.field.type === 'readonly'; } } diff --git a/lib/core/form/components/widgets/dynamic-table/dynamic-table.widget.model.ts b/lib/core/form/components/widgets/dynamic-table/dynamic-table.widget.model.ts index 0136432153..83dceeef82 100644 --- a/lib/core/form/components/widgets/dynamic-table/dynamic-table.widget.model.ts +++ b/lib/core/form/components/widgets/dynamic-table/dynamic-table.widget.model.ts @@ -180,7 +180,7 @@ export class DynamicTableModel extends FormWidgetModel { } if (column.type === 'Boolean') { - return rowValue ? true : false; + return !!rowValue; } if (column.type === 'Date') { diff --git a/lib/core/form/components/widgets/widget.component.ts b/lib/core/form/components/widgets/widget.component.ts index 07799542d5..844f2b5ff6 100644 --- a/lib/core/form/components/widgets/widget.component.ts +++ b/lib/core/form/components/widgets/widget.component.ts @@ -59,8 +59,8 @@ export class WidgetComponent implements AfterViewInit { constructor(public formService?: FormService) { } - hasField() { - return this.field ? true : false; + hasField(): boolean { + return !!this.field; } // Note for developers: @@ -73,7 +73,7 @@ export class WidgetComponent implements AfterViewInit { } isValid(): boolean { - return this.field.validationSummary ? true : false; + return !!this.field.validationSummary; } hasValue(): boolean { diff --git a/lib/core/layout/components/header/header.component.spec.ts b/lib/core/layout/components/header/header.component.spec.ts index cd1fb0d0b5..afba7b5327 100644 --- a/lib/core/layout/components/header/header.component.spec.ts +++ b/lib/core/layout/components/header/header.component.spec.ts @@ -74,7 +74,6 @@ describe('HeaderLayoutComponent', () => { const logo = fixture.nativeElement.querySelector('.adf-app-logo'); const src = logo.getAttribute('src'); - expect(logo === null).toBeFalsy(); expect(src).toEqual('logo.png'); }); diff --git a/lib/core/models/product-version.model.ts b/lib/core/models/product-version.model.ts index 9276210087..c9365e470f 100644 --- a/lib/core/models/product-version.model.ts +++ b/lib/core/models/product-version.model.ts @@ -71,8 +71,8 @@ export class LicenseModel { this.remainingDays = obj.remainingDays || null; this.holder = obj.holder || null; this.mode = obj.mode || null; - this.isClusterEnabled = obj.isClusterEnabled ? true : false; - this.isCryptodocEnabled = obj.isCryptodocEnabled ? true : false; + this.isClusterEnabled = !!obj.isClusterEnabled; + this.isCryptodocEnabled = !!obj.isCryptodocEnabled; } } } @@ -85,10 +85,10 @@ export class VersionStatusModel { constructor(obj?: any) { if (obj) { - this.isReadOnly = obj.isReadOnly ? true : false; - this.isAuditEnabled = obj.isAuditEnabled ? true : false; - this.isQuickShareEnabled = obj.isQuickShareEnabled ? true : false; - this.isThumbnailGenerationEnabled = obj.isThumbnailGenerationEnabled ? true : false; + this.isReadOnly = !!obj.isReadOnly; + this.isAuditEnabled = !!obj.isAuditEnabled; + this.isQuickShareEnabled = !!obj.isQuickShareEnabled; + this.isThumbnailGenerationEnabled = !!obj.isThumbnailGenerationEnabled; } } } diff --git a/lib/core/pipes/file-size.pipe.ts b/lib/core/pipes/file-size.pipe.ts index ee0f1ca32e..2586ad350d 100644 --- a/lib/core/pipes/file-size.pipe.ts +++ b/lib/core/pipes/file-size.pipe.ts @@ -28,7 +28,7 @@ export class FileSizePipe implements PipeTransform { } transform(bytes: number, decimals: number = 2): string { - if (bytes == null || bytes === undefined) { + if (bytes == null) { return ''; } diff --git a/lib/core/pipes/file-type.pipe.ts b/lib/core/pipes/file-type.pipe.ts index 3c4a27df80..78b299ac4f 100644 --- a/lib/core/pipes/file-type.pipe.ts +++ b/lib/core/pipes/file-type.pipe.ts @@ -25,7 +25,7 @@ export class FileTypePipe implements PipeTransform { transform(value: string) { - if ( value == null || value === undefined ) { + if ( value == null ) { return ''; } else { const fileInfo = value.substring(value.lastIndexOf('/') + 1).replace(/\.[a-z]+/, ''); diff --git a/lib/core/services/authentication.service.ts b/lib/core/services/authentication.service.ts index d1d06d1162..2968d3f5eb 100644 --- a/lib/core/services/authentication.service.ts +++ b/lib/core/services/authentication.service.ts @@ -157,7 +157,7 @@ export class AuthenticationService { * @returns True if set, false otherwise */ isRememberMeSet(): boolean { - return (this.cookie.getItem(REMEMBER_ME_COOKIE_KEY) === null) ? false : true; + return (this.cookie.getItem(REMEMBER_ME_COOKIE_KEY) !== null); } /** diff --git a/lib/core/services/identity-group.service.ts b/lib/core/services/identity-group.service.ts index 3475ede66d..2ed631e7dd 100644 --- a/lib/core/services/identity-group.service.ts +++ b/lib/core/services/identity-group.service.ts @@ -287,10 +287,7 @@ export class IdentityGroupService { checkGroupHasClientApp(groupId: string, clientId: string): Observable { return this.getClientRoles(groupId, clientId).pipe( map((response: any[]) => { - if (response && response.length > 0) { - return true; - } - return false; + return response && response.length > 0; }), catchError((error) => this.handleError(error)) ); diff --git a/lib/core/services/identity-user.service.ts b/lib/core/services/identity-user.service.ts index ac28fe2965..a171ee7b20 100644 --- a/lib/core/services/identity-user.service.ts +++ b/lib/core/services/identity-user.service.ts @@ -201,10 +201,7 @@ export class IdentityUserService { checkUserHasClientApp(userId: string, clientId: string): Observable { return this.getClientRoles(userId, clientId).pipe( map((clientRoles: any[]) => { - if (clientRoles.length > 0) { - return true; - } - return false; + return clientRoles.length > 0; }) ); } diff --git a/lib/core/services/upload.service.ts b/lib/core/services/upload.service.ts index 68b6767240..db76da0643 100644 --- a/lib/core/services/upload.service.ts +++ b/lib/core/services/upload.service.ts @@ -82,7 +82,7 @@ export class UploadService { * @returns True if a file is uploading, false otherwise */ isUploading(): boolean { - return this.activeTask ? true : false; + return !!this.activeTask; } /** diff --git a/lib/insights/src/lib/analytics-process/components/analytics-generator.component.ts b/lib/insights/src/lib/analytics-process/components/analytics-generator.component.ts index f7726a57e8..c37feb0da9 100644 --- a/lib/insights/src/lib/analytics-process/components/analytics-generator.component.ts +++ b/lib/insights/src/lib/analytics-process/components/analytics-generator.component.ts @@ -120,8 +120,8 @@ export class AnalyticsGeneratorComponent implements OnChanges { return this.showDetails; } - isCurrent(position: number) { - return position === this.currentChartPosition ? true : false; + isCurrent(position: number): boolean { + return position === this.currentChartPosition; } selectCurrent(position: number) { diff --git a/lib/insights/src/lib/analytics-process/components/analytics-report-heat-map.component.ts b/lib/insights/src/lib/analytics-process/components/analytics-report-heat-map.component.ts index 470fccdcc6..62f02d4b3d 100644 --- a/lib/insights/src/lib/analytics-process/components/analytics-report-heat-map.component.ts +++ b/lib/insights/src/lib/analytics-process/components/analytics-report-heat-map.component.ts @@ -85,10 +85,10 @@ export class AnalyticsReportHeatMapComponent implements OnInit { }); } - hasMetric() { - return (this.report.totalCountsPercentages || - this.report.totalTimePercentages || - this.report.avgTimePercentages) ? true : false; + hasMetric(): boolean { + return !!(this.report.totalCountsPercentages || + this.report.totalTimePercentages || + this.report.avgTimePercentages); } } diff --git a/lib/insights/src/lib/analytics-process/components/analytics-report-list.component.ts b/lib/insights/src/lib/analytics-process/components/analytics-report-list.component.ts index a2ee09fd89..0f11447b6f 100644 --- a/lib/insights/src/lib/analytics-process/components/analytics-report-list.component.ts +++ b/lib/insights/src/lib/analytics-process/components/analytics-report-list.component.ts @@ -171,15 +171,15 @@ export class AnalyticsReportListComponent implements OnInit { this.selectFirst = false; } - isSelected(report: any) { - return this.currentReport === report ? true : false; + isSelected(report: any): boolean { + return this.currentReport === report; } - isList() { + isList(): boolean { return this.layoutType === AnalyticsReportListComponent.LAYOUT_LIST; } - isGrid() { + isGrid(): boolean { return this.layoutType === AnalyticsReportListComponent.LAYOUT_GRID; } } diff --git a/lib/insights/src/lib/analytics-process/components/widgets/widget.component.ts b/lib/insights/src/lib/analytics-process/components/widgets/widget.component.ts index fbc74d1902..310827cb8b 100644 --- a/lib/insights/src/lib/analytics-process/components/widgets/widget.component.ts +++ b/lib/insights/src/lib/analytics-process/components/widgets/widget.component.ts @@ -35,8 +35,8 @@ export class WidgetComponent implements OnChanges { } } - hasField() { - return this.field ? true : false; + hasField(): boolean { + return !!this.field; } hasValue(): boolean { diff --git a/lib/insights/src/lib/diagram/models/chart/bar-chart.model.ts b/lib/insights/src/lib/diagram/models/chart/bar-chart.model.ts index f239a82821..dfd753f341 100644 --- a/lib/insights/src/lib/diagram/models/chart/bar-chart.model.ts +++ b/lib/insights/src/lib/diagram/models/chart/bar-chart.model.ts @@ -101,7 +101,7 @@ export class BarChart extends Chart { }; }; - hasDatasets() { - return this.datasets && this.datasets.length > 0 ? true : false; + hasDatasets(): boolean { + return this.datasets && this.datasets.length > 0; } } diff --git a/lib/insights/src/lib/diagram/models/chart/details-table-chart.model.ts b/lib/insights/src/lib/diagram/models/chart/details-table-chart.model.ts index 7c8e885cb8..d88f2f2686 100644 --- a/lib/insights/src/lib/diagram/models/chart/details-table-chart.model.ts +++ b/lib/insights/src/lib/diagram/models/chart/details-table-chart.model.ts @@ -28,7 +28,7 @@ export class DetailsTableChart extends TableChart { } } - hasDetailsTable() { - return this.detailsTable ? true : false; + hasDetailsTable(): boolean { + return !!this.detailsTable; } } diff --git a/lib/process-services-cloud/src/lib/form/components/form-cloud.component.ts b/lib/process-services-cloud/src/lib/form/components/form-cloud.component.ts index c42b478509..a1f76fa748 100644 --- a/lib/process-services-cloud/src/lib/form/components/form-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/form/components/form-cloud.component.ts @@ -365,11 +365,7 @@ export class FormCloudComponent extends FormBaseComponent implements OnChanges, } this.executeOutcome.emit(args); - if (args.defaultPrevented) { - return false; - } - - return true; + return !args.defaultPrevented; } protected storeFormAsMetadata() { diff --git a/lib/process-services-cloud/src/lib/form/services/content-cloud-node-selector.service.ts b/lib/process-services-cloud/src/lib/form/services/content-cloud-node-selector.service.ts index 39e8fd08ee..bd0584ffe9 100644 --- a/lib/process-services-cloud/src/lib/form/services/content-cloud-node-selector.service.ts +++ b/lib/process-services-cloud/src/lib/form/services/content-cloud-node-selector.service.ts @@ -46,7 +46,7 @@ export class ContentCloudNodeSelectorService { actionName: 'Choose', currentFolderId: '-my-', select, - isSelectionValid: this.isNodeFile.bind(this), + isSelectionValid: (entry: Node) => entry.isFile, showFilesInResult: true }; @@ -61,8 +61,4 @@ export class ContentCloudNodeSelectorService { close() { this.dialog.closeAll(); } - - private isNodeFile(entry: Node): boolean { - return entry && entry.isFile; - } } diff --git a/lib/process-services-cloud/src/lib/process/directives/cancel-process.directive.ts b/lib/process-services-cloud/src/lib/process/directives/cancel-process.directive.ts index f25e418808..c16bd7a5e0 100644 --- a/lib/process-services-cloud/src/lib/process/directives/cancel-process.directive.ts +++ b/lib/process-services-cloud/src/lib/process/directives/cancel-process.directive.ts @@ -58,7 +58,7 @@ export class CancelProcessDirective implements OnInit, OnDestroy { @HostListener('click') async onClick() { try { - this.cancelProcess(); + await this.cancelProcess(); } catch (error) { this.error.emit(error); } diff --git a/lib/process-services-cloud/src/lib/task/directives/claim-task-cloud.directive.ts b/lib/process-services-cloud/src/lib/task/directives/claim-task-cloud.directive.ts index 1fc45e062c..f22827d315 100644 --- a/lib/process-services-cloud/src/lib/task/directives/claim-task-cloud.directive.ts +++ b/lib/process-services-cloud/src/lib/task/directives/claim-task-cloud.directive.ts @@ -74,7 +74,7 @@ export class ClaimTaskCloudDirective implements OnInit { @HostListener('click') async onClick() { try { - this.claimTask(); + await await this.claimTask(); } catch (error) { this.error.emit(error); } diff --git a/lib/process-services-cloud/src/lib/task/directives/unclaim-task-cloud.directive.ts b/lib/process-services-cloud/src/lib/task/directives/unclaim-task-cloud.directive.ts index 8897122541..fdcb1ee55f 100644 --- a/lib/process-services-cloud/src/lib/task/directives/unclaim-task-cloud.directive.ts +++ b/lib/process-services-cloud/src/lib/task/directives/unclaim-task-cloud.directive.ts @@ -72,7 +72,7 @@ export class UnClaimTaskCloudDirective implements OnInit { @HostListener('click') async onClick() { try { - this.unclaimTask(); + await this.unclaimTask(); } catch (error) { this.error.emit(error); } diff --git a/lib/process-services/src/lib/app-list/apps-list.component.ts b/lib/process-services/src/lib/app-list/apps-list.component.ts index 951e1693f9..6d3a61c39a 100644 --- a/lib/process-services/src/lib/app-list/apps-list.component.ts +++ b/lib/process-services/src/lib/app-list/apps-list.component.ts @@ -176,10 +176,7 @@ export class AppsListComponent implements OnInit, AfterContentInit, OnDestroy { * Check if the value of the layoutType property is an allowed value */ isValidType(): boolean { - if (this.layoutType && (this.layoutType === AppsListComponent.LAYOUT_LIST || this.layoutType === AppsListComponent.LAYOUT_GRID)) { - return true; - } - return false; + return this.layoutType && (this.layoutType === AppsListComponent.LAYOUT_LIST || this.layoutType === AppsListComponent.LAYOUT_GRID); } /** diff --git a/lib/process-services/src/lib/content-widget/attach-file-widget-dialog.service.ts b/lib/process-services/src/lib/content-widget/attach-file-widget-dialog.service.ts index ad386e505f..9bb8966c6c 100644 --- a/lib/process-services/src/lib/content-widget/attach-file-widget-dialog.service.ts +++ b/lib/process-services/src/lib/content-widget/attach-file-widget-dialog.service.ts @@ -54,7 +54,7 @@ export class AttachFileWidgetDialogService { selected, ecmHost, context, - isSelectionValid: this.isNodeFile.bind(this), + isSelectionValid: (entry: Node) => entry.isFile, showFilesInResult: true }; @@ -71,10 +71,6 @@ export class AttachFileWidgetDialogService { this.dialog.closeAll(); } - private isNodeFile(entry: Node): boolean { - return entry.isFile; - } - private getLoginTitleTranslation(ecmHost: string): string { return this.translation.instant(`ATTACH-FILE.DIALOG.LOGIN`, { ecmHost }); } diff --git a/lib/process-services/src/lib/form/form.component.ts b/lib/process-services/src/lib/form/form.component.ts index 16c3b85317..a00ac8bcce 100644 --- a/lib/process-services/src/lib/form/form.component.ts +++ b/lib/process-services/src/lib/form/form.component.ts @@ -392,11 +392,6 @@ export class FormComponent extends FormBaseComponent implements OnInit, OnDestro } this.executeOutcome.emit(args); - if (args.defaultPrevented) { - return false; - } - - return true; + return !args.defaultPrevented; } - } diff --git a/lib/process-services/src/lib/process-list/models/process-definition.model.ts b/lib/process-services/src/lib/process-list/models/process-definition.model.ts index 4193b999bb..700065c803 100644 --- a/lib/process-services/src/lib/process-list/models/process-definition.model.ts +++ b/lib/process-services/src/lib/process-list/models/process-definition.model.ts @@ -37,6 +37,6 @@ export class ProcessDefinitionRepresentation { this.deploymentId = obj && obj.deploymentId || null; this.tenantId = obj && obj.tenantId || null; this.metaDataValues = obj && obj.metaDataValues || []; - this.hasStartForm = obj && obj.hasStartForm === true ? true : false; + this.hasStartForm = obj && obj.hasStartForm === true; } } diff --git a/lib/process-services/src/lib/task-list/components/attach-form.component.ts b/lib/process-services/src/lib/task-list/components/attach-form.component.ts index df064519f2..51ae4fff0a 100644 --- a/lib/process-services/src/lib/task-list/components/attach-form.component.ts +++ b/lib/process-services/src/lib/task-list/components/attach-form.component.ts @@ -64,11 +64,7 @@ export class AttachFormComponent implements OnInit, OnChanges { this.attachFormControl = new FormControl('', Validators.required); this.attachFormControl.valueChanges.subscribe( (currentValue) => { if (this.attachFormControl.valid) { - if ( this.formId !== currentValue) { - this.disableSubmit = false; - } else { - this.disableSubmit = true; - } + this.disableSubmit = this.formId === currentValue; } }); } diff --git a/lib/process-services/src/lib/task-list/components/task-audit.directive.ts b/lib/process-services/src/lib/task-list/components/task-audit.directive.ts index 335a9141ac..c20c3a9fd9 100644 --- a/lib/process-services/src/lib/task-list/components/task-audit.directive.ts +++ b/lib/process-services/src/lib/task-list/components/task-audit.directive.ts @@ -59,11 +59,6 @@ export class TaskAuditDirective implements OnChanges { public audit: any; - /** - * - * @param translateService - * @param taskListService - */ constructor(private contentService: ContentService, private taskListService: TaskListService) { } @@ -74,11 +69,8 @@ export class TaskAuditDirective implements OnChanges { } } - isValidType() { - if (this.format && (this.isJsonFormat() || this.isPdfFormat())) { - return true; - } - return false; + isValidType(): boolean { + return this.format && (this.isJsonFormat() || this.isPdfFormat()); } setDefaultFormatType(): void { diff --git a/lib/process-services/src/lib/task-list/components/task-form/claim-task.directive.ts b/lib/process-services/src/lib/task-list/components/task-form/claim-task.directive.ts index d2bdcd7ffa..ff77ebd466 100644 --- a/lib/process-services/src/lib/task-list/components/task-form/claim-task.directive.ts +++ b/lib/process-services/src/lib/task-list/components/task-form/claim-task.directive.ts @@ -71,7 +71,7 @@ export class ClaimTaskDirective { @HostListener('click') async onClick() { try { - this.claimTask(); + await this.claimTask(); } catch (error) { this.error.emit(error); } diff --git a/lib/process-services/src/lib/task-list/components/task-form/unclaim-task.directive.ts b/lib/process-services/src/lib/task-list/components/task-form/unclaim-task.directive.ts index 57f1812c0b..4fe5089c5d 100644 --- a/lib/process-services/src/lib/task-list/components/task-form/unclaim-task.directive.ts +++ b/lib/process-services/src/lib/task-list/components/task-form/unclaim-task.directive.ts @@ -70,7 +70,7 @@ export class UnclaimTaskDirective { @HostListener('click') async onClick() { try { - this.unclaimTask(); + await this.unclaimTask(); } catch (error) { this.error.emit(error); } diff --git a/lib/process-services/src/lib/task-list/models/filter.model.ts b/lib/process-services/src/lib/task-list/models/filter.model.ts index 4e65d8cc9e..b8d150698c 100644 --- a/lib/process-services/src/lib/task-list/models/filter.model.ts +++ b/lib/process-services/src/lib/task-list/models/filter.model.ts @@ -78,8 +78,8 @@ export class FilterRepresentationModel implements UserTaskFilterRepresentation { } } - hasFilter() { - return this.filter ? true : false; + hasFilter(): boolean { + return !!this.filter; } } diff --git a/lib/testing/src/lib/core/pages/pagination.page.ts b/lib/testing/src/lib/core/pages/pagination.page.ts index 002aa7e3ac..143dbba160 100644 --- a/lib/testing/src/lib/core/pages/pagination.page.ts +++ b/lib/testing/src/lib/core/pages/pagination.page.ts @@ -139,10 +139,6 @@ export class PaginationPage { return totalNumberOfFiles.split('of ')[1]; } - async getNumberOfAllRows(): Promise { - return +this.getTotalNumberOfFiles(); - } - /* * Wait until the total number of items is less then specified value */