EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
TS migration
Yuriic5c8c1bcbcad
diff --git a/client/src/views/fields/array.ts b/client/src/views/fields/array.tsindex 8d78230765..05fe6e39ec 100644--- a/client/src/views/fields/array.ts+++ b/client/src/views/fields/array.ts@@ -26,8 +26,6 @@* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.************************************************************************/-/** @module views/fields/array */-import BaseFieldView, {BaseOptions as BaseOptions,BaseParams as BaseParams,@@ -843,7 +841,7 @@ class ArrayFieldView<this.trigger('change');}- fetch() {+ fetch(): Record<string, any> {const data = {} as Record<string, any>;let list = Espo.Utils.clone(this.selected || []);diff --git a/client/src/views/fields/checklist.js b/client/src/views/fields/checklist.tssimilarity index 61%rename from client/src/views/fields/checklist.jsrename to client/src/views/fields/checklist.tsindex 6ee3626f57..2bec012a63 100644--- a/client/src/views/fields/checklist.js+++ b/client/src/views/fields/checklist.ts@@ -26,21 +26,31 @@* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.************************************************************************/-/** @module views/fields/checklist */+import ArrayFieldView, {ArrayOptions, ArrayParams} from 'views/fields/array';+import {BaseViewSchema} from 'views/fields/base';-import ArrayFieldView from 'views/fields/array';+export interface ChecklistParams extends ArrayParams {}-class ChecklistFieldView extends ArrayFieldView {+export interface ChecklistOptions extends ArrayOptions {+ /**+ * Is inversed.+ */+ isInversed?: boolean+}- type = 'checklist'+class ChecklistFieldView<+ S extends BaseViewSchema = BaseViewSchema,+ O extends ChecklistOptions = ChecklistOptions,+ P extends ChecklistParams = ChecklistParams,+> extends ArrayFieldView<S, O, P> {- listTemplate = 'fields/array/list'- detailTemplate = 'fields/checklist/detail'- editTemplate = 'fields/checklist/edit'+ readonly type: string = 'checklist'- isInversed = false+ protected listTemplate = 'fields/array/list'+ protected detailTemplate = 'fields/checklist/detail'+ protected editTemplate = 'fields/checklist/edit'- events = {}+ protected isInversed = falsedata() {return {@@ -49,20 +59,17 @@ class ChecklistFieldView extends ArrayFieldView {};}- setup() {+ protected setup() {super.setup();- this.params.options = this.params.options || [];+ this.params.options = this.params.options ?? [];- this.isInversed = this.params.isInversed || this.options.isInversed || this.isInversed;+ this.isInversed = this.options.isInversed ?? this.isInversed;}- /**- * @protected- */- setupFieldEvents() {}+ protected setupFieldEvents() {}- afterRender() {+ protected afterRender() {if (this.isSearchMode()) {this.renderSearch();}@@ -74,14 +81,14 @@ class ChecklistFieldView extends ArrayFieldView {}}- getOptionDataList() {- let valueList = this.model.get(this.name) || [];- let list = [];+ protected getOptionDataList(): Record<string, any> {+ const valueList: string[] = (this.model.get(this.name) ?? []) as string[];+ const list: Record<string, any>[] = [];- this.params.options.forEach((item) => {- let isChecked = ~valueList.indexOf(item);- let dataName = item;- let id = this.cid + '-' + Espo.Utils.camelCaseToHyphen(item.replace(/\s+/g, '-'));+ (this.params.options ?? []).forEach(item => {+ let isChecked = valueList.includes(item);+ const dataName = item;+ const id = this.cid + '-' + Espo.Utils.camelCaseToHyphen(item.replace(/\s+/g, '-'));if (this.isInversed) {isChecked = !isChecked;@@ -92,18 +99,18 @@ class ChecklistFieldView extends ArrayFieldView {isChecked: isChecked,dataName: dataName,id: id,- label: this.translatedOptions[item] || item,+ label: this.translatedOptions?.[item] || item,});});return list;}- fetch() {- let list = [];+ fetch(): Record<string, any> {+ const list: string[] = [];- this.params.options.forEach(item => {- let $item = this.$el.find('input[data-name="' + item + '"]');+ (this.params.options ?? []).forEach(item => {+ const $item = this.$el.find(`input[data-name="${item}"]`);let isChecked = $item.get(0) && $item.get(0).checked;@@ -116,39 +123,37 @@ class ChecklistFieldView extends ArrayFieldView {}});- let data = {};-- data[this.name] = list;-- return data;+ return {[this.name]: list};}validateRequired() {if (!this.isRequired()) {- return;+ return false;}- let value = this.model.get(this.name);+ const value = this.model.get(this.name);if (!value || value.length === 0) {- let msg = this.translate('fieldIsRequired', 'messages')+ const msg = this.translate('fieldIsRequired', 'messages').replace('{field}', this.getLabelText());this.showValidationMessage(msg, '.checklist-item-container:last-child input');return true;}++ return false;}validateMaxCount() {if (!this.params.maxCount) {- return;+ return false;}- let itemList = this.model.get(this.name) || [];+ const itemList = this.model.get(this.name) ?? [];if (itemList.length > this.params.maxCount) {- let msg =+ const msg =this.translate('fieldExceedsMaxCount', 'messages').replace('{field}', this.getLabelText()).replace('{maxCount}', this.params.maxCount.toString());@@ -157,6 +162,8 @@ class ChecklistFieldView extends ArrayFieldView {return true;}++ return false;}}diff --git a/client/src/views/fields/multi-enum.ts b/client/src/views/fields/multi-enum.tsindex 3d32e42f85..820c056a30 100644--- a/client/src/views/fields/multi-enum.ts+++ b/client/src/views/fields/multi-enum.ts@@ -26,8 +26,6 @@* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.************************************************************************/-/** @module views/fields/multi-enumeration */-import ArrayFieldView, {ArrayOptions, ArrayParams} from 'views/fields/array';import {StyleMap} from 'views/fields/enum';import RegExpPattern from 'helpers/reg-exp-pattern';