json-object-editor 0.10.432 → 0.10.433

package/CHANGELOG.md

@@ -1,6 +1,7 @@
 ## CHANGELOG
 
 ### 0.10.400
+	433 - dynamic sites update
 	432 - minimal updates
 	431 - reloadable, plugin-utils, ai chat beta
 	430 - JOE Ai chat functional for alpha experiences.

package/css/joe-styles.css

@@ -2965,6 +2965,11 @@ html.no-touch .joe-object-field .joe-button:hover{
     float: none;
     display:block;
 }
+
+.joe-content-sidebar joe-button.joe-button {
+    float: none;
+}
+
 .joe-object-field .joe-iconed-button.full-width{
     text-align:left;
 }

package/css/joe.css

@@ -3451,6 +3451,11 @@ html.no-touch .joe-object-field .joe-button:hover{
     float: none;
     display:block;
 }
+
+.joe-content-sidebar joe-button.joe-button {
+    float: none;
+}
+
 .joe-object-field .joe-iconed-button.full-width{
     text-align:left;
 }

package/js/JsonObjectEditor.jquery.craydent.js

@@ -4774,9 +4774,9 @@ this.renderHTMLContent = function(specs){
                 type: subprop.type||'text'
             };
             if(sortable){
-                onclick='title="sort by '+property.name+'" onclick="_joe.Fields.objectlist.sortBy(\''+prop.name+'\',\''+subprop.name+'\');"';
+                onclick='title="sort by '+property.name+' ('+subprop.name+')" onclick="_joe.Fields.objectlist.sortBy(\''+prop.name+'\',\''+subprop.name+'\');"';
             }else{
-                onclick = '';
+                onclick = 'title="('+subprop.name+')"';
             }
             width=(subprop.width)?'width="'+subprop.width+'"':'';
             html+="<th "+onclick+" data-subprop='"+subprop.name+"' "+width+">"
@@ -9408,6 +9408,7 @@ logit(intent)
 			var cTitle = self.propAsFuncOrValue(self.current.title,tempObj);
             var titleStr = fillTemplate(cTitle,titleObj);
             self.TITLE.dom().html(specs.before+titleStr+specs.after);
+            document.title = titleStr;
             return titleStr;
         }
     };

package/js/joe-full.js

@@ -16079,9 +16079,9 @@ this.renderHTMLContent = function(specs){
                 type: subprop.type||'text'
             };
             if(sortable){
-                onclick='title="sort by '+property.name+'" onclick="_joe.Fields.objectlist.sortBy(\''+prop.name+'\',\''+subprop.name+'\');"';
+                onclick='title="sort by '+property.name+' ('+subprop.name+')" onclick="_joe.Fields.objectlist.sortBy(\''+prop.name+'\',\''+subprop.name+'\');"';
             }else{
-                onclick = '';
+                onclick = 'title="('+subprop.name+')"';
             }
             width=(subprop.width)?'width="'+subprop.width+'"':'';
             html+="<th "+onclick+" data-subprop='"+subprop.name+"' "+width+">"
@@ -20713,6 +20713,7 @@ logit(intent)
 			var cTitle = self.propAsFuncOrValue(self.current.title,tempObj);
             var titleStr = fillTemplate(cTitle,titleObj);
             self.TITLE.dom().html(specs.before+titleStr+specs.after);
+            document.title = titleStr;
             return titleStr;
         }
     };

package/js/joe.js

@@ -4780,9 +4780,9 @@ this.renderHTMLContent = function(specs){
                 type: subprop.type||'text'
             };
             if(sortable){
-                onclick='title="sort by '+property.name+'" onclick="_joe.Fields.objectlist.sortBy(\''+prop.name+'\',\''+subprop.name+'\');"';
+                onclick='title="sort by '+property.name+' ('+subprop.name+')" onclick="_joe.Fields.objectlist.sortBy(\''+prop.name+'\',\''+subprop.name+'\');"';
             }else{
-                onclick = '';
+                onclick = 'title="('+subprop.name+')"';
             }
             width=(subprop.width)?'width="'+subprop.width+'"':'';
             html+="<th "+onclick+" data-subprop='"+subprop.name+"' "+width+">"
@@ -9414,6 +9414,7 @@ logit(intent)
 			var cTitle = self.propAsFuncOrValue(self.current.title,tempObj);
             var titleStr = fillTemplate(cTitle,titleObj);
             self.TITLE.dom().html(specs.before+titleStr+specs.after);
+            document.title = titleStr;
             return titleStr;
         }
     };

package/js/page-editor-scripts.js

@@ -28,7 +28,9 @@ function JOEPageEditor(){
             var html = 
             '<jpe-info-content title="'+data.id+'">'
                 +icon
-                +'<a href="//'+jsc_hostname+':'+jsc_port+'/JOE/sitebuilder#/'+data.schema+'/'+data.id+'" class="jpe-edit-btn" target="_blank">edit</a>'
+                +`<a href="${location.origin}/JOE/sitebuilder#/${data.schema}/${data.id}" class="jpe-edit-btn" target="_blank">edit</a>`
+                //+'<a href="//'+jsc_hostname+':'+jsc_port+'/JOE/sitebuilder#/'+data.schema+'/'+data.id+'" class="jpe-edit-btn" target="_blank">edit</a>'
+                
                 +'<jpe-info-name>'+data.name+'</jpe-info-name>'
                 //+'<jpe-info-cuid>'+data.id+'</jpe-info-cuid>'
                 +'<jpe-info-schema>'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-object-editor",
-  "version": "0.10.432",
+  "version": "0.10.433",
   "description": "JOE the Json Object Editor | Platform Edition",
   "main": "app.js",
   "scripts": {

package/server/fields/core.js

@@ -305,10 +305,11 @@ var fields = {
             if(typeof(__collectionNames) != undefined){
                 var opts = [],name;
                 __collectionNames.map(function(collName){
-                    name = (_joe.schemas[collName] && _joe.schemas[collName].menuicon)?
+                    let schemaObj = _joe.schemas[collName] || {name:collName};
+                    name = (schemaObj && schemaObj.menuicon)?
                     '<joe-icon class="fleft icon-30 icon-grey" style="padding-bottom:5px; padding-right:5px;">'
-                    +_joe.schemas[collName].menuicon+'</joe-icon>'+collName
-                    :'<joe-icon class="fleft icon-30 icon-grey" style="padding-bottom:5px; padding-right:5px;">'+'</joe-icon>'+collName;
+                    +schemaObj.menuicon+'</joe-icon>'+(schemaObj.display||schemaObj.name)
+                    :'<joe-icon class="fleft icon-30 icon-grey" style="padding-bottom:5px; padding-right:5px;">'+'</joe-icon>'+(schemaObj.display||schemaObj.name);
                     
                     opts.push({name:name,_id:collName});
                 })

package/server/modules/Sites.js

@@ -101,7 +101,7 @@ function findDynamicPage(originalURL,site,req){//returns a page or false
                 return ({page:testpage,mixins:mixins})
             }*/
             if(match){
-                logit('dynamic page: '+testpage.name);
+                logit('dynamic page found: '+testpage.name);
                 return ({page:testpage,mixins:mixins});
             }
         }
@@ -322,7 +322,7 @@ var Blocks = {
 
 SitesServer.parseRoute = function(req,res,next){
     var routeStartTimer = new Date().getTime();
-    var mixins;
+    var mixins = {};
     var DYNAMIC={};
     var section_content;
     var editor = false;
@@ -407,10 +407,14 @@ logit('\n\r'+modulename+new Date()+' siteurl: '+siteurl+' site: '+(site && site.
         var hash="";
         if(page.dynamic && page.content_items && page.content_items.length){
             //find mixins
-            logit(page.content_items);
+            logit('content items: '+page.content_items);
             page.content_items.map(function(ci){
                 if(mixins[ci.reference]){
-                    DYNAMIC[ci.reference] = JOE.Cache.findByID(ci.itemtype,mixins[ci.reference])||{}
+                    DYNAMIC[ci.reference] = $J.get(mixins[ci.reference]);
+                }
+                if(DYNAMIC[ci.reference] && DYNAMIC[ci.reference].itemtype != ci.itemtype){
+                    delete DYNAMIC[ci.reference];
+                    console.log(modulename+' dynamic itemtype mismatch',ci.itemtype,DYNAMIC[ci.reference].itemtype);
                 }
             })
             //use ":" for particular parameter

package/server/schemas/block.js

@@ -70,7 +70,8 @@ var block = {
             }
         var fieldset = [
         //'display',
-        'name','info',
+        'name',
+        'info',
         {extend:'description',specs:{type:'rendering', height:'100px'}},
 
         {section_start:'Template',collapsed:function(item){

package/server/schemas/page.js

@@ -12,13 +12,38 @@ var page = {
             '<joe-subtext><b><small>layout</b></small> ${RUN[_joe.getDataItemProp;\'${layout}\';\'layout\']}</joe-subtext>',
         listWindowTitle: 'Pages'
     },
+    methods:{
+        buildURL:function(item,fullURL,mixins){
+            var path = item.path || '/';
+
+             // Handle dynamic mixin substitution (e.g., :campaign → guid)
+            if (mixins && typeof mixins === 'object') {
+                Object.entries(mixins).forEach(([key, val]) => {
+                    path = path.replace(`:${key}`, val);
+                });
+            }
+            
+            // Normalize site prefix
+            if(item.site){
+                var site = $J.get(item.site);
+                path = `/${site.url}/${path}`.replace(/\/+/g, '/');
+            }
+
+            // Optional full URL
+            if(fullURL){
+                path = location.origin + path;
+            }
+            return path;
+        }
+    },
     itemMenu:function(item){
         var menu = [];
         if(item.site){
-            var site = _joe.Data.site.where({_id:item.site})[0]||{};
-            var path = (site.url+'/'+item.path).replace('//','/');
+            // var site = _joe.Data.site.where({_id:item.site})[0]||{};
+            // var path = (site.url+'/'+item.path).replace('//','/');
+            var fullURL = _joe.schemas.page.methods.buildURL(item,true)
             menu.push({name:'<joe-icon class="joe-view-button" title="preview">&nbsp;</joe-icon>',
-                action:'window.open(\'//'+location.hostname+':'+__jsc.sitesPort+'/'+path+'\');'});
+                action:`window.open('${fullURL}');`});
         }
         return menu;
     },
@@ -124,9 +149,10 @@ var page = {
         }},
         {name:'dynamic',type:'boolean',display:'dynamic',label:'the following items from the url path will be available in the template as ${this.DYNAMIC.[reference]}'},
        // {name:'dynamic_hash',display:'Hash Routing',comment:'ie #/content_reference/content_reference'},
-        {name:'content_items',comment:'itemtype is the dataset to look at, reference is path param to use for an ID in that dataset', type:'objectList',
+        {name:'content_items',display:'Content Items',comment:'itemtype is the dataset to look at, reference is path param to use for an ID in that dataset', type:'objectList',
             properties:['itemtype','reference']
         },
+        'datasets',
         {section_end:'Dynamic'},
         'meta',
         {section_start:'system',collapsed:true},
@@ -140,7 +166,7 @@ var page = {
                  //_joe.Data.site.where({_id:item.site})[0]||{};
 
                 //var path = __jsc.PORT?('/'+site.url+'/'+item.path).replace('//','/'):'//'+location.hostname+':'+__jsc.sitesPort+'/'+(site.url+'/'+item.path).replace('//','/');
-                var path = location.origin + (site.path||'')+item.path;
+                var path = _joe.schemas.page.methods.buildURL(item,true)
                 
                 return `
                 <joe-subtext>${location.origin}</joe-subtext>

package/web-components/joe-button.js

@@ -26,6 +26,11 @@ class JoeButton extends HTMLElement {
 
     atts.color && classesToAdd.push(`joe-${atts.color}-button`);
     atts.icon && classesToAdd.push('joe-iconed-button',`joe-${atts.icon}-button`);
+
+    this.overwrites = {};
+    if(atts.overwrites){
+      this.overwrites = eval('('+atts.overwrites+')');
+    }
     var actionPreset = false;
     if(atts.action){
       var actString = '';
@@ -35,8 +40,12 @@ class JoeButton extends HTMLElement {
           var actKey = "create"
           //this.classList.add(`joe-${atts.action}-button`)
           classesToAdd.push(`joe-${actKey}-button`);
+          var ovs = Object.keys(this.overwrites).length?
+          ',overwrites:{'+Object.keys(this.overwrites).map(k=>{
+            return `'${k}':'${this.overwrites[k]}'`;
+          }).join(',')+'}':'';
           if(atts.schema){
-            actString = `_joe.Object.${actKey}('${atts.schema}')`;
+            actString = `_joe.Object.${actKey}({schema:'${atts.schema}'${ovs}})`;
             newHTML = `new <b>${atts.schema.toUpperCase()}</b>`;
             classesToAdd.push('joe-iconed-button',`joe-plus-button`);
           }