@reldens/cms 0.56.0 → 0.58.0

package/admin/reldens-admin-client.js

@@ -177,8 +177,7 @@ window.addEventListener('DOMContentLoaded', () => {
                         params.set('sortBy', columnName);
                         params.set('sortDirection', sortDirection);
                     }
-                    let newUrl = url.pathname+'?'+params;
-                    window.location.href = newUrl;
+                    window.location.href = url.pathname+'?'+params;
                     return false;
                 });
             }
@@ -190,44 +189,35 @@ window.addEventListener('DOMContentLoaded', () => {
     if(sortableHeaders){
         for(let header of sortableHeaders){
             header.addEventListener('click', () => {
+                let sortForm = header.querySelector('.sort-form');
+                if(!sortForm){
+                    return;
+                }
                 let columnName = header.getAttribute('data-column');
-                let currentSortDirection = header.classList.contains('sorted-asc') ? 'asc' : header.classList.contains('sorted-desc') ? 'desc' : '';
+                let currentSortDirection = header.classList.contains('sorted-asc')
+                    ? 'asc'
+                    : header.classList.contains('sorted-desc') ? 'desc' : '';
                 let newSortDirection = 'asc';
                 if('asc' === currentSortDirection){
                     newSortDirection = 'desc';
                 }
-                let sortForm = document.createElement('form');
-                sortForm.method = 'POST';
-                sortForm.action = window.location.pathname;
-                let sortByInput = document.createElement('input');
-                sortByInput.type = 'hidden';
-                sortByInput.name = 'sortBy';
+                let sortByInput = sortForm.querySelector('input[name="sortBy"]');
+                let sortDirectionInput = sortForm.querySelector('input[name="sortDirection"]');
                 sortByInput.value = columnName;
-                sortForm.appendChild(sortByInput);
-                let sortDirectionInput = document.createElement('input');
-                sortDirectionInput.type = 'hidden';
-                sortDirectionInput.name = 'sortDirection';
                 sortDirectionInput.value = newSortDirection;
-                sortForm.appendChild(sortDirectionInput);
                 let entitySearchInput = document.querySelector('#entityFilterTerm');
-                if(entitySearchInput && entitySearchInput.value){
-                    let filterTermInput = document.createElement('input');
-                    filterTermInput.type = 'hidden';
-                    filterTermInput.name = 'entityFilterTerm';
-                    filterTermInput.value = entitySearchInput.value;
-                    sortForm.appendChild(filterTermInput);
+                let entityFilterTermInput = sortForm.querySelector('input[name="entityFilterTerm"]');
+                if(entityFilterTermInput){
+                    entityFilterTermInput.value = entitySearchInput?.value || '';
                 }
                 let allFilters = document.querySelectorAll('.filters-toggle-content .filter input');
                 for(let filterInput of allFilters){
-                    if(filterInput.value){
-                        let filterFieldInput = document.createElement('input');
-                        filterFieldInput.type = 'hidden';
-                        filterFieldInput.name = filterInput.name;
-                        filterFieldInput.value = filterInput.value;
-                        sortForm.appendChild(filterFieldInput);
+                    let filterName = filterInput.name.replace('filters[', '').replace(']', '');
+                    let sortFormFilterInput = sortForm.querySelector('input[data-filter-key="'+filterName+'"]');
+                    if(sortFormFilterInput){
+                        sortFormFilterInput.value = filterInput.value;
                     }
                 }
-                document.body.appendChild(sortForm);
                 sortForm.submit();
             });
         }

package/admin/templates/list-content.html

@@ -27,6 +27,14 @@
                 </svg>
             </span>
         </div>
+        <form class="sort-form hidden" method="POST" action="{{&listRoute}}">
+            <input type="hidden" name="sortBy" value=""/>
+            <input type="hidden" name="sortDirection" value=""/>
+            <input type="hidden" name="entityFilterTerm" value=""/>
+            {{#filters}}
+            <input type="hidden" name="filters[{{&propertyKey}}]" value="" data-filter-key="{{&propertyKey}}"/>
+            {{/filters}}
+        </form>
     </th>
     {{/fieldsHeaders}}
     <th class="field field-edit"></th>

package/lib/admin-manager/router-contents.js

@@ -611,7 +611,7 @@ class RouterContents
             fieldValue = '' !== fieldValue ? sc.formatDate(new Date(fieldValue)) : '';
         }
         if('reference' === resourceProperty.type){
-            let relationEntity = entity[resourceProperty.alias || resourceProperty.reference];
+            let relationEntity = entity[resourceProperty.alias || 'related_'+resourceProperty.reference];
             if(relationEntity){
                 let relation = this.relations()[resourceProperty.reference];
                 if(relation){

package/lib/frontend/content-renderer.js

@@ -123,7 +123,7 @@ class ContentRenderer
             return layoutContent;
         }
         let routerKey = route?.router;
-        let categoryName = currentEntityData?.cms_categories?.name;
+        let categoryName = currentEntityData?.related_cms_categories?.name;
         let siteHandle = this.templateResolver.resolveDomainToSiteKey(domain)
             + (routerKey ? ' '+routerKey : '')
             + (categoryName ? ' cat-'+categoryName : '');

package/lib/sitemap-loader.js

@@ -65,14 +65,11 @@ class SitemapLoader
         try {
             let routesWithPages = await this.routesRepository.loadWithRelations(filters, 'cms_pages');
             let sitemapPages = routesWithPages.filter(route => {
-                if(!route.cms_pages || 0 === route.cms_pages.length){
+                if(!route.related_cms_pages || 0 === route.related_cms_pages.length){
                     return false;
                 }
-                let page = route.cms_pages[0];
-                if('noindex,nofollow' === page.meta_robots){
-                    return false;
-                }
-                return true;
+                return 'noindex,nofollow' !== route.related_cms_pages[0].meta_robots;
+
             });
             req.sitemapPages = sitemapPages;
             eventData.variables.sitemapPages = sitemapPages;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@reldens/cms",
     "scope": "@reldens",
-    "version": "0.56.0",
+    "version": "0.58.0",
     "description": "Reldens - CMS",
     "author": "Damian A. Pastorini",
     "license": "MIT",
@@ -35,9 +35,9 @@
     },
     "dependencies": {
         "@reldens/server-utils": "^0.46.0",
-        "@reldens/storage": "^0.89.0",
+        "@reldens/storage": "^0.91.0",
         "@reldens/utils": "^0.54.0",
-        "dotenv": "17.2.3",
+        "dotenv": "17.2.4",
         "mustache": "4.2.0"
     }
 }