Skip to content

EspoCRM – Open Source CRM Application

filter view custom field view

Yuri Kuznetsov5d40cbf8f6ed
diff --git a/client/src/views/record/search.js b/client/src/views/record/search.js
index ffa2f69d6b..16f337b043 100644
--- a/client/src/views/record/search.js
+++ b/client/src/views/record/search.js
@@ -31,9 +31,11 @@
import View from 'view';
import StoredTextSearch from 'helpers/misc/stored-text-search';
import Autocomplete from 'ui/autocomplete';
+import FilterView from 'views/search/filter';
/**
* @typedef {Object} module:views/record/search~boolFilterDefs
+ * @property {string} [name]
* @property {boolean} [inPortalDisabled]
* @property {boolean} [isPortalOnly]
* @property {boolean} [aux]
@@ -139,9 +141,11 @@ class SearchView extends View {
return this.fieldFilterList !== null;
});
- this.boolFilterList = Espo.Utils
- .clone(this.getMetadata().get(['clientDefs', this.scope, 'boolFilterList']) || [])
- .filter(/** module:views/record/search~boolFilterDefs|string */item => {
+ /** @type {Array<module:views/record/search~boolFilterDefs|string>} */
+ const boolFilterList = this.getMetadata().get(['clientDefs', this.scope, 'boolFilterList']) ?? [];
+
+ this.boolFilterList = boolFilterList
+ .filter(item => {
if (typeof item === 'string') {
return true;
}
@@ -173,7 +177,7 @@ class SearchView extends View {
return item;
}
- item = item || {};
+ item = item ?? {};
return item.name;
});
@@ -1092,7 +1096,7 @@ class SearchView extends View {
* @param {SearchView~createFilterCallback} callback
* @param {boolean} [noRender]
*/
- createFilter(name, params, callback, noRender) {
+ async createFilter(name, params, callback, noRender) {
params = params || {};
let rendered = false;
@@ -1101,48 +1105,47 @@ class SearchView extends View {
rendered = true;
this.$advancedFiltersPanel.append(
- '<div data-name="'+name+'" class="filter filter-' + name + '" />'
+ `<div data-name="${name}" class="filter filter-${name}" />`
);
}
- this.createView('filter-' + name, 'views/search/filter', {
+ const view = new FilterView({
name: name,
model: this.model,
params: params,
- selector: '.filter[data-name="' + name + '"]',
- }, view => {
- if (typeof callback === 'function') {
- view.once('after:render', () => {
- callback(view);
- });
- }
+ });
- if (rendered && !noRender) {
- view.render();
- }
+ await this.assignView(`filter-${name}`, view, `.filter[data-name="${name}"]`);
+
+ if (typeof callback === 'function') {
+ view.once('after:render', () => callback(view));
+ }
- this.listenTo(view, 'change', () => {
- let toShowApply = this.isSearchedWithAdvancedFilter;
+ if (rendered && !noRender) {
+ view.render().then(() => {});
+ }
- if (!toShowApply) {
- const data = view.getView('field').fetchSearch();
+ this.listenTo(view, 'change', () => {
+ let toShowApply = this.isSearchedWithAdvancedFilter;
- if (data) {
- toShowApply = true;
- }
- }
+ if (!toShowApply) {
+ const data = view.getFieldView().fetchSearch();
- if (!toShowApply) {
- return;
+ if (data) {
+ toShowApply = true;
}
+ }
- this.showApplyFiltersButton();
- });
+ if (!toShowApply) {
+ return;
+ }
- this.listenTo(view, 'search', () => {
- this.search();
- this.hideApplyFiltersButton();
- });
+ this.showApplyFiltersButton();
+ });
+
+ this.listenTo(view, 'search', () => {
+ this.search();
+ this.hideApplyFiltersButton();
});
}
diff --git a/client/src/views/search/filter.js b/client/src/views/search/filter.js
index 33203eae37..52319a5d2e 100644
--- a/client/src/views/search/filter.js
+++ b/client/src/views/search/filter.js
@@ -42,48 +42,64 @@ class FilterView extends View {
};
}
+ /**
+ * @param {{
+ * name: string,
+ * fieldView?: string,
+ * params?: Record|null,
+ * notRemovable?: boolean,
+ * model: import('model').default,
+ * }} options Field view is supported as of v9.3.
+ */
+ constructor(options) {
+ super(options);
+
+ this.options = options;
+ }
+
setup() {
const name = this.name = this.options.name;
- let type = this.model.getFieldType(name);
- if (!type && name === 'id') {
- type = 'id'
+ let viewName = this.options.fieldView;
+
+ if (!viewName) {
+ let type = this.model.getFieldType(name);
+
+ if (!type && name === 'id') {
+ type = 'id';
+ }
+
+ if (type) {
+ viewName = this.model.getFieldParam(name, 'view') ||
+ this.getFieldManager().getViewName(type);
+ }
}
- if (type) {
- const viewName =
- this.model.getFieldParam(name, 'view') ||
- this.getFieldManager().getViewName(type);
-
- this.createView('field', viewName, {
- mode: 'search',
- model: this.model,
- selector: '.field',
- defs: {
- name: name,
- },
- searchParams: this.options.params,
- }, view => {
- this.listenTo(view, 'change', () => {
- this.trigger('change');
- });
-
- this.listenTo(view, 'search', () => {
- this.trigger('search');
- });
- });
+ if (!viewName) {
+ return;
}
+
+ this.createView('field', viewName, {
+ mode: 'search',
+ model: this.model,
+ selector: '.field',
+ name: name,
+ searchParams: this.options.params,
+ }, view => {
+ this.listenTo(view, 'change', () => this.trigger('change'));
+ this.listenTo(view, 'search', () => this.trigger('search'));
+ });
}
/**
- * @return {module:views/fields/base}
+ * @return {import('views/fields/base').default|null}
*/
getFieldView() {
return this.getView('field');
}
populateDefaults() {
- const view = this.getView('field');
+ const view = this.getFieldView();
if (!view) {
return;