@reldens/cms 0.24.0 → 0.25.0

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

@@ -31,6 +31,7 @@ class RouterContents
         this.fetchTranslation = props.fetchTranslation;
         this.fetchEntityIdPropertyKey = props.fetchEntityIdPropertyKey;
         this.fetchUploadProperties = props.fetchUploadProperties;
+        this.uploaderFactory = props.uploaderFactory;
         this.filtersManager = new AdminFiltersManager();
     }
 
@@ -41,7 +42,7 @@ class RouterContents
         let shouldClearFilters = 'true' === req?.query?.clearFilters;
         let sessionFilters = this.filtersManager.getFiltersFromSession(req, entityPath);
         let filtersFromParams = shouldClearFilters ? {} : req?.body?.filters || req?.query?.filters || {};
-        let entityFilterTerm = shouldClearFilters ? '' : req?.body?.entityFilterTerm || req?.query?.entityFilterTerm || '';
+        let entityFilterTerm = shouldClearFilters ? '' : sc.get(req?.body, 'entityFilterTerm', '');
         if(shouldClearFilters){
             this.filtersManager.clearFiltersFromSession(req, entityPath);
         }
@@ -107,9 +108,18 @@ class RouterContents
                                 driverResource.options.properties[property]?.alias || '',
                                 driverResource.id()
                             );
-                            return {name: property, value: '' !== alias ? alias + ' ('+propertyTitle+')' : propertyTitle};
+                            return {
+                                name: property,
+                                value: '' !== alias ? alias + ' ('+propertyTitle+')' : propertyTitle
+                            };
                         }),
-                        rows: await this.loadEntitiesForList(driverResource, pageSize, currentPage, req, combinedFilters)
+                        rows: await this.loadEntitiesForList(
+                            driverResource,
+                            pageSize,
+                            currentPage,
+                            req,
+                            combinedFilters
+                        )
                     }),
                     pagination: renderedPagination,
                     extraContentForList: sc.get(listProperties, 'extraContentForList', ''),
@@ -159,7 +169,8 @@ class RouterContents
         }
         let extraDataEvent = {entitySerializedData, entityId: driverResource.id(), entity: loadedEntity};
         await this.emitEvent('adminEntityExtraData', extraDataEvent);
-        renderedViewProperties.entitySerializedData = JSON.stringify(extraDataEvent.entitySerializedData).replace(/"/g, '"');
+        renderedViewProperties.entitySerializedData = JSON.stringify(extraDataEvent.entitySerializedData)
+            .replace(/"/g, '"');
         await this.emitEvent('reldens.adminViewPropertiesPopulation', {
             idProperty,
             req,
@@ -244,10 +255,30 @@ class RouterContents
 
     async processSaveEntity(req, res, driverResource, entityPath)
     {
+        let uploadProperties = this.fetchUploadProperties(driverResource);
+        if(0 < Object.keys(uploadProperties).length){
+            if(this.uploaderFactory.error.message){
+                Logger.error('Upload factory error detected', this.uploaderFactory.error);
+                return this.rootPath+'/'+entityPath+'?result=uploadError&error='
+                    +encodeURIComponent(this.uploaderFactory.error.message);
+            }
+            let uploadValidationResult = this.validateUploadedFiles(req, uploadProperties);
+            if(!uploadValidationResult.success){
+                Logger.error('Upload validation failed', uploadValidationResult.error);
+                return this.rootPath+'/'+entityPath+'?result=uploadValidationError&error='
+                    +encodeURIComponent(uploadValidationResult.error.message);
+            }
+        }
         let idProperty = this.fetchEntityIdPropertyKey(driverResource);
         let id = (req?.body[idProperty] || '');
         let entityRepository = this.dataServer.getEntity(driverResource.entityKey);
-        let entityDataPatch = this.preparePatchData(driverResource, idProperty, req, driverResource.options.properties, id);
+        let entityDataPatch = this.preparePatchData(
+            driverResource,
+            idProperty,
+            req,
+            driverResource.options.properties,
+            id
+        );
         if(!entityDataPatch){
             Logger.error('Bad patch data.', entityDataPatch);
             return this.rootPath+'/'+entityPath+'?result=saveBadPatchData';
@@ -256,7 +287,8 @@ class RouterContents
             let saveResult = await this.saveEntity(id, entityRepository, entityDataPatch);
             if(!saveResult){
                 Logger.error('Save result error.', saveResult, entityDataPatch);
-                return this.generateEntityRoute('editPath', driverResource, idProperty, null, id)+'?result=saveEntityStorageError';
+                return this.generateEntityRoute('editPath', driverResource, idProperty, null, id)
+                    +'?result=saveEntityStorageError';
             }
             await this.emitEvent('reldens.adminAfterEntitySave', {
                 req,
@@ -292,6 +324,40 @@ class RouterContents
         }
     }
 
+    validateUploadedFiles(req, uploadProperties)
+    {
+        for(let uploadPropertyKey of Object.keys(uploadProperties)){
+            let property = uploadProperties[uploadPropertyKey];
+            let uploadedFiles = req.files?.[uploadPropertyKey];
+            if(!uploadedFiles || 0 === uploadedFiles.length){
+                if(property.isRequired){
+                    return {success: false, error: {message: 'Required file upload missing: '+uploadPropertyKey}};
+                }
+                continue;
+            }
+            for(let file of uploadedFiles){
+                let filePath = file.path;
+                if(!FileHandler.exists(filePath)){
+                    return {
+                        success: false,
+                        error: {
+                            message: 'Uploaded file not found in bucket: '+file.filename,
+                            filePath,
+                            bucket: property.bucket
+                        }
+                    };
+                }
+                if(!FileHandler.isFile(filePath)){
+                    return {
+                        success: false,
+                        error: {message: 'Uploaded file is not a valid file: '+file.filename, filePath}
+                    };
+                }
+            }
+        }
+        return {success: true};
+    }
+
     async countTotalEntities(driverResource, filters)
     {
         let entityRepository = this.dataServer.getEntity(driverResource.entityKey);
@@ -394,12 +460,19 @@ class RouterContents
     preparePatchData(driverResource, idProperty, req, resourceProperties, id)
     {
         let entityDataPatch = {};
-        for(let i of driverResource.options.editProperties){
+        for(let i of Object.keys(resourceProperties)){
             if(i === idProperty){
                 continue;
             }
-            let propertyUpdateValue = sc.get(req.body, i, null);
             let property = resourceProperties[i];
+            let shouldProcess = driverResource.options.editProperties.includes(i);
+            if(!id && !shouldProcess && property.isRequired && 'reference' === property.type){
+                shouldProcess = true;
+            }
+            if(!shouldProcess){
+                continue;
+            }
+            let propertyUpdateValue = sc.get(req.body, i, null);
             if('null' === propertyUpdateValue){
                 propertyUpdateValue = null;
             }
@@ -414,7 +487,15 @@ class RouterContents
             let isEmpty = '' === propertyUpdateValue;
             let isNull = null === propertyUpdateValue;
             if('number' === propertyType && !isNull && !isEmpty){
-                propertyUpdateValue = Number(propertyUpdateValue);
+                let numValue = Number(propertyUpdateValue);
+                if(isNaN(numValue)){
+                    Logger.critical(
+                        'Invalid number value for property.',
+                        {propertyKey: i, value: propertyUpdateValue, entity: driverResource.entityKey}
+                    );
+                    return false;
+                }
+                propertyUpdateValue = numValue;
             }
             if('string' === propertyType && !isNull && !isEmpty){
                 propertyUpdateValue = String(propertyUpdateValue);
@@ -424,7 +505,11 @@ class RouterContents
             }
             let isUploadCreate = property.isUpload && !id;
             if(property.isRequired && (isNull || isEmpty) && (!property.isUpload || isUploadCreate)){
-                Logger.critical('Bad patch data on update.', propertyUpdateValue, property);
+                // missing required fields would break the update:
+                Logger.critical(
+                    'Missing property on prepare patch data.',
+                    {propertyKey: i, config: property, propertyUpdateValue, entity: driverResource.entityKey}
+                );
                 return false;
             }
             if(!property.isUpload || (property.isUpload && !isNull)){
@@ -434,6 +519,7 @@ class RouterContents
         return entityDataPatch;
     }
 
+
     prepareUploadPatchData(req, i, propertyUpdateValue, property)
     {
         let filesData = sc.get(req.files, i, null);
@@ -561,7 +647,7 @@ class RouterContents
     {
         let relationEntityRepository = this.dataServer.getEntity(relationDriverResource.entityKey);
         if(!relationEntityRepository){
-            return false;
+            return [];
         }
         return await relationEntityRepository.loadAll();
     }

package/lib/admin-manager/router.js

@@ -171,6 +171,7 @@ class Router
         }
         let fields = [];
         let allowedFileTypes = {};
+        let entityBuckets = {};
         for(let uploadPropertyKey of Object.keys(uploadProperties)){
             let property = uploadProperties[uploadPropertyKey];
             allowedFileTypes[uploadPropertyKey] = property.allowedTypes || false;
@@ -179,12 +180,12 @@ class Router
                 field.maxCount = 1;
             }
             fields.push(field);
-            this.buckets[uploadPropertyKey] = property.bucket;
+            entityBuckets[uploadPropertyKey] = property.bucket;
         }
         this.adminRouter.post(
             entityRoute + this.savePath,
             this.isAuthenticated.bind(this),
-            this.uploaderFactory.createUploader(fields, this.buckets, allowedFileTypes),
+            this.uploaderFactory.createUploader(fields, entityBuckets, allowedFileTypes),
             async (req, res) => {
                 //await this.reloadTemplatesIfNeeded();
                 await this.emitEvent('reldens.adminBeforeEntitySave', {

package/lib/admin-manager.js

@@ -241,7 +241,7 @@ class AdminManager
 
     fetchEntityIdPropertyKey(driverResource)
     {
-        let resourceProperties = driverResource.options?.properties;
+        let resourceProperties = driverResource?.options?.properties;
         if(!resourceProperties){
             Logger.error('Property "ID" not found.', resourceProperties);
             return  '';

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@reldens/cms",
     "scope": "@reldens",
-    "version": "0.24.0",
+    "version": "0.25.0",
     "description": "Reldens - CMS",
     "author": "Damian A. Pastorini",
     "license": "MIT",
@@ -33,8 +33,8 @@
         "url": "https://github.com/damian-pastorini/reldens-cms/issues"
     },
     "dependencies": {
-        "@reldens/server-utils": "^0.25.0",
-        "@reldens/storage": "^0.67.0",
+        "@reldens/server-utils": "^0.26.0",
+        "@reldens/storage": "^0.68.0",
         "@reldens/utils": "^0.53.0",
         "dotenv": "^17.2.1",
         "mustache": "^4.2.0"