EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
foreign array fix
Yuri Kuznetsov880478689f3a
diff --git a/client/src/helpers/misc/foreign-field.js b/client/src/helpers/misc/foreign-field.jsindex f7c2d015ec..1c6494c3bc 100644--- a/client/src/helpers/misc/foreign-field.js+++ b/client/src/helpers/misc/foreign-field.js@@ -30,6 +30,12 @@export default class {+ /**+ * @private+ * @type {string}+ */+ entityType+/*** @param {module:views/fields/base} view A field view.*/@@ -48,6 +54,8 @@ export default class {const entityType = metadata.get(['entityDefs', model.entityType, 'links', link, 'entity']) ||model.entityType;+ this.entityType = entityType;+const fieldDefs = metadata.get(['entityDefs', entityType, 'fields', field]) || {};const type = fieldDefs.type;@@ -78,4 +86,11 @@ export default class {getForeignParams() {return Espo.Utils.cloneDeep(this.foreignParams);}++ /**+ * @return {string}+ */+ getEntityType() {+ return this.entityType;+ }}diff --git a/client/src/views/fields/foreign-array.js b/client/src/views/fields/foreign-array.jsindex 656b4d35ba..85b5b8faf1 100644--- a/client/src/views/fields/foreign-array.js+++ b/client/src/views/fields/foreign-array.js@@ -28,11 +28,31 @@import ArrayFieldView from 'views/fields/array';import ForeignEnumFieldView from 'views/fields/foreign-enum';+import Helper from 'helpers/misc/foreign-field';class ForeignArrayFieldView extends ArrayFieldView {type = 'foreign'+ /**+ * @private+ * @type {string}+ */+ foreignEntityType++ setup() {+ const helper = new Helper(this);+ const foreignParams = helper.getForeignParams();++ for (const param in foreignParams) {+ this.params[param] = foreignParams[param];+ }++ this.foreignEntityType = helper.getEntityType();++ super.setup();+ }+setupOptions() {ForeignEnumFieldView.prototype.setupOptions.call(this);}diff --git a/client/src/views/fields/foreign-checklist.js b/client/src/views/fields/foreign-checklist.jsindex 28f737eee0..a029242662 100644--- a/client/src/views/fields/foreign-checklist.js+++ b/client/src/views/fields/foreign-checklist.js@@ -27,37 +27,34 @@************************************************************************/import ChecklistFieldView from 'views/fields/checklist';+import Helper from 'helpers/misc/foreign-field';+import ForeignArrayFieldView from 'views/fields/foreign-array';class ForeignChecklistFieldView extends ChecklistFieldView {type = 'foreign'- setupOptions() {- this.params.options = [];-- if (!this.params.field || !this.params.link) {- return;- }+ /**+ * @private+ * @type {string}+ */+ foreignEntityType- const scope = this.getMetadata()- .get(['entityDefs', this.model.entityType, 'links', this.params.link, 'entity']);+ setup() {+ const helper = new Helper(this);+ const foreignParams = helper.getForeignParams();- if (!scope) {- return;+ for (const param in foreignParams) {+ this.params[param] = foreignParams[param];}- this.params.isSorted = this.getMetadata()- .get(['entityDefs', scope, 'fields', this.params.field, 'isSorted']) || false;+ this.foreignEntityType = helper.getEntityType();- this.params.options = this.getMetadata()- .get(['entityDefs', scope, 'fields', this.params.field, 'options']) || [];-- this.translatedOptions = {};+ super.setup();+ }- this.params.options.forEach(item => {- this.translatedOptions[item] = this.getLanguage()- .translateOption(item, this.params.field, scope);- });+ setupOptions() {+ ForeignArrayFieldView.prototype.setupOptions.call(this);}}diff --git a/client/src/views/fields/foreign-enum.js b/client/src/views/fields/foreign-enum.jsindex 0c89aea890..669d99ccef 100644--- a/client/src/views/fields/foreign-enum.js+++ b/client/src/views/fields/foreign-enum.js@@ -27,62 +27,48 @@************************************************************************/import EnumFieldView from 'views/fields/enum';+import Helper from 'helpers/misc/foreign-field';class ForeignEnumFieldView extends EnumFieldView {type = 'foreign'- setupOptions() {- this.params.options = [];+ /**+ * @private+ * @type {string}+ */+ foreignEntityType- const field = this.params.field;- const link = this.params.link;+ setup() {+ const helper = new Helper(this);+ const foreignParams = helper.getForeignParams();- if (!field || !link) {- return;+ for (const param in foreignParams) {+ this.params[param] = foreignParams[param];}- const entityType = this.getMetadata().get(`entityDefs.${this.model.entityType}.links.${link}.entity`);+ this.foreignEntityType = helper.getEntityType();- if (!entityType) {- return;- }+ super.setup();+ }- /**- * @type {{- * optionsPath?: string|null,- * optionsReference?: string|null,- * translation?: string|null,- * options?: string[],- * isSorted?: boolean,- * displayAsLabel?: boolean,- * style?: Record,- * labelType?: string,- * }}- */- const fieldDefs = this.getMetadata().get(`entityDefs.${entityType}.fields.${field}`);-- if (!fieldDefs) {+ setupOptions() {+ const field = this.params.field;+ const link = this.params.link;++ if (!field || !link) {return;}- let {- optionsPath,- optionsReference,- translation,- options,- isSorted,- displayAsLabel,- style,- labelType,- } = fieldDefs;+ let optionsPath = this.params.optionsPath;+ const optionsReference = this.params.optionsReference;+ let options = this.params.options;+ const style = this.params.style;if (!optionsPath && optionsReference) {const [refEntityType, refField] = optionsReference.split('.');optionsPath = `entityDefs.${refEntityType}.fields.${refField}.options`;-- style = this.getMetadata().get(`entityDefs.${refEntityType}.fields.${refField}.style`) ?? {};}if (optionsPath) {@@ -90,14 +76,10 @@ class ForeignEnumFieldView extends EnumFieldView {}this.params.options = Espo.Utils.clone(options) ?? [];- this.params.translation = translation;- this.params.isSorted = isSorted ?? false;- this.params.displayAsLabel = displayAsLabel ?? false;- this.params.labelType = labelType;this.styleMap = style ?? {};const pairs = this.params.options- .map(item => [item, this.getLanguage().translateOption(item, field, entityType)])+ .map(item => [item, this.getLanguage().translateOption(item, field, this.foreignEntityType)])this.translatedOptions = Object.fromEntries(pairs);}diff --git a/client/src/views/fields/foreign-multi-enum.js b/client/src/views/fields/foreign-multi-enum.jsindex 5de3da47e9..211e7069be 100644--- a/client/src/views/fields/foreign-multi-enum.js+++ b/client/src/views/fields/foreign-multi-enum.js@@ -28,11 +28,31 @@import MultiEnumFieldView from 'views/fields/multi-enum';import ForeignArrayFieldView from 'views/fields/foreign-array';+import Helper from 'helpers/misc/foreign-field';class ForeignMultiEnumFieldView extends MultiEnumFieldView {type = 'foreign'+ /**+ * @private+ * @type {string}+ */+ foreignEntityType++ setup() {+ const helper = new Helper(this);+ const foreignParams = helper.getForeignParams();++ for (const param in foreignParams) {+ this.params[param] = foreignParams[param];+ }++ this.foreignEntityType = helper.getEntityType();++ super.setup();+ }+setupOptions() {ForeignArrayFieldView.prototype.setupOptions.call(this);}