json-object-editor 0.10.425 → 0.10.431

package/CHANGELOG.md

@@ -1,6 +1,8 @@
 ## CHANGELOG
 
 ### 0.10.400
+	431 - - reloadable, plugin-utils, ai chat beta
+	430 - JOE Ai chat functional for alpha experiences.
 	424 - fixed formbuilder to explicitly call out jQuery
 	423 - added contextual items to chat and flattened them.
 	- Initial work with ai partner

package/capp/capp.css

@@ -462,12 +462,19 @@ html.no-touch .capp-retro capp-menu-option:hover{
 
 
 capp-menu-option-bonus{
-    display:block;
+    /* display:block;
     float:right;
     cursor:pointer;
     margin-right: -5px;
     line-height: 1;
+    box-sizing: border-box; */
+    display:block;
+    float:right;
+    cursor:pointer;
+    margin-right: -15px;
+    line-height: 1;
     box-sizing: border-box;
+    margin-left: -5px;
 }
 
 .capp-retro capp-menu-option.selected {

package/capp/capp.js

@@ -213,7 +213,7 @@ function CraydentApp(specs,render){
     }
     this.Button.addFromSchema = function(schema,specs){
         var specs = $.extend({container:'capp-panel'},specs);
-        var icon = schema.name;
+        var icon = schema.display||schema.name;
         if(schema.menuicon||schema.icon){
             icon = (schema.menuicon||schema.icon)+'<svg-label>'+(schema.display || schema.name)+'</svg-label>';
         }
@@ -243,7 +243,7 @@ function CraydentApp(specs,render){
             specs = label.specs;
             cssclass = label.cssclass;
         }
-        var temp = '<capp-menu-option class="${cssclass}" onclick="${action}">${name}</capp-menu-option>';
+        var temp = '<capp-menu-option class="${cssclass}" title="${title}" onclick="${action}">${name}</capp-menu-option>';
 
         function renderBonus(side,content){
 
@@ -270,17 +270,24 @@ function CraydentApp(specs,render){
     };
     this.Menu.addFromApps = function(apps,label,cssclass){
         var app_items=[],link,appname;
-        apps.map(function(a){
+        apps.map(function(aa){
+            let a = aa,title='',description='';
+            if(aa.name){
+               a = aa.name;
+title= aa.title;
+description=aa.description||'';
+            }
             var cssclass= (location.pathname.indexOf(a)!= -1)?"selected":'';
             var link = a+location.search;
-            appname = a;
+            appname = title||a;
             //TODO allow appname to use app title or display
             app_items.push({
                 name:appname+'<capp-menu-option-bonus title="open in new window" onclick="window.open(\''+link+'\'); window.event.stopPropagation();">'
                 +self.svgs.newwindow
                 +'</capp-menu-option-bonus>',
                 action:'window.location=\'/JOE/'+link+'\'',
-                cssclass:cssclass
+                cssclass:cssclass,
+                title:description
             });
         });
 

package/css/joe-ai.css

@@ -0,0 +1,174 @@
+joe-ai-chatbox{
+    top:50px;
+}
+chatbox-wrapper {
+    padding: 5px;
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    display: block;
+  }
+  chat-footer,
+  chat-header,
+  chat-content{
+    position: absolute;
+    left: 0;
+    right: 0;
+    display: block;
+
+  }
+
+  chat-header {
+    top: 0;
+    margin:5px;
+  }
+  chat-content {
+    display: block;;
+    position: absolute;
+    top: 80px;
+    bottom: 70px;
+    left: 0;
+    right: 0;
+    overflow: auto;
+    /* margin-bottom: 10px; */
+    background: #fff;
+    border: 1px solid #ccc;
+    margin: 5px;
+    overflow-x: clip;
+  }
+  chat-footer {
+    bottom: 0;
+
+  }
+
+
+  .close-btn {
+    position: absolute;
+    top: 8px;
+    right: 8px;
+    width: 24px;
+    height: 24px;
+    cursor: pointer;
+    z-index:5px;
+  }
+  .close-btn svg {
+    width: 100%;
+    height: 100%;
+  }
+ 
+  chat-title{
+    margin: 0;
+    font-size: 14px;
+    display:block;
+    font-weight: bold;
+  }
+  chat-header  p {
+    margin: 4px 0 0 0;
+    font-size: 12px;
+    color: #666;
+  }
+  chat-header  svg {
+    width: 36px;
+    height: 36px;
+  }
+  label-select-wrapper {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+  }
+
+  .thinking-message {
+    font-size: 13px;
+    color: #888;
+    font-style: italic;
+    margin: 10px 0;
+    text-align: center;
+  }
+  .meta {
+    font-size: 14px;
+    font-weight: bold;
+    margin-bottom: 2px;
+    /* display: flex
+; */
+    align-items: center;
+    gap: 8px;
+    color: #99999999;
+  }
+  .content {
+    font-size: 14px;
+    white-space: pre-wrap;
+    line-height: 1.4em;
+  }
+
+  input[type="text"] {
+    flex: 1;
+    padding: 8px;
+    border-radius: 4px;
+    border: 1px solid #ccc;
+  }
+  button {
+    padding: 8px 12px;
+    background: #007bff;
+    color: white;
+    border: none;
+    border-radius: 4px;
+    cursor: pointer;
+    position: absolute;
+    bottom: 20px;
+    right: 10px;
+  }
+  button:disabled {
+    opacity: 0.5;
+    cursor: default;
+  }
+  participant-name{
+    color:#20202099
+  }
+  .message {
+    margin-bottom: 10px;
+    padding: 8px;
+    background: #f5f5f5;
+  }
+
+  .message.user{
+    text-align:right;
+    margin-left: 30px;
+    border-radius: 10px 0 0 10px;
+  }
+
+    .message.system {
+      background: #fee;
+    }
+.message.assistant{
+    background: #00666633;
+    margin-right: 30px;
+    border-radius: 0px 10px 10px 0px;
+  }
+  #chat-input {
+    width: calc(100% - 100px);
+    margin: 5px;
+    min-height: 50px;
+    /* border-radius: 0px 0px 0px 8px; */
+    bottom: 0;
+    position: absolute;
+    /* overflow: visible; */
+    padding: 5px;
+    resize: vertical;
+  }
+  
+  joe-object {
+    display: block;
+    margin: 0 auto;
+    /* width: 100%; */
+    /* height: 100%; */
+    padding:5px;
+    background: #fff;
+    margin: 10px;
+    padding: 10px;
+    text-align: center;
+    box-shadow: 1px 1px 10px #20202020;
+    border: 1px solid #00666699;
+    cursor: pointer;
+  }

package/css/joe-styles.css

@@ -1927,9 +1927,17 @@ joe-card{
 
 .joe-content-sidebar .joe-field-item-content {
     padding:5px;
-    font-size:18px;
+    font-size:16px;
     line-height: 1.1em;
 }
+/* .joe-content-sidebar .joe-field-item-content {
+    padding:6px;
+    font-size: 16px;
+    line-height: 1.1em;
+	border: 1px solid #00666644;
+    box-shadow:0 1px 4px #0002;
+    margin:5px;
+} */
 /*-------------------------
 	List Option Buttons
 -------------------------*/
@@ -2020,6 +2028,12 @@ joe-list-item.deletable {
     padding: 10px;
     margin: 10px 0;
 }
+.joe-content-sidebar joe-list-item {
+    padding: 5px;
+    margin: 5px 0;
+    border: 1px solid #00666633;
+    box-shadow: 0 1px 4px #0002;
+}
 swipe-option{
     position:absolute;
     top:0;
@@ -2142,6 +2156,12 @@ joe-field{
 .hide-label > .joe-field-label {
     display: none;
 }
+.joe-field-label .joe-reload-icon {
+    font-size: 16px;
+    margin: 0 10px;
+    cursor: pointer;
+    line-height: 14px;
+}
 /*----------------------------- End joe-field-label -----------------------------*/
 
 /*----------------------------- Begin joe-field-comment -----------------------------*/
@@ -3241,6 +3261,10 @@ html.no-touch .joe-group-item.disabled:hover{
     padding-left: 10px;
     cursor:pointer;
 }
+.joe-content-sidebar .joe-group-item {
+    width: 100%;
+    float: none;
+}
 /*-------------------------
     Object List
 -------------------------*/

package/css/joe.css

@@ -1,9 +1,3 @@
-/* -------------------------------------------------------- 
- * 
- *  JOE - v1.5.0 
- *  Created by: Corey Hadden 
- * 
- * -------------------------------------------------------- */
 /* -------------------------------------------------------- 
  * 
  *  JOE - v1.5.0 
@@ -2419,9 +2413,17 @@ joe-card{
 
 .joe-content-sidebar .joe-field-item-content {
     padding:5px;
-    font-size:18px;
+    font-size:16px;
     line-height: 1.1em;
 }
+/* .joe-content-sidebar .joe-field-item-content {
+    padding:6px;
+    font-size: 16px;
+    line-height: 1.1em;
+	border: 1px solid #00666644;
+    box-shadow:0 1px 4px #0002;
+    margin:5px;
+} */
 /*-------------------------
 	List Option Buttons
 -------------------------*/
@@ -2512,6 +2514,12 @@ joe-list-item.deletable {
     padding: 10px;
     margin: 10px 0;
 }
+.joe-content-sidebar joe-list-item {
+    padding: 5px;
+    margin: 5px 0;
+    border: 1px solid #00666633;
+    box-shadow: 0 1px 4px #0002;
+}
 swipe-option{
     position:absolute;
     top:0;
@@ -2634,6 +2642,12 @@ joe-field{
 .hide-label > .joe-field-label {
     display: none;
 }
+.joe-field-label .joe-reload-icon {
+    font-size: 16px;
+    margin: 0 10px;
+    cursor: pointer;
+    line-height: 14px;
+}
 /*----------------------------- End joe-field-label -----------------------------*/
 
 /*----------------------------- Begin joe-field-comment -----------------------------*/
@@ -3733,6 +3747,10 @@ html.no-touch .joe-group-item.disabled:hover{
     padding-left: 10px;
     cursor:pointer;
 }
+.joe-content-sidebar .joe-group-item {
+    width: 100%;
+    float: none;
+}
 /*-------------------------
     Object List
 -------------------------*/

package/js/JsonObjectEditor.jquery.craydent.js

@@ -1064,6 +1064,8 @@ Column Count
     this.Header = {}
     this.toggleHelpMenu = function(show,target){
 
+    }
+    this.listUnsavedChanges = function(){
     }
 	this.Header.Render = this.renderEditorHeader = function(specs){
         var BM = new Benchmarker();
@@ -3226,6 +3228,7 @@ this.renderHTMLContent = function(specs){
                 +fillTemplate(fieldlabel,self.current.object)
                 +(required && '*' ||'')
                 +self.renderFieldTooltip(prop)
+                +self.renderFieldReloadIcon(prop)
             +'</label>';
 
             //render comment
@@ -3318,7 +3321,15 @@ this.renderHTMLContent = function(specs){
 
 		return tooltip_html;
 	};
+    this.renderFieldReloadIcon = function(prop){
+        var reloadable = self.propAsFuncOrValue(prop.reloadable);
+        if(!reloadable){return '';}
+        //var comment = ($.type(prop.comment) == "function")?prop.comment():prop.comment;
+        var comment_html = ` <joe-icon class="joe-reload-icon fright" title="Reload Field" onclick="_joe.Fields.rerender('${prop.name}')">⟳</joe-icon>`;
 
+        return comment_html;
+    };
+    
 	this.selectAndRenderFieldType = function(prop){
 		//var joeFieldBenchmarker = new Benchmarker();
 
@@ -4551,7 +4562,8 @@ this.renderHTMLContent = function(specs){
             stripecolor:false,
             bgcolor:false,
             checkbox:false,
-            value:''
+            value:'',
+            link:false
         },specs);
         var schemaprop = specs.schemaprop && self.propAsFuncOrValue(specs.schemaprop,item);
         var schema = ((schemaprop && item[schemaprop])||schema||item.itemtype||item.type);
@@ -4562,7 +4574,7 @@ this.renderHTMLContent = function(specs){
         
         var idprop = specs.idprop || (schemaobj && schemaobj.idprop) ||'_id';
         var hasMenu = specs.itemMenu && specs.itemMenu.length;
-        var action = specs.action || ' onclick="goJoe(_joe.search(\'${'+idprop+'}\')[0],{schema:\''+schema+'\'})" ';
+        var action = self.propAsFuncOrValue(specs.action,item) || ' onclick="goJoe(_joe.search(\'${'+idprop+'}\')[0],{schema:\''+schema+'\'})" ';
         var nonclickable = self.propAsFuncOrValue(specs.nonclickable,item);
         var clickablelistitem = (!specs.gotoButton && !nonclickable/* && !hasMenu*/);
         //var clickablelistitem = !!clickable && (!specs.gotoButton && !hasMenu);
@@ -4577,6 +4589,7 @@ this.renderHTMLContent = function(specs){
             'data-value="' +encodeURI(JSON.stringify(specs.value))+ '" data-isObject=true'
             :'data-value="' + specs.value + '"';
         
+        var link = specs.link && self.propAsFuncOrValue(specs.link,item);
         var html = fillTemplate(`<joe-list-item schema="${schema}" 
             itemId="${item[idprop]}"
             idprop="${idprop}"
@@ -4599,13 +4612,13 @@ this.renderHTMLContent = function(specs){
                         
                         + self.Render.itemCheckbox(item,schemaobj)
 
-                        +((specs.link && '<a class="non-link" onclick="__cancelClick();" href="'+specs.link+'">')||'')  
+                        +((link && '<a class="non-link" onclick="__cancelClick();" href="'+link+'">')||'')  
 
                         + '<div class="joe-field-item-content '+(nonclickable && 'nonclickable' || '')+'" ' + click + ' >'
                             + self.propAsFuncOrValue(contentTemplate+__clearDiv__, item)
                         + __clearDiv__+'</div>'
 
-                        +((specs.link && '</a>')||'')   
+                        +((link && '</a>')||'')   
                         +self.Render.stripeColor(item,specs.stripecolor)
                         + self._renderExpanderButton(expanderContent, item)
                         + (specs.deleteButton && deleteButton || '')
@@ -7380,6 +7393,7 @@ Field Rendering Helpers
     var sortable_index;
     this.Autosave = {
         possibleChanges:true,
+        unsavedChanges:false,
         activate:function(){
             if(!self.specs.autosave){
                 return;
@@ -7409,7 +7423,8 @@ Field Rendering Helpers
                     var showUnsaved = (hasChanged && self.getMode() == "details");
                     document.title =( showUnsaved && '*' ||'')
                         +document.title.replace('*','');
-                        self.overlay.toggleClass('unsaved-changes',showUnsaved)
+                        self.overlay.toggleClass('unsaved-changes',showUnsaved);
+                        self.Autosave.unsavedChanges = hasChanged;
                 },intercnt)
         },
         deactivate:function(){
@@ -7641,7 +7656,7 @@ Field Rendering Helpers
             tocheck.map(field=>{
 
             })
-            return (tocheck.length > 0);
+            return (tocheck.length > 0)?tocheck:false;
         }
         if(self.overlay.hasClass('active') && !listMode && !self.current.changesConfirmed && tocheck.length){
             
@@ -7649,7 +7664,7 @@ Field Rendering Helpers
             self.current.changesConfirmed = confirmed;
             return confirmed;
         }
-        return true;
+        return tocheck;
     }
 /*-------------------------------------------------------------------->
  J | MESSAGING
@@ -8280,7 +8295,10 @@ Field Rendering Helpers
     
         for (const [field, val] of Object.entries(object)) {
             if (val === undefined || val === null) continue;
-            if (field == '_id') continue;
+            if (field == '_id'){
+                flattened[field] = val;
+                continue;
+            }
     
             if (typeof val === 'string' && $c.isCuid(val) && recursive && depth > 0) {
                 if (!visited.has(val)) {
@@ -9857,7 +9875,7 @@ logit(intent)
                     var users = _joe.Data[(user_dataset || 'user')].where({_id:{$in:ids}});
                     var html = '';
                     users.map(function(user){
-                        html += self.SERVER.User.Render.cube(user);
+                        html += self.SERVER.User.Render.cube(user,cssclass);
                     })
                     return html;
                 },
@@ -10378,6 +10396,7 @@ logit(intent)
             var e = e || window.event;
             if (e.stopPropagation) e.stopPropagation();
             if (e.preventDefault) e.preventDefault();
+            return false;
         },
         getPossibleValues:function(propertyName,schema,specs){
             //TODO: