json-object-editor 0.10.425 → 0.10.430

package/js/joe-ai.js

@@ -3,7 +3,7 @@
     const Ai = {};
     const self = this;
     Ai._openChats = {}; // Conversation ID -> element
-    Ai.default_ai = null; // Default AI assistant ID
+    Ai.default_ai = null; // Default AI assistant object
     // ========== COMPONENTS ==========
     
     class JoeAIChatbox extends HTMLElement {
@@ -13,10 +13,15 @@
 
         this.attachShadow({ mode: 'open' });
         this.messages = [];
-        
+        this.UI={header:null,content:null,footer:null};
+        this.conversation = null;
+        this.conversation_id = null;
+        this.currentRunId = null;
+        this.thread_id = null;
+        this.user_id = null;
       }
   
-      connectedCallback() {
+      async connectedCallback() {
         this.conversation_id = this.getAttribute('conversation_id');
 
         this.selected_assistant_id = Ai.default_ai?Ai.default_ai.value:null;
@@ -25,9 +30,102 @@
           this.renderError("Missing conversation_id");
           return;
         }
-        this.loadConversation();
+        
+        var c = await this.loadConversation();
         this.getAllAssistants();
+        this.setupUI();
+      }
+
+      setupUI() {
+      // Set up UI elements and event listeners
+        // Inject external CSS
+        const styleLink = document.createElement('link');
+        styleLink.setAttribute('rel', 'stylesheet');
+        styleLink.setAttribute('href', '/JsonObjectEditor/css/joe-ai.css'); // Adjust path as needed
+        this.shadowRoot.appendChild(styleLink);
+            
+
+        Ai.default_ai
+        /*HEADER*/
+        Ai.getDefaultAssistant();
+        const assistantOptions = _joe.Data.ai_assistant.map(a => {
+        
+          const label = a.name || a.title || 'Assistant';
+          const value = a._id;
+          const selected = value === this.selected_assistant_id ? 'selected' : '';
+        
+          return `<option value="${value}" ${selected}>${label}</option>`;
+        }).join('');
+        
+        const assistantSelect = `
+        <label-select-wrapper>
+          <label class="assistant-select-label" title="joe ai assistants">${_joe && _joe.SVG.icon.assistant}</label>
+          <select id="assistant-select">
+            ${assistantOptions}
+          </select>
+          </label-select-wrapper>
+        `;
+
+        /*CONTENT*/
+        const chatMessages = this.messages.map(msg => this.renderMessage(msg)).reverse().join('');
+
+        // Build inner HTML in a wrapper
+        const wrapper = document.createElement('chatbox-wrapper');
+        wrapper.className = 'chatbox';
+        wrapper.innerHTML = `
+          <div class="close-btn" title="Close Chatbox" >${_joe.SVG.icon.close}</div>
+          <chat-header>
+            <chat-title>${this.conversation.name}</chat-title>
+            <p>${this.conversation.info||''}</p>
+            ${assistantSelect}
+          </chat-header>
+          <chat-content>${chatMessages}</chat-content>
+          <chat-footer>
+            <textarea id="chat-input" type="text" placeholder="Type a message..."></textarea>
+            <button id="send-button">Send</button>
+          </chat-footer>
+        `;
+  
+        this.shadowRoot.appendChild(wrapper);
+      
+        ['header','content','header'].map(u=>{
+          this.UI[u] = this.shadowRoot.querySelector('chat-'+u);
+        })
+        this.UI.content.update = this.updateMessages.bind(this);
+        setTimeout(() => {
+          this.UI.content.scrollTop = this.UI.content.scrollHeight;
+        }, 100);
+        this.UI.content.scrollTop = this.UI.content.scrollHeight;
+
+        this.UI.textarea = this.shadowRoot.getElementById('chat-input');
+        this.UI.textarea.addEventListener('keydown', (e) => {
+          if (e.key === 'Enter' && !e.shiftKey) {
+            e.preventDefault(); // Prevent newline if needed
+            console.log('Enter pressed!');
+            this.sendMessage();
+          }
+        });
 
+        this.UI.sendButton = this.shadowRoot.getElementById('send-button');
+        this.UI.sendButton.addEventListener('click', () => this.sendMessage());
+     
+         // Wire up the close button
+        this.shadowRoot.querySelector('.close-btn').addEventListener('click', () => {
+          //this.closeChat()
+          this.closest('joe-ai-chatbox').closeChat();
+        });
+        // this.ui.assistant_select = this.shadowRoot.querySelector('#assistant-select');
+        // this.ui.assistant_select?.addEventListener('change', (e) => {
+        //   this.selected_assistant_id = e.target.value;
+        // });
+        //this.selected_assistant_id = this.ui.assistant_select?.value || null;
+
+      }
+      updateMessages(messages){
+        messages && (this.messages = messages);
+        const chatMessages = this.messages.map(msg => this.renderMessage(msg)).reverse().join('');
+        this.UI.content.innerHTML = chatMessages;
+        this.UI.content.scrollTop = this.UI.content.scrollHeight;
       }
       async getAllAssistants() {
         const res = await fetch('/API/item/ai_assistant');
@@ -51,6 +149,7 @@
 
       }
       async loadConversation() {
+        //load conversation and messages into this 
         try {
           const res = await fetch(`/API/object/ai_conversation/_id/${this.conversation_id}`);
           const convo = await res.json();
@@ -66,9 +165,11 @@
             const resThread = await fetch(`/API/plugin/chatgpt-assistants/getThreadMessages?thread_id=${convo.thread_id}`);
             const threadMessages = await resThread.json();
             this.messages = threadMessages?.messages || [];
+            this.thread_id = convo.thread_id;
+            this.user = $J.get(convo.user);
           }
   
-          this.render();
+          return {conversation:convo,messages:this.messages};
         } catch (err) {
           console.error("Chatbox load error:", err);
           this.renderError("Error loading conversation.");
@@ -87,121 +188,40 @@
         const convoName = this.conversation.name || "Untitled Conversation";
         const convoInfo = this.conversation.info || "";
   
-        const chatMessages = this.messages.map(msg => this.renderMessage(msg)).reverse().join('');
 
-        const assistantOptions = (this.conversation.assistants || []).map(a => {
-          const meta = this.getAssistantInfo(a) || {};
-        
-          const label = meta.name || a.name || a.title || 'Assistant';
-          const value = meta._id;
-          const selected = value === this.selected_assistant_id ? 'selected' : '';
-        
-          return `<option value="${value}" ${selected}>${label}</option>`;
-        }).join('');
-        
-        const assistantSelect = `
-        <label-select-wrapper>
-          <label class="assistant-select-label" title="joe ai assistants">${_joe && _joe.SVG.icon.assistant}</label>
-          <select id="assistant-select">
-            ${assistantOptions}
-          </select>
-          </label-select-wrapper>
-        `;
 
-        this.shadowRoot.innerHTML = `
-          <style>
-              
-            .chatbox {
-                padding:10px; display:flex; flex-direction:column; height:100%; 
-            }
-            .close-btn {
-                position: absolute;
-                top: 8px;
-                right: 8px;
-                width: 24px;
-                height: 24px;
-                cursor: pointer;
-            }
-            .close-btn svg { width:100%; height:100%; }
-            .header { margin-bottom:10px; }
-            .header h2 { margin:0; font-size:18px; }
-            .header p { margin:4px 0 0 0; font-size:12px; color:#666; }
-            .header svg{
-                width: 36px;
-                height: 36px;
-              }
-                label-select-wrapper{
-                display: flex; align-items: center; gap: 8px;
-                }
-            .messages { flex:1; overflow:auto; max-height:300px; margin-bottom:10px; 
-                background: #fff;
-                border: 1px solid #ccc;
-            }
-            .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;
-            }
-            .inputRow { display:flex; gap:8px; }
-            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; }
-            button:disabled { opacity:0.5; cursor:default; }
-            .message { margin-bottom:10px; padding:8px; border-radius:6px; background:#f5f5f5; }
-            .message.assistant { background:#eef; }
-            .message.system { background:#fee; }
-          </style>
-  
-          <div class="chatbox">
-        <div class="close-btn" title="Close Chatbox">
-            ${_joe.SVG.icon.close}
-        </div>
-            <div class="header">
-              <h2>${convoName}</h2>
-              <p>${convoInfo}</p>
-              ${assistantSelect}
-            </div>
-            <div class="messages">
-              ${chatMessages}
-            </div>
-            <div class="inputRow">
-              <input id="chat-input" type="text" placeholder="Type a message..." />
-              <button id="send-button">Send</button>
-            </div>
-          </div>
-        `;
-        const messagesDiv = this.shadowRoot.querySelector('.messages');
-        messagesDiv.scrollTop = messagesDiv.scrollHeight;
-        this.shadowRoot.getElementById('send-button').addEventListener('click', () => this.sendMessage());
-     
-         // Wire up the close button
-        this.shadowRoot.querySelector('.close-btn').addEventListener('click', () => this.closeChat());
-        this.ui.assistant_select = this.shadowRoot.querySelector('#assistant-select');
-        this.ui.assistant_select?.addEventListener('change', (e) => {
-          this.selected_assistant_id = e.target.value;
-        });
-        this.selected_assistant_id = this.ui.assistant_select?.value || null;
+
+
+
+
+
 
     }
-  
+    processMessageText(text) {
+      
+      // const replaced = text.replace(
+      //   /\{\{\{BEGIN_OBJECT:(.*?)\}\}\}[\s\S]*?\{\{\{END_OBJECT:\1\}\}\}/g,
+      //   (match, cuid) => `<joe-object object_id="${cuid}"></joe-object>`
+      // );
+      let didReplace = false;
+
+      const replaced = text.replace(
+        /\{\{\{BEGIN_OBJECT:(.*?)\}\}\}[\s\S]*?\{\{\{END_OBJECT:\1\}\}\}/g,
+        (match, cuid) => {
+          didReplace = true;
+          return `<joe-object object_id="${cuid}"></joe-object>`;
+        }
+      );
+
+      return {text:replaced, replaced:didReplace};
+    }
     renderMessage(msg) {
         const role = msg.role || 'user';
         const classes = `message ${role}`;
-      
+        var username = role;
+        if(role === 'user'){
+          username = this.user.name||'User';
+        }
         let contentText = '';
       
         if (Array.isArray(msg.content)) {
@@ -217,14 +237,22 @@
         } else {
           contentText = '[Unsupported message format]';
         }
-      
+
+        const ctInfo = this.processMessageText(contentText);
+        contentText = ctInfo.text;
+        if(ctInfo.replaced){
+          username = 'platform'
+        }
+
         // Build timestamp
         const createdAt = msg.created_at ? new Date(msg.created_at * 1000) : null; // OpenAI sends timestamps in seconds
         const timestamp = createdAt ? createdAt.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' }) : '';
       
         return `
           <div class="${classes}">
-            <div class="meta"><strong>${role.toUpperCase()}</strong> ${timestamp ? `<span class="timestamp">${timestamp}</span>` : ''}</div>
+            <div class="meta">
+            <participant-name>${username.toUpperCase()}</participant-name> 
+            ${timestamp ? `<span class="timestamp">${timestamp}</span>` : ''}</div>
             <div class="content">${contentText}</div>
           </div>
         `;
@@ -233,14 +261,29 @@
       renderError(message) {
         this.shadowRoot.innerHTML = `<div style="color:red;">${message}</div>`;
       }
-  
-      async sendMessage() {
-        const input = this.shadowRoot.getElementById('chat-input');
+
+
+      async getResponse(conversation_id,content,role,assistant_id){
+        const response = await fetch('/API/plugin/chatgpt-assistants/addMessage', {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify({
+            conversation_id: conversation_id,
+            content: content,
+            role: role||'system',
+            assistant_id: assistant_id||Ai.default_ai?Ai.default_ai.value:null
+          })
+        }).then(res => res.json());
+      }
+
+      async sendMessage() {//** */
+        
+        const input = this.UI.textarea;
         const message = input.value.trim();
         if (!message) return;
       
         input.disabled = true;
-        this.shadowRoot.getElementById('send-button').disabled = true;
+        this.UI.sendButton.disabled = true;
       
         try {
           const response = await fetch('/API/plugin/chatgpt-assistants/addMessage', {
@@ -256,7 +299,9 @@
           if (response.success && response.runObj) {
             this.currentRunId = response.runObj.id; // Store the run ID for polling
             await this.loadConversation();   // reload messages
+            this.UI.content.update(); // update messages
             this.startPolling();              // 🌸 start watching for assistant reply!
+            input.value = '';
           } else {
             alert('Failed to send message.');
           }
@@ -265,9 +310,9 @@
           alert('Error sending message.');
         }
       
-        input.value = '';
-        input.disabled = false;
-        this.shadowRoot.getElementById('send-button').disabled = false;
+
+        // input.disabled = false;
+        // this.shadowRoot.getElementById('send-button').disabled = false;
       }
       
       startPolling() {
@@ -286,18 +331,21 @@
             const threadMessages = await resThread.json();
         
             if (threadMessages?.messages) {
-              this.messages = threadMessages.messages;
-              this.render();
+              this.UI.content.update(threadMessages.messages);
+              //this.messages = threadMessages.messages;
+              //this.render();
             }
         
             clearInterval(this.pollingInterval);
             this.pollingInterval = null;
             this.hideThinkingMessage();
+            this.UI.textarea.disabled = false;
+            this.UI.sendButton.disabled = false;
           }
         }, 2000);
       }
       showThinkingMessage() {
-        const messagesDiv = this.shadowRoot.querySelector('.messages');
+        const messagesDiv = this.UI.content;
         if (!messagesDiv) return;
       
         // Pull assistant thinking text
@@ -329,14 +377,69 @@
     }
   
     customElements.define('joe-ai-chatbox', JoeAIChatbox);
-  
+    
+    
+    class JoeObject extends HTMLElement {
+      constructor() {
+        super();
+
+
+        this.object_id = this.getAttribute('object_id');
+        this.object = $J.get(this.object_id);
+      
+      }
+      connectedCallback() {
+        const id = this.getAttribute('object_id');
+        var sTemp = $J.schema('business')?.listView?.title||false;
+        this.innerHTML = (sTemp)?JOE.propAsFuncOrValue(sTemp,this.object) :`<jo-title>${this.object.name}</jo-title>
+        <jo-subtitle>${this.object.info} - ${this.object._id}</jo-subtitle>`;
+        this.addEventListener('click', () => {
+          // Handle click event here, e.g., open the object in a new tab or show details
+          goJoe(_joe.search(this.object._id)[0],{schema:this.object.itemtype})
+          //window.open(`/object/${this.object_id}`, '_blank');
+        });
+      }
+       
+    }
+    customElements.define('joe-object', JoeObject);
+
+
+    //**YES**
+    Ai.spawnChatHelper = async function(object_id,user_id=_joe.User._id,conversation_id) {
+      //if not conversation_id, create a new one
+      let convo_id = conversation_id;
+      var newChat = false;
+      if(!convo_id){
+        const response = await fetch('/API/plugin/chatgpt-assistants/createConversation', {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify({
+            object_id,
+            user_id
+          })
+        }).then(res => res.json());
+        convo_id = response?.conversation?._id;
+        newChat = true;
+        if(response.error){
+          console.error('❌ Failed to create conversation:', response.error);
+          return;
+        } 
+      }
+
+      await _joe.Ai.spawnContextualChat(convo_id,{object_id,newChat});
+    }
+    Ai.getDefaultAssistant = function() {
+
+      Ai.default_ai = Ai.default_ai ||_joe.Data.setting.where({name:'DEFAULT_AI_ASSISTANT'})[0]||false;
+      return Ai.default_ai;
+    }
     // ========== HELPERS ==========
     Ai.spawnContextualChat = async function(conversationId, options = {}) {
       if (!conversationId) {
           console.warn("Missing conversation ID for chat spawn.");
           return;
       }
-      Ai.default_ai = _joe.Data.setting.where({name:'DEFAULT_AI_ASSISTANT'})[0]||false;
+      Ai.getDefaultAssistant();
 
       // 1. Check if chat already open
       if (Ai._openChats[conversationId]) {
@@ -346,9 +449,11 @@
       }
   
       try {
+        const flattened = _joe.Object.flatten(options.object_id);
+        if (options.newChat) {
           // 2. Prepare context
-          const flattened = _joe.Object.flatten();
-          const contextInstructions = _joe.Ai.generateContextInstructions(flattened);
+
+          const contextInstructions = _joe.Ai.generateContextInstructions(flattened,options.object_id);
   
           // 3. Inject context into backend
           const contextResult = await fetch('/API/plugin/chatgpt-assistants/addMessage', {
@@ -356,9 +461,10 @@
               headers: { 'Content-Type': 'application/json' },
               body: JSON.stringify({
                   conversation_id: conversationId,
-                  //role: 'system',
+                  role: 'JOE',
                   content: contextInstructions,
-                  assistant_id: Ai.default_ai.value
+                  assistant_id: Ai.default_ai.value,
+                  object_id: options.object_id
               })
           }).then(res => res.json());
   
@@ -366,38 +472,51 @@
               console.error('❌ Failed to inject context:', contextResult?.error);
               return;
           }
-  
+        }
           // 4. Create new chatbox
           const chat = document.createElement('joe-ai-chatbox');
           chat.setAttribute('conversation_id', conversationId);
-  
+          const screenWidth = window.innerWidth;
+          if(screenWidth <= 768){
+            chat.setAttribute('mobile', 'true');
+            chat.style.width = 'auto';
+            chat.style.left = '0px';
+          }
+          else{
+            chat.setAttribute('mobile', 'false');
+            chat.style.width = options.width || '640px';
+            chat.style.left = 'auto';
+          }
           // Apply styles
-          chat.style.width = options.width || '400px';
-          chat.style.height = options.height || '420px';
-          chat.style.bottom = options.bottom || '20px';
-          chat.style.right = options.right || '20px';
+          
+          //chat.style.height = options.height || '420px';
+          chat.style.bottom = options.bottom || '50px';
+          chat.style.right = options.right || '0px';
+          chat.style.top = options.top || '50px';
           chat.style.position = 'fixed';
           chat.style.zIndex = '10000';
           chat.style.background = '#efefef';
           chat.style.border = '1px solid #fff';
           chat.style.borderRadius = '8px';
-          chat.style.boxShadow = '0px 2px 10px rgba(0,0,0,0.1)';
+          chat.style.boxShadow = '0px 1px 4px rgba(0, 0, 0, 0.3)';
           chat.style.padding = '5px';
-  
+          chat.style.margin = '5px';
+
           document.body.appendChild(chat);
   
           // 5. Track it
           Ai._openChats[conversationId] = chat;
   
+          if (options.newChat) {
           // 6. Show soft local UI message
-          _joe.Ai.injectSystemMessage(conversationId, `Context injected: ${flattened.name || flattened.title || 'Object'} (${flattened._id})`);
-  
+          //_joe.Ai.injectSystemMessage(conversationId, `Context injected: ${flattened.name || flattened.title || 'Object'} (${flattened._id})`);
+          }
       } catch (err) {
           console.error('❌ spawnChat context injection failed:', err);
       }
   };
   
-    Ai.spawnChat = function(conversationId, options = {}) {
+   /* Ai.spawnChat = function(conversationId, options = {}) {
         if (!conversationId) {
           console.warn("Missing conversation ID for chat spawn.");
           return;
@@ -442,27 +561,31 @@
         return chat;
         // 4. Optionally clean up when chatbox is removed (if you wire close buttons later)
       };
-  
-    Ai.generateContextInstructions = function(flattenedObj) {
+  */
+    Ai.generateContextInstructions = function(flattenedObj,object_id) {
         if (!flattenedObj) return '';
     
-        let context = "Context: You are assisting the user with the following object:\n\n";
-    
-        for (const [key, value] of Object.entries(flattenedObj)) {
-            if (typeof value === 'object' && value !== null) {
-                context += `- ${key}: (linked object)\n`;
-                for (const [subkey, subval] of Object.entries(value)) {
-                    context += `    • ${subkey}: ${subval}\n`;
-                }
-            } else {
-                context += `- ${key}: ${value}\n`;
-            }
-        }
+        let context = `{{{BEGIN_OBJECT:${object_id}}}}`+
+        "Context: You are assisting the user with the following object:\n\n";
+
+        context += JSON.stringify(flattenedObj, null, 2) + "\n\n";
+        // for (const [key, value] of Object.entries(flattenedObj)) {
+        //     if (typeof value === 'object' && value !== null) {
+        //         context += `- ${key}: (linked object)\n`;
+        //         for (const [subkey, subval] of Object.entries(value)) {
+        //             context += `    • ${subkey}: ${subval}\n`;
+        //         }
+        //     } else {
+        //         context += `- ${key}: ${value}\n`;
+        //     }
+        // }
     
-        context += `\nAlways refer to this context when answering questions or completing tasks related to this object.\n`;
+        context += `\nAlways refer to this context when answering questions or completing tasks related to this object.\n`+
+        `{{{END_OBJECT:${object_id}}}}`;
     
         return context;
     };
+
     Ai.injectSystemMessage = async function(conversationId, text) {
       if (!conversationId || !text) return;
   
@@ -470,7 +593,7 @@
           // Create a system-style message object
           const messageObj = {
               conversation_id: conversationId,
-              role: 'system',
+              role: 'joe',
               content: text,
               created: new Date().toISOString()
           };

package/js/joe-full.js

@@ -19585,7 +19585,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)) {

package/js/joe.js

@@ -1,9 +1,3 @@
-/* -------------------------------------------------------- 
- * 
- *  JOE - v1.5.0 
- *  Created by: Corey Hadden 
- * 
- * -------------------------------------------------------- */
 /* -------------------------------------------------------- 
  * 
  *  JOE - v1.5.0 
@@ -8292,7 +8286,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)) {

package/package.json

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

package/pages/template.html

@@ -311,8 +311,9 @@
 	JOE.init();
 	//capp.init();
 	var capp_apps = '${USERAPPS}'.split(',') || [];
+	var caobj = ${USERAPPSOBJ};
 	var all_apps = '${APPS}'.split(',') || [];
-	capp.Menu.addFromApps(capp_apps,'<joe-subtext>${this.webconfig.name}</joe-subtext>${APPNAME}');
+	capp.Menu.addFromApps(caobj,'<joe-subtext>${this.webconfig.name}</joe-subtext>${APPNAME}');
 	//capp.Button.add('Docs',null,'window.open(\'/JsonObjectEditor/docs.html\')','capp-header');