@reldens/cms 0.18.0 → 0.20.0

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

@@ -37,7 +37,10 @@ class ContentsBuilder
         this.adminContents.layout = await this.buildLayout();
         this.adminContents.sideBar = await this.buildSideBar();
         this.adminContents.login = await this.renderRoute(this.adminFilesContents.login, '');
-        this.adminContents.dashboard = await this.renderRoute(this.adminFilesContents.dashboard, this.adminContents.sideBar);
+        this.adminContents.dashboard = await this.renderRoute(
+            this.adminFilesContents.dashboard,
+            this.adminContents.sideBar
+        );
         this.adminContents.entities = await this.buildEntitiesContents();
         await this.emitEvent('reldens.buildAdminContentsAfter');
         return this.adminContents;
@@ -67,7 +70,8 @@ class ContentsBuilder
         navigationContents = eventBuildSideBarBefore.navigationContents;
         for(let driverResource of this.resources()){
             let navigation = driverResource.options?.navigation;
-            let name = this.translations.labels[driverResource.id()] || this.translations.labels[driverResource.entityKey];
+            let name = this.translations.labels[driverResource.id()]
+                || this.translations.labels[driverResource.entityKey];
             let path = this.rootPath+'/'+(driverResource.id().replace(/_/g, '-'));
             if(navigation?.name){
                 if(!navigationContents[navigation.name]){
@@ -93,10 +97,7 @@ class ContentsBuilder
                 for(let subId of Object.keys(navigationContents[id])){
                     subItems += navigationContents[id][subId];
                 }
-                navigationView += await this.render(
-                    this.adminFilesContents.sideBarHeader,
-                    {name: id, subItems}
-                );
+                navigationView += await this.render(this.adminFilesContents.sideBarHeader, {name: id, subItems});
                 continue;
             }
             navigationView += navigationContents[id];

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

@@ -51,6 +51,14 @@ class RouterContents
                 }
             );
         }
+        let listProperties = {
+            entityNewRoute: this.rootPath+'/'+driverResource.entityPath+this.editPath
+        };
+        await this.emitEvent('reldens.adminListPropertiesPopulation', {
+            req,
+            driverResource,
+            listProperties
+        });
         return await this.adminContentsRenderRoute(
             await this.adminContentsRender(
                 this.adminContentsEntities()[entityPath].list,
@@ -67,7 +75,8 @@ class RouterContents
                         }),
                         rows: await this.loadEntitiesForList(driverResource, pageSize, currentPage, req, filters)
                     }),
-                    pagination: renderedPagination
+                    pagination: renderedPagination,
+                    extraContentForList: sc.get(listProperties, 'extraContentForList', '')
                 }, ...driverResource.options.filterProperties.map((property) => {
                     let filterValue = (filtersFromParams[property] || '');
                     return {[property]: '' === filterValue ? '' : 'value="'+filterValue+'"'};
@@ -274,13 +283,21 @@ class RouterContents
                 );
                 fields.push({
                     name: property,
-                    value: await this.generatePropertyRenderedValue(fieldValue, fieldName, resourceProperties[property]),
-                    viewLink: '' !== idProperty ? this.generateEntityRoute('viewPath', driverResource, idProperty, entity) : ''
+                    value: await this.generatePropertyRenderedValue(
+                        fieldValue,
+                        fieldName,
+                        resourceProperties[property]
+                    ),
+                    viewLink: '' !== idProperty
+                        ? this.generateEntityRoute('viewPath', driverResource, idProperty, entity)
+                        : ''
                 });
             }
             entityRows.push({
                 fields,
-                editLink: '' !== idProperty ? this.generateEntityRoute('editPath', driverResource, idProperty, entity) : '',
+                editLink: '' !== idProperty
+                    ? this.generateEntityRoute('editPath', driverResource, idProperty, entity)
+                    : '',
                 deleteLink: this.rootPath + '/' + driverResource.entityPath + this.deletePath,
                 id: entity[idProperty]
             });
@@ -317,12 +334,13 @@ class RouterContents
                 continue;
             }
             for(let entity of entities){
+                let bucket = sc.get(property, 'bucket', '');
                 if(!property.isArray){
-                    FileHandler.remove([(property.bucket || ''), entity[propertyKey]]);
+                    FileHandler.remove([bucket, entity[propertyKey]]);
                     continue;
                 }
                 for(let entityFile of entity[propertyKey].split(property.isArray)){
-                    FileHandler.remove([(property.bucket || ''), entityFile]);
+                    FileHandler.remove([bucket, entityFile]);
                 }
             }
         }
@@ -337,7 +355,10 @@ class RouterContents
             }
             let propertyUpdateValue = sc.get(req.body, i, null);
             let property = resourceProperties[i];
-            let propertyType = property.type || 'string';
+            if('null' === propertyUpdateValue){
+                propertyUpdateValue = null;
+            }
+            let propertyType = sc.get(property, 'type', 'string');
             if(property.isUpload){
                 propertyType = 'upload';
                 propertyUpdateValue = this.prepareUploadPatchData(req, i, propertyUpdateValue, property);
@@ -345,21 +366,23 @@ class RouterContents
             if('boolean' === propertyType){
                 propertyUpdateValue = '1' === propertyUpdateValue || 'on' === propertyUpdateValue;
             }
-            if('number' === propertyType && null !== propertyUpdateValue && '' !== propertyUpdateValue){
+            let isEmpty = '' === propertyUpdateValue;
+            let isNull = null === propertyUpdateValue;
+            if('number' === propertyType && !isNull && !isEmpty){
                 propertyUpdateValue = Number(propertyUpdateValue);
             }
-            if('string' === propertyType && null !== propertyUpdateValue && '' !== propertyUpdateValue){
+            if('string' === propertyType && !isNull && !isEmpty){
                 propertyUpdateValue = String(propertyUpdateValue);
             }
-            if('' === propertyUpdateValue && !property.isRequired){
+            if(isEmpty && !property.isRequired){
                 propertyUpdateValue = null;
             }
             let isUploadCreate = property.isUpload && !id;
-            if(property.isRequired && (null === propertyUpdateValue || '' === propertyUpdateValue) && (!property.isUpload || isUploadCreate)){
+            if(property.isRequired && (isNull || isEmpty) && (!property.isUpload || isUploadCreate)){
                 Logger.critical('Bad patch data on update.', propertyUpdateValue, property);
                 return false;
             }
-            if(!property.isUpload || (property.isUpload && null !== propertyUpdateValue)){
+            if(!property.isUpload || (property.isUpload && !isNull)){
                 entityDataPatch[i] = propertyUpdateValue;
             }
         }
@@ -405,9 +428,14 @@ class RouterContents
     generatePropertyRenderedValueWithLabel(entity, propertyKey, resourceProperty)
     {
         let fieldValue = (0 === entity[propertyKey] ? '0' : entity[propertyKey] || '');
+        if(sc.isObject(fieldValue) && 'json' === resourceProperty.dbType){
+            fieldValue = sc.toJsonString(fieldValue);
+        }
         let fieldName = propertyKey;
         if('boolean' === resourceProperty.type){
-            fieldValue = 1 === entity[propertyKey] || '1' === entity[propertyKey] || true === entity[propertyKey] ? 'Yes' : 'No';
+            fieldValue = 1 === entity[propertyKey]
+            || '1' === entity[propertyKey]
+            || true === entity[propertyKey] ? 'Yes' : 'No';
         }
         if('datetime' === resourceProperty.type){
             fieldValue = '' !== fieldValue ? sc.formatDate(new Date(fieldValue)) : '';
@@ -440,8 +468,16 @@ class RouterContents
     {
         let entityPropertyValue = sc.get(entity, propertyKey, null);
         let fieldValue = (0 === entityPropertyValue ? '0' : entityPropertyValue || '');
+        if('null' === fieldValue){
+            fieldValue = '';
+        }
+        if(sc.isObject(fieldValue) && 'json' === resourceProperty.dbType){
+            fieldValue = sc.toJsonString(fieldValue);
+        }
         if('boolean' === resourceProperty.type){
-            fieldValue = 1 === entityPropertyValue || '1' === entityPropertyValue || true === entityPropertyValue ? ' checked="checked"' : '';
+            fieldValue = 1 === entityPropertyValue
+                || '1' === entityPropertyValue
+                || true === entityPropertyValue ? ' checked="checked"' : '';
         }
         if('datetime' === resourceProperty.type){
             fieldValue = !entityPropertyValue || '' === entityPropertyValue
@@ -452,7 +488,9 @@ class RouterContents
             let relationDriverResource = this.resourcesByReference()[resourceProperty.reference];
             let relation = this.relations()[resourceProperty.reference];
             let relationKey = resourceProperty.alias || resourceProperty.reference;
-            let relationTitleProperty = relation ? relation[relationKey] : this.fetchEntityIdPropertyKey(relationDriverResource);
+            let relationTitleProperty = relation
+                ? relation[relationKey]
+                : this.fetchEntityIdPropertyKey(relationDriverResource);
             let options = (await this.fetchRelationOptions(relationDriverResource)).map((option) => {
                 let value = option[this.fetchEntityIdPropertyKey(relationDriverResource)];
                 return {
@@ -462,10 +500,11 @@ class RouterContents
                 };
             });
             if(!resourceProperty.isRequired){
+                let isSelected = !entity || null === entity[propertyKey] || '' === entity[propertyKey];
                 options.unshift({
                     label: '-- Select --',
                     value: '',
-                    selected: (!entity || null === entity[propertyKey] || '' === entity[propertyKey]) ? ' selected="selected"' : ''
+                    selected: isSelected ? ' selected="selected"' : ''
                 });
             }
             return options;
@@ -476,6 +515,9 @@ class RouterContents
     async fetchRelationOptions(relationDriverResource)
     {
         let relationEntityRepository = this.dataServer.getEntity(relationDriverResource.entityKey);
+        if(!relationEntityRepository){
+            return false;
+        }
         return await relationEntityRepository.loadAll();
     }
 

package/lib/admin-manager-validator.js

@@ -3,6 +3,7 @@
  * Reldens - AdminManagerValidator
  *
  */
+
 const { ValidatorInterface, Logger } = require('@reldens/utils');
 
 class AdminManagerValidator extends ValidatorInterface
@@ -29,7 +30,7 @@ class AdminManagerValidator extends ValidatorInterface
                 return false;
             }
         }
-        return true
+        return true;
     }
 
 }

package/lib/admin-manager.js

@@ -115,7 +115,7 @@ class AdminManager
             viewPath: this.viewPath,
             editPath: this.editPath,
             deletePath: this.deletePath,
-            emitEvent: (eventName, eventData = {}) => this.events.emit(eventName, {adminManager: this, ...eventData}),
+            emitEvent: this.emitEvent,
             adminContentsRender: (...args) => this.contentsBuilder.render(...args),
             adminContentsRenderRoute: (...args) => this.contentsBuilder.renderRoute(...args),
             adminContentsEntities: () => this.contentsBuilder.adminContents.entities,
@@ -135,8 +135,10 @@ class AdminManager
             cacheManager: this.cacheManager,
             renderCallback: this.renderCallback,
             cacheCleanButton: this.adminFilesContents.cacheCleanButton,
+            clearAllCacheButton: this.adminFilesContents.clearAllCacheButton,
             translations: this.translations,
-            cacheCleanRoute: this.cacheRoutesHandler.cacheCleanRoute
+            cacheCleanRoute: this.cacheRoutesHandler.cacheCleanRoute,
+            clearAllCacheRoute: this.cacheRoutesHandler.clearAllCacheRoute
         });
     }
 

package/lib/admin-translations.js

@@ -21,7 +21,9 @@ class AdminTranslations
                 reldensGithubText: 'Need a new feature?'
                     +' Would you like to contribute with code?'
                     +' Find the source code or create an issue in GitHub',
-                reldensLoading: 'Loading...'
+                reldensLoading: 'Loading...',
+                confirmClearCacheMessage: 'Are you sure you want to clear all cache? This action cannot be undone.',
+                clearCacheWarning: 'This will clear all cached routes and may impact site performance temporarily.'
             },
             labels: {
                 navigation: 'Reldens - CMS',
@@ -32,6 +34,12 @@ class AdminTranslations
                 shuttingDown: 'Server is shutting down in:',
                 submitShutdownLabel: 'Shutdown Server',
                 submitCancelLabel: 'Cancel Server Shutdown',
+                cleanCache: 'Clean Cache',
+                clearAllCache: 'Clear All Cache',
+                confirmClearCache: 'Confirm Clear Cache',
+                warning: 'Warning:',
+                cancel: 'Cancel',
+                confirm: 'Continue',
             }
         };
         for(let i of Object.keys(translations)){

package/lib/cache/add-cache-button-subscriber.js

@@ -15,8 +15,10 @@ class AddCacheButtonSubscriber
         this.cacheManager = sc.get(props, 'cacheManager', false);
         this.renderCallback = sc.get(props, 'renderCallback', false);
         this.cacheCleanButton = sc.get(props, 'cacheCleanButton', '');
+        this.clearAllCacheButton = sc.get(props, 'clearAllCacheButton', '');
         this.translations = sc.get(props, 'translations', {});
         this.cacheCleanRoute = sc.get(props, 'cacheCleanRoute', '');
+        this.clearAllCacheRoute = sc.get(props, 'clearAllCacheRoute', '');
         this.setupEvents();
     }
 
@@ -37,14 +39,14 @@ class AddCacheButtonSubscriber
         //Logger.debug('Listening events PropertiesPopulation.');
         this.events.on('reldens.adminViewPropertiesPopulation', this.populateViewFields.bind(this));
         this.events.on('reldens.adminEditPropertiesPopulation', this.populateEditFields.bind(this));
-
+        this.events.on('reldens.adminListPropertiesPopulation', this.populateListFields.bind(this));
     }
 
     async populateViewFields(event)
     {
         let cacheButton = await this.generateCacheCleanButton(event);
         if(!cacheButton){
-            Logger.warning('Missing cache button contents on AddCacheButtonSubscriber.');
+            //Logger.info('Missing cache button contents on AddCacheButtonSubscriber.');
             return false;
         }
         if(!event.renderedViewProperties.extraContentForView){
@@ -59,7 +61,7 @@ class AddCacheButtonSubscriber
     {
         let cacheButton = await this.generateCacheCleanButton(event);
         if(!cacheButton){
-            Logger.warning('Missing cache button contents on AddCacheButtonSubscriber.');
+            //Logger.info('Missing cache button contents on AddCacheButtonSubscriber.');
             return false;
         }
         if(!event.renderedEditProperties.extraContentForEdit){
@@ -70,12 +72,30 @@ class AddCacheButtonSubscriber
         return true;
     }
 
+    async populateListFields(event)
+    {
+        let clearAllButton = await this.generateClearAllCacheButton(event);
+        if(!clearAllButton){
+            return false;
+        }
+        if(!event.listProperties.extraContentForList){
+            event.listProperties.extraContentForList = '';
+        }
+        event.listProperties.extraContentForList += clearAllButton;
+        return true;
+    }
+
     async generateCacheCleanButton(event)
     {
         if('routes' !== event.driverResource.id()){
             return false;
         }
-        if(!event.loadedEntity || !event.loadedEntity.id){
+        if(!event.loadedEntity){
+            Logger.error('Missing loaded entity on AddCacheButtonSubscriber.');
+            return false;
+        }
+        if(!event.loadedEntity.id){
+            Logger.error('Missing loaded entity ID on AddCacheButtonSubscriber.');
             return false;
         }
         if(!this.cacheCleanButton){
@@ -91,7 +111,35 @@ class AddCacheButtonSubscriber
             {
                 cacheCleanRoute: this.cacheCleanRoute,
                 routeId: event.loadedEntity.id,
-                buttonText: sc.get(this.translations, 'cleanCache', 'Clean Cache')
+                buttonText: sc.get(this.translations.labels, 'cleanCache', 'cleanCache')
+            }
+        );
+    }
+
+    async generateClearAllCacheButton(event)
+    {
+        if('routes' !== event.driverResource.id()){
+            return false;
+        }
+        if(!this.clearAllCacheButton){
+            Logger.error('Clear all cache button template content not found');
+            return '';
+        }
+        if(!this.renderCallback){
+            Logger.error('Render callback not available for clear all cache button');
+            return '';
+        }
+        return await this.renderCallback(
+            this.clearAllCacheButton,
+            {
+                buttonText: sc.get(this.translations.labels, 'clearAllCache', 'clearAllCache'),
+                clearAllCacheRoute: this.clearAllCacheRoute,
+                confirmTitle: sc.get(this.translations.labels, 'confirmClearCache', 'confirmClearCache'),
+                confirmMessage: sc.get(this.translations.messages, 'confirmClearCacheMessage', 'confirmClearCacheMessage'),
+                warningText: sc.get(this.translations.labels, 'warning', 'warning'),
+                warningMessage: sc.get(this.translations.messages, 'clearCacheWarning', 'clearCacheWarning'),
+                cancelText: sc.get(this.translations.labels, 'cancel', 'cancel'),
+                confirmText: sc.get(this.translations.labels, 'confirm', 'confirm')
             }
         );
     }

package/lib/cache/cache-manager.js

@@ -67,17 +67,53 @@ class CacheManager
         return true;
     }
 
+    findAllCacheFilesForPath(domain, path)
+    {
+        let cacheInfo = this.generateCacheKey(domain, path);
+        if(!FileHandler.exists(cacheInfo.folderPath)){
+            return [];
+        }
+        let allFiles = FileHandler.readFolder(cacheInfo.folderPath);
+        if(0 === allFiles.length){
+            return [];
+        }
+        let baseFileName = cacheInfo.fileName.replace('.html', '');
+        let matchingFiles = [];
+        for(let file of allFiles){
+            if(file === cacheInfo.fileName){
+                matchingFiles.push(FileHandler.joinPaths(cacheInfo.folderPath, file));
+                continue;
+            }
+            if(file.startsWith(baseFileName + '_') && file.endsWith('.html')){
+                matchingFiles.push(FileHandler.joinPaths(cacheInfo.folderPath, file));
+            }
+        }
+        return matchingFiles;
+    }
+
     async delete(domain, path)
     {
         let cacheByDomains = this.fetchCachePathsByDomain(domain, path);
         for(let cacheInfo of cacheByDomains){
-            if(!FileHandler.exists(cacheInfo.fullPath)){
-                Logger.debug('File does not exist: '+cacheInfo.fullPath);
-                return true;
+            let allCacheFiles = this.findAllCacheFilesForPath(cacheInfo.domain || domain, path);
+            if(0 === allCacheFiles.length){
+                let singleCacheInfo = this.generateCacheKey(cacheInfo.domain || domain, path);
+                if(!FileHandler.exists(singleCacheInfo.fullPath)){
+                    Logger.debug('No cache files found for: '+path);
+                    continue;
+                }
+                allCacheFiles = [singleCacheInfo.fullPath];
             }
-            if(!FileHandler.remove(cacheInfo.fullPath)){
-                Logger.error('Failed to delete cache file: '+cacheInfo.fullPath);
-                return false;
+            for(let cacheFilePath of allCacheFiles){
+                if(!FileHandler.exists(cacheFilePath)){
+                    Logger.debug('File does not exist: '+cacheFilePath);
+                    continue;
+                }
+                if(!FileHandler.remove(cacheFilePath)){
+                    Logger.error('Failed to delete cache file: '+cacheFilePath);
+                    return false;
+                }
+                Logger.debug('Deleted cache file: '+cacheFilePath);
             }
         }
         return true;
@@ -87,12 +123,15 @@ class CacheManager
     {
         let cacheByDomains = [];
         if(domain && 'default' !== domain){
-            cacheByDomains.push(this.generateCacheKey(domain, path));
+            cacheByDomains.push({domain: domain});
+            return cacheByDomains;
+        }
+        if(!FileHandler.exists(this.cacheBasePath)){
             return cacheByDomains;
         }
         let cachedDomainFolders = FileHandler.readFolder(this.cacheBasePath);
         for(let cachedDomainFolder of cachedDomainFolders) {
-            cacheByDomains.push(this.generateCacheKey(cachedDomainFolder, path));
+            cacheByDomains.push({domain: cachedDomainFolder});
         }
         return cacheByDomains;
     }

package/lib/cache/cache-routes-handler.js

@@ -18,6 +18,8 @@ class CacheRoutesHandler
         this.rootPath = sc.get(props, 'rootPath', '');
         this.cacheCleanPath = '/cache-clean';
         this.cacheCleanRoute = this.rootPath+this.cacheCleanPath;
+        this.clearAllCachePath = '/cache-clear-all';
+        this.clearAllCacheRoute = this.rootPath+this.clearAllCachePath;
         this.setupRoutes();
     }
 
@@ -42,6 +44,13 @@ class CacheRoutesHandler
                 return await this.processCacheClean(req, res);
             }
         );
+        this.router.adminRouter.post(
+            this.clearAllCachePath,
+            this.router.isAuthenticated.bind(this.router),
+            async (req, res) => {
+                return await this.processClearAllCache(req, res);
+            }
+        );
         return true;
     }
 
@@ -71,6 +80,20 @@ class CacheRoutesHandler
         return res.redirect(this.rootPath+'/routes/view'+'?id='+routeId+'&result=success');
     }
 
+    async processClearAllCache(req, res)
+    {
+        if(!this.cacheManager){
+            return res.json({error: 'Cache manager not available'});
+        }
+        let clearResult = await this.cacheManager.clear();
+        if(!clearResult){
+            Logger.error('Failed to clear all cache');
+            return res.redirect(this.rootPath+'/routes?result=errorClearAllCache');
+        }
+        Logger.info('All cache cleared successfully');
+        return res.redirect(this.rootPath+'/routes?result=success');
+    }
+
 }
 
 module.exports.CacheRoutesHandler = CacheRoutesHandler;

package/lib/cms-pages-route-manager.js

@@ -76,9 +76,14 @@ class CmsPagesRouteManager
             Logger.error('Routes repository not found.');
             return;
         }
+        let path = sc.get(req.body, 'routePath', this.generateDefaultRoutePath(entityData));
+        if(!path || '' === path.trim()){
+            Logger.debug('No valid path available for CMS page route creation. Skipping route management.');
+            return;
+        }
         let cmsPageId = Number(entityData.id);
         let routePatchData = {
-            path: sc.get(req.body, 'routePath', this.generateDefaultRoutePath(entityData)),
+            path,
             router: sc.get(req.body, 'routeRouter', 'cmsPages'),
             cache_ttl_seconds: Number(sc.get(req.body, 'routeCacheTtl', 3600)),
             enabled: Number(sc.get(req.body, 'routeEnabled', 1)),
@@ -91,9 +96,12 @@ class CmsPagesRouteManager
         if(!routeResult){
             routeResult = await routesRepository.create(routePatchData);
             if(routeResult){
-                let pagesRepository = this.dataServer.getEntity('cms_pages');
+                let pagesRepository = this.dataServer.getEntity('cmsPages');
                 if(pagesRepository){
-                    await pagesRepository.updateById(cmsPageId, {route_id: routeResult.id});
+                    let pageResult = await pagesRepository.updateById(cmsPageId, {route_id: routeResult.id});
+                    if(!pageResult){
+                        Logger.error('Page could not be updated with route ID.', routeResult);
+                    }
                 }
             }
         }
@@ -105,7 +113,11 @@ class CmsPagesRouteManager
 
     generateDefaultRoutePath(pageData)
     {
-        return '/' + sc.get(pageData, 'title', 'page').toLowerCase()
+        let title = sc.get(pageData, 'title', '');
+        if(!title || '' === title.trim()){
+            return '';
+        }
+        return '/' + title.toLowerCase()
             .replace(/[^a-z0-9\s-]/g, '')
             .replace(/\s+/g, '-')
             .replace(/-+/g, '-')