reduce duplication and code improvements (#1707)

* reduce code duplication

* reduce duplication, fix license headers

* simplify code

* typings fixes

* update tests

* minor fixes

* markdown fixes

* revert changes
This commit is contained in:
Denys Vuika
2020-12-11 15:47:17 +00:00
committed by GitHub
parent b71e1530d1
commit 7a5350a06d
64 changed files with 482 additions and 744 deletions

View File

@@ -212,8 +212,7 @@ export function canDownloadSelection(context: RuleContext): boolean {
* JSON ref: `app.selection.folder`
*/
export function hasFolderSelected(context: RuleContext): boolean {
const folder = context.selection.folder;
return folder ? true : false;
return !!context.selection.folder;
}
/**
@@ -221,8 +220,7 @@ export function hasFolderSelected(context: RuleContext): boolean {
* JSON ref: `app.selection.library`
*/
export function hasLibrarySelected(context: RuleContext): boolean {
const library = context.selection.library;
return library ? true : false;
return !!context.selection.library;
}
/**
@@ -256,10 +254,7 @@ export function hasNoLibraryRole(context: RuleContext): boolean {
* JSON ref: `app.selection.file`
*/
export function hasFileSelected(context: RuleContext): boolean {
if (context && context.selection && context.selection.file) {
return true;
}
return false;
return !!(context && context.selection && context.selection.file);
}
/**

View File

@@ -57,9 +57,6 @@ export class ToolbarButtonComponent {
}
private hasClickAction(actionRef: ContentActionRef): boolean {
if (actionRef && actionRef.actions && actionRef.actions.click) {
return true;
}
return false;
return !!(actionRef && actionRef.actions && actionRef.actions.click);
}
}

View File

@@ -53,10 +53,7 @@ export class ToolbarMenuItemComponent {
}
private hasClickAction(actionRef: ContentActionRef): boolean {
if (actionRef && actionRef.actions && actionRef.actions.click) {
return true;
}
return false;
return !!(actionRef && actionRef.actions && actionRef.actions.click);
}
trackById(_: number, obj: { id: string }) {

View File

@@ -47,10 +47,6 @@ export class ToolbarMenuComponent {
this.matTrigger.closeMenu();
}
get hasChildren(): boolean {
return this.actionRef && this.actionRef.children && this.actionRef.children.length > 0;
}
trackById(_: number, obj: { id: string }) {
return obj.id;
}

View File

@@ -466,7 +466,7 @@ export class AppExtensionService implements RuleContext {
// todo: move to ADF/RuleService
isRuleDefined(ruleId: string): boolean {
return ruleId && this.getEvaluator(ruleId) ? true : false;
return !!(ruleId && this.getEvaluator(ruleId));
}
// todo: move to ADF/RuleService

View File

@@ -126,10 +126,6 @@ export class RouterEffects {
}
private isLibraryContent(path: PathInfoEntity): boolean {
if (path && path.elements.length >= 2 && path.elements[1].name === 'Sites') {
return true;
}
return false;
return path && path.elements.length >= 2 && path.elements[1].name === 'Sites';
}
}