json-object-editor 0.10.654 → 0.10.660

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]
@@ -5356,13 +5390,6 @@ this.renderHTMLContent = function(specs){
             ;
         //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){
@@ -5379,8 +5406,9 @@ this.renderHTMLContent = function(specs){
         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 = '';
-        
-        
+        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){
@@ -5409,16 +5437,32 @@ this.renderHTMLContent = function(specs){
                 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>';
             }    
             // Build optional OpenAI retry/upload button
             var openaiBtn = '';