EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
TS migration
Yuriib41e7edf9fa8
diff --git a/client/src/views/fields/array.ts b/client/src/views/fields/array.tsindex d6bd4b7406..8d78230765 100644--- a/client/src/views/fields/array.ts+++ b/client/src/views/fields/array.ts@@ -191,7 +191,7 @@ class ArrayFieldView<protected allowCustomOptions: boolean- private noEmptyString: boolean+ protected noEmptyString: booleanprotected styleMap: StyleMap@@ -644,7 +644,7 @@ class ArrayFieldView<this.selected = selected;}- getValueForDisplay() {+ protected getValueForDisplay(): string {// Do not use the `html` method to avoid XSS.const list = this.selected.map(item => {diff --git a/client/src/views/fields/url-multiple.js b/client/src/views/fields/url-multiple.tssimilarity index 73%rename from client/src/views/fields/url-multiple.jsrename to client/src/views/fields/url-multiple.tsindex 1fa3c4d329..5ba0450fbb 100644--- a/client/src/views/fields/url-multiple.js+++ b/client/src/views/fields/url-multiple.ts@@ -26,27 +26,41 @@* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.************************************************************************/-import ArrayFieldView from 'views/fields/array';+import ArrayFieldView, {ArrayOptions, ArrayParams} from 'views/fields/array';+import {BaseViewSchema} from 'views/fields/base';++export interface UrlMultipleParams extends ArrayParams {+ /**+ * Strip.+ */+ strip?: boolean+}++export interface UrlMultipleOptions extends ArrayOptions {}/**- * An Url-Multiple field.+ * A Url-Multiple field.*/-class UrlMultipleFieldView extends ArrayFieldView {+class UrlMultipleFieldView<+ S extends BaseViewSchema = BaseViewSchema,+ O extends UrlMultipleOptions = UrlMultipleOptions,+ P extends UrlMultipleParams = UrlMultipleParams,+> extends ArrayFieldView<S, O, P> {- type = 'urlMultiple'+ readonly type: string = 'urlMultiple'- maxItemLength = 255- displayAsList = true- defaultProtocol = 'https:'+ protected maxItemLength = 255+ protected displayAsList = true+ protected defaultProtocol = 'https:'- setup() {+ protected setup() {super.setup();this.noEmptyString = true;this.params.pattern = '$uriOptionalProtocol';}- addValueFromUi(value) {+ protected addValueFromUi(value: string) {value = value.trim();if (this.params.strip) {@@ -64,12 +78,7 @@ class UrlMultipleFieldView extends ArrayFieldView {super.addValueFromUi(value);}- /**- * @private- * @param {string} value- * @return {string}- */- decodeURI(value) {+ private decodeURI(value: string): string {try {return decodeURI(value);} catch (e) {@@ -79,11 +88,7 @@ class UrlMultipleFieldView extends ArrayFieldView {}}- /**- * @param {string} value- * @return {string}- */- strip(value) {+ private strip(value: string): string {if (value.indexOf('//') !== -1) {value = value.substring(value.indexOf('//') + 2);}@@ -93,7 +98,7 @@ class UrlMultipleFieldView extends ArrayFieldView {return value;}- prepareUrl(url) {+ private prepareUrl(url: string): string {if (url.indexOf('//') === -1) {url = this.defaultProtocol + '//' + url;}@@ -101,8 +106,7 @@ class UrlMultipleFieldView extends ArrayFieldView {return url;}- getValueForDisplay() {- /** @type {JQuery[]} */+ protected getValueForDisplay(): string {const $list = this.selected.map(value => {return $('<a>').attr('href', this.prepareUrl(value))@@ -115,12 +119,12 @@ class UrlMultipleFieldView extends ArrayFieldView {$('<div>').addClass('multi-enum-item-container').append($item)- .get(0).outerHTML+ .get(0)?.outerHTML as any).join('');}- getItemHtml(value) {+ protected getItemHtml(value: string): string {const html = super.getItemHtml(value);const $item = $(html);@@ -130,10 +134,10 @@ class UrlMultipleFieldView extends ArrayFieldView {.attr('href', this.prepareUrl(value)).css('user-drag', 'none').attr('target', '_blank')- .text(this.decodeURI(value))+ .text(this.decodeURI(value)) as any);- return $item.get(0).outerHTML;+ return $item.get(0)?.outerHTML as string;}}