EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
Link manager UI impr
Yurii1201daf5e543
diff --git a/client/src/views/admin/link-manager/index.js b/client/src/views/admin/link-manager/index.jsindex cf96b68923..3b2849386e 100644--- a/client/src/views/admin/link-manager/index.js+++ b/client/src/views/admin/link-manager/index.js@@ -30,6 +30,7 @@import View from 'view';import LinkManagerEditParamsModalView from 'views/admin/link-manager/modals/edit-params';+import Ajax from 'ajax';class LinkManagerIndexView extends View {@@ -222,47 +223,54 @@ class LinkManagerIndexView extends View {this.$el.find('input[data-name="quick-search"]').focus();}- createLink() {- this.createView('edit', 'views/admin/link-manager/modals/edit', {+ async createLink() {+ const view = await this.createView('edit', 'views/admin/link-manager/modals/edit', {scope: this.scope,- }, view => {- view.render();+ });- this.listenTo(view, 'after:save', () => {- this.clearView('edit');+ this.listenTo(view, 'after:save', () => {+ this.clearView('edit');- this.setupLinkData();- this.render();- });+ this.setupLinkData();+ this.reRender();+ });- this.listenTo(view, 'close', () => {- this.clearView('edit');- });+ this.listenTo(view, 'close', () => {+ this.clearView('edit');});++ await view.render();}- editLink(link) {- this.createView('edit', 'views/admin/link-manager/modals/edit', {+ async editLink(link) {+ const view = await this.createView('edit', 'views/admin/link-manager/modals/edit', {scope: this.scope,link: link,- }, view => {- view.render();+ })- this.listenTo(view, 'after:save', () => {- this.clearView('edit');+ this.listenTo(view, 'after:save', async () => {+ this.setupLinkData();- this.setupLinkData();- this.render();- });+ if (view.isRemoved()) {+ await this.reRender();- this.listenTo(view, 'close', () => {- this.clearView('edit');- });+ return;+ }++ this.unchainView('edit');+ await this.reRender();+ this.setView('edit', view);});++ this.listenTo(view, 'close', () => {+ this.clearView('edit');+ });++ await view.render();}removeLink(link) {- Espo.Ajax+ Ajax.postRequest('EntityManager/action/removeLink', {entity: this.scope,link: link,diff --git a/client/src/views/admin/link-manager/modals/edit-params.js b/client/src/views/admin/link-manager/modals/edit-params.jsindex 66a3d2df46..180a17fbbc 100644--- a/client/src/views/admin/link-manager/modals/edit-params.js+++ b/client/src/views/admin/link-manager/modals/edit-params.js@@ -30,6 +30,8 @@ import ModalView from 'views/modal';import Model from 'model';import EditForModalRecordView from 'views/record/edit-for-modal';import BoolFieldView from 'views/fields/bool';+import Ui from 'ui';+import Ajax from 'ajax';export default class LinkManagerEditParamsModalView extends ModalView {@@ -101,6 +103,21 @@ export default class LinkManagerEditParamsModalView extends ModalView {},];+ this.shortcutKeys = {+ 'Control+Enter': (e) => {+ e.preventDefault();+ e.stopPropagation();++ this.save()+ },+ 'Control+KeyS': (e) => {+ e.preventDefault();+ e.stopPropagation();++ this.save(true)+ },+ };+if (!defs.isCustom) {this.addDropdownItem({name: 'resetToDefault',@@ -220,13 +237,14 @@ export default class LinkManagerEditParamsModalView extends ModalView {/*** @private*/- async save() {+ async save(noClose = false) {if (this.recordView.validate()) {return;}this.disableAllActionItems();- Espo.Ui.notifyWait();++ Ui.notifyWait();const params = {};@@ -253,9 +271,13 @@ export default class LinkManagerEditParamsModalView extends ModalView {await Promise.all([this.getMetadata().loadSkipCache()]);this.broadcastUpdate();- this.close();+ if (!noClose) {+ this.close();+ } else {+ this.enableAllActionItems();+ }- Espo.Ui.success(this.translate('Saved'));+ Ui.success(this.translate('Saved'));}/**@@ -263,10 +285,10 @@ export default class LinkManagerEditParamsModalView extends ModalView {*/async resetToDefault() {this.disableAllActionItems();- Espo.Ui.notifyWait();+ Ui.notifyWait();try {- await Espo.Ajax.postRequest('EntityManager/action/resetLinkParamsToDefault', {+ await Ajax.postRequest('EntityManager/action/resetLinkParamsToDefault', {entityType: this.props.entityType,link: this.props.link,});@@ -281,7 +303,7 @@ export default class LinkManagerEditParamsModalView extends ModalView {this.formModel.setMultiple(this.getParamsFromMetadata());this.enableAllActionItems();- Espo.Ui.success(this.translate('Saved'));+ Ui.success(this.translate('Saved'));}/**diff --git a/client/src/views/admin/link-manager/modals/edit.js b/client/src/views/admin/link-manager/modals/edit.jsindex 82b98c63b8..772ac1dfa6 100644--- a/client/src/views/admin/link-manager/modals/edit.js+++ b/client/src/views/admin/link-manager/modals/edit.js@@ -30,6 +30,8 @@ import ModalView from 'views/modal';import Model from 'model';import Index from 'views/admin/link-manager/index';import EnumFieldView from 'views/fields/enum';+import Ajax from 'ajax';+import Ui from 'ui';class LinkManagerEditModalView extends ModalView {@@ -89,6 +91,17 @@ class LinkManagerEditModalView extends ModalView {const isNew = this.isNew = (false === link);+ if (!this.isNew) {+ this.addDropdownItem({+ name: 'saveAndContinueEditing',+ label: 'Save & Continue Editing',+ title: 'Ctrl+S',+ groupIndex: 0,+ iconClass: 'far fa-floppy-disk',+ onClick: () => this.save({noClose: true}),+ });+ }+this.headerText = this.translate('Create Link', 'labels', 'Admin');if (!isNew) {@@ -592,9 +605,10 @@ class LinkManagerEditModalView extends ModalView {['', ...this.getEntityTypeLayouts(foreignEntityType)] :[''];- this.layoutFieldView.translatedOptions = foreignEntityType ?- this.getEntityTypeLayoutsTranslations(foreignEntityType) :- {};+ const translations = foreignEntityType ?+ this.getEntityTypeLayoutsTranslations(foreignEntityType) : {};++ this.layoutFieldView.setTranslatedOptions(translations);this.layoutFieldView.setOptionList(layouts).then(() => this.layoutFieldView.reRender());@@ -607,9 +621,10 @@ class LinkManagerEditModalView extends ModalView {['', ...this.getEntityTypeFilters(foreignEntityType)] :[''];- this.selectFilterFieldView.translatedOptions = foreignEntityType ?- this.getEntityTypeFiltersTranslations(foreignEntityType) :- {};+ const translations = foreignEntityType ?+ this.getEntityTypeFiltersTranslations(foreignEntityType) : {};++ this.selectFilterFieldView.setTranslatedOptions(translations);this.selectFilterFieldView.setOptionList(layouts).then(() => this.selectFilterFieldView.reRender());@@ -993,7 +1008,7 @@ class LinkManagerEditModalView extends ModalView {* @param {{noClose?: boolean}} [options]*/save(options) {- options = options || {};+ options = options ?? {};const arr = ['link',@@ -1053,7 +1068,7 @@ class LinkManagerEditModalView extends ModalView {return;}- this.$el.find('button[data-name="save"]').addClass('disabled').attr('disabled');+ this.disableActions();let url = 'EntityManager/action/createLink';@@ -1129,14 +1144,13 @@ class LinkManagerEditModalView extends ModalView {delete attributes.selectFilterForeign;}- Espo.Ajax+ Ajax.postRequest(url, attributes).then(() => {if (!this.isNew) {- Espo.Ui.success(this.translate('Saved'));- }- else {- Espo.Ui.success(this.translate('Created'));+ Ui.success(this.translate('Saved'));+ } else {+ Ui.success(this.translate('Created'));}this.model.fetchedAttributes = this.model.getClonedAttributes();@@ -1153,9 +1167,7 @@ class LinkManagerEditModalView extends ModalView {}if (options.noClose) {- this.$el.find('button[data-name="save"]')- .removeClass('disabled')- .removeAttr('disabled');+ this.enableActions();}});})@@ -1168,15 +1180,31 @@ class LinkManagerEditModalView extends ModalView {console.error(statusReasonHeader);}- Espo.Ui.error(msg, {closeButton: true});+ Ui.error(msg, {closeButton: true});xhr.errorIsHandled = true;}- this.$el.find('button[data-name="save"]').removeClass('disabled').removeAttr('disabled');+ this.enableActions();});}+ /**+ * @private+ */+ disableActions() {+ this.disableButton('save');+ this.hideActionItem('saveAndContinueEditing');+ }++ /**+ * @private+ */+ enableActions() {+ this.enableButton('save');+ this.showActionItem('saveAndContinueEditing');+ }+getForeignLinkEntityTypeList(entityType, link, entityTypeList, onlyNotCustom) {const list = [];