jsharmony 1.40.14 → 1.41.0

package/AppSrv.File.js

@@ -334,6 +334,12 @@ exports.ProcessFileParams = function (req, res, model, P, fieldlist, sql_extfiel
         if (field.controlparams._data_file_has_extension) tdest += '%%%EXT%%%';
         fileops.push({ op: 'move', src: '', dest: tdest });
       }
+      //Delete cached files in main operation
+      if (field.controlparams.cache) for (var cname in field.controlparams.cache) {
+        var cdest = jsh.Config.datadir + field.controlparams.data_folder + '/' + (field.controlparams.data_file_prefix||field.name) + '_' + cname + '_%%%KEY%%%';
+        if (field.controlparams._data_file_has_extension) cdest += '%%%EXT%%%';
+        fileops.push({ op: 'move', src: '', dest: cdest });
+      }
       filecallback(null);
     }
     else {
@@ -378,6 +384,12 @@ exports.ProcessFileParams = function (req, res, model, P, fieldlist, sql_extfiel
             fileops.push({ op: 'move', src: '', dest: tdest });
           }
         }
+        //Clear cached files
+        if (field.controlparams.cache) for (var cname in field.controlparams.cache) {
+          var cdest = jsh.Config.datadir + field.controlparams.data_folder + '/' + (field.controlparams.data_file_prefix||field.name) + '_' + cname + '_%%%KEY%%%';
+          if (field.controlparams._data_file_has_extension) cdest += '.' + (field.controlparams.cache[cname].format || '');
+          fileops.push({ op: 'move', src: '', dest: cdest });
+        }
         //Resize Image, if applicable
         if (field.controlparams.image && _.includes(jsh.Config.supported_images, file_ext)) {
           filedest = Helper.ReplaceAll(filedest, '%%%EXT%%%', '.' + field.controlparams.image.format);
@@ -413,7 +425,7 @@ exports.ProcessFileOperations = function (keyval, fileops, rslt, stats, callback
       function(filehandlercb){
         //Get src file extension
         HelperFS.getExtFileName(filesrc, function(err, filename){
-          if(err) return callback(Helper.NewError('File not found', -33));
+          if(err) return opcallback(Helper.NewError('File not found', -33));
           filesrc = filename;
           return filehandlercb();
         });
@@ -421,7 +433,10 @@ exports.ProcessFileOperations = function (keyval, fileops, rslt, stats, callback
       function(filehandlercb){
         //Get dest file extension
         HelperFS.getExtFileName(filedest, function(err, filename){
-          if(err) return callback(Helper.NewError('File not found', -33));
+          if(err){
+            if((fileop.op == 'move') && !filesrc) return opcallback(null);
+            return opcallback(Helper.NewError('File not found', -33));
+          }
           filedest = filename;
           return filehandlercb();
         });
@@ -445,6 +460,7 @@ exports.ProcessFileOperations = function (keyval, fileops, rslt, stats, callback
       else return opcallback(null);
     });
   }, function (fileerr) {
+    if(fileerr && (fileerr.number == -33)) return callback(fileerr);
     if ((fileerr != null) && ('code' in fileerr) && (fileerr.code == 'ENOENT')) { /* Ignore this error */ }
     else if (fileerr != null) {
       jsh.Log.error(fileerr);
@@ -458,7 +474,10 @@ exports.ProcessFileOperationsDone = function (fileops, callback) {
   async.eachSeries(fileops, function (fileop, opcallback) {
     if ((fileop.op == 'move') || (fileop.op == 'delete_on_complete')) {
       if (fileop.src == '') return opcallback(null);
-      HelperFS.unlink(fileop.src, function (err) { opcallback(null); });
+      HelperFS.getExtFileName(fileop.src, function(err, filename){
+        if(err) return opcallback(null);
+        HelperFS.unlink(filename, function (err) { opcallback(null); });
+      });
     }
     else return opcallback(null);
   }, function (err) { callback(null, null); });

package/AppSrv.ModelForm.js

@@ -649,12 +649,17 @@ exports.deleteModelForm = function (req, res, fullmodelid, Q, P, onComplete) {
     _.each(filelist, function (file) {
       var filefield = _this.getFieldByName(model.fields, file);
       //Delete file in post-processing
-      fileops.push({ op: 'move', src: _this.jsh.Config.datadir + filefield.controlparams.data_folder + '/' + (filefield.controlparams.data_file_prefix||file) + '_' + keyval + ((filefield.controlparams._data_file_has_extension)?'%%%EXT%%%':''), dst: '' });
+      fileops.push({ op: 'move', src: _this.jsh.Config.datadir + filefield.controlparams.data_folder + '/' + (filefield.controlparams.data_file_prefix||file) + '_' + keyval + ((filefield.controlparams._data_file_has_extension)?'%%%EXT%%%':''), dest: '' });
       //Delete thumbnails in post-processing
       if (filefield.controlparams.thumbnails) for (var tname in filefield.controlparams.thumbnails) {
-        fileops.push({ op: 'move', src: _this.jsh.Config.datadir + filefield.controlparams.data_folder + '/' + (filefield.controlparams.data_file_prefix||filefield.name) + '_' + tname + '_' + keyval + ((filefield.controlparams._data_file_has_extension)?'%%%EXT%%%':''), dst: '' });
+        fileops.push({ op: 'move', src: _this.jsh.Config.datadir + filefield.controlparams.data_folder + '/' + (filefield.controlparams.data_file_prefix||filefield.name) + '_' + tname + '_' + keyval + ((filefield.controlparams._data_file_has_extension)?'%%%EXT%%%':''), dest: '' });
+      }
+      //Delete cache in post-processing
+      if (filefield.controlparams.cache) for (var cname in filefield.controlparams.cache) {
+        fileops.push({ op: 'move', src: _this.jsh.Config.datadir + filefield.controlparams.data_folder + '/' + (filefield.controlparams.data_file_prefix||filefield.name) + '_' + cname + '_' + keyval + ((filefield.controlparams._data_file_has_extension)?'%%%EXT%%%':''), dest: '' });
       }
     });
+    
     dbtasks['_POSTPROCESS'] = function (callback) {
       _this.ProcessFileOperationsDone(fileops, callback);
     };

package/clientjs/XAPI.Grid.js

@@ -227,6 +227,8 @@ exports = module.exports = function(jsh){
 
         if(_.isString(col1)) col1 = col1.toUpperCase();
         if(_.isString(col2)) col2 = col2.toUpperCase();
+        if(_.isNil(col1)) col1 = '';
+        if(_.isNil(col2)) col2 = '';
 
         if(sortexp.dir=='^'){
           if(col1 < col2) return -1;

package/jsHarmony.LoadModels.js

@@ -1961,7 +1961,7 @@ exports.ParseEntities = function () {
     var _v_controlparams = [
       'value_true', 'value_false', 'value_hidden', 'code_val', 'popupstyle', 'popupiconstyle', 'popup_copy_results', 'onpopup', 'base_readonly', 'dateformat', 'panelstyle',
       'download_button', 'preview_button', 'upload_button', 'delete_button', 'data_folder', 'data_file_prefix', 'sqlparams', '_data_file_has_extension', 'show_thumbnail', 'preview_on_click', 'icon',
-      'image', 'thumbnails', 'expand_all', 'expand_to_selected', 'onmove', 'ondrop', 'ongetnodecontent', 'drag_anchor_settings', 'item_context_menu', 'item_dropdown', 'insert_link', 'grid_save_before_update', 'update_when_blank', 'htmlarea_config', 'placeholder'
+      'image', 'thumbnails', 'cache', 'expand_all', 'expand_to_selected', 'onmove', 'ondrop', 'ongetnodecontent', 'drag_anchor_settings', 'item_context_menu', 'item_dropdown', 'insert_link', 'grid_save_before_update', 'update_when_blank', 'htmlarea_config', 'placeholder'
     ];
     var _v_popuplov = ['target', 'code_val', 'popupstyle', 'popupiconstyle', 'popup_copy_results', 'onpopup', 'popup_copy_results', 'onpopup', 'base_readonly'];
     var _v_lov = ['sql', 'sql2', 'sqlmp', 'code', 'code2', 'code_sys', 'code2_sys', 'code_app', 'code2_app', 'schema', 'blank', 'parent', 'parents', 'datalock', 'sql_params', 'sqlselect', 'sqlselect_params', 'sqltruncate', 'always_get_full_lov', 'nodatalock', 'showcode', 'db', 'database', 'values', 'post_process'];

package/jsHarmony.css

@@ -229,6 +229,7 @@ BODY
 <%-rootcss%> .xform_file_download .xform_file_download_button { padding-right:25px; }
 <%-rootcss%> .xform_file_download.nodocument .xform_file_download_button { display:none; }
 <%-rootcss%> .xform_image, .xform_image_preview { display:inline-block; }
+<%-rootcss%> .xtbl td .xform_image_preview { vertical-align: text-top; }
 <%-rootcss%> .xform .xform_label,
 <%-rootcss%> .xform input,
 <%-rootcss%> .xform select,

package/jsHarmonyConfig.js

@@ -155,9 +155,9 @@ function jsHarmonyConfig(config){
     "validation_level": "standard"
   };
   //Valid file upload extensions
-  this.valid_extensions = [".jpg", ".jpeg", ".pdf", ".png", ".svg", ".tif", ".tiff", ".gif", ".mp4", ".ogv", ".webm", ".mp3", ".wav", ".avi", ".txt", ".xlsm", ".xls", ".xlsx", ".bak", ".zip", ".csv"];
+  this.valid_extensions = [".jpg", ".jpeg", ".webp", ".pdf", ".png", ".svg", ".tif", ".tiff", ".gif", ".mp4", ".ogv", ".webm", ".mp3", ".wav", ".avi", ".txt", ".xlsm", ".xls", ".xlsx", ".bak", ".zip", ".csv"];
   //Valid image extensions
-  this.supported_images = ['.jpg','.jpeg','.gif','.png','.svg'];
+  this.supported_images = ['.jpg','.jpeg','.webp','.gif','.png','.svg'];
   //File viewers
   this.file_viewers = { /* '.ext': function(jsh, req, res, options, fpath, fname){ ... } */ };
   //Time before log entries are flushed to disk

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsharmony",
-  "version": "1.40.14",
+  "version": "1.41.0",
   "description": "Rapid Application Development (RAD) Platform for Node.js Database Application Development",
   "main": "index.js",
   "scripts": {
@@ -44,6 +44,8 @@
     "express": "^4.17.1",
     "form-data": "^2.5.0",
     "jsharmony-db": "^1.2.0",
+    "jsharmony-image-magick": "^1.1.0",
+    "jsharmony-image-sharp": "^1.1.0",
     "jsharmony-validate": "^1.1.5",
     "lodash": "^4.17.19",
     "mime": "^1.3.4",