jsharmony-cms 1.12.2 → 1.13.0

package/clientjs/jsHarmonyCMS.Component.js

@@ -221,6 +221,11 @@ exports = module.exports = function(componentId, element, cms, jsh, componentCon
       jsh.async.each(
         $element.find('[data-component]'),
         function(el, el_cb) {
+          var $el = jsh.$(el);
+          if(!$el.hasClass('initialized')){
+            $el.addClass('initialized');
+            $el.attr('data-component-id', cms.componentManager.getNextComponentId());
+          }
           cms.componentManager.renderContentComponent(el, undefined, el_cb);
         },
         callback

package/clientjs/jsHarmonyCMS.Editor.TinyMCEPlugin.js

@@ -898,6 +898,17 @@ exports = module.exports = function(jsh, cms, editor){
         continue;
       }
       node.attr('data-component-id', null);
+      if(node.attr('class')){
+        var cls = node.attr('class').toString().trim().split(' ');
+        var newcls = '';
+        if(cls.indexOf('initialized')>=0){
+          for(var j=0;j<cls.length;j++){
+            if(!cls[j] || (cls[j]=='initialized')) continue;
+            newcls += cls[j] + ' ';
+          }
+          node.attr('class', newcls.trim() || null);
+        }
+      }
       node.empty();
       var newNode = tinymce.html.Node.create('#text');
       newNode.value = String.fromCharCode(0x00A0);

package/jsHarmonyCMS.js

@@ -126,7 +126,7 @@ jsHarmonyCMS.prototype.Init = function(cb){
       function(ready_cb){
         var sql = 'update '+(_this.schema?_this.schema+'.':'')+"deployment set deployment_sts='FAILED' where deployment_sts='RUNNING';";
         if(_this.Config.debug_params.auto_restart_failed_publish){
-          sql = 'insert into '+(_this.schema?_this.schema+'.':'')+"deployment(deployment_tag, branch_id, deployment_date, deployment_target_id) select concat(deployment_tag,'#'), branch_id, deployment_date, deployment_target_id from "+(_this.schema?_this.schema+'.':'')+"deployment where deployment_sts='RUNNING';" + sql;
+          sql = 'insert into '+(_this.schema?_this.schema+'.':'')+"deployment(deployment_tag, branch_id, deployment_date, deployment_target_id, deployment_params) select concat(deployment_tag,'#'), branch_id, deployment_date, deployment_target_id, deployment_params from "+(_this.schema?_this.schema+'.':'')+"deployment where deployment_sts='RUNNING';" + sql;
         }
         jsh.AppSrv.ExecCommand('system', sql, [], { }, function (err, rslt) {
           if (err) { jsh.Log.error(err); }
@@ -797,10 +797,9 @@ jsHarmonyCMS.prototype.getFactoryConfig = function(){
   configFactory.scheduled_tasks['deploy'] = {
     action: configFactory.Helper.JobProc.ExecuteSQL('jsHarmonyCMS_GetNextDeployment', function(rslt){
       if(_this.funcs.deploymentQueue.length()) return;
-      if(rslt && rslt.length && rslt[0] && rslt[0].length){
-        var deployment = rslt[0][0];
+      _.each(rslt && rslt.length && rslt[0], function(deployment){
         _this.funcs.deploy.call(_this.jsh.AppSrv, deployment.deployment_id);
-      }
+      });
     }),
     options: {
       quiet: true

package/jsHarmonyCMSConfig.js

@@ -142,6 +142,7 @@ function jsHarmonyCMSConfig(){
   this.onRender = null; //function(target, content, callback){ return callback(new_content); }  //target = 'editor', 'publish'
   this.onRouteLinkBrowser = null; //function(jsh, req, res, model, callback){ return callback(); } //callback(false) to stop further processing
   this.onReplaceBranchURL = null; //function(url, branchData, getLinkContent, addUrlSuffix, options){ return url; } //return a value (not undefined) to stop processing
+  this.onDeploy_Init = null; //function(jsh, deployment_id, deployment, callback(err, stopDeployment)){ return callback(err); }
   this.onDeploy_LoadData = null; //function(jsh, branchData, template_variables, callback){ return callback(err); }
   this.onValidate_LoadData = null; //function(jsh, branchData, template_variables, callback){ return callback(err); }
   this.onDeploy_GenerateRedirects = null; //function(jsh, branchData, template_variables, callback){ return callback(err, generated_redirect_files); }

package/models/Publish_Log.js

@@ -6,6 +6,8 @@ jsh.App[modelid] = new (function(){
   var sleepsWithoutUpdate = 0;
   var lastLog = '';
 
+  this.onPublishComplete = null;
+
   this.onload = function(){
     this.updateButtons(xmodel.get('deployment_sts'));
     //Load API Data
@@ -71,6 +73,9 @@ jsh.App[modelid] = new (function(){
         }
         //Auto-refresh
         if(_.includes(['PENDING','RUNNING'], deployment_sts)) setTimeout(function(){ _this.loadData(); }, _this.getSleepTime());
+        else{
+          if(_this.onPublishComplete) _this.onPublishComplete();
+        }
 
         initialized = true;
       }

package/models/_funcs.deploy.js

@@ -535,7 +535,7 @@ module.exports = exports = function(module, funcs){
 
     //Update deployment to running status
     var sql = "select \
-        deployment_id, dt.site_id, deployment_tag, deployment_target_name, deployment_target_publish_path, deployment_target_template_variables, deployment_target_publish_config, deployment_target_sts, deployment_git_revision, \
+        deployment_id, dt.site_id, deployment_tag, deployment_params, deployment_target_name, deployment_target_publish_path, deployment_target_template_variables, deployment_target_publish_config, deployment_target_sts, deployment_git_revision, \
         d.deployment_target_id, \
         (select param_cur_val from jsharmony.v_param_cur where param_cur_process='CMS' and param_cur_attrib='PUBLISH_TGT') publish_tgt, \
         site.site_default_page_filename site_default_page_filename \
@@ -554,6 +554,15 @@ module.exports = exports = function(module, funcs){
       if(!deployment) { let err = 'Invalid Deployment ID'; funcs.deploy_log_error(deployment_id, err); return onComplete(err); }
 
       async.waterfall([
+        
+        function(deploy_cb){
+          if(!module.Config.onDeploy_Init) return deploy_cb();
+          module.Config.onDeploy_Init(jsh, deployment_id, deployment, function(err, stopDeployment){
+            if(err){ funcs.deploy_log_error(deployment_id, err); return onComplete(err); }
+            if(stopDeployment) return onComplete();
+            return deploy_cb();
+          });
+        },
 
         //Change status to RUNNING
         function(deploy_cb){

package/models/sql/_functions.mssql.json

@@ -60,15 +60,15 @@
     ]
   },
   "{schema}.insert_deployment":{
-    "params": ["site_id", "deployment_target_id", "branch_id", "deployment_date", "deployment_tag"],
+    "params": ["site_id", "deployment_target_id", "branch_id", "deployment_date", "deployment_tag", { "name": "deployment_params", "default": null }],
     "sql": [
-      "insert into {schema}.v_my_deployment(site_id, deployment_target_id, branch_id, deployment_date, deployment_tag) values(%%%site_id%%%, %%%deployment_target_id%%%, %%%branch_id%%%, %%%deployment_date%%%, %%%deployment_tag%%%);"
+      "insert into {schema}.v_my_deployment(site_id, deployment_target_id, branch_id, deployment_date, deployment_tag, deployment_params) values(%%%site_id%%%, %%%deployment_target_id%%%, %%%branch_id%%%, %%%deployment_date%%%, %%%deployment_tag%%%, %%%deployment_params%%%);"
     ]
   },
   "{schema}.insert_redeployment":{
-    "params": ["src_deployment_id", "deployment_target_id", "deployment_date", "deployment_tag"],
+    "params": ["src_deployment_id", "deployment_target_id", "deployment_date", "deployment_tag", { "name": "deployment_params", "default": null }],
     "sql": [
-      "insert into {schema}.v_my_deployment(site_id, deployment_target_id, branch_id, deployment_date, deployment_tag, deployment_git_revision) select site_id, %%%deployment_target_id%%%, branch_id, %%%deployment_date%%%, %%%deployment_tag%%%, deployment_git_revision from {schema}.v_my_deployment where deployment_id=%%%src_deployment_id%%%;"
+      "insert into {schema}.v_my_deployment(site_id, deployment_target_id, branch_id, deployment_date, deployment_tag, deployment_params, deployment_git_revision) select site_id, %%%deployment_target_id%%%, branch_id, %%%deployment_date%%%, %%%deployment_tag%%%, %%%deployment_params%%%, deployment_git_revision from {schema}.v_my_deployment where deployment_id=%%%src_deployment_id%%%;"
     ]
   },
   "jsHarmonyCMS_Upload": "insert into {tgtschema}.v_my_{item}({columns}) values ({values});",

package/models/sql/_functions.pgsql.json

@@ -60,15 +60,15 @@
     ]
   },
   "{schema}.insert_deployment":{
-    "params": ["site_id", "deployment_target_id", "branch_id", "deployment_date", "deployment_tag"],
+    "params": ["site_id", "deployment_target_id", "branch_id", "deployment_date", "deployment_tag", { "name": "deployment_params", "default": null }],
     "sql": [
-      "insert into {schema}.v_my_deployment(site_id, deployment_target_id, branch_id, deployment_date, deployment_tag) values(%%%site_id%%%, %%%deployment_target_id%%%, %%%branch_id%%%, %%%deployment_date%%%, %%%deployment_tag%%%) returning deployment_id;"
+      "insert into {schema}.v_my_deployment(site_id, deployment_target_id, branch_id, deployment_date, deployment_tag, deployment_params) values(%%%site_id%%%, %%%deployment_target_id%%%, %%%branch_id%%%, %%%deployment_date%%%, %%%deployment_tag%%%, %%%deployment_params%%%) returning deployment_id;"
     ]
   },
   "{schema}.insert_redeployment":{
-    "params": ["src_deployment_id", "deployment_target_id", "deployment_date", "deployment_tag"],
+    "params": ["src_deployment_id", "deployment_target_id", "deployment_date", "deployment_tag", { "name": "deployment_params", "default": null }],
     "sql": [
-      "insert into {schema}.v_my_deployment(site_id, deployment_target_id, branch_id, deployment_date, deployment_tag, deployment_git_revision) select site_id, %%%deployment_target_id%%%, branch_id, %%%deployment_date%%%, %%%deployment_tag%%%, deployment_git_revision from {schema}.v_my_deployment where deployment_id=%%%src_deployment_id%%% returning deployment_id;"
+      "insert into {schema}.v_my_deployment(site_id, deployment_target_id, branch_id, deployment_date, deployment_tag, deployment_params, deployment_git_revision) select site_id, %%%deployment_target_id%%%, branch_id, %%%deployment_date%%%, %%%deployment_tag%%%, %%%deployment_params%%%, deployment_git_revision from {schema}.v_my_deployment where deployment_id=%%%src_deployment_id%%% returning deployment_id;"
     ]
   },
   "jsHarmonyCMS_Upload": "insert into {tgtschema}.v_my_{item}({columns}) values ({values}) returning {item}_key;",

package/models/sql/_functions.sqlite.json

@@ -60,15 +60,15 @@
     ]
   },
   "{schema}.insert_deployment":{
-    "params": ["site_id", "deployment_target_id", "branch_id", "deployment_date", "deployment_tag"],
+    "params": ["site_id", "deployment_target_id", "branch_id", "deployment_date", "deployment_tag", { "name": "deployment_params", "default": null }],
     "sql": [
-      "insert into {schema}.v_my_deployment(site_id, deployment_target_id, branch_id, deployment_date, deployment_tag) values(%%%site_id%%%, %%%deployment_target_id%%%, %%%branch_id%%%, %%%deployment_date%%%, %%%deployment_tag%%%);select last_insert_rowid_override deployment_id from jsharmony_meta;"
+      "insert into {schema}.v_my_deployment(site_id, deployment_target_id, branch_id, deployment_date, deployment_tag, deployment_params) values(%%%site_id%%%, %%%deployment_target_id%%%, %%%branch_id%%%, %%%deployment_date%%%, %%%deployment_tag%%%, %%%deployment_params%%%);select last_insert_rowid_override deployment_id from jsharmony_meta;"
     ]
   },
   "{schema}.insert_redeployment":{
-    "params": ["src_deployment_id", "deployment_target_id", "deployment_date", "deployment_tag"],
+    "params": ["src_deployment_id", "deployment_target_id", "deployment_date", "deployment_tag", { "name": "deployment_params", "default": null }],
     "sql": [
-      "insert into {schema}.v_my_deployment(site_id, deployment_target_id, branch_id, deployment_date, deployment_tag, deployment_git_revision) select site_id, %%%deployment_target_id%%%, branch_id, %%%deployment_date%%%, %%%deployment_tag%%%, deployment_git_revision from {schema}.v_my_deployment where deployment_id=%%%src_deployment_id%%%;select last_insert_rowid_override deployment_id from jsharmony_meta;"
+      "insert into {schema}.v_my_deployment(site_id, deployment_target_id, branch_id, deployment_date, deployment_tag, deployment_params, deployment_git_revision) select site_id, %%%deployment_target_id%%%, branch_id, %%%deployment_date%%%, %%%deployment_tag%%%, %%%deployment_params%%%, deployment_git_revision from {schema}.v_my_deployment where deployment_id=%%%src_deployment_id%%%;select last_insert_rowid_override deployment_id from jsharmony_meta;"
     ]
   },
   "jsHarmonyCMS_Upload": "insert into {tgtschema}.v_my_{item}({columns}) values ({values}); select last_insert_rowid_override {item}_key from jsharmony_meta;",

package/models/sql/objects/deployment.json

@@ -96,6 +96,7 @@
       { "name": "deployment_sts", "type": "varchar", "length": 32, "foreignkey": { "code_deployment_sts": "code_val" }, "null": false, "default": "PENDING" },
       { "name": "deployment_target_id", "type": "bigint", "null": false, "foreignkey": { "deployment_target": "deployment_target_id" }, "actions": ["prevent_update"] },
       { "name": "deployment_git_revision", "type": "varchar", "length": 1024 },
+      { "name": "deployment_params", "type": "varchar", "length": -1 },
       
       { "name": "deployment_sts_tstmp", "type": "datetime", "length": 7 },
       { "name": "deployment_sts_user", "type": "varchar", "length": 20 },
@@ -189,6 +190,7 @@
           "deployment_sts",
           "deployment_target_id",
           "deployment_git_revision",
+          "deployment_params",
 
           "deployment_etstmp",
           "deployment_euser",
@@ -220,7 +222,7 @@
           "with_insert_identity(branch, branch_id, ",
           "  insert into {schema}.branch(branch_parent_id, branch_type, branch_name, branch_sts, site_id, branch_user_id) values(inserted(branch_id), 'DEPLOYMENT', inserted(deployment_tag), 'ARCHIVE', (select site_id from {schema}.branch where branch_id=inserted(branch_id)), null),",
           ////Insert deployment
-          "  insert into {schema}.deployment(deployment_tag, branch_id, deployment_date, deployment_target_id, deployment_sts, deployment_git_revision) values(inserted(deployment_tag), @@INSERT_ID, inserted(deployment_date), inserted(deployment_target_id), 'PENDING', inserted(deployment_git_revision))",
+          "  insert into {schema}.deployment(deployment_tag, branch_id, deployment_date, deployment_target_id, deployment_sts, deployment_git_revision, deployment_params) values(inserted(deployment_tag), @@INSERT_ID, inserted(deployment_date), inserted(deployment_target_id), 'PENDING', inserted(deployment_git_revision), inserted(deployment_params))",
           "  return_insert_key(deployment, deployment_id, (deployment_target_id=inserted(deployment_target_id) and deployment_tag=inserted(deployment_tag)));",
           ////Add all menu / pages / media / redirect / sitemap from other branch
           "  foreach(%%%{schema}.branch_items%%%, %%%TRIGGER_EOL%%%, \"insert into {tbl_branch_item}(branch_id, {item}_key, {item}_id, {item}_orig_id) select (select deployment.branch_id from {schema}.deployment inner join {schema}.branch on {schema}.branch.branch_id={schema}.deployment.branch_id where deployment_tag=inserted(deployment_tag) and site_id=inserted(site_id)), {item}_key, {item}_id, {item}_id from {tbl_branch_item} where branch_id=inserted(branch_id) and {item}_id is not null\")",

package/models/sql/scripts/upgrade/1-13-0.mssql.sql

@@ -0,0 +1,3 @@
+alter table {schema}.deployment add deployment_params nvarchar(max) null;
+
+jsharmony.version_increment('jsHarmonyCMS',1,13,0,0);

package/models/sql/scripts/upgrade/1-13-0.pgsql.sql

@@ -0,0 +1,3 @@
+alter table {schema}.deployment add column deployment_params text null;
+
+jsharmony.version_increment('jsHarmonyCMS',1,13,0,0);

package/models/sql/scripts/upgrade/1-13-0.sqlite.sql

@@ -0,0 +1,3 @@
+alter table {schema}.deployment add column deployment_params text;
+
+jsharmony.version_increment('jsHarmonyCMS',1,13,0,0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsharmony-cms",
-  "version": "1.12.2",
+  "version": "1.13.0",
   "description": "jsHarmony CMS",
   "main": "index.js",
   "scripts": {

package/public/js/jsHarmonyCMS.js

@@ -4262,6 +4262,11 @@ exports = module.exports = function(componentId, element, cms, jsh, componentCon
       jsh.async.each(
         $element.find('[data-component]'),
         function(el, el_cb) {
+          var $el = jsh.$(el);
+          if(!$el.hasClass('initialized')){
+            $el.addClass('initialized');
+            $el.attr('data-component-id', cms.componentManager.getNextComponentId());
+          }
           cms.componentManager.renderContentComponent(el, undefined, el_cb);
         },
         callback
@@ -6079,6 +6084,17 @@ exports = module.exports = function(jsh, cms, editor){
         continue;
       }
       node.attr('data-component-id', null);
+      if(node.attr('class')){
+        var cls = node.attr('class').toString().trim().split(' ');
+        var newcls = '';
+        if(cls.indexOf('initialized')>=0){
+          for(var j=0;j<cls.length;j++){
+            if(!cls[j] || (cls[j]=='initialized')) continue;
+            newcls += cls[j] + ' ';
+          }
+          node.attr('class', newcls.trim() || null);
+        }
+      }
       node.empty();
       var newNode = tinymce.html.Node.create('#text');
       newNode.value = String.fromCharCode(0x00A0);