json-object-editor 0.10.653 → 0.10.657

package/js/JsonObjectEditor.jquery.craydent.js

@@ -168,6 +168,27 @@ function JsonObjectEditor(specs){
             }});
         }
 
+    };
+    this.uploaderSetFileRole = function(uploader_id, filename, role){
+        try{
+            var joe_uploader = self.uploaders && self.uploaders[uploader_id];
+            if (!joe_uploader || !Array.isArray(joe_uploader.files)) { return; }
+            var file = joe_uploader.files.where({filename:filename})[0];
+            if (!file) { return; }
+            if (role) {
+                file.file_role = role;
+            } else {
+                delete file.file_role;
+            }
+            if (joe_uploader.preview) {
+                $(joe_uploader.preview).html(_renderUploaderFilePreviews(joe_uploader.files, joe_uploader.cuid));
+            }
+            if (typeof self.updateObject === 'function') {
+                self.updateObject(null, null, true);
+            }
+        }catch(e){
+            console.warn('uploaderSetFileRole error', e && e.message || e);
+        }
     };
 	window._joes.push(this);
 
@@ -5329,6 +5350,19 @@ this.renderHTMLContent = function(specs){
         if(files && !$c.isArray(files)){
             files = [files];
         }
+
+        // Register uploader object (including optional file_roles) BEFORE we render
+        // previews so that _renderUploaderFilePreviews can access role metadata.
+        var uploader_obj = {
+            cuid: uploader_id,
+            prop: prop.name,
+            files: files,
+            max: prop.max || 0,
+            // Optional file role configuration from schema (e.g. [{value,label,default}])
+            roles: prop.file_roles || []
+        };
+        self.uploaders[uploader_id] = uploader_obj;
+
         if(prop.field && self.current.object[prop.field]){
             var kfield = self.getField(prop.field);
             var preview = self.current.object[prop.field]
@@ -5351,18 +5385,11 @@ this.renderHTMLContent = function(specs){
                     '<div class="joe-uploader-preview">'+dz_message+'</div>'+
                 '</div>'+
                 '<div class="joe-uploader-message">add a file</div>'+
-            '<div class="joe-button joe-green-button joe-upload-cofirm-button hidden"  onclick="_joe.uploaderConfirm(\''+uploader_id+'\',\''+prop.name+'\');">Upload File</div>'+__clearDiv__+
+            '<div class="joe-button joe-green-button joe-upload-cofirm-button ui-helper-hidden hidden"  onclick="_joe.uploaderConfirm(\''+uploader_id+'\',\''+prop.name+'\');">Upload File</div>'+__clearDiv__+
             '</div>'
             ;
         //var idprop = prop.idprop || '_id';
         //html+= __clearDiv__;
-        var uploader_obj = {
-            cuid:uploader_id,
-            prop:prop.name,
-            files:files,
-            max:prop.max || 0
-        }
-        self.uploaders[uploader_id] = uploader_obj;
         return html;
     };
     function _removeUploaderFile(id,filename){
@@ -5378,9 +5405,10 @@ this.renderHTMLContent = function(specs){
         var jup_template,html= '';
         var alink ="<a href='${url}${base64}' class='file-link' target='_blank'></a>";
         var delete_btn = '<joe-uploader-file-delete-btn class="svg-shadow" onclick="_joe.Fields.uploader.remove(\''+cuid+'\',\'${filename}\');">'+self.SVG.icon.close+'</joe-uploader-delete-btn>';
-        var label = '<joe-uploader-file-label>${filename}</joe-uploader-file-label>';
-        
-        
+        var label = '';
+        var uploader = self.uploaders && self.uploaders[cuid];
+        var roles = uploader && uploader.roles;
+
         files.map(function(file){
             var filesize = '<joe-uploader-file-label>${filename}</joe-uploader-file-label>';
             if(file.size){
@@ -5403,18 +5431,49 @@ this.renderHTMLContent = function(specs){
             
             
             
+            // Build the label with filename and optional OpenAI file id on a new line
+            label = '<joe-uploader-file-label>'+(file.filename || '')+'</joe-uploader-file-label>';
+            if(file.openai_file_id){
+                label += '<joe-uploader-file-oaid >'+file.openai_file_id+'</joe-uploader-file-oaid>';
+            }
+
+            // Optional file role selector when roles are configured on this uploader
+            var roleSelect = '';
+            if (roles && roles.length) {
+                var currentRole = file.file_role || '';
+                var safeFilename = String(file.filename || '').replace(/'/g, "\\'");
+                var optsHtml = '<option value=""></option>';
+                roles.forEach(function(r){
+                    if (!r || !r.value) { return; }
+                    var lbl = r.label || r.value;
+                    var sel = (currentRole === r.value) ? ' selected' : '';
+                    optsHtml += '<option value="'+r.value.replace(/\"/g,'&quot;')+'"'+sel+'>'+lbl.replace(/</g,'&lt;').replace(/>/g,'&gt;')+'</option>';
+                });
+                var onchange = "_joe.uploaderSetFileRole('"+cuid+"','"+safeFilename+"', this.value)";
+                roleSelect = '<div class=\"joe-uploader-file-role\"><select onchange=\"'+onchange+'\">'+optsHtml+'</select></div>';
+            }
+
             if((file.type && file.type.contains('image')) || (!file.type && (file.url||file.base64).split('.').contains(['jpg','jpeg','png','gif','svg']))){
-                jup_template = '<joe-uploader-file class="'+(file.uploaded && 'uploaded'||'')+'" style="background-image:url(${url}${base64})">'+alink+label+filesize+delete_btn+'</joe-uploader-file>';
+                jup_template = '<joe-uploader-file class="'+(file.uploaded && 'uploaded'||'')+'" style="background-image:url(${url}${base64})">'+alink+label+roleSelect+filesize+delete_btn+'</joe-uploader-file>';
             }else if (docTypes.includes((file.url || file.base64).split('.').pop())) {
                 jup_template = '<joe-uploader-file class="'+(file.uploaded && 'uploaded'||'')+'">'+
                 '<joe-uploader-file-extension >.'+(file.type.split('/')[1] || 'docx')+'</joe-uploader-file-extension>'+
-                alink+label+filesize+delete_btn+'</joe-uploader-file>';
+                alink+label+roleSelect+filesize+delete_btn+'</joe-uploader-file>';
             }else{
                 jup_template = '<joe-uploader-file class="'+(file.uploaded && 'uploaded'||'')+'">'+
                 '<joe-uploader-file-extension >.'+(file.type.split('/')[1] || '???')+'</joe-uploader-file-extension>'+
-                alink+label+filesize+delete_btn+'</joe-uploader-file>';
+                alink+label+roleSelect+filesize+delete_btn+'</joe-uploader-file>';
             }    
-            html += fillTemplate(jup_template,file);
+            // Build optional OpenAI retry/upload button
+            var openaiBtn = '';
+            var needRetry = (!file.openai_file_id || file.openai_status == 'error');
+            var hasUrl = !!file.url;
+            if(hasUrl && needRetry){
+                var openaiLabel = (file.openai_status == 'error') ? 'Retry OpenAI' : 'Upload to OpenAI';
+                var safeFilename = (file.filename || '').replace(/'/g,"\\'");
+                openaiBtn = '<joe-uploader-openai-btn class="joe-button" style="margin-left:6px;" onclick="_joe.SERVER.Plugins.openaiRetryFromUrl(\''+cuid+'\',\''+safeFilename+'\');">'+openaiLabel+'</joe-uploader-openai-btn>';
+            }
+            html += fillTemplate(jup_template,file) + openaiBtn;
         })
         return html+'<div class="clear"></div>';
     }
@@ -5431,7 +5490,7 @@ this.renderHTMLContent = function(specs){
                 $(joe_uploader.dropzone).find('img,div').replaceWith('<img src="' + base64 + '">')
                 //joe_uploader.dropzone.html('<img src="' + base64 + '">');
                 joe_uploader.message.html('<b>'+file.name+'</b> selected');
-                joe_uploader.confirmBtn.removeClass('hidden');
+                joe_uploader.confirmBtn.removeClass('ui-helper-hidden hidden');
             }else {
                 results.innerHTML = 'Nothing to upload.';
             }
@@ -5462,7 +5521,7 @@ this.renderHTMLContent = function(specs){
                 }
                 joe_uploader.files.push(temp_file);
                 $(joe_uploader.preview).html(_renderUploaderFilePreviews(joe_uploader.files,joe_uploader.cuid));
-                joe_uploader.confirmBtn.removeClass('hidden');
+                joe_uploader.confirmBtn.removeClass('ui-helper-hidden hidden');
             }else {
                 results.innerHTML = 'Nothing to upload.';
             }
@@ -5530,6 +5589,20 @@ this.renderHTMLContent = function(specs){
                     var fileobj = joe_uploader.files.where({filename:filename})[0];
                     fileobj.uploaded = new Date();
                     fileobj.url = url;
+                    // Apply captured OpenAI info if present
+                    var key = self.current.object._id + '/' + filename;
+                    var oi = _joe._lastOpenAI && _joe._lastOpenAI[key];
+                    fileobj.openai_purpose = 'assistants';
+                    if(oi){
+                        fileobj.openai_file_id = oi.openai_file_id || null;
+                        fileobj.openai_status = (oi.openai_file_id && 'ok') || (oi.openai_error && 'error') || 'not_uploaded';
+                        fileobj.openai_error = oi.openai_error || null;
+                        if(oi.openai_error){
+                            joe_uploader.message.append('<div>OpenAI error: '+oi.openai_error+'</div>');
+                        }
+                    }else{
+                        fileobj.openai_status = fileobj.openai_status || 'not_uploaded';
+                    }
                     delete fileobj.base64;
                 }
 
@@ -5600,6 +5673,14 @@ this.renderHTMLContent = function(specs){
             self.uploaders[id].dropzone = $(this).find('.joe-uploader-dropzone');
             self.uploaders[id].confirmBtn = $(this).find('.joe-upload-cofirm-button');
 
+			// If there are pending files (not uploaded or missing url), show the confirm button
+			var pending = (self.uploaders[id].files || []).some(function(file){
+				return $c.isObject(file) && (!file.uploaded || !file.url);
+			});
+			if(pending){
+				self.uploaders[id].confirmBtn.removeClass('ui-helper-hidden hidden');
+			}
+
         });
     };
         encapsulateFieldType('uploader',self.renderUploaderField,
@@ -9936,6 +10017,13 @@ logit(intent)
                                 url = prefix+response.Key;
                             }
                             var filename = response.Key.replace(self.current.object._id+'/','');
+                            // Stash OpenAI info for use during finalization
+                            _joe._lastOpenAI = _joe._lastOpenAI || {};
+                            _joe._lastOpenAI[response.Key] = {
+                                openai_file_id: response.openai_file_id,
+                                openai_purpose: response.openai_purpose,
+                                openai_error: response.openai_error
+                            };
                             if(field.url_field){
                                 var nprop = {};
                                 _joe.current.object[field.url_field] = url;
@@ -9960,6 +10048,53 @@ logit(intent)
                     file: { base64:data.base64, extension:data.extension, type:data.contentType, filename: (_joe.current.object._id+data.extension), name: (_joe.current.object._id+data.extension) },
                     field: data.field
                 }, callback);
+            },
+            // Retry uploading a specific file to OpenAI using its URL.
+            // Invoked by the uploader row action.
+            openaiRetryFromUrl:function(uploader_id, filename){
+                try{
+                    var joe_uploader = self.uploaders[uploader_id];
+                    if(!joe_uploader){ return alert('Uploader not found'); }
+                    var file = joe_uploader.files.where({filename:filename})[0];
+                    if(!file){ return alert('File not found'); }
+                    if(!file.url){ return alert('No URL to upload to OpenAI'); }
+                    var btn = $(joe_uploader.preview).find("joe-uploader-openai-btn:contains('"+filename+"')");
+                    joe_uploader.message.append('<div>Uploading to OpenAI...</div>');
+                    $.ajax({
+                        url: (location.port && '//'+__jsc.hostname+':'+__jsc.port+'/API/plugin/chatgpt/filesRetryFromUrl/') || '//'+__jsc.hostname+'/API/plugin/chatgpt/filesRetryFromUrl/',
+                        type:'POST',
+                        data:{
+                            url:file.url,
+                            filename:file.filename,
+                            contentType:file.type
+                        },
+                        success:function(resp){
+                            if(resp && resp.success && resp.openai_file_id){
+                                file.openai_file_id = resp.openai_file_id;
+                                file.openai_purpose = resp.openai_purpose || 'assistants';
+                                file.openai_status = 'ok';
+                                file.openai_error = null;
+                                joe_uploader.message.append('<div>OpenAI file attached</div>');
+                            }else{
+                                file.openai_status = 'error';
+                                file.openai_error = (resp && resp.error) || 'Upload failed';
+                                joe_uploader.message.append('<div>OpenAI error: '+(file.openai_error)+'</div>');
+                            }
+                            // Refresh preview to reflect new status/button
+                            $(joe_uploader.preview).html(_renderUploaderFilePreviews(joe_uploader.files,joe_uploader.cuid));
+                            // Save object so file metadata is persisted
+                            self.updateObject(null, null, true);
+                        },
+                        error:function(xhr,status,err){
+                            var message = (xhr && (xhr.responseJSON && (xhr.responseJSON.error || xhr.responseJSON.code) || xhr.responseText)) || err || status || 'Retry failed';
+                            file.openai_status = 'error';
+                            file.openai_error = message;
+                            joe_uploader.message.append('<div>OpenAI error: '+message+'</div>');
+                        }
+                    });
+                }catch(e){
+                    alert(e && e.message || e);
+                }
             }
         },
         ready:{