json-object-editor 0.10.430 → 0.10.432

package/CHANGELOG.md

@@ -1,6 +1,8 @@
 ## CHANGELOG
 
 ### 0.10.400
+	432 - minimal updates
+	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.

package/css/joe-ai.css

@@ -11,17 +11,18 @@ chatbox-wrapper {
     display: block;
   }
   chat-footer,
-  chat-header
+  chat-header,
   chat-content{
     position: absolute;
     left: 0;
     right: 0;
     display: block;
-    border:1px solid blue
+
   }
 
   chat-header {
     top: 0;
+    margin:5px;
   }
   chat-content {
     display: block;;
@@ -50,6 +51,7 @@ chatbox-wrapper {
     width: 24px;
     height: 24px;
     cursor: pointer;
+    z-index:5px;
   }
   .close-btn svg {
     width: 100%;
@@ -58,7 +60,7 @@ chatbox-wrapper {
  
   chat-title{
     margin: 0;
-    font-size: 18px;
+    font-size: 14px;
     display:block;
     font-weight: bold;
   }

package/css/joe-styles.css

@@ -2156,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 -----------------------------*/
@@ -3255,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

@@ -2642,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 -----------------------------*/
@@ -3741,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();
@@ -2990,7 +2992,7 @@ this.renderHTMLContent = function(specs){
             show =  ' no-section ';
             hidden=true;
         }
-        var secname = fillTemplate((prop.display||prop.section_label||prop.section_start),self.current.object);
+        var secname = fillTemplate(self.propAsFuncOrValue((prop.display||prop.section_label||prop.section_start),self.current.object),self.current.object);
         var secID = prop.section_start;
         if(!secname || !secID){
          return '';
@@ -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
@@ -9860,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;
                 },
@@ -10381,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:

package/js/joe-ai.js

@@ -259,7 +259,12 @@
       }
   
       renderError(message) {
-        this.shadowRoot.innerHTML = `<div style="color:red;">${message}</div>`;
+        this.shadowRoot.innerHTML = `<div style="color:red;">${message}</div>
+        <div class="close-btn" title="Close Chatbox" >${_joe.SVG.icon.close}</div>`;
+        this.shadowRoot.querySelector('.close-btn').addEventListener('click', () => {
+          //this.closeChat()
+          this.closest('joe-ai-chatbox').closeChat();
+        });
       }
 
 

package/js/joe-full.js

@@ -12369,6 +12369,8 @@ Column Count
     this.Header = {}
     this.toggleHelpMenu = function(show,target){
 
+    }
+    this.listUnsavedChanges = function(){
     }
 	this.Header.Render = this.renderEditorHeader = function(specs){
         var BM = new Benchmarker();
@@ -14295,7 +14297,7 @@ this.renderHTMLContent = function(specs){
             show =  ' no-section ';
             hidden=true;
         }
-        var secname = fillTemplate((prop.display||prop.section_label||prop.section_start),self.current.object);
+        var secname = fillTemplate(self.propAsFuncOrValue((prop.display||prop.section_label||prop.section_start),self.current.object),self.current.object);
         var secID = prop.section_start;
         if(!secname || !secID){
          return '';
@@ -14531,6 +14533,7 @@ this.renderHTMLContent = function(specs){
                 +fillTemplate(fieldlabel,self.current.object)
                 +(required && '*' ||'')
                 +self.renderFieldTooltip(prop)
+                +self.renderFieldReloadIcon(prop)
             +'</label>';
 
             //render comment
@@ -14623,7 +14626,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();
 
@@ -15856,7 +15867,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);
@@ -15867,7 +15879,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);
@@ -15882,6 +15894,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}"
@@ -15904,13 +15917,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 || '')
@@ -18685,6 +18698,7 @@ Field Rendering Helpers
     var sortable_index;
     this.Autosave = {
         possibleChanges:true,
+        unsavedChanges:false,
         activate:function(){
             if(!self.specs.autosave){
                 return;
@@ -18714,7 +18728,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(){
@@ -18946,7 +18961,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){
             
@@ -18954,7 +18969,7 @@ Field Rendering Helpers
             self.current.changesConfirmed = confirmed;
             return confirmed;
         }
-        return true;
+        return tocheck;
     }
 /*-------------------------------------------------------------------->
  J | MESSAGING
@@ -21165,7 +21180,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;
                 },
@@ -21686,6 +21701,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:

package/js/joe.js

@@ -1070,6 +1070,8 @@ Column Count
     this.Header = {}
     this.toggleHelpMenu = function(show,target){
 
+    }
+    this.listUnsavedChanges = function(){
     }
 	this.Header.Render = this.renderEditorHeader = function(specs){
         var BM = new Benchmarker();
@@ -2996,7 +2998,7 @@ this.renderHTMLContent = function(specs){
             show =  ' no-section ';
             hidden=true;
         }
-        var secname = fillTemplate((prop.display||prop.section_label||prop.section_start),self.current.object);
+        var secname = fillTemplate(self.propAsFuncOrValue((prop.display||prop.section_label||prop.section_start),self.current.object),self.current.object);
         var secID = prop.section_start;
         if(!secname || !secID){
          return '';
@@ -3232,6 +3234,7 @@ this.renderHTMLContent = function(specs){
                 +fillTemplate(fieldlabel,self.current.object)
                 +(required && '*' ||'')
                 +self.renderFieldTooltip(prop)
+                +self.renderFieldReloadIcon(prop)
             +'</label>';
 
             //render comment
@@ -3324,7 +3327,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();
 
@@ -4557,7 +4568,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);
@@ -4568,7 +4580,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);
@@ -4583,6 +4595,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}"
@@ -4605,13 +4618,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 || '')
@@ -7386,6 +7399,7 @@ Field Rendering Helpers
     var sortable_index;
     this.Autosave = {
         possibleChanges:true,
+        unsavedChanges:false,
         activate:function(){
             if(!self.specs.autosave){
                 return;
@@ -7415,7 +7429,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(){
@@ -7647,7 +7662,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){
             
@@ -7655,7 +7670,7 @@ Field Rendering Helpers
             self.current.changesConfirmed = confirmed;
             return confirmed;
         }
-        return true;
+        return tocheck;
     }
 /*-------------------------------------------------------------------->
  J | MESSAGING
@@ -9866,7 +9881,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;
                 },
@@ -10387,6 +10402,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:

package/package.json

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

package/readme.md

@@ -198,11 +198,13 @@ a list of schema objects that can configure the editor fields, these can be give
 			alert(obj.name);
 		},*/
 		onblur:logit,
+		
 		hideNumbers:boolean *toggle list numbers*
 		multipleCallback:function to be called after a multi-edit. passed list of edited items.
 		onUpdate: callback for after update. passed single edited items.
 		onMultipleUpdate:callback for after multi update.passed list of edited items.
                 filters: array of objects
+		checkChanges:(bool) whether or not to check for changes via interval and on leave
 	}
 ##Table View
 	- add tableView object to a schema;

package/server/app-config.js

@@ -31,7 +31,7 @@ var apps = function(){
             title:'JOE Platform',
             info:'This is the master Data Model Management System (DMMS) admin page. It has access to all of your schemas and datasets.',
             description:'JOE is the Json Object Editor. The Platform app has access to all your schemas and datasets.',
-            plugins:['auth.js','formBuilder.js','reportbuilder.js','callbackTester.js','memberRegistry.js','awsConnect.js','notifier.js','calendar.js','inventory.js','money.js'],
+            plugins:['auth.js','formBuilder.js','reportbuilder.js','callbackTester.js','memberRegistry.js','awsConnect.js','notifier.js','calendar.js','inventory.js','money.js','plugin-utils.js','chatgpt.js','chatgpt-assistants.js','chatgpt-tools.js'],
             collections:((default_schemas.concat(['schema','group',
                 'site','page','post','layout','block','include','event',
                 'project','board','task',

package/server/fields/core.js

@@ -68,15 +68,16 @@ var fields = {
     'coords':{type:'geo'},
     'state':{type:'select',values:usStates,idprop:'code',template:'${code}',width:'25%',minwidth:'100px',blank:true},
     'name':{type:'text',onblur:'_joe.TITLE.set()'},
-    instructions_format:{type:'select',values:['wysiwyg','code'], rerender:'instructions',display:'Instructions Format'},
+    instructions_format:{type:'select',values:['wysiwyg','code','text',], rerender:'instructions',display:'Instructions Format'},
     instructions:{
-        height:'auto',
+        height:'500px',
         display:'Instructions',
+        default:'code',
         type:function(item){
-            if(!item.instructions_format){
-                return 'wysiwyg';
+            if(!item.instructions_format || item.instructions_format == 'text'){
+                return 'rendering';
             }
-            if(["code"].indexOf(item.instructions_format) != -1){
+            else if(["code"].indexOf(item.instructions_format) != -1){
                 return 'code';
             }
             return item.instructions_format;
@@ -86,8 +87,16 @@ var fields = {
         type: "select",
         display: "Ai Model",
         values: [
-          { value: "gpt-4o", name: "GPT-4o (Current Default)" }
-        ],
+            { value: "gpt-4o", name: "GPT-4o (Fast, 128k)" },
+            { value: "gpt-4.1", name: "GPT-4.1 (Strong, 1M)" },
+            { value: "gpt-4.1-mini", name: "4.1-mini (Cheap, 1M)" },
+            { value: "gpt-4.1-nano", name: "4.1-nano (Fastest, light tasks)" }
+          ],
+          tooltip:`Ai Model Guide -
+            GPT-4o is the default for fast, responsive tasks and supports up to 128k tokens. It’s ideal for short completions, summaries, and dynamic UI tools.
+            GPT-4.1 and 4.1-mini support a massive 1 million token context, making them perfect for large inputs like full business profiles, long strategy texts, and multi-object analysis.
+            4.1-mini is significantly cheaper than full 4.1, with great balance for most structured AI workflows.
+            4.1-nano is best for lightweight classification or routing logic where speed and cost matter more than depth.`,
         default: "gpt-4o",
       },
     template:{
@@ -174,8 +183,14 @@ var fields = {
             return status.color||'';
         }
     },
-    tags:{type:'group',icon:'tag',
-
+    tags:{type:'group',icon:'tag',hidden:function(obj){
+        let tags = _joe.Data.tag.filter(function(tag){
+            return !(tag.datasets.indexOf(item.itemtype) == -1);
+        });
+        if(!tags.length){
+            return true;
+        }
+    },
         values:function(item){
             var tags = _joe.Data.tag.filter(function(tag){
                 return !(tag.datasets.indexOf(item.itemtype) == -1);

package/server/modules/Apps.js

@@ -496,16 +496,53 @@ function Apps(){
     }
     this.loadPlugin = function(p){
         //logit(moduleName+'loading plugin '+p);
+        let _joeSrc='';
         console.log(JOE.Utils.color('[plugin]', 'plugin'), 'loaded: '+p);
         var plugin;
         if(p.indexOf('.js') == -1){p+= '.js';}
-        try{
-            var pluginpath = internalPluginsDir + p;
-            fs.accessSync(pluginpath, fs.F_OK);
+
+        const candidateDirs = [
+            pluginsDir,
+            internalPluginsDir
+        ];
+        let pluginpath = null;
+        let override = false;
+        //for (let dir of candidateDirs) {
+
+
+            try {
+                let attempt = internalPluginsDir + p;
+                fs.accessSync(attempt, fs.F_OK);
+                pluginpath = attempt;
                 
-        }catch(e){
-            var pluginpath = pluginsDir + p;
-        }
+                
+            } catch (e) {
+                // continue
+            }
+            try {
+                let attempt = pluginsDir + p;
+                fs.accessSync(attempt, fs.F_OK);
+                if(pluginpath){
+                    override = true;
+                }
+                pluginpath = attempt;
+                
+                
+            } catch (e) {
+               
+                // continue
+            }
+       // }
+        // try{
+        //     //first try the pluginsDir, then the internalPluginsDir
+
+            
+        //     var pluginpath = internalPluginsDir + p;
+        //     fs.accessSync(pluginpath, fs.F_OK);
+                
+        // }catch(e){
+        //     var pluginpath = pluginsDir + p;
+        // }
         try{
             try{
                 delete require.cache[require.resolve(pluginpath)];
@@ -513,12 +550,15 @@ function Apps(){
                 console.log(moduleName+'[error] '+p+' not deleted');
             }
             plugin = require(pluginpath);
-            
+            _joeSrc = pluginpath;
         }catch(e){
             plugin = {error:'plugin '+p+' not found'};
             console.log(e,plugin);
         }
+        plugin._pathname = _joeSrc;
+        plugin._override = override;
         self.plugins[p.replace('.js','')] = plugin;
+        
         return plugin;
     }
 

package/server/modules/Storage.js

@@ -102,6 +102,9 @@ function Storage(specs){
                 
                 var save_callback = function(err,data){
                     callback(err,data);
+                    if (!specs || specs.push !== false) {
+                        JOE.io.emit('item_updated', { results: [data] });
+                    }
                     if(!err){
                         var ts = new Date().toISOString();
                         var cached = JOE.Cache.findByID(data.itemtype,data._id);

package/server/plugins/chatgpt-assistants.js

@@ -0,0 +1,359 @@
+
+const { run } = require("googleapis/build/src/apis/run");
+const OpenAI = require("openai");
+
+function ChatGPTAssistants() {
+  const self = this;
+
+  function coloredLog(message) {
+    console.log(JOE.Utils.color('[chatgpt-assistants]', 'plugin', false), message);
+  }
+
+ 
+
+  function getAPIKey() {
+    const setting = JOE.Utils.Settings('OPENAI_API_KEY');
+    if (!setting) throw new Error("Missing OPENAI_API_KEY setting");
+    return setting;
+  }
+
+  function newClient() {
+    return new OpenAI({ apiKey: getAPIKey() });
+  }
+
+  function validateThreadId(thread_id) {
+    const validPattern = /^[a-zA-Z0-9_-]+$/;
+    if (!validPattern.test(thread_id)) {
+      console.error("❌ Invalid characters in thread_id!");
+      return false;
+    }
+    return true;
+  }
+  function stripHtml(html) {
+    if (!html) return "";
+    return html.replace(/<[^>]*>?/gm, '').trim();
+  }
+  this.getRandomTheme = async function(data, req, res) {
+    try {
+      const themes = ["hope", "peace", "perseverance", "joy", "strength", "love", "faith", "healing"];
+      const randomTheme = themes[Math.floor(Math.random() * themes.length)];
+      
+      coloredLog("🎯 Selected Random Theme: " + randomTheme);
+  
+      return res.jsonp({
+        theme: randomTheme
+      });
+  
+    } catch (err) {
+      coloredLog("❌ Error in getRandomTheme: " + err.message);
+      return res.jsonp({ error: err.message });
+    }
+  };
+  
+  this.testAssistant = async function(data, req, res){
+    const openai = newClient();
+    const assistant = await openai.beta.assistants.retrieve("asst_HFzrtyAVyzDDwn1PLOIwU26W");
+    thread = await openai.beta.threads.create();
+  
+      // 2. Add a user message
+      await openai.beta.threads.messages.create({
+        thread_id: thread.id,
+        role: 'user',
+        content: `Please analyze this business: welltyme.com`
+      });
+    coloredLog('⚡ Starting Assistant thread');
+    console.log(assistant);
+    return res.jsonp({ assistant });
+  }
+  this.syncAssistantToOpenAI = async function(data, req, res) {
+    const openai = newClient();
+  
+    try {
+      coloredLog("🔄 Starting syncAssistantToOpenAI");
+  
+      const assistant = JOE.Data.ai_assistant.find(a => a._id === data._id);
+      if (!assistant) {
+        return ({ error: "AI Assistant not found in Joe." });
+      }
+      
+      // Check if updating or creating
+      let existing = null;
+      if (assistant.assistant_id) {
+        try {
+          existing = await openai.beta.assistants.retrieve(assistant.assistant_id);
+        } catch (e) {
+          console.warn('Assistant ID exists but not found at OpenAI, will create new.');
+          existing = null;
+        }
+      }
+      const payload = {
+        name: assistant.name,
+        instructions: stripHtml(assistant.instructions || ""),
+        model: assistant.ai_model || "gpt-4o",
+        tools: [],
+        //file_search: { enabled: !!assistant.file_search_enabled },
+        //code_interpreter: { enabled: !!assistant.code_interpreter_enabled }
+      };
+        // 1. Add user-defined function tools
+      const parsedTools = Array.isArray(assistant.tools) ? assistant.tools : JSON.parse(assistant.tools || "[]");
+      payload.tools.push(...parsedTools);
+
+      // 2. Add built-in tools if toggled ON
+      if (assistant.file_search_enabled) {
+        payload.tools.push({ type: "file_search" });
+      }
+
+      if (assistant.code_interpreter_enabled) {
+        payload.tools.push({ type: "code_interpreter" });
+}
+      // if (existing && existing.file_ids?.length) {
+      //   payload.file_ids = existing.file_ids;
+      // }
+
+      // Only set file_ids if handling files manually
+      if (assistant.file_ids && assistant.file_ids.length > 0) {
+        payload.file_ids = assistant.file_ids;
+      }
+      coloredLog("📦 Payload for OpenAI sync:");
+      coloredLog(JSON.stringify(payload, null, 2));
+  
+      let apiResponse;
+  
+      if (!assistant.assistant_id) {
+        coloredLog("🆕 No assistant_id found. Creating new Assistant...");
+        apiResponse = await openai.beta.assistants.create(payload);
+        assistant.assistant_id = apiResponse.id;
+      } else {
+        coloredLog("♻️ assistant_id found. Updating existing Assistant...");
+        apiResponse = await openai.beta.assistants.update(assistant.assistant_id, payload);
+      }
+  
+      assistant.last_synced = new Date().toISOString();
+  
+      // 💾 Set status to "assistant_synced" if found
+      const syncStatus = JOE.Data.status.find(s => s.code === "assistant_synced");
+      if (syncStatus) {
+        assistant.status = syncStatus._id;
+      }
+  
+      await new Promise((resolve, reject) => {
+        JOE.Storage.save(assistant, 'ai_assistant', function(err, saved) {
+          if (err) {
+            return reject(err);
+          }
+          resolve(saved);
+        });
+      });
+  
+      coloredLog("💾 Assistant sync saved back to Joe successfully.");
+  
+      return ({
+        success: true,
+        assistant_id: assistant.assistant_id,
+        message: assistant.assistant_id ? "Assistant synced successfully." : "Assistant created successfully."
+      });
+  
+    } catch (err) {
+      coloredLog("❌ Error in syncAssistantToOpenAI: " + err.message);
+      return ({ error: err.message });
+    }
+  };
+  this.getThreadMessages = async function(data, req, res) {
+    coloredLog("🔄 Starting getThreadMessages");
+    try {
+      const thread_id = data.thread_id;
+      if (!thread_id) {
+        return ({ error: "Missing thread ID." });
+      }
+      if(data.polling){
+        coloredLog('Polling for thread messages: ' + thread_id);
+      }
+      const openai = newClient();
+      const messages = await openai.beta.threads.messages.list(thread_id);
+  
+      //return res.jsonp({ success: true, messages: messages.data || [] });
+      var succResp = { success: true, messages: messages.data || [] }
+      return(succResp);
+    } catch (err) {
+      console.error('❌ getThreadMessages error:', err);
+
+      return({ error: "Failed to load thread messages." });
+    }
+  };
+  this.addMessage = async function(data, req, res) {
+    try {
+      const { conversation_id, content,object_id} = data;
+      if (!conversation_id || !content) {
+        return({ error: "Missing conversation ID or content." });
+      }
+  
+      const openai = newClient();
+  
+      const convo = await new Promise((resolve, reject) => {
+        JOE.Storage.load('ai_conversation', { _id: conversation_id }, (err, results) => {
+          if (err || !results || !results.length) {
+            return reject("Conversation not found.");
+          }
+          resolve(results[0]);
+        });
+      });
+      var resave = false;
+      //add objectID
+      if(object_id && !convo.context_objects.includes(object_id)){
+        if(!convo.context_objects) convo.context_objects = [];
+        convo.context_objects.push(object_id);
+        resave = true;
+      }
+
+      if (!convo.thread_id) {
+        const thread = await openai.beta.threads.create();
+        convo.thread_id = thread.id;
+        resave = true;
+        // await new Promise((resolve, reject) => {
+        //   JOE.Storage.save(convo, 'ai_conversation', function(err, saved) {
+        //     if (err) return reject(err);
+        //     resolve(saved);
+        //   });
+        // });
+      }
+  
+      if(resave){
+        await new Promise((resolve, reject) => {
+          JOE.Storage.save(convo, 'ai_conversation', function(err, saved) {
+            if (err) return reject(err);
+            resolve(saved);
+          });
+        });
+
+      }
+
+      await openai.beta.threads.messages.create(convo.thread_id, {
+        role: "user",
+        content: content
+      });
+      var runObj = null;
+      // NOW ➔ trigger assistant reply if assistant is selected
+      if (convo.assistants && convo.assistants.length > 0) {
+        // const assistant_id = convo.assistants[0]; // Assuming you store OpenAI assistant ID here
+        //get assistant object by id
+        const assistant_id = data.assistant_id || convo.assistants?.[0]?.openai_id;
+        const assistant = JOE.Data.ai_assistant.find(a => a._id === assistant_id);
+        if (assistant.assistant_id) {
+          runObj = await openai.beta.threads.runs.create(convo.thread_id, {
+            assistant_id: assistant.assistant_id
+          });
+  
+          console.log(`Assistant run started: ${runObj.id}`);
+          // You could optionally poll for completion here
+        }
+      }else if(convo.assistant){
+        const assistant = $J.get(convo.assistant);
+        runObj = await openai.beta.threads.runs.create(convo.thread_id, {
+          assistant_id: assistant.assistant_id // Assuming you store OpenAI assistant ID here
+        });
+
+        coloredLog(`Assistant run started: ${runObj.id}`);
+      }
+      return({ success: true,runObj });
+    } catch (err) {
+      console.error('❌ addMessage error:', err);
+      return({ error: "Failed to send message.", message: err.message });
+    }
+  };
+  this.getRunStatus = async function(data, req, res) {
+    try {
+      const run_id = data.run_id;
+      const thread_id = data.thread_id;
+      var errors = [];
+      if (!run_id) errors.push("Missing run ID.");
+      if(!thread_id) errors.push("Missing thread ID.");
+
+      if (errors.length) {
+        return { error: errors.join(" ") };
+      }
+  
+      const openai = newClient();
+      const run = await openai.beta.threads.runs.retrieve(thread_id, run_id);
+      coloredLog("🔄 Run status retrieved: " + run.status +'assistant_id: ' + run.assistant_id);
+      return {
+        id: run.id,
+        status: run.status,
+        assistant_id: run.assistant_id,
+        completed_at: run.completed_at,
+        usage: run.usage || {}
+      };
+  
+    } catch (err) {
+      console.error("❌ getRunStatus error:", err);
+      return { error: "Failed to check run status." };
+    }
+  };
+  
+  function getDefaultAssistant() {
+    var asst_id = JOE.Utils.Settings('DEFAULT_AI_ASSISTANT');
+    const defaultAssistant = $J.get(asst_id);
+    if (!defaultAssistant) {
+      throw new Error("Default Assistant not found.");
+    }
+    return defaultAssistant;
+  }
+  this.createConversation = async function(data, req, res) {
+    //this function creates a new conversation
+    //it should use the default assistant and add the context of the passed object id after being flattend to the conversation.
+    //save user_is to the conversation object
+    
+    try {
+      const { object_id, user_id } = data;
+      const openai = newClient();
+      const user = $J.get(user_id);
+      const contextObject = $J.get(object_id);
+      var newConvo = null;
+      var assistant = getDefaultAssistant();
+      var assistants = assistant? [assistant._id]:[];
+      const convo ={
+        _id:cuid(),
+        created: new Date().toISOString(),
+        _joeUpdated: new Date().toISOString(),
+        itemtype: 'ai_conversation',
+        name:`${user.name}'s conversation about ${contextObject.name} [${contextObject.itemtype}]`,
+        user:user_id,
+        members:[],
+        assistant:assistant._id,
+        context_objects:[object_id]
+      }
+  
+      if (!convo.thread_id) {
+        const thread = await openai.beta.threads.create();
+        convo.thread_id = thread.id;
+  
+        newConvo = await new Promise((resolve, reject) => {
+          JOE.Storage.save(convo, 'ai_conversation', function(err, saved) {
+            if (err) return reject(err);
+            resolve(saved);
+          });
+        });
+      }
+
+      return({ success: true,conversation:newConvo });
+    } catch (err) {
+      console.error('❌ conversation creation error:', err);
+      return({ error: "Failed to create conversation.",message: err.message });
+    }
+  };
+
+  //self.profileBusinessFromURL = profileBusinessFromURL;
+  this.async = {
+    syncAssistantToOpenAI : this.syncAssistantToOpenAI ,
+    getRunStatus: this.getRunStatus,
+    getThreadMessages: this.getThreadMessages,
+    addMessage: this.addMessage,
+    getRandomTheme: this.getRandomTheme,
+    testAssistant: this.testAssistant,
+    createConversation: this.createConversation
+
+  };
+  return self;
+
+}
+
+module.exports = new ChatGPTAssistants();

package/server/plugins/chatgpt-tools.js

@@ -0,0 +1,79 @@
+const OpenAI = require("openai");
+
+function ChatGPTTools() {
+  const self = this;
+
+  function coloredLog(message) {
+    console.log(JOE.Utils.color('[chatgpt-tools]', 'plugin', false), message);
+  }
+
+
+
+  function getAPIKey() {
+    const setting = JOE.Utils.Settings('OPENAI_API_KEY');
+    if (!setting) throw new Error("Missing OPENAI_API_KEY setting");
+    return setting;
+  }
+
+  //search JOE data for ai_tool objects
+  function getTools(data){
+    var query = Object.assign({itemtype:'ai_tool'}, data||{});
+    var tools = JOE.Cache.search(query);
+    var functionalTools = {};
+    for(var i=0; i<tools.length; i++){
+        var tool = tools[i];
+        functionalTools[tool._id] = Object.assign(tool,{
+          tool_properties:JSON.parse(tool.tool_properties),
+        });
+    }
+    return functionalTools;
+  }
+
+  function newClient() {
+    return new OpenAI({ apiKey: getAPIKey() });
+  }
+
+  
+  this.default = function(data, req, res) {
+    try {
+        var payload = {
+            params: req.params,
+            data: data,
+            tools:getTools(data),
+            success:true
+        };
+    } catch (e) {
+        return { errors: 'plugin error: ' + e, failedat: 'plugin' };
+    }
+    return payload;
+  };
+
+  this.flattened = function(data, req, res){
+    try {
+      var flattened = JOE.Utils.flattenObject(data._id);
+      var payload = {
+          params: req.params,
+          data: data,
+          object:flattened,
+          success:true
+      };
+    } catch (e) {
+        return { errors: 'plugin error: ' + e, failedat: 'plugin' };
+    }
+    return payload;
+  }
+  //1. start or continue a conversation
+
+
+
+
+  //self.profileBusinessFromURL = profileBusinessFromURL;
+  this.async = {
+
+
+  };
+  return self;
+
+}
+
+module.exports = new ChatGPTTools();

package/server/plugins/plugin-utils.js

@@ -0,0 +1,46 @@
+function PluginUtils(){
+    var self = this;
+
+    function getPluginList(){
+        const plugins = {}
+        for(var plug in JOE.Apps.plugins){
+            let plugin = JOE.Apps.plugins[plug];
+            plugins[plug]={
+                name:plug,
+                protected:plugin.protected,
+                async:Object.keys(plugin.async||{}),
+                _pathname:plugin._pathname,
+                _override:plugin._override,
+            }
+        };
+        return plugins;
+    }
+    this.default = function(data,req,res){
+        // list the plugins that are available
+        const plugins = getPluginList();
+        try{ 
+            var payload = {
+                params:req.params,
+                data:data,
+                plugins:plugins
+            }
+        }catch(e){
+            return {errors:'plugin error: '+e,failedat:'plugin'};
+        }
+ 
+       
+        
+        return payload;
+    };
+
+    this.html = function(data,req,res){
+        
+ 
+       
+        
+        return JSON.stringify(self.default(data,req),'','\t\r\n <br/>');
+    }
+    this.protected = [];
+    return self; 
+}
+module.exports = new PluginUtils();

package/server/schemas/ai_conversation.js

@@ -7,6 +7,25 @@ var schema = {
       await _joe.Ai.spawnContextualChat(object_id);
     }
   },
+  listView:{
+    title: function(chat){
+        return `
+       
+        <joe-subtext >${_joe.Utils.prettyPrintDTS(chat.created)}</joe-subtext>
+        <joe-title>${chat.name}</joe-title>
+         <joe-title>${_joe.SERVER.User.Render.cubes(chat.user,'fleft')}</joe-title>
+        <div>${(chat.context_objects||[]).map(function(ref){
+                var obj = $J.get(ref);
+                if(obj){
+                    return `<joe-subtext>${obj.itemtype}:<b>${obj.name}</b> - ${obj._id}</joe-subtext>`;
+                }else{
+                    return `<joe-subtext>${ref}</joe-subtext>`;
+                }
+            }).join('')}</div>
+        `;
+    },
+    listWindowTitle: 'Ai Conversations'
+},
   fields: function() {
     return [
 
@@ -66,7 +85,10 @@ var schema = {
         },
         
         },
-        {name:'context_objects',type:"objectReference", locked:true,values:function(obj,prop){
+        {name:'context_objects',type:"objectReference", 
+          display:'Context Objects',
+          comment:'Objects included in this conversation for Ai context.',
+          locked:true,values:function(obj,prop){
           return JOE.getData();
         }},
       { sidebar_end: "right" },

package/server/schemas/ai_tool.js

@@ -18,7 +18,15 @@ var schema = {
         // set the tool_properties.name to the passed current objects tool_id
         let rawProps = _jco(true).tool_properties ||"{}";
         var toolProperties = eval('('+rawProps+')')||{};
-            toolProperties.name = propObj.name;
+          toolProperties.type = 'function';
+          toolProperties.function = Object.assign({
+            description:'',
+            parameters:{
+              type:'object',
+              properties:{}
+            }
+          },toolProperties.function,{name:propObj.name});  
+          //toolProperties.function.name = propObj.name;
         _joe.Fields.set('tool_properties',JSON.stringify(toolProperties,'\n','\t'));
 
     }
@@ -35,22 +43,24 @@ var schema = {
         type: "code",
         display: "Tool Properties (OpenAI format)",
         height: "300px",
+        language: "json",
         comment:
           `<div>Define the tool funcitonal properties as used in OpenAI tool calling.</div>
+          <a href="https://platform.openai.com/docs/guides/gpt/function-calling?api-mode=chat" target="_blank">OpenAI Function Calling</a><br/>
            <pre>{
-    "type": "function",
-    "name": "get_weather",
-    "description": "Get current temperature for provided coordinates in celsius.",
+  "type": "function",
+  "function": {
+    "name": "findBusinessLinks",
+    "description": "Find relevant links for a business.",
     "parameters": {
-        "type": "object",
-        "properties": {
-            "latitude": { "type": "number" },
-            "longitude": { "type": "number" }
-        },
-        "required": ["latitude", "longitude"],
-        "additionalProperties": false
-    },
-    "strict": true
+      "type": "object",
+      "properties": {
+        "business_name": { "type": "string" },
+        "website": { "type": "string", "format": "uri" }
+      },
+      "required": ["business_name", "website"]
+    }
+  }
 }</pre>`
       },
       { section_end: "schema" },