Merge pull request 'fix bug 75222' (#352) from fix/bug-75222 into hotfix/v9.0.4

Author: maxkadushkin

common/loginpage/src/css/styles.less

@@ -1921,7 +1921,7 @@ li.menu-item {
     }
     .search-icon {
         position: absolute;
-        top: 55%;
+        top: 50%;
         left: 10px;
         transform: translateY(-50%);
         width: 24px;
@@ -1937,7 +1937,7 @@ li.menu-item {
 
     .tool.close {
         position: absolute;
-        top: 55%;
+        top: 50%;
         right: 10px;
         transform: translateY(-50%);
         width: 16px;
@@ -2087,8 +2087,8 @@ li.menu-item {
             }
 
             .cloud-icon {
-                width: 16px;
-                height: 16px;
+                width: 20px;
+                height: 20px;
                 background-size: contain;
             }
     }

common/loginpage/src/paneltemplates.js

@@ -93,8 +93,8 @@
                                             <use id="idx-nothing-found-dark" href="#nothing-found-dark"></use>
                                         </svg>
                                     </div>
-                                    <p class="no-results-title">${_lang.tplNoResultsTitle}</p>
-                                    <p class="no-results-text">${_lang.tplNoResultsText}</p> 
+                                    <p class="no-results-title" l10n>${_lang.tplNoResultsTitle}</p>
+                                    <p class="no-results-text" l10n>${_lang.tplNoResultsText}</p> 
                                 </div>
                                 <section class='themed-sroll' panel='all'>
                                     <div class='table-box flex-fill'>
@@ -146,9 +146,7 @@
     });
 
     utils.fn.extend(ControllerTemplates.prototype, (function() {
-        let _page_num = 0, 
-            isLoading = false, 
-            totalPages = null; 
+        let isCloudTmplsLoading = false;
 
         const _on_nav_item_click = function(e) {
             $('.nav-item', this.view.$panel).removeClass('selected');
@@ -353,26 +351,30 @@
             $('#search-no-results', $panel).toggle(matchCount === 0);
         };
 
-        const _loadTemplates = function() {
-            if (isLoading || (totalPages !== null && _page_num >= totalPages)) return;
+        const _loadTemplates = function(nl, page_num = 0) {
+            const locale = nl ? nl.split('_')[0].toLowerCase() : 'en';
+            if (isCloudTmplsLoading) return;
 
-            _page_num++;  
-            isLoading = true;
+            page_num++;
+            isCloudTmplsLoading = true;
 
             const _domain = localStorage.templatesdomain ? localStorage.templatesdomain : 'https://oforms.onlyoffice.com'; // https://oforms.teamlab.info
-            const _url = `${_domain}/dashboard/api/oforms?populate=*&locale=en&pagination[page]=${_page_num}`;
+            const _url = `${_domain}/dashboard/api/oforms?populate=*&locale=${locale}&pagination[page]=${page_num}`;
             fetch(_url)
                 .then(r => r.json())
                 .then(d => {
-                    isLoading = false;
-                    if (d.data) {
+                    isCloudTmplsLoading = false;
+                    if (d.data && d.data.length > 0) {
                         _on_add_cloud_templates.call(this, d.data);
-                        totalPages = d.meta.pagination.pageCount;
+                        const totalPages = d.meta.pagination.pageCount;
 
-                        if (_page_num < totalPages) {
-                            _loadTemplates.call(this);
+                        if (page_num + 1 <= totalPages) {
+                            _loadTemplates.call(this, nl, page_num);
                         } 
-                     }
+                    } else if (d.data && d.data.length === 0 && locale !== 'en') {
+                        _resetPagination.call(this);
+                        _loadTemplates.call(this, 'en', 0);
+                    }
                 })
                 .catch (function (err) {
                     console.error(err);
@@ -382,19 +384,9 @@
                 })
         };
 
-        const loadAllPages = function() {
-            if (isLoading) return;
-
-            _page_num = 0;
-            const self = this;
-            const loadNext = () => {
-                if (_page_num < totalPages || totalPages === null) {
-                    _loadTemplates.call(self);
-                    setTimeout(loadNext, 150); 
-                }
-            };
-
-            loadNext(); 
+        const _resetPagination = function() {
+            isCloudTmplsLoading = false;
+            this.templates.empty();
         };
 
         return {
@@ -438,13 +430,16 @@
                     ls.push("en-US","en_US","en");
                     window.sdk.LocalFileTemplates(ls);
                 };
-                _reload_templates(utils.Lang.id);
 
                 CommonEvents.on('lang:changed', (ol, nl) => {
+                    _resetPagination.call(this);  
                     _reload_templates(nl);
+                    _loadTemplates.call(this, nl);
+                    $('#template-search', this.view.$panel).attr('placeholder', utils.Lang.tplSearch);
                 });
 
-                loadAllPages.call(this);
+                _reload_templates(utils.Lang.id);
+                _loadTemplates.call(this, utils.Lang.id);
 
                 return this;
             }