diff --git a/src/main/resources/assets/admin/common/js/BrowserHelper.ts b/src/main/resources/assets/admin/common/js/BrowserHelper.ts index 873a256f0..d6137ba7f 100644 --- a/src/main/resources/assets/admin/common/js/BrowserHelper.ts +++ b/src/main/resources/assets/admin/common/js/BrowserHelper.ts @@ -64,7 +64,7 @@ export class BrowserHelper { static isSafari(): boolean { return navigator.vendor && navigator.vendor.indexOf('Apple') > -1 && - navigator.userAgent && !navigator.userAgent.match('CriOS'); + navigator.userAgent && !(/CriOS/.exec(navigator.userAgent)); } static isAndroid(): boolean { @@ -76,7 +76,7 @@ export class BrowserHelper { } private static init() { - let M = navigator.userAgent.match(/(opera|chrome|safari|firefox|msie|trident(?=\/))\/?\s*(\d+)/i) || []; + let M = (/(opera|chrome|safari|firefox|msie|trident(?=\/))\/?\s*(\d+)/i.exec(navigator.userAgent)) || []; BrowserHelper.BROWSER_NAME = (BrowserName)[M[1].toLocaleUpperCase()]; BrowserHelper.BROWSER_VERSION = M[2]; diff --git a/src/main/resources/assets/admin/common/js/ClassHelper.ts b/src/main/resources/assets/admin/common/js/ClassHelper.ts index 70a42c6e5..e293b6b9a 100644 --- a/src/main/resources/assets/admin/common/js/ClassHelper.ts +++ b/src/main/resources/assets/admin/common/js/ClassHelper.ts @@ -81,7 +81,7 @@ export class ClassHelper { static findPath(obj: Object, constructor: Function, nestLevel: number = 1): string { let value; - let path; + let path: string; // don't search in current package if nest level is to big if (nestLevel > ClassHelper.MAX_NEST_LEVEL) { diff --git a/src/main/resources/assets/admin/common/js/ObjectHelper.ts b/src/main/resources/assets/admin/common/js/ObjectHelper.ts index cf1738bf3..9927b6d4b 100644 --- a/src/main/resources/assets/admin/common/js/ObjectHelper.ts +++ b/src/main/resources/assets/admin/common/js/ObjectHelper.ts @@ -11,6 +11,7 @@ export class ObjectHelper { * @returns {Object} */ static create(constructor: Function, ..._args: any[]) { + // eslint-disable-next-line prefer-spread, prefer-rest-params let factory = constructor.bind.apply(constructor, arguments); return new factory(); } diff --git a/src/main/resources/assets/admin/common/js/aggregation/BucketFactory.ts b/src/main/resources/assets/admin/common/js/aggregation/BucketFactory.ts index a1b9061c3..ff3f8386f 100644 --- a/src/main/resources/assets/admin/common/js/aggregation/BucketFactory.ts +++ b/src/main/resources/assets/admin/common/js/aggregation/BucketFactory.ts @@ -1,7 +1,5 @@ import {BucketWrapperJson} from './BucketWrapperJson'; import {Bucket} from './Bucket'; -import {DateRangeBucketJson} from './DateRangeBucketJson'; -import {BucketJson} from './BucketJson'; import {DateRangeBucket} from './DateRangeBucket'; export class BucketFactory { @@ -9,9 +7,9 @@ export class BucketFactory { public static createFromJson(json: BucketWrapperJson): Bucket { if (json.DateRangeBucket) { - return DateRangeBucket.fromDateRangeJson(json.DateRangeBucket); + return DateRangeBucket.fromDateRangeJson(json.DateRangeBucket); } else if (json.BucketJson) { - return Bucket.fromJson(json.BucketJson); + return Bucket.fromJson(json.BucketJson); } else { throw new Error('Bucket-type not recognized: ' + json); } diff --git a/src/main/resources/assets/admin/common/js/app/browse/filter/BrowseFilterPanel.ts b/src/main/resources/assets/admin/common/js/app/browse/filter/BrowseFilterPanel.ts index e3a961382..e1b132f42 100644 --- a/src/main/resources/assets/admin/common/js/app/browse/filter/BrowseFilterPanel.ts +++ b/src/main/resources/assets/admin/common/js/app/browse/filter/BrowseFilterPanel.ts @@ -52,7 +52,7 @@ export class BrowseFilterPanel }); this.clearFilter = new ClearFilterButton(); - this.clearFilter.onClicked(() => this.reset()); + this.clearFilter.onClicked(() => void this.reset()); this.hitsCounterEl = new SpanEl('hits-counter'); diff --git a/src/main/resources/assets/admin/common/js/app/wizard/WizardHeaderWithDisplayNameAndName.ts b/src/main/resources/assets/admin/common/js/app/wizard/WizardHeaderWithDisplayNameAndName.ts index 5f5fa48e0..ca6b4a08b 100644 --- a/src/main/resources/assets/admin/common/js/app/wizard/WizardHeaderWithDisplayNameAndName.ts +++ b/src/main/resources/assets/admin/common/js/app/wizard/WizardHeaderWithDisplayNameAndName.ts @@ -7,7 +7,6 @@ import {AutosizeTextInput} from '../../ui/text/AutosizeTextInput'; import {ValueChangedEvent} from '../../ValueChangedEvent'; import {StringHelper} from '../../util/StringHelper'; import {NamePrettyfier} from '../../NamePrettyfier'; -import {DisplayNameGenerator} from './DisplayNameGenerator'; import {WizardHeader} from './WizardHeader'; import {Name} from '../../Name'; import {DivEl} from '../../dom/DivEl'; @@ -232,7 +231,7 @@ export class WizardHeaderWithDisplayNameAndName /* TODO: DEPRECATE METHODS BELOW IN 4.0 */ disableNameInput() { - console.warn(`WizardHeaderWithDisplayNameAndName.disableNameInput() is deprecated and will be removed in lib-admin-ui 4.0.0`); + console.warn('WizardHeaderWithDisplayNameAndName.disableNameInput() is deprecated and will be removed in lib-admin-ui 4.0.0'); this.toggleNameInput(false); } diff --git a/src/main/resources/assets/admin/common/js/application/ApplicationKey.ts b/src/main/resources/assets/admin/common/js/application/ApplicationKey.ts index 6708cd56f..ac09859a7 100644 --- a/src/main/resources/assets/admin/common/js/application/ApplicationKey.ts +++ b/src/main/resources/assets/admin/common/js/application/ApplicationKey.ts @@ -48,12 +48,7 @@ export class ApplicationKey } isSystemReserved(): boolean { - for (let key in ApplicationKey.SYSTEM_RESERVED_APPLICATION_KEYS) { - if (ApplicationKey.SYSTEM_RESERVED_APPLICATION_KEYS[key].equals(this)) { - return true; - } - } - return false; + return ApplicationKey.SYSTEM_RESERVED_APPLICATION_KEYS.some(key => key.equals(this)); } toString(): string { diff --git a/src/main/resources/assets/admin/common/js/application/ApplicationLoader.ts b/src/main/resources/assets/admin/common/js/application/ApplicationLoader.ts index 3322950d9..1d768d5c8 100644 --- a/src/main/resources/assets/admin/common/js/application/ApplicationLoader.ts +++ b/src/main/resources/assets/admin/common/js/application/ApplicationLoader.ts @@ -29,15 +29,14 @@ export class ApplicationLoader } load(): Q.Promise { - let me = this; - me.notifyLoadingData(); + this.notifyLoadingData(); - return me.sendRequest() + return this.sendRequest() .then((applications: Application[]) => { - if (me.filterObject) { - applications = applications.filter(me.filterResults, me); + if (this.filterObject) { + applications = applications.filter(this.filterResults, this); } - me.notifyLoadedData(applications); + this.notifyLoadedData(applications); return applications; }); diff --git a/src/main/resources/assets/admin/common/js/data/PropertyArray.ts b/src/main/resources/assets/admin/common/js/data/PropertyArray.ts index 5d8a43274..1f5ecbd46 100644 --- a/src/main/resources/assets/admin/common/js/data/PropertyArray.ts +++ b/src/main/resources/assets/admin/common/js/data/PropertyArray.ts @@ -441,7 +441,8 @@ export class PropertyArray private checkType(type: ValueType) { if (!this.type.equals(type)) { - throw new Error(`This PropertyArray expects only properties with value of type '${this.type}', got: ${type}`); + const msg = `This PropertyArray expects only properties with value of type '${this.type.toString()}', got: ${type.toString()}`; + throw new Error(msg); } } diff --git a/src/main/resources/assets/admin/common/js/data/PropertyTree.ts b/src/main/resources/assets/admin/common/js/data/PropertyTree.ts index 046910016..098772cb5 100644 --- a/src/main/resources/assets/admin/common/js/data/PropertyTree.ts +++ b/src/main/resources/assets/admin/common/js/data/PropertyTree.ts @@ -101,7 +101,7 @@ export class PropertyTree } /** - * @returns {PropertySet} Returns the root [[PropertySet]] of this tree. + * @returns {PropertySet} Returns the root [[PropertySet]] of this tree. */ public getRoot(): PropertySet { return this.root; diff --git a/src/main/resources/assets/admin/common/js/dom/Element.ts b/src/main/resources/assets/admin/common/js/dom/Element.ts index af660f0fa..47c012620 100644 --- a/src/main/resources/assets/admin/common/js/dom/Element.ts +++ b/src/main/resources/assets/admin/common/js/dom/Element.ts @@ -247,7 +247,7 @@ export class Element { static fromSelector(s: string, loadExistingChildren: boolean = true): Element[] { return $(s).map((_index, elem) => { - let htmlEl = elem; + let htmlEl = elem; let parentEl; if (htmlEl && htmlEl.parentElement) { parentEl = Element.fromHtmlElement(htmlEl.parentElement); @@ -1302,6 +1302,7 @@ export class Element { } private getFirstNonEmptyAncestor(): Element { + // eslint-disable-next-line @typescript-eslint/no-this-alias let el: Element = this; while (!!el && el.isEmptyElement()) { diff --git a/src/main/resources/assets/admin/common/js/dom/ElementHelper.ts b/src/main/resources/assets/admin/common/js/dom/ElementHelper.ts index d1e5acbba..9a6db1f42 100644 --- a/src/main/resources/assets/admin/common/js/dom/ElementHelper.ts +++ b/src/main/resources/assets/admin/common/js/dom/ElementHelper.ts @@ -70,7 +70,7 @@ export class ElementHelper { getParent(): ElementHelper { let parent = this.el.parentElement; - return parent ? new ElementHelper(parent) : null; + return parent ? new ElementHelper(parent) : null; } setDisabled(value: boolean): ElementHelper { diff --git a/src/main/resources/assets/admin/common/js/dom/ImgElHelper.ts b/src/main/resources/assets/admin/common/js/dom/ImgElHelper.ts index 3612b7e99..56cc31180 100644 --- a/src/main/resources/assets/admin/common/js/dom/ImgElHelper.ts +++ b/src/main/resources/assets/admin/common/js/dom/ImgElHelper.ts @@ -11,7 +11,7 @@ export class ImgHelper } static create(): ElementHelper { - return new ImgHelper(document.createElement('img')); + return new ImgHelper(document.createElement('img')); } getHTMLElement(): HTMLImageElement { diff --git a/src/main/resources/assets/admin/common/js/event/EventBus.ts b/src/main/resources/assets/admin/common/js/event/EventBus.ts index 2aed75019..f66e500aa 100644 --- a/src/main/resources/assets/admin/common/js/event/EventBus.ts +++ b/src/main/resources/assets/admin/common/js/event/EventBus.ts @@ -45,7 +45,7 @@ export class EventBus { static polyfillCustomEvent(contextWindow: Window) { const customEventFn = (event: string, params: any) => { - params = params || { bubbles: false, cancelable: false, detail: undefined }; + params = params || {bubbles: false, cancelable: false, detail: undefined}; const evt = document.createEvent('CustomEvent'); evt.initCustomEvent(event, params.bubbles, params.cancelable, params.detail); return evt; diff --git a/src/main/resources/assets/admin/common/js/form/FormItemOccurrences.ts b/src/main/resources/assets/admin/common/js/form/FormItemOccurrences.ts index 4bd197fcc..356a080b8 100644 --- a/src/main/resources/assets/admin/common/js/form/FormItemOccurrences.ts +++ b/src/main/resources/assets/admin/common/js/form/FormItemOccurrences.ts @@ -396,7 +396,7 @@ export class FormItemOccurrences { const promises: Q.Promise[] = []; const totalItemsNeeded: number = this.getTotalOccurrencesNeeded(); - const extraItemsToRemove: V[] = this.occurrenceViews.filter((item: V, index: number) => index >= totalItemsNeeded ); + const extraItemsToRemove: V[] = this.occurrenceViews.filter((item: V, index: number) => index >= totalItemsNeeded); extraItemsToRemove.forEach((item: V) => this.removeOccurrenceView(item)); this.occurrenceViews.forEach((view: V) => { diff --git a/src/main/resources/assets/admin/common/js/form/inputtype/appconfig/ApplicationConfiguratorDialog.ts b/src/main/resources/assets/admin/common/js/form/inputtype/appconfig/ApplicationConfiguratorDialog.ts index 1b4c0954b..aba70f714 100644 --- a/src/main/resources/assets/admin/common/js/form/inputtype/appconfig/ApplicationConfiguratorDialog.ts +++ b/src/main/resources/assets/admin/common/js/form/inputtype/appconfig/ApplicationConfiguratorDialog.ts @@ -177,7 +177,7 @@ export class ApplicationConfiguratorDialog private findComboboxes(element: Element): ComboBox[] { if (element instanceof ComboBox) { - return [>element]; + return [element]; } return ArrayHelper.flatten(element.getChildren().map(child => this.findComboboxes(child))); diff --git a/src/main/resources/assets/admin/common/js/form/inputtype/support/BaseInputTypeNotManagingAdd.ts b/src/main/resources/assets/admin/common/js/form/inputtype/support/BaseInputTypeNotManagingAdd.ts index db764af73..8669d146c 100644 --- a/src/main/resources/assets/admin/common/js/form/inputtype/support/BaseInputTypeNotManagingAdd.ts +++ b/src/main/resources/assets/admin/common/js/form/inputtype/support/BaseInputTypeNotManagingAdd.ts @@ -54,7 +54,7 @@ export abstract class BaseInputTypeNotManagingAdd handleDnDStart(ui: JQueryUI.SortableUIParams): void { - let draggedElement = Element.fromHtmlElement(ui.item[0]); + let draggedElement = Element.fromHtmlElement(ui.item[0]); this.draggingIndex = draggedElement.getSiblingIndex(); ui.placeholder.text('Drop form item set here'); @@ -67,7 +67,7 @@ export abstract class BaseInputTypeNotManagingAdd handleDnDUpdate(ui: JQueryUI.SortableUIParams) { if (this.draggingIndex >= 0) { - let draggedElement = Element.fromHtmlElement(ui.item[0]); + let draggedElement = Element.fromHtmlElement(ui.item[0]); let draggedToIndex = draggedElement.getSiblingIndex(); this.inputOccurrences.moveOccurrence(this.draggingIndex, draggedToIndex); } diff --git a/src/main/resources/assets/admin/common/js/form/set/FormSetView.ts b/src/main/resources/assets/admin/common/js/form/set/FormSetView.ts index 5ca683a5e..581080916 100644 --- a/src/main/resources/assets/admin/common/js/form/set/FormSetView.ts +++ b/src/main/resources/assets/admin/common/js/form/set/FormSetView.ts @@ -194,7 +194,7 @@ export abstract class FormSetView validate(silent: boolean = true, viewToSkipValidation: FormItemOccurrenceView = null): ValidationRecording { if (!this.formItemOccurrences) { - throw new Error(`Can't validate before layout is done`); + throw new Error('Can\'t validate before layout is done'); } const validationRecordingPath = this.resolveValidationRecordingPath(); @@ -429,7 +429,7 @@ export abstract class FormSetView } protected handleDnDStart(ui: JQueryUI.SortableUIParams): void { - const draggedElement = Element.fromHtmlElement(ui.item[0]); + const draggedElement = Element.fromHtmlElement(ui.item[0]); assert(draggedElement.hasClass(this.classPrefix + '-occurrence-view')); this.draggingIndex = draggedElement.getSiblingIndex(); @@ -439,7 +439,7 @@ export abstract class FormSetView protected handleDnDUpdate(ui: JQueryUI.SortableUIParams) { if (this.draggingIndex >= 0) { - const draggedElement = Element.fromHtmlElement(ui.item[0]); + const draggedElement = Element.fromHtmlElement(ui.item[0]); assert(draggedElement.hasClass(this.classPrefix + '-occurrence-view')); const draggedToIndex = draggedElement.getSiblingIndex(); @@ -458,7 +458,7 @@ export abstract class FormSetView return; // everything is already have been handled in update } - const draggedElement = Element.fromHtmlElement(ui.item[0]); + const draggedElement = Element.fromHtmlElement(ui.item[0]); assert(draggedElement.hasClass(this.classPrefix + '-occurrence-view')); const draggedToIndex = draggedElement.getSiblingIndex(); this.formItemOccurrences.refreshOccurence(draggedToIndex); @@ -537,7 +537,7 @@ export abstract class FormSetView const views = this.formItemOccurrences.getOccurrenceViews(); const occurrenceCount = views.length; const anyExpandable = occurrenceCount > 0 && views.some(view => view.isExpandable()); - const isCollapsed = (>this.formItemOccurrences).isCollapsed(); + const isCollapsed = (this.formItemOccurrences).isCollapsed(); const caption = occurrenceCount > 1 ? (isCollapsed ? i18n('button.expandall') : i18n('button.collapseall')) : @@ -549,7 +549,7 @@ export abstract class FormSetView private makeCollapseButton(): AEl { const collapseButton = new AEl('collapse-button'); collapseButton.onClicked((event: MouseEvent) => { - const isCollapsed = (>this.formItemOccurrences).isCollapsed(); + const isCollapsed = (this.formItemOccurrences).isCollapsed(); this.toggleOccurrencesVisibility(isCollapsed); return false; }); @@ -585,9 +585,9 @@ export abstract class FormSetView item.setContainerVisible(true); const processFormItemView = (formItemView: FormItemView) => { if (formItemView instanceof FormSetView) { - (>formItemView).expandRecursively(); + (formItemView).expandRecursively(); } else if (formItemView instanceof FormOptionSetOptionView) { - (formItemView).getFormItemViews().forEach(processFormItemView); + (formItemView).getFormItemViews().forEach(processFormItemView); } }; item.getFormItemViews().forEach(processFormItemView); diff --git a/src/main/resources/assets/admin/common/js/form/set/optionset/FormOptionSetOccurrenceView.ts b/src/main/resources/assets/admin/common/js/form/set/optionset/FormOptionSetOccurrenceView.ts index 94839d7f8..6511d515f 100644 --- a/src/main/resources/assets/admin/common/js/form/set/optionset/FormOptionSetOccurrenceView.ts +++ b/src/main/resources/assets/admin/common/js/form/set/optionset/FormOptionSetOccurrenceView.ts @@ -55,7 +55,7 @@ export abstract class FormOptionSetOccurrenceView super.subscribeOnItemEvents(); this.formItemViews.forEach((formItemView: FormOptionSetOptionView) => { - formItemView.onSelectionChanged(() => this.handleSelectionChanged(formItemView)); + formItemView.onSelectionChanged(() => this.handleSelectionChanged(formItemView)); }); } diff --git a/src/main/resources/assets/admin/common/js/query/FulltextSearchExpression.ts b/src/main/resources/assets/admin/common/js/query/FulltextSearchExpression.ts index 26e874d06..539c9ded1 100644 --- a/src/main/resources/assets/admin/common/js/query/FulltextSearchExpression.ts +++ b/src/main/resources/assets/admin/common/js/query/FulltextSearchExpression.ts @@ -31,7 +31,7 @@ export class FulltextSearchExpression { } static escapeString(value: string): string { - return value.replace(/((\&\&)|(\|\|)|[+-=> -1) { + if (value.indexOf('\'') > -1) { return `"${value}"`; } else { return `'${value}'`; diff --git a/src/main/resources/assets/admin/common/js/schema/content/ContentTypeName.ts b/src/main/resources/assets/admin/common/js/schema/content/ContentTypeName.ts index 9f9394326..e5a4b3ed1 100644 --- a/src/main/resources/assets/admin/common/js/schema/content/ContentTypeName.ts +++ b/src/main/resources/assets/admin/common/js/schema/content/ContentTypeName.ts @@ -51,7 +51,7 @@ export class ContentTypeName static IMAGE: ContentTypeName = ContentTypeName.from(ApplicationKey.MEDIA, 'image'); constructor(name: string) { - assertNotNull(name, `Content type name can't be null`); + assertNotNull(name, 'Content type name can\'t be null'); let parts = name.split(ApplicationBasedName.SEPARATOR); super(ApplicationKey.fromString(parts[0]), parts[1]); } diff --git a/src/main/resources/assets/admin/common/js/schema/mixin/MixinName.ts b/src/main/resources/assets/admin/common/js/schema/mixin/MixinName.ts index 93b49d285..c6ef70220 100644 --- a/src/main/resources/assets/admin/common/js/schema/mixin/MixinName.ts +++ b/src/main/resources/assets/admin/common/js/schema/mixin/MixinName.ts @@ -8,7 +8,7 @@ export class MixinName extends ApplicationBasedName { constructor(name: string) { - assertNotNull(name, `Mixin name can't be null`); + assertNotNull(name, 'Mixin name can\'t be null'); let parts = name.split(ApplicationBasedName.SEPARATOR); super(ApplicationKey.fromString(parts[0]), parts[1]); } diff --git a/src/main/resources/assets/admin/common/js/security/auth/IsAuthenticatedRequest.ts b/src/main/resources/assets/admin/common/js/security/auth/IsAuthenticatedRequest.ts index bf9e01237..dc69b67e6 100644 --- a/src/main/resources/assets/admin/common/js/security/auth/IsAuthenticatedRequest.ts +++ b/src/main/resources/assets/admin/common/js/security/auth/IsAuthenticatedRequest.ts @@ -19,6 +19,7 @@ export class IsAuthenticatedRequest } sendAndParse(): Q.Promise { + // eslint-disable-next-line @typescript-eslint/no-misused-promises IsAuthenticatedRequest.cachedRequestPromise = IsAuthenticatedRequest.cachedRequestPromise || super.sendAndParse(); return IsAuthenticatedRequest.cachedRequestPromise; } diff --git a/src/main/resources/assets/admin/common/js/ui/dialog/ProgressBarManager.ts b/src/main/resources/assets/admin/common/js/ui/dialog/ProgressBarManager.ts index 71bde71cb..e7f4e59dc 100644 --- a/src/main/resources/assets/admin/common/js/ui/dialog/ProgressBarManager.ts +++ b/src/main/resources/assets/admin/common/js/ui/dialog/ProgressBarManager.ts @@ -57,7 +57,7 @@ export class ProgressBarManager { this.managingElement = config.managingElement; this.processHandler = config.processHandler; this.processingLabel = config.processingLabel; - this.unlockControlsHandler = config.unlockControlsHandler || (() => {/*empty*/ + this.unlockControlsHandler = config.unlockControlsHandler || (() => { /*empty*/ }); this.createProcessingMessage = config.createProcessingMessage; diff --git a/src/main/resources/assets/admin/common/js/ui/form/FormItem.ts b/src/main/resources/assets/admin/common/js/ui/form/FormItem.ts index ec100c20a..9c743a5b6 100644 --- a/src/main/resources/assets/admin/common/js/ui/form/FormItem.ts +++ b/src/main/resources/assets/admin/common/js/ui/form/FormItem.ts @@ -166,7 +166,7 @@ export class FormItemBuilder { constructor(input: FormItemEl) { if (!input) { - throw new Error(`Input can't be null.`); + throw new Error('Input can\'t be null.'); } this.input = input; } diff --git a/src/main/resources/assets/admin/common/js/ui/grid/Grid.ts b/src/main/resources/assets/admin/common/js/ui/grid/Grid.ts index f6111fe1d..7bb8aaaca 100644 --- a/src/main/resources/assets/admin/common/js/ui/grid/Grid.ts +++ b/src/main/resources/assets/admin/common/js/ui/grid/Grid.ts @@ -461,13 +461,13 @@ export class Grid subscribeBeforeMoveRows(callback: (e: any, args: any) => void) { if (this.rowManagerPlugin) { - (>this.rowManagerPlugin.onBeforeMoveRows).subscribe(callback); + (this.rowManagerPlugin.onBeforeMoveRows).subscribe(callback); } } subscribeMoveRows(callback: (e: any, args: any) => void) { if (this.rowManagerPlugin) { - (>this.rowManagerPlugin.onMoveRows).subscribe(callback); + (this.rowManagerPlugin.onMoveRows).subscribe(callback); } } diff --git a/src/main/resources/assets/admin/common/js/ui/security/PrincipalComboBox.ts b/src/main/resources/assets/admin/common/js/ui/security/PrincipalComboBox.ts index 6cc2ab402..289933eda 100644 --- a/src/main/resources/assets/admin/common/js/ui/security/PrincipalComboBox.ts +++ b/src/main/resources/assets/admin/common/js/ui/security/PrincipalComboBox.ts @@ -89,8 +89,8 @@ export class PrincipalSelectedOptionsView let key = PrincipalKey.fromString(id); return Option.create() - .setValue(id) - .setDisplayValue(Principal.create().setKey(key).setDisplayName(key.getId()).build()) + .setValue(id) + .setDisplayValue(Principal.create().setKey(key).setDisplayName(key.getId()).build()) .setEmpty(true) .build(); } diff --git a/src/main/resources/assets/admin/common/js/ui/selector/combobox/BaseRichComboBox.ts b/src/main/resources/assets/admin/common/js/ui/selector/combobox/BaseRichComboBox.ts index 112d2d778..9e7322754 100644 --- a/src/main/resources/assets/admin/common/js/ui/selector/combobox/BaseRichComboBox.ts +++ b/src/main/resources/assets/admin/common/js/ui/selector/combobox/BaseRichComboBox.ts @@ -399,7 +399,7 @@ export class BaseRichComboBox this.comboBox.setLoader(loader); this.comboBox.onOptionFilterInputValueChanged((event: OptionFilterInputValueChangedEvent) => { - return this.reload(event.getNewValue()); + this.reload(event.getNewValue()); }); this.loader.onLoadingData((event: LoadingDataEvent) => { diff --git a/src/main/resources/assets/admin/common/js/ui/selector/combobox/BaseSelectedOptionsView.ts b/src/main/resources/assets/admin/common/js/ui/selector/combobox/BaseSelectedOptionsView.ts index ad773b8ff..f7f40f26d 100644 --- a/src/main/resources/assets/admin/common/js/ui/selector/combobox/BaseSelectedOptionsView.ts +++ b/src/main/resources/assets/admin/common/js/ui/selector/combobox/BaseSelectedOptionsView.ts @@ -206,14 +206,14 @@ export class BaseSelectedOptionsView } protected handleDnDStart(ui: JQueryUI.SortableUIParams): void { - let draggedElement = Element.fromHtmlElement(ui.item[0]); + let draggedElement = Element.fromHtmlElement(ui.item[0]); this.draggingIndex = draggedElement.getSiblingIndex(); } protected handleDnDUpdate(ui: JQueryUI.SortableUIParams) { if (this.draggingIndex >= 0) { - let draggedElement = Element.fromHtmlElement(ui.item[0]); + let draggedElement = Element.fromHtmlElement(ui.item[0]); let draggedToIndex = draggedElement.getSiblingIndex(); this.handleMovedOccurrence(this.draggingIndex, draggedToIndex); } diff --git a/src/main/resources/assets/admin/common/js/ui/selector/combobox/ComboBox.ts b/src/main/resources/assets/admin/common/js/ui/selector/combobox/ComboBox.ts index 41988b5f6..e7c85f470 100644 --- a/src/main/resources/assets/admin/common/js/ui/selector/combobox/ComboBox.ts +++ b/src/main/resources/assets/admin/common/js/ui/selector/combobox/ComboBox.ts @@ -354,16 +354,10 @@ export class ComboBox let optionsMap = this.getDisplayedOptions().map((x) => { return x.getValue(); }).join(); - let selectedOptions: Option[] = this.getSelectedOptions(); - let filteredOption = []; - let gridOptions = []; - for (let k in selectedOptions) { - if (optionsMap.search(selectedOptions[k].getValue()) >= 0) { - filteredOption.push(selectedOptions[k].getValue()); - } - } - this.comboBoxDropdown.getDropdownGrid().getGrid().getSelectedRows().forEach((row: number) => { - gridOptions.push(this.comboBoxDropdown.getDropdownGrid().getOptionByRow(row).getValue()); + const selectedOptions: Option[] = this.getSelectedOptions(); + const filteredOption = selectedOptions.filter(o => optionsMap.search(o.getValue()) >= 0); + const gridOptions = this.comboBoxDropdown.getDropdownGrid().getGrid().getSelectedRows().map((row: number) => { + return this.comboBoxDropdown.getDropdownGrid().getOptionByRow(row).getValue(); }); return (filteredOption.length !== gridOptions.length) || diff --git a/src/main/resources/assets/admin/common/js/ui/tab/TabItem.ts b/src/main/resources/assets/admin/common/js/ui/tab/TabItem.ts index b9d4ccee9..03df34dc9 100644 --- a/src/main/resources/assets/admin/common/js/ui/tab/TabItem.ts +++ b/src/main/resources/assets/admin/common/js/ui/tab/TabItem.ts @@ -14,7 +14,7 @@ export class TabItem extends LiEl implements NavigationItem { - static tabIndexFormat: string = `{0}. `; + static tabIndexFormat: string = '{0}. '; private index: number; private label: string; private labelEl: AEl; @@ -142,7 +142,7 @@ export class TabItem onClosed(listener: (event: TabItemClosedEvent) => void) { if (this.closeAction) { - throw new Error(`Failed to set 'on closed' listener. Close action is already setted.`); + throw new Error('Failed to set \'on closed\' listener. Close action is already setted.'); } else { this.closedListeners.push(listener); } diff --git a/src/main/resources/assets/admin/common/js/ui/time/TimePicker.ts b/src/main/resources/assets/admin/common/js/ui/time/TimePicker.ts index bf7b15d58..2c2fe4cfb 100644 --- a/src/main/resources/assets/admin/common/js/ui/time/TimePicker.ts +++ b/src/main/resources/assets/admin/common/js/ui/time/TimePicker.ts @@ -89,7 +89,7 @@ export class TimePicker this.setTime(null, null); this.hidePopup(); } else { - let parsedTime = typedTime.match(/^\s*([0-2][0-9]:[0-5][0-9])\s*$/); + let parsedTime = /^\s*([0-2][0-9]:[0-5][0-9])\s*$/.exec(typedTime); if (parsedTime && parsedTime.length === 2) { let splitTime = parsedTime[1].split(':'); this.setTime(parseInt(splitTime[0], 10), parseInt(splitTime[1], 10)); diff --git a/src/main/resources/assets/admin/common/js/ui/treegrid/TreeGrid.ts b/src/main/resources/assets/admin/common/js/ui/treegrid/TreeGrid.ts index b603044aa..28949dbdb 100644 --- a/src/main/resources/assets/admin/common/js/ui/treegrid/TreeGrid.ts +++ b/src/main/resources/assets/admin/common/js/ui/treegrid/TreeGrid.ts @@ -97,7 +97,7 @@ export class TreeGrid event.preventDefault(); event.stopImmediatePropagation(); - } + }; constructor(builder: TreeGridBuilder) { diff --git a/src/main/resources/assets/admin/common/js/ui/treegrid/TreeGridToolbar.ts b/src/main/resources/assets/admin/common/js/ui/treegrid/TreeGridToolbar.ts index 4188892de..7eb7372a0 100644 --- a/src/main/resources/assets/admin/common/js/ui/treegrid/TreeGridToolbar.ts +++ b/src/main/resources/assets/admin/common/js/ui/treegrid/TreeGridToolbar.ts @@ -26,7 +26,7 @@ export class TreeGridToolbar this.refreshButton = new Button(); this.refreshButton .addClass(StyleHelper.getCommonIconCls('loop')) - .onClicked(() => treeGrid.reload()); + .onClicked(() => void treeGrid.reload()); this.leftWrapper = new DivEl('left-wrapper'); this.leftWrapper.appendChildren(this.selectionController, this.selectionPanelToggler); diff --git a/src/main/resources/assets/admin/common/js/ui/treegrid/TreeNode.ts b/src/main/resources/assets/admin/common/js/ui/treegrid/TreeNode.ts index 7e3109c39..522ab83da 100644 --- a/src/main/resources/assets/admin/common/js/ui/treegrid/TreeNode.ts +++ b/src/main/resources/assets/admin/common/js/ui/treegrid/TreeNode.ts @@ -116,6 +116,7 @@ export class TreeNode } getRoot(): TreeNode { + // eslint-disable-next-line @typescript-eslint/no-this-alias let root: TreeNode = this; let parent: TreeNode = this.getParent(); while (parent) { @@ -183,6 +184,7 @@ export class TreeNode if (!child) { return; } + // eslint-disable-next-line @typescript-eslint/no-for-in-array for (let curChildIndex in this.children) { if (this.children[curChildIndex].getId() === child.getId()) { this.children[curChildIndex] = child; diff --git a/src/main/resources/assets/admin/common/js/ui/uploader/UploaderEl.ts b/src/main/resources/assets/admin/common/js/ui/uploader/UploaderEl.ts index 8889adebb..f6d1d7d35 100644 --- a/src/main/resources/assets/admin/common/js/ui/uploader/UploaderEl.ts +++ b/src/main/resources/assets/admin/common/js/ui/uploader/UploaderEl.ts @@ -962,7 +962,7 @@ export class UploaderEl const focusableElements: HTMLCollectionOf = this.getDefaultDropzoneContainer().getHTMLElement().getElementsByTagName('input'); for (let i = 0; i < focusableElements.length; i++) { - const el = focusableElements.item(i); + const el = focusableElements.item(i); el.tabIndex = -1; } } diff --git a/src/main/resources/assets/admin/common/js/util/AppHelper.ts b/src/main/resources/assets/admin/common/js/util/AppHelper.ts index c3ce951d0..b544bd32f 100644 --- a/src/main/resources/assets/admin/common/js/util/AppHelper.ts +++ b/src/main/resources/assets/admin/common/js/util/AppHelper.ts @@ -3,6 +3,8 @@ import {Element} from '../dom/Element'; import {Body} from '../dom/Body'; import {WindowDOM} from '../dom/WindowDOM'; +/* eslint-disable @typescript-eslint/ban-ts-comment, @typescript-eslint/no-this-alias, prefer-rest-params */ + export class AppHelper { // Returns a function, that, as long as it continues to be invoked, will not diff --git a/src/main/resources/assets/admin/common/js/util/loader/ImageLoader.ts b/src/main/resources/assets/admin/common/js/util/loader/ImageLoader.ts index 84356d757..c612e7b2b 100644 --- a/src/main/resources/assets/admin/common/js/util/loader/ImageLoader.ts +++ b/src/main/resources/assets/admin/common/js/util/loader/ImageLoader.ts @@ -7,10 +7,10 @@ export class ImageLoader { let returnImage: HTMLImageElement; url = encodeURI(url); - for (let i in ImageLoader.cachedImages) { - if (ImageLoader.cachedImages[i].src === url) { + for (let cachedImage of ImageLoader.cachedImages) { + if (cachedImage.src === url) { imageFound = true; - returnImage = ImageLoader.cachedImages[i]; + returnImage = cachedImage; } } diff --git a/src/main/resources/assets/admin/common/js/validator/Validator.ts b/src/main/resources/assets/admin/common/js/validator/Validator.ts index da10236fa..cc14032a9 100644 --- a/src/main/resources/assets/admin/common/js/validator/Validator.ts +++ b/src/main/resources/assets/admin/common/js/validator/Validator.ts @@ -13,6 +13,6 @@ export class Validator { return true; } - return !text.match(/