json-object-editor 0.10.657 → 0.10.660

package/js/joe-ai.js

@@ -773,7 +773,9 @@
           const payload = {
             model: this.model || undefined,
             ai_assistant_id: this.getAttribute('ai_assistant_id') || undefined,
-            source: this.getAttribute('source') || 'widget'
+            source: this.getAttribute('source') || 'widget',
+            scope_itemtype: this.getAttribute('scope_itemtype') || undefined,
+            scope_id: this.getAttribute('scope_id') || undefined
           };
           // Resolve the effective user for this widget and pass id/name/color
           // explicitly to the server. This works for:
@@ -1362,29 +1364,11 @@
 
 
     //**YES**
+    // Legacy assistants-based object chat helper (kept for reference); the new
+    // object chat path uses the widget + ai_widget_conversation stack instead.
     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);
-          alert('Failed to create conversation: '+response.message);
-          return;
-        } 
-      }
-
-      await _joe.Ai.spawnContextualChat(convo_id,{object_id,newChat});
+      console.warn('spawnChatHelper (assistants chat) is legacy; use object chat widget instead.');
+      return;
     }
     Ai.getDefaultAssistant = function() {
 
@@ -1573,7 +1557,208 @@
       } catch (err) {
           console.error("❌ injectSystemMessage failed:", err);
       }
-  };
+    };
+
+    // Optional helpers for making object chat shells draggable / resizable.
+    // Kept behind flags so they can be toggled or iterated on without
+    // affecting core behavior.
+    Ai.objectChatDraggable = false;
+    Ai.objectChatResizable = false;
+    Ai.enableObjectChatDrag = function(shell){
+      try{
+        var header = shell.querySelector('.joe-object-chat-header');
+        if (!header) { return; }
+        let dragging = false;
+        let dragOffsetX = 0, dragOffsetY = 0;
+        header.addEventListener('pointerdown', function(e){
+          dragging = true;
+          shell.setPointerCapture(e.pointerId);
+          dragOffsetX = e.clientX - shell.offsetLeft;
+          dragOffsetY = e.clientY - shell.offsetTop;
+        });
+        header.addEventListener('pointermove', function(e){
+          if (!dragging) return;
+          const x = e.clientX - dragOffsetX;
+          const y = e.clientY - dragOffsetY;
+          shell.style.left = x + 'px';
+          shell.style.top = y + 'px';
+          shell.style.right = 'auto';
+          shell.style.bottom = 'auto';
+        });
+        header.addEventListener('pointerup', function(e){
+          if (!dragging) return;
+          dragging = false;
+          try{ shell.releasePointerCapture(e.pointerId); }catch(_e){}
+        });
+      }catch(e){
+        console.warn('enableObjectChatDrag error', e);
+      }
+    };
+    Ai.enableObjectChatResize = function(shell){
+      try{
+        shell.style.resize = 'both';
+        shell.style.overflow = 'hidden';
+      }catch(e){
+        console.warn('enableObjectChatResize error', e);
+      }
+    };
+
+    // Simple object-scoped widget chat launcher. For a given object id +
+    // itemtype we maintain (per-page) a single floating panel containing:
+    //   - <joe-ai-assistant-picker>
+    //   - <joe-ai-widget>
+    // This reuses the AIHub chat stack, but adds scope_itemtype/scope_id so
+    // the backend can attach object files and context.
+    Ai._objectWidgets = Ai._objectWidgets || {};
+    Ai.openObjectChatLauncher = function(object_id, itemtype, name){
+      try{
+        if (!object_id) { return; }
+        var key = (itemtype || 'item') + ':' + object_id;
+        var existing = Ai._objectWidgets[key];
+        if (existing && document.body.contains(existing)) {
+          existing.scrollIntoView({ behavior:'smooth', block:'end' });
+          return;
+        }
+        var isMobile = (window.innerWidth || document.documentElement.clientWidth || 0) <= 768;
+        var shell = document.createElement('div');
+        shell.className = 'joe-object-chat-shell';
+
+        var safeKey = key.replace(/[^a-zA-Z0-9_\-]/g,'_');
+        var widgetId = 'object_chat_'+safeKey;
+        var title = name || (itemtype+': '+object_id);
+
+        // Header with assistant picker + close button
+        var header = document.createElement('div');
+        header.className = 'joe-object-chat-header';
+        header.style.display = 'flex';
+        header.style.alignItems = 'center';
+        header.style.justifyContent = 'space-between';
+        header.style.padding = '4px 8px';
+        header.style.background = '#111827';
+        header.style.color = '#f9fafb';
+        header.style.cursor = isMobile ? 'default' : 'move';
+
+        var titleSpan = document.createElement('span');
+        titleSpan.textContent = title;
+        titleSpan.style.fontSize = '12px';
+        titleSpan.style.marginRight = '8px';
+
+        var picker = document.createElement('joe-ai-assistant-picker');
+        picker.setAttribute('for_widget', widgetId);
+        picker.setAttribute('source', 'object_chat');
+        picker.style.flex = '1 1 auto';
+        picker.style.marginRight = '8px';
+
+        var closeBtn = document.createElement('button');
+        closeBtn.type = 'button';
+        closeBtn.textContent = '×';
+        closeBtn.title = 'Close chat';
+        closeBtn.style.border = 'none';
+        closeBtn.style.background = 'transparent';
+        closeBtn.style.color = '#f9fafb';
+        closeBtn.style.cursor = 'pointer';
+        closeBtn.style.fontSize = '16px';
+        closeBtn.style.lineHeight = '16px';
+        closeBtn.style.padding = '0 4px';
+
+        header.appendChild(titleSpan);
+        header.appendChild(picker);
+        header.appendChild(closeBtn);
+
+        // Widget body
+        var w = document.createElement('joe-ai-widget');
+        w.setAttribute('id', widgetId);
+        w.setAttribute('title', title);
+        w.setAttribute('source','object_chat');
+        w.setAttribute('scope_itemtype', itemtype || '');
+        w.setAttribute('scope_id', object_id);
+        // Default assistant for this widget; picker can override per-conversation.
+        try{
+          // Ai.getDefaultAssistant returns the DEFAULT_AI_ASSISTANT setting
+          // record, whose .value is the ai_assistant _id we want to use here.
+          var defSetting = Ai.getDefaultAssistant && Ai.getDefaultAssistant();
+          if (defSetting && defSetting.value){
+            w.setAttribute('ai_assistant_id', defSetting.value);
+          }
+        }catch(_e){}
+        // Pass current user id through so widgetStart/widgetMessage can
+        // attribute the conversation correctly.
+        try{
+          if (_joe && _joe.User && _joe.User._id){
+            w.setAttribute('user_id', _joe.User._id);
+            // Also set the property so resolveUser sees it even if the
+            // attribute change happens after the custom element constructor.
+            w.user_id = _joe.User._id;
+          }
+        }catch(_e){}
+        w.style.display = 'block';
+        w.style.width = '100%';
+        w.style.height = '100%';
+
+        shell.appendChild(header);
+        shell.appendChild(w);
+
+        // Positioning and sizing
+        shell.style.position = 'fixed';
+        shell.style.zIndex = '10000';
+        shell.style.boxShadow = '0 8px 24px rgba(15,23,42,0.4)';
+        shell.style.background = '#f3f4f6';
+        shell.style.border = '1px solid #e5e7eb';
+        shell.style.borderRadius = '10px 0 0 10px';
+        shell.style.overflow = 'hidden';
+        shell.style.display = 'flex';
+        shell.style.flexDirection = 'column';
+
+        function applyDesktopLayout(){
+          shell.style.width = '420px';
+          shell.style.height = '60vh';
+          shell.style.right = '0px';
+          shell.style.bottom = '50px';
+          shell.style.left = 'auto';
+          shell.style.top = 'auto';
+          shell.style.resize = 'both';
+        }
+        function applyMobileLayout(){
+          shell.style.width = '100vw';
+          shell.style.height = '50vh';
+          shell.style.left = '0px';
+          shell.style.right = '0px';
+          shell.style.bottom = '0px';
+          shell.style.top = 'auto';
+          shell.style.resize = 'none';
+        }
+
+        if (isMobile){
+          applyMobileLayout();
+        }else{
+          applyDesktopLayout();
+        }
+
+        document.body.appendChild(shell);
+        Ai._objectWidgets[key] = shell;
+
+        // Close behavior
+        closeBtn.addEventListener('click', function(){
+          try{
+            if (Ai._objectWidgets[key] === shell){
+              delete Ai._objectWidgets[key];
+            }
+          }catch(_e){}
+          shell.remove();
+        });
+
+        if (!isMobile){
+          if (Ai.objectChatDraggable) {
+            Ai.enableObjectChatDrag(shell);
+          }
+          if (Ai.objectChatResizable) {
+            Ai.enableObjectChatResize(shell);
+          }
+        }
+      }catch(e){
+        console.error('openObjectChatLauncher error', e);
+      }
+    };
 
     // ---------- Autofill (Responses) ----------
     // Usage from schema: add `ai:{ prompt:'...' }` to a field. Core will render a
@@ -1879,13 +2064,23 @@
       var schema = (_joe && _joe.current && _joe.current.schema) || {};
       // Prefer the live, constructed field defs; fall back to schema.fields
       var liveFieldDefs = (_joe && _joe.current && Array.isArray(_joe.current.fields) && _joe.current.fields) || [];
-      var schemaFields = (schema && schema.fields) || [];
+      var schemaFields = [];
+      if (schema && schema.fields) {
+        if (Array.isArray(schema.fields)) {
+          schemaFields = schema.fields;
+        } else if (typeof schema.fields === 'function') {
+          try{
+            var tmp = schema.fields();
+            if (Array.isArray(tmp)) { schemaFields = tmp; }
+          }catch(_e){}
+        }
+      }
       var fieldNames = [];
       // collect from live constructed defs
       liveFieldDefs.forEach(function(fd){
         if(fd && fd.name && fd.type === 'uploader'){ fieldNames.push(fd.name); }
       });
-      // also collect from raw schema (string or object), dedupe
+      // also collect from raw schema (string or object or spec), dedupe
       schemaFields.forEach(function(f){
         var fname = (typeof f === 'string') ? f : (f && (f.name || f.field || f.prop));
         if(!fname){ return; }
@@ -2065,11 +2260,16 @@
   };
 
     
-    // Attach AI to _joe
-    if (window._joe) {
-      _joe.Ai = Ai;
-    } else {
-      console.warn('joeAI.js loaded before _joe was ready.');
+    // Attach AI to _joe. On some pages joe-ai.js may load before _joe is
+    // constructed; in that case, defer attachment until window load.
+    function attachAItoJoe(){
+      if (!window._joe) { return false; }
+      if (!_joe.Ai) { _joe.Ai = Ai; }
+      return true;
+    }
+    if (!attachAItoJoe()) {
+      console.warn('joeAI.js loaded before _joe was ready; deferring Ai attach.');
+      window.addEventListener('load', attachAItoJoe);
     }
   
   })();

package/package.json

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