json-object-editor 0.10.434 → 0.10.436

package/CHANGELOG.md

@@ -1,6 +1,8 @@
 ## CHANGELOG
 
 ### 0.10.400
+	436 - tags listRender
+	435 - and add user-select property to capp-menu-label
 	433 - dynamic sites update
 	432 - minimal updates
 	431 - reloadable, plugin-utils, ai chat beta

package/capp/capp.css

@@ -381,6 +381,7 @@ capp-menu-label{
     height: 50px;
     min-width: 50px;
     text-align: center;
+    user-select: none;
 }
 
 capp-header > capp-menu > capp-menu-label {

package/css/joe-styles.css

@@ -344,6 +344,8 @@ html.no-touch .joe-button.joe-orangegrey-button:hover{background-color:#ff8804 !
 .joe-blue-button, .joe-preview-button{background-color:#336699; color:#ddd;}
 html.no-touch .joe-button.joe-blue-button:hover,html.no-touch .joe-button.joe-preview-button:hover{background-color:#447799;color: #fff;}
 
+.joe-ai-button{background-color:#88aaff; color:#ddd;}
+
 .joe-red-button{background-color:#Bb6655;}
 html.no-touch .joe-button.joe-red-button:hover{background-color:#ff7755;color: #fff;}
 
@@ -479,6 +481,12 @@ joe-button > svg {
     box-shadow: 0px 1px 3px 0px rgba(0,0,0,.4);
     border-radius: 4px;
 }
+
+joe-button-wrapper.bottom joe-button.joe-button {
+    border-radius: 0;
+    margin: 10px -10px -10px -10px;
+    box-shadow:none;
+}
 /*.joe-sidebar_right-button{background-image: url("../img/btns/sidebar-right.png");  }
 .joe-sidebar_left-button{background-image: url("../img/btns/sidebar-left.png");  }*/
 /* ------------------------- END JOE-BUTTON ---------------------*/
@@ -3476,6 +3484,19 @@ th.joe-objectlist-object-row-template-header {
         display: inline-block;
         position: relative;
     }
+    joe-tags{
+        display:block;
+        position:relative;
+        font-size:12px;
+        /* padding:3px; */
+    }
+    joe-tag{
+        display: inline-block;
+        padding:2px 4px;
+        background: #eee;
+        color:#202020;
+        margin:3px;
+    }
 
 /*-------------------------
     V: Preview

package/css/joe.css

@@ -830,6 +830,8 @@ html.no-touch .joe-button.joe-orangegrey-button:hover{background-color:#ff8804 !
 .joe-blue-button, .joe-preview-button{background-color:#336699; color:#ddd;}
 html.no-touch .joe-button.joe-blue-button:hover,html.no-touch .joe-button.joe-preview-button:hover{background-color:#447799;color: #fff;}
 
+.joe-ai-button{background-color:#88aaff; color:#ddd;}
+
 .joe-red-button{background-color:#Bb6655;}
 html.no-touch .joe-button.joe-red-button:hover{background-color:#ff7755;color: #fff;}
 
@@ -965,6 +967,12 @@ joe-button > svg {
     box-shadow: 0px 1px 3px 0px rgba(0,0,0,.4);
     border-radius: 4px;
 }
+
+joe-button-wrapper.bottom joe-button.joe-button {
+    border-radius: 0;
+    margin: 10px -10px -10px -10px;
+    box-shadow:none;
+}
 /*.joe-sidebar_right-button{background-image: url("../img/btns/sidebar-right.png");  }
 .joe-sidebar_left-button{background-image: url("../img/btns/sidebar-left.png");  }*/
 /* ------------------------- END JOE-BUTTON ---------------------*/
@@ -3962,6 +3970,19 @@ th.joe-objectlist-object-row-template-header {
         display: inline-block;
         position: relative;
     }
+    joe-tags{
+        display:block;
+        position:relative;
+        font-size:12px;
+        /* padding:3px; */
+    }
+    joe-tag{
+        display: inline-block;
+        padding:2px 4px;
+        background: #eee;
+        color:#202020;
+        margin:3px;
+    }
 
 /*-------------------------
     V: Preview

package/package.json

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

package/server/schemas/tag.js

@@ -6,11 +6,14 @@ var tag ={
     default_schema:true,
     fields:[
         'name',
-        {name:'tag_id',display:'Tag ID',comment:'a memorable ID for this parent tag'},
-        {name:'parent_tag',type:'select',values:'tag',idprop:'_id',blank:true},
         'info',
+        {name:'parent_tag',display:"Parent Tag", comment:'used for organizing tags',type:'select',values:'tag',idprop:'_id',blank:true, width:'50%'},
+        {name:'tag_id',display:'Tag ID',comment:'a memorable ID for this parent tag', width:'50%'},
+
+
         'datasets',
-        {section_start:'usage',collapsed:true},
+        {sidebar_start:'right'},
+        {section_start:'usage',collapsed:false},
         {name:'usages',label:false,type:'content',
         run:function(item){
             var usages = _joe.search({tags:{$in:[item._id]}})
@@ -33,6 +36,7 @@ var tag ={
             return html;
         }},
         {section_end:'usage'},
+        {sidebar_end:'right'},
         '_id','created','itemtype'
     ],
     idprop: '_id',
@@ -50,7 +54,15 @@ var tag ={
         (new Set(schemas)).map(function(schema){
             subs.push({name:schema,filter:{datasets:{$in:[schema]}}})
         });
-        return subs.sortBy('name');
+        
+        subs = subs.sortBy('name');
+
+        // subs = subs.concat(_joe.Filter.Options.getDatasetPropertyValues('tag','parent_tag',{
+        //         group:'by parent tag',
+        //         display:'${name}',
+        // }));
+        return subs;
+
     },
     menuicon:'<svg xmlns="http://www.w3.org/2000/svg" viewBox="-200 -200 900 900"><rect x="101.7" y="183.8" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 264.6132 638.825)" width="325.9" height="161.6" class="a"/><path d="M491.2 310.4L309.1 128.3l-41.9-42 -50.8-50.8L7.4 0.2c-9.4-1.6-7.2 7.2-7.2 7.2l35.3 209 50.8 50.8 42 42 182.1 182.1c11.7 11.7 30.8 11.7 42.4 0L491.3 352.8C502.9 341.2 502.9 322.1 491.2 310.4zM53.7 73.2c-10.7 0-19.5-8.7-19.5-19.5C34.2 42.9 43 34.2 53.7 34.2 64.5 34.2 73.2 42.9 73.2 53.7 73.2 64.5 64.5 73.2 53.7 73.2zM322.7 456.9L72.4 206.5 206.5 72.4l250.3 250.3L322.7 456.9z" /></svg>',
     listView:{
@@ -62,6 +74,31 @@ var tag ={
             //+(datasets||'');
         },
         listWindowTitle: 'Tags'
+    },
+    methods:{
+        renderTags:function(tags,specs){
+            var html = ''
+            var specs = specs || {};
+            if (typeof specs == 'string'){
+                specs = {cssclass:specs};
+            }
+            //list the tags of an object, if array, use array if object, use the tags property
+            //if no tags, return empty string
+            var tags = tags.tags || tags;
+            if(!tags || tags.length == 0){
+                return '';
+            }
+            html += `<joe-tags class="${specs.cssclass||''}">`;
+            tags.map(function(tag){
+                let tagObj = $J.get(tag);
+                if(tagObj){
+                    html+= `<joe-tag data-id="${tagObj._id}" title="${tagObj.info}" style="${tagObj.color && (`background:'${tagObj.color}'`)}">${tagObj.name}</joe-tag>`;
+                }
+            })
+            html+= '</joe-tags>';
+            return html;
+
+        }
     }
 };