ref

sokogfb · Jun 20, 2023 · cc32089 · cc32089
1 parent 56dd0aa
commit cc32089
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 22 deletions.
diff --git a/client/src/view-helper.js b/client/src/view-helper.js
@@ -665,7 +665,7 @@ class ViewHelper {
      * A Markdown text to HTML (one-line).
      *
      * @param {string} text A text.
-     * @returns {string} HTML.
+     * @returns {Handlebars.SafeString} HTML.
      */
     transformMarkdownInlineText(text) {
         return this.transformMarkdownText(text, {inline: true});
@@ -751,7 +751,7 @@ class ViewHelper {
     /**
      * Sanitize HTML.
      *
-     * @param {type} text HTML.
+     * @param {string} text HTML.
      * @param {Object} [options] Options.
      * @returns {string}
      */
@@ -898,32 +898,44 @@ class ViewHelper {
      * @param {module:view} view A view.
      * @param {string} type A view-setup-handler type.
      * @param {string} [scope] A scope.
+     * @return Promise
      */
     processSetupHandlers(view, type, scope) {
-        scope = scope || view.scope;
+        scope = scope || view.scope || view.entityType;
 
-        let handlerList = this.metadata.get(['clientDefs', 'Global', 'viewSetupHandlers', type]) || [];
+        let handlerIdList = this.metadata.get(['clientDefs', 'Global', 'viewSetupHandlers', type]) || [];
 
         if (scope) {
-            handlerList = handlerList
+            handlerIdList = handlerIdList
                 .concat(
                     this.metadata.get(['clientDefs', scope, 'viewSetupHandlers', type]) || []
                 );
         }
 
-        if (handlerList.length === 0) {
-            return;
+        if (handlerIdList.length === 0) {
+            return Promise.resolve();
         }
 
-        for (let handlerClassName of handlerList) {
-            let promise = new Promise(function (resolve) {
-                Espo.loader.require(handlerClassName, Handler => {
+        /**
+         * @interface
+         * @name ViewHelper~Handler
+         */
+
+        /**
+         * @function
+         * @name ViewHelper~Handler#process
+         * @param {module:view} [view] Deprecated.
+         */
+
+        let promiseList = [];
+
+        for (let id of handlerIdList) {
+            let promise = new Promise(resolve => {
+                Espo.loader.require(id, /** typeof ViewHelper~Handler */Handler => {
                     let result = (new Handler(view)).process(view);
 
                     if (result && Object.prototype.toString.call(result) === '[object Promise]') {
-                        result.then(() => {
-                            resolve();
-                        });
+                        result.then(() => resolve());
 
                         return;
                     }
@@ -932,8 +944,10 @@ class ViewHelper {
                 });
             });
 
-            view.wait(promise);
+            promiseList.push(promise);
         }
+
+        return Promise.all(promiseList);
     }
 
     /**

diff --git a/client/src/views/detail.js b/client/src/views/detail.js
@@ -107,7 +107,9 @@ class DetailView extends MainView {
     setupFinal() {
         super.setupFinal();
 
-        this.getHelper().processSetupHandlers(this, 'detail');
+        this.wait(
+            this.getHelper().processSetupHandlers(this, 'detail')
+        );
     }
 
     /** @private */

diff --git a/client/src/views/edit.js b/client/src/views/edit.js
@@ -85,7 +85,9 @@ class EditView extends MainView {
     setupFinal() {
         super.setupFinal();
 
-        this.getHelper().processSetupHandlers(this, 'edit');
+        this.wait(
+            this.getHelper().processSetupHandlers(this, 'edit')
+        );
     }
 
     /**

diff --git a/client/src/views/list-related.js b/client/src/views/list-related.js
@@ -250,7 +250,9 @@ class ListRelatedView extends MainView {
             this.keepCurrentRootUrl = true;
         }
 
-        this.getHelper().processSetupHandlers(this, 'list');
+        this.wait(
+            this.getHelper().processSetupHandlers(this, 'list')
+        );
     }
 
     /**

diff --git a/client/src/views/list.js b/client/src/views/list.js
@@ -233,7 +233,9 @@ class ListView extends MainView {
     setupFinal() {
         super.setupFinal();
 
-        this.getHelper().processSetupHandlers(this, 'list');
+        this.wait(
+            this.getHelper().processSetupHandlers(this, 'list')
+        );
     }
 
     /**

diff --git a/client/src/views/record/detail.js b/client/src/views/record/detail.js
@@ -1926,7 +1926,9 @@ class DetailRecordView extends BaseRecordView {
             });
         }
 
-        this.getHelper().processSetupHandlers(this, this.setupHandlerType);
+        this.wait(
+            this.getHelper().processSetupHandlers(this, this.setupHandlerType)
+        );
 
         this.initInlineEditDynamicWithLogicInteroperability();
 

diff --git a/client/src/views/record/kanban.js b/client/src/views/record/kanban.js
@@ -334,7 +334,9 @@ class KanbanRecordView extends ListRecordView {
 
         this.isCreatable = this.statusFieldIsEditable && this.getAcl().check(this.entityType, 'create');
 
-        this.getHelper().processSetupHandlers(this, 'record/kanban');
+        this.wait(
+            this.getHelper().processSetupHandlers(this, 'record/kanban')
+        );
     }
 
     afterRender() {

diff --git a/client/src/views/record/list.js b/client/src/views/record/list.js
@@ -1952,7 +1952,9 @@ class ListRecordView extends View {
             this.layoutName += 'Portal';
         }
 
-        this.getHelper().processSetupHandlers(this, this.setupHandlerType);
+        this.wait(
+            this.getHelper().processSetupHandlers(this, this.setupHandlerType)
+        );
 
         this.listenTo(this.collection, 'sync', (c, r, options) => {
             if (this.hasView('modal') && this.getView('modal').isRendered()) {

diff --git a/client/src/views/record/search.js b/client/src/views/record/search.js
@@ -255,7 +255,9 @@ class SearchView extends View {
             this.controlResetButtonVisibility();
         });
 
-        this.getHelper().processSetupHandlers(this, 'record/search');
+        this.wait(
+            this.getHelper().processSetupHandlers(this, 'record/search')
+        );
     }
 
     setupViewModeDataList() {