From f9c6ede6a3488a22eda4d7fa903aea89d2212361 Mon Sep 17 00:00:00 2001
From: Jim Myers <qqmyers@hotmail.com>
Date: Fri, 1 May 2026 17:31:35 -0400
Subject: [PATCH 1/6] i18n, fix download, cleanup

---
 previewers/betatest/i18n/en.json      |  37 ++++++
 previewers/betatest/i18n/es.json      |  37 ++++++
 previewers/betatest/i18n/fr.json      |  37 ++++++
 previewers/betatest/js/refiqda.js     |   2 +-
 previewers/betatest/js/refiqdacore.js | 162 +++++++++++++-------------
 previewers/betatest/js/refiqdpx.js    | 108 +++++++++--------
 6 files changed, 253 insertions(+), 130 deletions(-)

diff --git a/previewers/betatest/i18n/en.json b/previewers/betatest/i18n/en.json
index f2c095d..4afd1f6 100644
--- a/previewers/betatest/i18n/en.json
+++ b/previewers/betatest/i18n/en.json
@@ -24,6 +24,43 @@
   "rocratePreviewText": "RO-Crate Preview",
   "refiqdpxPreviewText": "REFI-QDA Project Preview",
   "refiqdcPreviewText": "REFI-QDA Codebook Preview",
+  "refiqdaPreviewText": "REFI-QDA Preview",
+  "refiqdaRedactedNotice": "Note: This is a redacted, public view of the restricted QDAS file",
+  "refiqdaEnableFilteringBy": "Enable Filtering By",
+  "refiqdaFilteringInstructions": "Select a table and then select entries in that table to filter the other tables.",
+  "refiqdaNoFiltering": "No Filtering",
+  "refiqdaParsingProject": "Found Project File. Parsing Contents...",
+  "refiqdaRetrievingFile": "Retrieving File...",
+  "refiqdaExcerptTooltipHeader": "Text Excerpt (Position $1-$2)",
+  "refiqdaWholeDocument": "Whole Document",
+  "refiqdaUsers": "Users",
+  "refiqdaCodes": "Codes",
+  "refiqdaSources": "Sources",
+  "refiqdaSource": "Source",
+  "refiqdaAnnotations": "Annotations",
+  "refiqdaNotes": "Notes",
+  "refiqdaCases": "Cases",
+  "refiqdaSets": "Sets",
+  "refiqdaName": "Name",
+  "refiqdaCode": "Code",
+  "refiqdaDescription": "Description",
+  "refiqdaColor": "Color",
+  "refiqdaCodable": "Codable",
+  "refiqdaUses": "# of Uses",
+  "refiqdaUser": "User",
+  "refiqdaDate": "Date",
+  "refiqdaSelection": "Selection",
+  "refiqdaExcerpt": "Excerpt",
+  "refiqdaGuid": "GUID",
+  "refiqdaText": "Text",
+  "refiqdaFilename": "Filename",
+  "refiqdaType": "Type",
+  "refiqdaContent": "Content",
+  "refiqdaAuthors": "Authors",
+  "refiqdaGraphs": "Graphs",
+  "refiqdaReset": "Reset",
+  "refiqdaNoQdeError": "Unable to continue: No .qde file found in archive",
+  "refiqdaZipReadError": "Zip file structure could not be read ($1). You can still download the zip file.",
   "jupyterPreviewText": "Jupyter Notebook Preview",
   "cdiPreviewText": "CDI Preview",
   "prev": "Previous",
diff --git a/previewers/betatest/i18n/es.json b/previewers/betatest/i18n/es.json
index da1b4d6..5d6ce34 100644
--- a/previewers/betatest/i18n/es.json
+++ b/previewers/betatest/i18n/es.json
@@ -23,6 +23,43 @@
   "rocratePreviewText": "Previsualización de RO-Crate",
   "refiqdpxPreviewText": "Previsualización del proyecto REFI-QDA",
   "refiqdcPreviewText": "Previsualización del libro de códigos REFI-QDA",
+  "refiqdaPreviewText": "Previsualización de REFI-QDA",
+  "refiqdaRedactedNotice": "Nota: Esta es una vista pública redactada del archivo QDAS restringido",
+  "refiqdaEnableFilteringBy": "Habilitar filtrado por",
+  "refiqdaFilteringInstructions": "Seleccione una tabla y luego seleccione entradas en esa tabla para filtrar las otras tablas.",
+  "refiqdaNoFiltering": "Sin filtrado",
+  "refiqdaParsingProject": "Archivo de proyecto encontrado. Analizando contenido...",
+  "refiqdaRetrievingFile": "Recuperando archivo...",
+  "refiqdaExcerptTooltipHeader": "Extracto de texto (Posición $1-$2)",
+  "refiqdaWholeDocument": "Documento completo",
+  "refiqdaUsers": "Usuarios",
+  "refiqdaCodes": "Códigos",
+  "refiqdaSources": "Fuentes",
+  "refiqdaSource": "Fuente",
+  "refiqdaAnnotations": "Anotaciones",
+  "refiqdaNotes": "Notas",
+  "refiqdaCases": "Casos",
+  "refiqdaSets": "Conjuntos",
+  "refiqdaName": "Nombre",
+  "refiqdaCode": "Código",
+  "refiqdaDescription": "Descripción",
+  "refiqdaColor": "Color",
+  "refiqdaCodable": "Codificable",
+  "refiqdaUses": "# de usos",
+  "refiqdaUser": "Usuario",
+  "refiqdaDate": "Fecha",
+  "refiqdaSelection": "Selección",
+  "refiqdaExcerpt": "Extracto",
+  "refiqdaGuid": "GUID",
+  "refiqdaText": "Texto",
+  "refiqdaFilename": "Nombre del archivo",
+  "refiqdaType": "Tipo",
+  "refiqdaContent": "Contenido",
+  "refiqdaAuthors": "Autores",
+  "refiqdaGraphs": "Gráficos",
+  "refiqdaReset": "Restablecer",
+  "refiqdaNoQdeError": "No se puede continuar: no se encontró ningún archivo .qde en el archivo",
+  "refiqdaZipReadError": "No se pudo leer la estructura del archivo Zip ($1). Aún puede descargar el archivo zip.",
   "jupyterPreviewText": "Previsualización de Jupyter Notebook",
   "cdiPreviewText": "Previsualización de CDI",
   "prev": "Anterior",
diff --git a/previewers/betatest/i18n/fr.json b/previewers/betatest/i18n/fr.json
index 373792b..fe15b16 100644
--- a/previewers/betatest/i18n/fr.json
+++ b/previewers/betatest/i18n/fr.json
@@ -24,6 +24,43 @@
   "rocratePreviewText": "Aperçu RO-Crate",
   "refiqdpxPreviewText": "Aperçu  du projet REFI-QDA",
   "refiqdcPreviewText": "Aperçu du codebook REFI-QDA",
+  "refiqdaPreviewText": "Aperçu REFI-QDA",
+  "refiqdaRedactedNotice": "Remarque : il s'agit d'une vue publique expurgée du fichier QDAS restreint",
+  "refiqdaEnableFilteringBy": "Activer le filtrage par",
+  "refiqdaFilteringInstructions": "Sélectionnez un tableau, puis sélectionnez des entrées dans ce tableau pour filtrer les autres tableaux.",
+  "refiqdaNoFiltering": "Pas de filtrage",
+  "refiqdaParsingProject": "Fichier de projet trouvé. Analyse du contenu...",
+  "refiqdaRetrievingFile": "Récupération du fichier...",
+  "refiqdaExcerptTooltipHeader": "Extrait de texte (Position $1-$2)",
+  "refiqdaWholeDocument": "Document entier",
+  "refiqdaUsers": "Utilisateurs",
+  "refiqdaCodes": "Codes",
+  "refiqdaSources": "Sources",
+  "refiqdaSource": "Source",
+  "refiqdaAnnotations": "Annotations",
+  "refiqdaNotes": "Notes",
+  "refiqdaCases": "Cas",
+  "refiqdaSets": "Ensembles",
+  "refiqdaName": "Nom",
+  "refiqdaCode": "Code",
+  "refiqdaDescription": "Description",
+  "refiqdaColor": "Couleur",
+  "refiqdaCodable": "Codable",
+  "refiqdaUses": "# d'utilisations",
+  "refiqdaUser": "Utilisateur",
+  "refiqdaDate": "Date",
+  "refiqdaSelection": "Sélection",
+  "refiqdaExcerpt": "Extrait",
+  "refiqdaGuid": "GUID",
+  "refiqdaText": "Texte",
+  "refiqdaFilename": "Nom du fichier",
+  "refiqdaType": "Type",
+  "refiqdaContent": "Contenu",
+  "refiqdaAuthors": "Auteurs",
+  "refiqdaGraphs": "Graphiques",
+  "refiqdaReset": "Réinitialiser",
+  "refiqdaNoQdeError": "Impossible de continuer : aucun fichier .qde trouvé dans l'archive",
+  "refiqdaZipReadError": "La structure du fichier Zip n'a pas pu être lue ($1). Vous pouvez toujours télécharger le fichier zip.",
   "jupyterPreviewText": "Aperçu Jupyter Notebook",
   "cdiPreviewText": "Aperçu CDI",
   "prev": "Précédent",
diff --git a/previewers/betatest/js/refiqda.js b/previewers/betatest/js/refiqda.js
index b9a047b..81ef434 100644
--- a/previewers/betatest/js/refiqda.js
+++ b/previewers/betatest/js/refiqda.js
@@ -6,7 +6,7 @@ function writeContent(fileUrl, file, title, authors) {
   };  // Custom rules
   wait = $('<div/>').attr('id', 'waiting');
   $('<img/>').width('15%').attr('src', 'images/Loading_icon.gif').attr('id', 'throbber').appendTo(wait);
-  $('<span/>').text('Retrieving File...').appendTo(wait);
+  $('<span/>').text($.i18n('refiqdaRetrievingFile')).appendTo(wait);
   wait.appendTo($('.preview'));
 
   if (fileUrl.includes('auxiliary/qdpx')) {
diff --git a/previewers/betatest/js/refiqdacore.js b/previewers/betatest/js/refiqdacore.js
index 749dbf9..85fda64 100644
--- a/previewers/betatest/js/refiqdacore.js
+++ b/previewers/betatest/js/refiqdacore.js
@@ -22,6 +22,10 @@ $(document).ready(function() {
 function translateBaseHtmlPage() {
   var refiqdaPreviewText = $.i18n("refiqdaPreviewText");
   $('.refiqdaPreviewText').text(refiqdaPreviewText);
+  var refiqdpxPreviewText = $.i18n("refiqdpxPreviewText");
+  $('.refiqdpxPreviewText').text(refiqdpxPreviewText);
+  var refiqdcPreviewText = $.i18n("refiqdcPreviewText");
+  $('.refiqdcPreviewText').text(refiqdcPreviewText);
 }
 
 var zipUrl = '';
@@ -54,7 +58,7 @@ function parseData(data, filejson) {
   $('#waiting').remove();
   wait = $('<div/>').attr('id', 'waiting');
   $('<img/>').width('15%').attr('src', 'images/Loading_icon.gif').appendTo(wait);
-    $('<span/>').text('Found Project File. Parsing Contents...').appendTo(wait);
+    $('<span/>').text($.i18n('refiqdaParsingProject')).appendTo(wait);
   wait.appendTo($('.preview'));
 
   new Promise((resolve) => setTimeout(resolve, 500)).then(() => { parseData2(data) });
@@ -68,25 +72,25 @@ function parseData2(data) {
   xmlDoc = parser.parseFromString(data, "text/xml");
 
   if(redactedMode) {
-    let redactedNotice = $('<h2/>').addClass('redacted-notice').text("Note: This is a redacted, public view of the restricted QDAS file").appendTo($(".preview"));
+    let redactedNotice = $('<h2/>').addClass('redacted-notice').text($.i18n('refiqdaRedactedNotice')).appendTo($(".preview"));
   }
     //Add a Filter By option
   let filterBlock = $('<div/>').width(tableWidth).appendTo($(".preview"));
-  filterBlock.append($("<h2/>").html("Enable Filtering By"));
-  filterBlock.append($("<p/>").html("Select a table and then select entries in that table to filter the other tables."));
+  filterBlock.append($("<h2/>").html($.i18n('refiqdaEnableFilteringBy')));
+  filterBlock.append($("<p/>").html($.i18n('refiqdaFilteringInstructions')));
   filterBlock.append($('<select/>').prop('id', 'filterby'));
-  $('#filterby').append($('<option/>').prop('value', 'None').text('No Filtering'));
+  $('#filterby').append($('<option/>').prop('value', 'None').text($.i18n('refiqdaNoFiltering')));
   //As tables are created, they will be added to the option list here
 
   //User table
   var users = xmlDoc.getElementsByTagName("User");
   if (users != null && users.length > 0) {
-    $('#filterby').append($('<option/>').prop('value', 'Users').text('Users'));
+    $('#filterby').append($('<option/>').prop('value', 'Users').text($.i18n('refiqdaUsers')));
 
     let userBlock = $('<div/>').width(tableWidth).appendTo($(".preview"));
-    userBlock.append($("<h2>").html("Users"));
+    userBlock.append($("<h2>").html($.i18n('refiqdaUsers')));
     //Users only has a "Name" column
-    let userTable = createTable("Users", "Name").appendTo(userBlock);
+    let userTable = createTable($.i18n('refiqdaUsers'), $.i18n('refiqdaName')).appendTo(userBlock);
     userTable.attr('id', 'usertable');
     userTable.addClass("usertable compact stripe");
 
@@ -112,7 +116,7 @@ function parseData2(data) {
   console.log("Starting codes");
   var codes = xmlDoc.getElementsByTagName("Code");
   if (codes != null  && codes.length > 0) {
-    $('#filterby').append($('<option/>').prop('value', 'Codes').text('Codes'));
+    $('#filterby').append($('<option/>').prop('value', 'Codes').text($.i18n('refiqdaCodes')));
 
     // Check if any codes have a color attribute
     let hasColorAttribute = false;
@@ -134,13 +138,13 @@ function parseData2(data) {
     }
 
     let codeBlock = $('<div/>').width(tableWidth).appendTo($(".preview"));
-    codeBlock.append($("<h2/>").html("Codes"));
+    codeBlock.append($("<h2/>").html($.i18n('refiqdaCodes')));
     // Create table with or without Color column based on whether color attributes exist
     let codeTable;
     if (hasColorAttribute) {
-      codeTable = createTable("Codes", "Code", "Description", "Color", "Codable", "# of Uses").appendTo(codeBlock);
+      codeTable = createTable($.i18n('refiqdaCodes'), $.i18n('refiqdaCode'), $.i18n('refiqdaDescription'), $.i18n('refiqdaColor'), $.i18n('refiqdaCodable'), $.i18n('refiqdaUses')).appendTo(codeBlock);
     } else {
-      codeTable = createTable("Codes", "Code", "Description", "Codable", "# of Uses").appendTo(codeBlock);
+      codeTable = createTable($.i18n('refiqdaCodes'), $.i18n('refiqdaCode'), $.i18n('refiqdaDescription'), $.i18n('refiqdaCodable'), $.i18n('refiqdaUses')).appendTo(codeBlock);
     }
     codeTable.attr('id', 'codetable');
     codeTable.addClass("codetable compact stripe");
@@ -311,7 +315,7 @@ function parseData2(data) {
               }
 
               annotationRows.push({
-                sourceRef: createSourceReference(source, zipUrl),
+                sourceRef: createSourceReference(source),
                 type: source.nodeName,
                 name: displayName,
                 codes: codes,
@@ -323,9 +327,9 @@ function parseData2(data) {
 
           // Add whole document entry to sources
           sourceRows.push({
-            sourceRef: createSourceReference(source, zipUrl),
+            sourceRef: createSourceReference(source),
             type: source.nodeName,
-            name: "Whole Document",
+            name: $.i18n('refiqdaWholeDocument'),
             codes: "",
             guid: source.getAttribute("guid"),
             matches: sourceMatches
@@ -336,11 +340,11 @@ function parseData2(data) {
 
       // Create Annotations table if there are any annotations
       if (annotationRows.length > 0) {
-          $('#filterby').append($('<option/>').prop('value', 'Annotations').text('Annotations'));
+          $('#filterby').append($('<option/>').prop('value', 'Annotations').text($.i18n('refiqdaAnnotations')));
 
           let annotationBlock = $('<div/>').width(tableWidth).appendTo($(".preview"));
-          annotationBlock.append($("<h2/>").html("Annotations"));
-          let annotationTable = createTable("Annotations", "Filename", "Type", "Selection", "Codes").appendTo(annotationBlock);
+          annotationBlock.append($("<h2/>").html($.i18n('refiqdaAnnotations')));
+          let annotationTable = createTable($.i18n('refiqdaAnnotations'), $.i18n('refiqdaFilename'), $.i18n('refiqdaType'), $.i18n('refiqdaSelection'), $.i18n('refiqdaCodes')).appendTo(annotationBlock);
           annotationTable.addClass("annotationtable compact stripe");
 
           annotationRows.forEach(function(rowData) {
@@ -356,26 +360,16 @@ function parseData2(data) {
           // Initialize tooltips after table is created (ONLY for annotations table)
           initializeExcerptTooltips();
 
-          if (typeof downloadFile === 'function') {
-              $("a[data-entry-index]").click(downloadFile);
-              $('.annotationtable').on('draw.dt', function() {
-                  $("a[data-entry-index]").off('click');
-                  $("a[data-entry-index]").click(downloadFile);
-                  // Reinitialize tooltips after redraw (ONLY for annotations)
-                  initializeExcerptTooltips();
-              });
-          }
-
           tables.push(annotationDataTable);
       }
 
       // Create Sources table if there are any sources
       if (sourceRows.length > 0) {
-        $('#filterby').append($('<option/>').prop('value', 'Sources').text('Sources'));
+        $('#filterby').append($('<option/>').prop('value', 'Sources').text($.i18n('refiqdaSources')));
 
         let sourceBlock = $('<div/>').width(tableWidth).appendTo($(".preview"));
-        sourceBlock.append($("<h2/>").html("Sources"));
-        let sourceTable = createTable("Sources", "Filename", "Type", "Selection", "Codes").appendTo(sourceBlock);
+        sourceBlock.append($("<h2/>").html($.i18n('refiqdaSources')));
+        let sourceTable = createTable($.i18n('refiqdaSources'), $.i18n('refiqdaFilename'), $.i18n('refiqdaType'), $.i18n('refiqdaSelection'), $.i18n('refiqdaCodes')).appendTo(sourceBlock);
         sourceTable.addClass("sourcetable compact stripe");
 
         sourceRows.forEach(function(rowData) {
@@ -385,7 +379,7 @@ function parseData2(data) {
         });
 
         sourceDataTable = new DataTable(".sourcetable", {
-         select: $('#filterby').val() == 'Sources',
+          select: $('#filterby').val() == 'Sources',
           order: [[0, 'asc']],
           columnDefs: [
             {
@@ -400,14 +394,6 @@ function parseData2(data) {
           ]
         });
 
-        if (typeof downloadFile === 'function') {
-          $("a[data-entry-index]").click(downloadFile);
-          $('.sourcetable').on('draw.dt', function() {
-            $("a[data-entry-index]").off('click');
-            $("a[data-entry-index]").click(downloadFile);
-          });
-        }
-
         tables.push(sourceDataTable);
       }
 
@@ -418,10 +404,10 @@ function parseData2(data) {
   var notes = xmlDoc.getElementsByTagName("Note");
 
   if (notes != null && notes.length > 0) {
-    $('#filterby').append($('<option/>').prop('value', 'Notes').text('Notes'));
+    $('#filterby').append($('<option/>').prop('value', 'Notes').text($.i18n('refiqdaNotes')));
     let noteBlock = $('<div/>').width(tableWidth).appendTo($(".preview"));
-    noteBlock.append($("<h2/>").html("Notes"));
-    let noteTable = createTable("Notes", "Name", "Content", "Description", "Authors").appendTo(noteBlock);
+    noteBlock.append($("<h2/>").html($.i18n('refiqdaNotes')));
+    let noteTable = createTable($.i18n('refiqdaNotes'), $.i18n('refiqdaName'), $.i18n('refiqdaContent'), $.i18n('refiqdaDescription'), $.i18n('refiqdaAuthors')).appendTo(noteBlock);
     noteTable.addClass("notetable compact stripe");
 
     for (let note of notes) {
@@ -476,7 +462,7 @@ function parseData2(data) {
 
   if (variables.length > 0 && cases.length > 0) {
     let variableMap = new Map();
-    let variableHeaders = ["Source"]; // First column is the source document
+    let variableHeaders = [$.i18n('refiqdaSource')]; // First column is the source document
 
     for (let variable of variables) {
       let guid = variable.getAttribute("guid");
@@ -487,8 +473,8 @@ function parseData2(data) {
     }
 
     let caseBlock = $('<div/>').width(tableWidth).appendTo($(".preview"));
-    caseBlock.append($("<h2/>").html("Cases"));
-    let caseTable = createTable("Cases", ...variableHeaders).appendTo(caseBlock);
+    caseBlock.append($("<h2/>").html($.i18n('refiqdaCases')));
+    let caseTable = createTable($.i18n('refiqdaCases'), ...variableHeaders).appendTo(caseBlock);
     caseTable.addClass("casetable compact stripe");
 
     for (let caseNode of cases) {
@@ -500,7 +486,7 @@ function parseData2(data) {
         let sourceGuid = sourceRef.getAttribute("targetGUID");
         let source = sourceMap.get(sourceGuid);
         if (source) {
-          rowData[0] = createSourceReference(source, zipUrl);
+          rowData[0] = createSourceReference(source);
         }
       }
 
@@ -529,10 +515,10 @@ function parseData2(data) {
  
   let sets = xmlDoc.getElementsByTagName("Set");
   if (sets != null && sets.length > 0) {
-    $('#filterby').append($('<option/>').prop('value', 'Sets').text('Sets'));
+    $('#filterby').append($('<option/>').prop('value', 'Sets').text($.i18n('refiqdaSets')));
     let setBlock = $('<div/>').width(tableWidth).appendTo($(".preview"));
-    setBlock.append($("<h2/>").html("Sets"));
-    let setTable = createTable("Sets", "Name", "Sources", "Codes").appendTo(setBlock);
+    setBlock.append($("<h2/>").html($.i18n('refiqdaSets')));
+    let setTable = createTable($.i18n('refiqdaSets'), $.i18n('refiqdaName'), $.i18n('refiqdaSources'), $.i18n('refiqdaCodes')).appendTo(setBlock);
     setTable.addClass("settable compact stripe");
 
     for (let set of sets) {
@@ -574,7 +560,7 @@ function parseData2(data) {
     let graphs = xmlDoc.getElementsByTagName("Graph");
     if (graphs != null && graphs.length > 0) {
       let graphBlock = $('<div/>').width(tableWidth).appendTo($(".preview"));
-      graphBlock.append($("<h2/>").html("Graphs").append($('<span/>').attr('id', 'reset').text('Reset').addClass('btn btn-default')));
+      graphBlock.append($("<h2/>").html($.i18n('refiqdaGraphs')).append($('<span/>').attr('id', 'reset').text($.i18n('refiqdaReset')).addClass('btn btn-default')));
 
       let elements = [];
       for (let graph of graphs) {
@@ -862,8 +848,8 @@ function addRow(table, ...values) {
   let tr = $('<tr/>');
   values.forEach(function(value) {
     let td = $('<td/>');
-    // Check if value is a jQuery object
-    if (value instanceof jQuery) {
+    // Check if value is a jQuery object or a DOM element
+    if (value instanceof jQuery || (typeof HTMLElement !== 'undefined' && value instanceof HTMLElement)) {
       td.append(value);
     } else {
       td.html(value || '');
@@ -1180,7 +1166,7 @@ function formatExcerptTooltip(excerpt, startPos, endPos) {
     return `
         <div style="padding: 8px; font-family: sans-serif;">
             <div style="font-weight: bold; margin-bottom: 6px; font-size: 11px; color: #999; border-bottom: 1px solid #ddd; padding-bottom: 4px;">
-                Text Excerpt (Position ${startPos}-${endPos})
+                ${$.i18n('refiqdaExcerptTooltipHeader', startPos, endPos)}
             </div>
             <div style="font-size: 13px; line-height: 1.5; max-height: 200px; overflow-y: auto; white-space: pre-wrap; word-wrap: break-word;">
                 "${displayExcerpt}"
@@ -1272,15 +1258,19 @@ async function loadTextExcerpt(plainTextPath, startPos, endPos, sourceGuid) {
 
         // For zip mode, use the fetchTextExcerpt function from refiqdpx.js
         if (isZipMode() && typeof fetchTextExcerpt === 'function') {
-            // fetchTextExcerpt already handles the substring extraction
-            let bagPath = plainTextPath.replace("internal://","sources/");
-            const excerpt = await fetchTextExcerpt(bagPath, startPos, endPos);
-            
-            // Note: We're not caching here because fetchTextExcerpt is efficient
-            // and only fetches the bytes we need. If you want to cache full files
-            // for multiple excerpts from the same file, you'd need to modify
-            // fetchTextExcerpt to optionally return the full text
-            return excerpt;
+            const finalPath = typeof resolveInternalZipPaths === 'function' ? resolveInternalZipPaths(plainTextPath) : plainTextPath.replace("internal://", "sources/");
+            if (finalPath) {
+                try {
+                    // Note: We're not caching here because fetchTextExcerpt is efficient
+                    // and only fetches the bytes we need. If you want to cache full files
+                    // for multiple excerpts from the same file, you'd need to modify
+                    // fetchTextExcerpt to optionally return the full text
+                    return await fetchTextExcerpt(finalPath, startPos, endPos);
+                } catch (e) {
+                    console.debug(`File not found at ${finalPath}`);
+                }
+            }
+            return null;
         } else {
             // Fallback for non-zip mode (direct file access)
             const response = await fetch(plainTextPath);
@@ -1305,21 +1295,6 @@ async function loadTextExcerpt(plainTextPath, startPos, endPos, sourceGuid) {
 function redactSources(guidsToRedact) {
   console.log("Redacting sources with GUIDs:", guidsToRedact);
 
-  // Find the paths of the source files to remove from the zip archive.
-  const pathsToRemove = new Set();
-  for (const guid of guidsToRedact) {
-    const sourceElement = xmlDoc.querySelector(`[guid="${guid}"]`);
-    if (sourceElement) {
-      const plainTextPath = sourceElement.getAttribute("plainTextPath");
-      if (plainTextPath) {
-        // The path in the zip is typically "sources/..."
-        pathsToRemove.add(plainTextPath.replace("internal://", ""));
-      }
-    }
-  }
-  console.log("Paths to remove from zip:", Array.from(pathsToRemove));
-
-
   let redactedXmlDoc = xmlDoc.cloneNode(true);
 
   for (const guid of guidsToRedact) {
@@ -1337,13 +1312,40 @@ function redactSources(guidsToRedact) {
   if (isZipMode() && typeof zip !== 'undefined') {
     // Use an async function to handle zip operations
     (async () => {
- try {
+      try {
+        // Find the paths of the source files to remove from the zip archive.
+        const pathsToRemove = new Set();
+        for (const guid of guidsToRedact) {
+          const sourceElement = xmlDoc.querySelector(`[guid="${guid}"]`);
+          if (sourceElement) {
+            // Check various path attributes
+            ["path", "plainTextPath", "richTextPath"].forEach(attr => {
+              const val = sourceElement.getAttribute(attr);
+              if (val) {
+                const p = typeof resolveInternalZipPaths === 'function' ? resolveInternalZipPaths(val) : val.replace("internal://", "sources/");
+                if (p) pathsToRemove.add(p);
+              }
+            });
+
+            // Check for paths in Representations
+            const representations = sourceElement.querySelectorAll('Representation');
+            representations.forEach(rep => {
+              const ptp = rep.getAttribute("plainTextPath");
+              if (ptp) {
+                const p = typeof resolveInternalZipPaths === 'function' ? resolveInternalZipPaths(ptp) : ptp.replace("internal://", "sources/");
+                if (p) pathsToRemove.add(p);
+              }
+            });
+          }
+        }
+        console.log("Paths to remove from zip:", Array.from(pathsToRemove));
+
         // Fetch the original zip file as a blob on-demand
         const zipResponse = await fetch(zipUrl);
         if (!zipResponse.ok) {
           throw new Error(`HTTP error! status: ${zipResponse.status}`);
         }
-        zipFileBlob = await zipResponse.blob();
+        const zipFileBlob = await zipResponse.blob();
 
         // 1. Create a new zip archive
         const zipWriter = new zip.ZipWriter(new zip.BlobWriter("application/x-zip-refiqda"));
diff --git a/previewers/betatest/js/refiqdpx.js b/previewers/betatest/js/refiqdpx.js
index faf6f66..7ff8252 100644
--- a/previewers/betatest/js/refiqdpx.js
+++ b/previewers/betatest/js/refiqdpx.js
@@ -14,11 +14,13 @@ function writeContent(fileUrl, file, title, authors) {
 
 let entries;
 const entryMap = {};
+var sourcesPathPrefix = "sources/";
+
 
 async function readZip(fileUrl, file) {
         wait = $('<div/>').attr('id', 'waiting');
         $('<img/>').width('15%').attr('src','images/Loading_icon.gif').attr('id','throbber').appendTo(wait);
-        $('<span/>').text(' Reading QPDX file. Parsing Contents...').appendTo(wait);
+        $('<span/>').text($.i18n('refiqdaParsingProject')).appendTo(wait);
         wait.appendTo($('.preview'));
 
     try {
@@ -33,7 +35,11 @@ async function readZip(fileUrl, file) {
         // get all entries from the zip
         entries = await reader.getEntries();
         if (entries.length) {
-
+            const hasUpperCase = entries.some(entry => entry.filename.startsWith('Sources/'));
+            if (hasUpperCase) {
+                sourcesPathPrefix = 'Sources/';
+                console.log("Detected sources path prefix:", sourcesPathPrefix);
+            }
 
             // First pass: Find and process the .qde file
             const qdeEntry = entries.find(entry => entry.filename.endsWith('.qde'));
@@ -49,7 +55,7 @@ async function readZip(fileUrl, file) {
                   },
                 });
                 projectBlob.then(text => parseData(text, file)).catch((err)=> {
-                    document.getElementById('waiting').innerHTML= "<span>Unable to continue: " + err + "</span>";
+                    document.getElementById('waiting').innerHTML= "<span>" + $.i18n('errorText') + err + "</span>";
                 });
 
                 // Second pass: Build entry map for all other files
@@ -59,7 +65,7 @@ async function readZip(fileUrl, file) {
                     }
                 });
             } else {
-                document.getElementById('waiting').innerHTML= "<span>Unable to continue: No .qde file found in archive</span>";
+                document.getElementById('waiting').innerHTML= "<span>" + $.i18n('refiqdaNoQdeError') + "</span>";
             }
         }
 
@@ -69,10 +75,9 @@ async function readZip(fileUrl, file) {
     }
     catch (err) {
         //Display error message
-        const errorMsg = document.createTextNode("Zip file structure could not be read (" + err + "). You can still download the zip file.");
-        document.getElementById('waiting').innerHTML="<span>Unable to continue: " + errorMsg + "</span>";
+        const errorMsg = $.i18n('refiqdaZipReadError', err);
+        document.getElementById('waiting').innerHTML="<span>" + errorMsg + "</span>";
         console.log(err);
-
     }
     finally {
         //remove throbber
@@ -110,56 +115,61 @@ async function fetchTextExcerpt(entryFilename, startPos, endPos) {
     }
 }
 
-async function downloadFile(event) {
-    const target = event.currentTarget;
-    let href = target.getAttribute("href");
-    if (target.dataset.entryIndex !== undefined && !target.download) {
-            console.log('Downloading');
-        target.removeAttribute("href");
-        event.preventDefault();
-        try {
-            await download(entries[Number(target.dataset.entryIndex)], target.parentElement, target);
-            href = target.getAttribute("href");
-        } catch (error) {
-            alert(error);
-        }
-        target.setAttribute("href", href);
-    }
-}
+/**
+ * Resolves an internal URI (e.g., "internal://file.txt") to the correct path within the ZIP archive.
+ * Standard QDPX stores files under "sources/", but we handle both for robustness and case sensitivity.
+ * @param {string} uri The URI to resolve.
+ * @returns {string|null} The resolved path in the ZIP, or null if not found.
+ */
+function resolveInternalZipPaths(uri) {
+    if (!uri) return null;
+    if (!uri.startsWith("internal://")) return uri;
 
-async function download(entry, li, a) {
-    const parentCell = $(a).closest('td');
-    if (!parentCell.hasClass("busy")) {
+    const relativePath = uri.substring(11); // Remove "internal://"
 
-        const controller = new AbortController();
-        const signal = controller.signal;
+    // 1. Try with the detected/default prefix
+    let path = sourcesPathPrefix + relativePath;
+    if (entryMap[path] !== undefined) return path;
 
-        parentCell.addClass("busy");
-        try {
-            const blobURL = URL.createObjectURL(await entry.getData(new zip.BlobWriter(), {
-                onprogress: (index, max) => {
+    // 2. Try without any prefix
+    if (entryMap[relativePath] !== undefined) return relativePath;
 
-                    const percent = Math.round(index/max*100);
-                    console.log(index + "   " + max  + "   " + percent);
-                    //setProgressBarValue(percent);
+    // 3. Try with the alternative prefix (just in case)
+    const altPrefix = sourcesPathPrefix === "sources/" ? "Sources/" : "sources/";
+    path = altPrefix + relativePath;
+    if (entryMap[path] !== undefined) return path;
 
-                },
-            }))
-            var index = a.getAttribute("data-entry-index");
-            console.log("index: " + index);
+    // 4. Return null if not found in archive
+    return null;
+}
 
-            const filename = a.getAttribute("data-entry-name");
+async function downloadSourceFile(sourceGuid, path) {
+    const finalPath = resolveInternalZipPaths(path);
+    const entryIndex = finalPath ? entryMap[finalPath] : undefined;
 
-            $("a[data-entry-index='" + index + "']").attr('href',blobURL);
-             $("a[data-entry-index='" + index + "']").attr('download', filename || a.text);
-            const clickEvent = new MouseEvent("click");
-            a.dispatchEvent(clickEvent);
+    if (entryIndex !== undefined) {
+        const entry = entries[entryIndex];
+        try {
+            const blobURL = URL.createObjectURL(await entry.getData(new zip.BlobWriter()));
+            const filename = finalPath.split('/').pop();
+            const tempLink = document.createElement('a');
+            tempLink.href = blobURL;
+            tempLink.download = filename;
+            tempLink.style.display = 'none';
+            document.body.appendChild(tempLink);
+            tempLink.click();
+            document.body.removeChild(tempLink);
+            setTimeout(() => URL.revokeObjectURL(blobURL), 10000);
         } catch (error) {
-            if (error.message != zip.ERR_ABORT) {
-                throw error;
-            }
-        } finally {
-            parentCell.removeClass("busy");
+            console.error('Download failed:', error);
+            alert('Download failed: ' + error);
         }
+    } else {
+        console.error('File not found in archive:', path);
+        alert('File not found in archive: ' + path);
     }
 }
+
+async function setProgressBarValue(val) {
+    // Dummy function since we don't have a progress bar in the UI yet
+}

From 2af6d9769929b349c88a1de94431c62f819bf170 Mon Sep 17 00:00:00 2001
From: Jim Myers <qqmyers@hotmail.com>
Date: Wed, 6 May 2026 10:31:29 -0400
Subject: [PATCH 2/6] initial code redaction

---
 previewers/betatest/i18n/en.json      |   5 +
 previewers/betatest/i18n/es.json      |   5 +
 previewers/betatest/i18n/fr.json      |   5 +
 previewers/betatest/js/refiqdacore.js | 222 ++++++++++++++++++++++++--
 4 files changed, 225 insertions(+), 12 deletions(-)

diff --git a/previewers/betatest/i18n/en.json b/previewers/betatest/i18n/en.json
index 4afd1f6..6daad7d 100644
--- a/previewers/betatest/i18n/en.json
+++ b/previewers/betatest/i18n/en.json
@@ -61,6 +61,11 @@
   "refiqdaReset": "Reset",
   "refiqdaNoQdeError": "Unable to continue: No .qde file found in archive",
   "refiqdaZipReadError": "Zip file structure could not be read ($1). You can still download the zip file.",
+  "refiqdaRedact": "Redact",
+  "refiqdaRedactSourceTooltip": "Create a redacted version of the datafile with the selected sources, and any related annotations, removed.",
+  "refiqdaRedactCodeTooltip": "Create a redacted version of the datafile with the selected codes, and any related annotations, removed.",
+  "refiqdaRedactSuccess": "Redacted file has been successfully uploaded to Dataverse.",
+  "refiqdaRedactError": "An error occurred during the redaction process: $1",
   "jupyterPreviewText": "Jupyter Notebook Preview",
   "cdiPreviewText": "CDI Preview",
   "prev": "Previous",
diff --git a/previewers/betatest/i18n/es.json b/previewers/betatest/i18n/es.json
index 5d6ce34..f8198b4 100644
--- a/previewers/betatest/i18n/es.json
+++ b/previewers/betatest/i18n/es.json
@@ -60,6 +60,11 @@
   "refiqdaReset": "Restablecer",
   "refiqdaNoQdeError": "No se puede continuar: no se encontró ningún archivo .qde en el archivo",
   "refiqdaZipReadError": "No se pudo leer la estructura del archivo Zip ($1). Aún puede descargar el archivo zip.",
+  "refiqdaRedact": "Redactar",
+  "refiqdaRedactSourceTooltip": "Cree una versión redactada del archivo de datos con las fuentes seleccionadas y cualquier anotación relacionada eliminadas.",
+  "refiqdaRedactCodeTooltip": "Cree una versión redactada del archivo de datos con los códigos seleccionados y cualquier anotación relacionada eliminadas.",
+  "refiqdaRedactSuccess": "El archivo redactado se ha cargado correctamente en Dataverse.",
+  "refiqdaRedactError": "Se produjo un error durante el proceso de redacción: $1",
   "jupyterPreviewText": "Previsualización de Jupyter Notebook",
   "cdiPreviewText": "Previsualización de CDI",
   "prev": "Anterior",
diff --git a/previewers/betatest/i18n/fr.json b/previewers/betatest/i18n/fr.json
index fe15b16..3db7e85 100644
--- a/previewers/betatest/i18n/fr.json
+++ b/previewers/betatest/i18n/fr.json
@@ -61,6 +61,11 @@
   "refiqdaReset": "Réinitialiser",
   "refiqdaNoQdeError": "Impossible de continuer : aucun fichier .qde trouvé dans l'archive",
   "refiqdaZipReadError": "La structure du fichier Zip n'a pas pu être lue ($1). Vous pouvez toujours télécharger le fichier zip.",
+  "refiqdaRedact": "Expurger",
+  "refiqdaRedactSourceTooltip": "Créez une version expurgée du fichier de données en supprimant les sources sélectionnées et toutes les annotations associées.",
+  "refiqdaRedactCodeTooltip": "Créez une version expurgée du fichier de données en supprimant les codes sélectionnés et toutes les annotations associées.",
+  "refiqdaRedactSuccess": "Le fichier expurgé a été téléchargé avec succès sur Dataverse.",
+  "refiqdaRedactError": "Une erreur s'est produite lors du processus d'expurgation : $1",
   "jupyterPreviewText": "Aperçu Jupyter Notebook",
   "cdiPreviewText": "Aperçu CDI",
   "prev": "Précédent",
diff --git a/previewers/betatest/js/refiqdacore.js b/previewers/betatest/js/refiqdacore.js
index 85fda64..45119c7 100644
--- a/previewers/betatest/js/refiqdacore.js
+++ b/previewers/betatest/js/refiqdacore.js
@@ -181,6 +181,30 @@ function parseData2(data) {
         select: $('#filterby').val() == 'Codes'
     };
 
+    if ($('#filterby').val() == 'Codes') {
+        dataTableConfig.layout = {
+            top2End: 'buttons'
+        };
+        dataTableConfig.buttons = [
+            'selectAll', 
+            'selectNone',
+            {
+                text: $.i18n('refiqdaRedact'),
+                className: 'redact-btn',
+                titleAttr: $.i18n('refiqdaRedactCodeTooltip'),
+                action: function ( e, dt, node, config ) {
+                    let selectedRows = dt.rows( { selected: true } );
+                    let codeGuids = [];
+                    selectedRows.nodes().to$().each(function() {
+                        codeGuids.push($(this).data('guid'));
+                    });
+                    redactCodes(codeGuids);
+                },
+                enabled: false
+            }
+        ];
+    }
+
     if (hasColorAttribute) {
         dataTableConfig.columnDefs = [
             {
@@ -236,6 +260,13 @@ function parseData2(data) {
     dataTableConfig.order = [[usesColumnIndex, "desc"]];
     codeDataTable = new DataTable(".codetable", dataTableConfig);
 
+    if ($('#filterby').val() == 'Codes') {
+        codeDataTable.on('select deselect', function () {
+            var selectedRows = codeDataTable.rows({ selected: true }).count();
+            codeDataTable.button('.redact-btn').enable(selectedRows > 0);
+        });
+    }
+
     tables.push(codeDataTable);
   }
 
@@ -663,6 +694,31 @@ $("#filterby")
         let codeConfig = {
           select: $('#filterby').val() == 'Codes'
         };
+
+        if ($('#filterby').val() == 'Codes') {
+            codeConfig.layout = {
+                top2End: 'buttons'
+            };
+            codeConfig.buttons = [
+                'selectAll', 
+                'selectNone',
+                {
+                    text: $.i18n('refiqdaRedact'),
+                    className: 'redact-btn',
+                    titleAttr: $.i18n('refiqdaRedactCodeTooltip'),
+                    action: function ( e, dt, node, config ) {
+                        let selectedRows = dt.rows( { selected: true } );
+                        let codeGuids = [];
+                        selectedRows.nodes().to$().each(function() {
+                            codeGuids.push($(this).data('guid'));
+                        });
+                        redactCodes(codeGuids);
+                    },
+                    enabled: false
+                }
+            ];
+        }
+
         if (hasColorColumn) {
           codeConfig.columnDefs = [
             {
@@ -719,6 +775,14 @@ $("#filterby")
             codeConfig.order = [[usesColumnIndex, "desc"]];
         }
         codeDataTable = new DataTable(".codetable", codeConfig);
+
+        if ($('#filterby').val() == 'Codes') {
+            codeDataTable.on('select deselect', function () {
+                var selectedRows = codeDataTable.rows({ selected: true }).count();
+                codeDataTable.button('.redact-btn').enable(selectedRows > 0);
+            });
+        }
+
         attachFilterHandler(codeDataTable);
         codeDataTable.draw();
         tables.push(codeDataTable);
@@ -754,9 +818,9 @@ $("#filterby")
             'selectAll', 
             'selectNone',
             {
-              text: 'Redact',
+              text: $.i18n('refiqdaRedact'),
               className: 'redact-btn',
-              titleAttr: 'Create a redacted version of the datafile with the selected sources, and any related annotations, removed.',
+              titleAttr: $.i18n('refiqdaRedactSourceTooltip'),
               action: function ( e, dt, node, config ) {
                 let selectedRows = dt.rows( { selected: true } );
                 let sourceGuids = [];
@@ -1292,20 +1356,57 @@ async function loadTextExcerpt(plainTextPath, startPos, endPos, sourceGuid) {
     }
 }
 
-function redactSources(guidsToRedact) {
-  console.log("Redacting sources with GUIDs:", guidsToRedact);
-
-  let redactedXmlDoc = xmlDoc.cloneNode(true);
-
+function removeSourcesFromXml(targetXmlDoc, guidsToRedact) {
   for (const guid of guidsToRedact) {
     // Find any source element by its GUID and remove it.
     // This will also remove all its children, including annotations.
-    let sourceElement = redactedXmlDoc.querySelector('[guid="' + guid + '"]');
+    let sourceElement = targetXmlDoc.querySelector('[guid="' + guid + '"]');
     if (sourceElement && sourceElement.parentNode) {
       sourceElement.parentNode.removeChild(sourceElement);
       console.log("Removed source element and its annotations with GUID:", guid);
     }
   }
+}
+
+function removeCodesFromXml(targetXmlDoc, guidsToRedact) {
+  for (const guid of guidsToRedact) {
+    // 1. Find and remove the Code element
+    let codeElement = targetXmlDoc.querySelector('Code[guid="' + guid + '"]');
+    if (codeElement && codeElement.parentNode) {
+      codeElement.parentNode.removeChild(codeElement);
+      console.log("Removed code element with GUID:", guid);
+    }
+
+    // 2. Find and remove all CodeRef elements pointing to this code
+    let codeRefs = targetXmlDoc.querySelectorAll('CodeRef[targetGUID="' + guid + '"]');
+    codeRefs.forEach(codeRef => {
+      // Find the parent annotation
+      let annotation = codeRef.parentNode;
+      while (annotation && annotation.nodeName !== 'Annotation') {
+          annotation = annotation.parentNode;
+      }
+
+      if (codeRef.parentNode) {
+        codeRef.parentNode.removeChild(codeRef);
+      }
+      
+      // 3. Remove any annotations that only used that code (now have no CodeRefs)
+      if (annotation) {
+        let remainingCodeRefs = annotation.querySelectorAll('CodeRef');
+        if (remainingCodeRefs.length === 0 && annotation.parentNode) {
+          annotation.parentNode.removeChild(annotation);
+          console.log("Removed annotation that has no remaining codes.");
+        }
+      }
+    });
+  }
+}
+
+function redactSources(guidsToRedact) {
+  console.log("Redacting sources with GUIDs:", guidsToRedact);
+
+  let redactedXmlDoc = xmlDoc.cloneNode(true);
+  removeSourcesFromXml(redactedXmlDoc, guidsToRedact);
 
   const redactedXmlString = new XMLSerializer().serializeToString(redactedXmlDoc);
 
@@ -1398,11 +1499,11 @@ function redactSources(guidsToRedact) {
 
         const responseData = await response.json();
         console.log("Upload successful:", responseData);
-        alert("Redacted file has been successfully uploaded to Dataverse.");
+        alert($.i18n('refiqdaRedactSuccess'));
 
       } catch (error) {
         console.error("Error during redaction and upload:", error);
-        alert(`An error occurred during the redaction process: ${error.message}`);
+        alert($.i18n('refiqdaRedactError', error.message));
       }
     })();
   } else {
@@ -1437,11 +1538,108 @@ function redactSources(guidsToRedact) {
 
         const responseData = await response.json();
         console.log("Upload successful:", responseData);
-        alert("Redacted file has been successfully uploaded to Dataverse.");
+        alert($.i18n('refiqdaRedactSuccess'));
+
+      } catch (error) {
+        console.error("Error during redaction and upload:", error);
+        alert($.i18n('refiqdaRedactError', error.message));
+      }
+    })();
+  }
+}
+
+function redactCodes(guidsToRedact) {
+  console.log("Redacting codes with GUIDs:", guidsToRedact);
+
+  let redactedXmlDoc = xmlDoc.cloneNode(true);
+  removeCodesFromXml(redactedXmlDoc, guidsToRedact);
+
+  const redactedXmlString = new XMLSerializer().serializeToString(redactedXmlDoc);
+
+  if (isZipMode() && typeof zip !== 'undefined') {
+    (async () => {
+      try {
+        // Fetch the original zip file as a blob on-demand
+        const zipResponse = await fetch(zipUrl);
+        if (!zipResponse.ok) {
+          throw new Error(`HTTP error! status: ${zipResponse.status}`);
+        }
+        const zipFileBlob = await zipResponse.blob();
+
+        const zipWriter = new zip.ZipWriter(new zip.BlobWriter("application/x-zip-refiqda"));
+        const zipReader = new zip.ZipReader(new zip.BlobReader(zipFileBlob));
+        const entries = await zipReader.getEntries();
+
+        for (const entry of entries) {
+          if (entry.filename === "project.qde") {
+            continue;
+          }
+          await zipWriter.add(entry.filename, new zip.BlobReader(await entry.getData(new zip.BlobWriter())));
+        }
+
+        await zipWriter.add("project.qde", new zip.TextReader(redactedXmlString));
+        const redactedZipBlob = await zipWriter.close();
+
+        const formData = new FormData();
+        const originalFilename = file.filename || "project.qdpx";
+        const redactedFilename = originalFilename.replace(/(\.qdpx)?$/, '-redacted.qdpx');
+
+        formData.append("file", redactedZipBlob, redactedFilename);
+        formData.append("origin", "qdas");
+        formData.append("isPublic", "true");
+        formData.append("type", "qda");
+
+        console.log(`Uploading redacted file: ${redactedFilename}`);
+        const response = await fetch(queryParams.signedUrls.uploadRedactedFile, {
+          method: 'POST',
+          body: formData,
+        });
+
+        if (!response.ok) {
+          const errorText = await response.text();
+          throw new Error(`Upload failed: ${response.statusText} - ${errorText}`);
+        }
+
+        const responseData = await response.json();
+        console.log("Upload successful:", responseData);
+        alert($.i18n('refiqdaRedactSuccess'));
+
+      } catch (error) {
+        console.error("Error during redaction and upload:", error);
+        alert($.i18n('refiqdaRedactError', error.message));
+      }
+    })();
+  } else {
+    (async () => {
+      try {
+        const redactedXmlBlob = new Blob([redactedXmlString], { type: 'text/x-xml-refiqda' });
+        const formData = new FormData();
+        const originalFilename = file.filename || "project.qdc";
+        const redactedFilename = originalFilename.replace(/(\.qdc)?$/, '-redacted.qdc');
+
+        formData.append("file", redactedXmlBlob, redactedFilename);
+        formData.append("origin", "qdas");
+        formData.append("isPublic", "true");
+        formData.append("type", "qda");
+
+        console.log(`Uploading redacted file: ${redactedFilename}`);
+        const response = await fetch(queryParams.signedUrls.uploadRedactedFile, {
+          method: 'POST',
+          body: formData,
+        });
+
+        if (!response.ok) {
+          const errorText = await response.text();
+          throw new Error(`Upload failed: ${response.statusText} - ${errorText}`);
+        }
+
+        const responseData = await response.json();
+        console.log("Upload successful:", responseData);
+        alert($.i18n('refiqdaRedactSuccess'));
 
       } catch (error) {
         console.error("Error during redaction and upload:", error);
-        alert(`An error occurred during the redaction process: ${error.message}`);
+        alert($.i18n('refiqdaRedactError', error.message));
       }
     })();
   }

From fe10ccc2a0e0948c2d454b780c89913f04cfb7f3 Mon Sep 17 00:00:00 2001
From: Jim Myers <qqmyers@hotmail.com>
Date: Wed, 6 May 2026 10:46:46 -0400
Subject: [PATCH 3/6] refactor to consolidate upload logic, move zip code to
 refiqdpx.js

---
 previewers/betatest/js/refiqdacore.js | 276 ++++++--------------------
 previewers/betatest/js/refiqdpx.js    |  53 +++++
 2 files changed, 118 insertions(+), 211 deletions(-)

diff --git a/previewers/betatest/js/refiqdacore.js b/previewers/betatest/js/refiqdacore.js
index 45119c7..4863727 100644
--- a/previewers/betatest/js/refiqdacore.js
+++ b/previewers/betatest/js/refiqdacore.js
@@ -1402,6 +1402,40 @@ function removeCodesFromXml(targetXmlDoc, guidsToRedact) {
   }
 }
 
+/**
+ * Uploads a redacted file (either a codebook XML or a project ZIP) to Dataverse.
+ * 
+ * @param {Blob} blob The redacted file blob.
+ * @param {string} filename The name of the file to be uploaded.
+ */
+async function uploadRedactedFile(blob, filename) {
+  try {
+    const formData = new FormData();
+    formData.append("file", blob, filename);
+    formData.append("origin", "qdas");
+    formData.append("isPublic", "true");
+    formData.append("type", "qda");
+
+    console.log(`Uploading redacted file: ${filename}`);
+    const response = await fetch(queryParams.signedUrls.uploadRedactedFile, {
+      method: 'POST',
+      body: formData,
+    });
+
+    if (!response.ok) {
+      const errorText = await response.text();
+      throw new Error(`Upload failed: ${response.statusText} - ${errorText}`);
+    }
+
+    const responseData = await response.json();
+    console.log("Upload successful:", responseData);
+    alert($.i18n('refiqdaRedactSuccess'));
+  } catch (error) {
+    console.error("Error during upload:", error);
+    alert($.i18n('refiqdaRedactError', error.message));
+  }
+}
+
 function redactSources(guidsToRedact) {
   console.log("Redacting sources with GUIDs:", guidsToRedact);
 
@@ -1411,140 +1445,38 @@ function redactSources(guidsToRedact) {
   const redactedXmlString = new XMLSerializer().serializeToString(redactedXmlDoc);
 
   if (isZipMode() && typeof zip !== 'undefined') {
-    // Use an async function to handle zip operations
-    (async () => {
-      try {
-        // Find the paths of the source files to remove from the zip archive.
-        const pathsToRemove = new Set();
-        for (const guid of guidsToRedact) {
-          const sourceElement = xmlDoc.querySelector(`[guid="${guid}"]`);
-          if (sourceElement) {
-            // Check various path attributes
-            ["path", "plainTextPath", "richTextPath"].forEach(attr => {
-              const val = sourceElement.getAttribute(attr);
-              if (val) {
-                const p = typeof resolveInternalZipPaths === 'function' ? resolveInternalZipPaths(val) : val.replace("internal://", "sources/");
-                if (p) pathsToRemove.add(p);
-              }
-            });
-
-            // Check for paths in Representations
-            const representations = sourceElement.querySelectorAll('Representation');
-            representations.forEach(rep => {
-              const ptp = rep.getAttribute("plainTextPath");
-              if (ptp) {
-                const p = typeof resolveInternalZipPaths === 'function' ? resolveInternalZipPaths(ptp) : ptp.replace("internal://", "sources/");
-                if (p) pathsToRemove.add(p);
-              }
-            });
+    // Find the paths of the source files to remove from the zip archive.
+    const pathsToRemove = new Set();
+    for (const guid of guidsToRedact) {
+      const sourceElement = xmlDoc.querySelector(`[guid="${guid}"]`);
+      if (sourceElement) {
+        // Check various path attributes
+        ["path", "plainTextPath", "richTextPath"].forEach(attr => {
+          const val = sourceElement.getAttribute(attr);
+          if (val) {
+            const p = typeof resolveInternalZipPaths === 'function' ? resolveInternalZipPaths(val) : val.replace("internal://", "sources/");
+            if (p) pathsToRemove.add(p);
           }
-        }
-        console.log("Paths to remove from zip:", Array.from(pathsToRemove));
-
-        // Fetch the original zip file as a blob on-demand
-        const zipResponse = await fetch(zipUrl);
-        if (!zipResponse.ok) {
-          throw new Error(`HTTP error! status: ${zipResponse.status}`);
-        }
-        const zipFileBlob = await zipResponse.blob();
-
-        // 1. Create a new zip archive
-        const zipWriter = new zip.ZipWriter(new zip.BlobWriter("application/x-zip-refiqda"));
-
-        // 2. Read entries from the original zip blob
-        const zipReader = new zip.ZipReader(new zip.BlobReader(zipFileBlob));
-        const entries = await zipReader.getEntries();
+        });
 
-        // 3. Copy entries to the new zip, excluding redacted files
-        for (const entry of entries) {
-          if (entry.filename === "project.qde") {
-            // Skip the old project file; we'll add the new one later
-            continue;
-          }
-          if (!pathsToRemove.has(entry.filename)) {
-            await zipWriter.add(entry.filename, new zip.BlobReader(await entry.getData(new zip.BlobWriter())));
-          } else {
-            console.log(`Excluding ${entry.filename} from new zip.`);
+        // Check for paths in Representations
+        const representations = sourceElement.querySelectorAll('Representation');
+        representations.forEach(rep => {
+          const ptp = rep.getAttribute("plainTextPath");
+          if (ptp) {
+            const p = typeof resolveInternalZipPaths === 'function' ? resolveInternalZipPaths(ptp) : ptp.replace("internal://", "sources/");
+            if (p) pathsToRemove.add(p);
           }
-        }
-
-        // 4. Add the new, redacted project.qde
-        await zipWriter.add("project.qde", new zip.TextReader(redactedXmlString));
-
-        // 5. Finalize the new zip file
-        const redactedZipBlob = await zipWriter.close();
-
-        // 6. Prepare for upload
-        const formData = new FormData();
-        const originalFilename = file.filename || "project.qdpx";
-        const redactedFilename = originalFilename.replace(/(\.qdpx)?$/, '-redacted.qdpx');
-
-        formData.append("file", redactedZipBlob, redactedFilename);
-        formData.append("origin", "qdas");
-        formData.append("isPublic", "true"); // Or handle dynamically if needed
-        formData.append("type", "qda");
-
-        // 7. POST the new file to Dataverse
-        console.log(`Uploading redacted file: ${redactedFilename}`);
-        const response = await fetch(queryParams.signedUrls.uploadRedactedFile, {
-          method: 'POST',
-          body: formData,
-          // Headers are not needed for FormData; browser sets them
         });
-
-        if (!response.ok) {
-          const errorText = await response.text();
-          throw new Error(`Upload failed: ${response.statusText} - ${errorText}`);
-        }
-
-        const responseData = await response.json();
-        console.log("Upload successful:", responseData);
-        alert($.i18n('refiqdaRedactSuccess'));
-
-      } catch (error) {
-        console.error("Error during redaction and upload:", error);
-        alert($.i18n('refiqdaRedactError', error.message));
       }
-    })();
+    }
+    createAndUploadRedactedZip(redactedXmlString, pathsToRemove);
   } else {
     // Fallback for non-zip mode (single XML file)
-    (async () => {
-      try {
-        // 1. Create a blob from the redacted XML string
-        const redactedXmlBlob = new Blob([redactedXmlString], { type: 'text/x-xml-refiqda' });
-
-        // 2. Prepare for upload
-        const formData = new FormData();
-        const originalFilename = file.filename || "project.qdc";
-        const redactedFilename = originalFilename.replace(/(\.qdc)?$/, '-redacted.qdc');
-
-        formData.append("file", redactedXmlBlob, redactedFilename);
-        formData.append("origin", "qdas");
-        formData.append("isPublic", "true"); // Or handle dynamically if needed
-        formData.append("type", "qda");
-
-        // 3. POST the new file to Dataverse
-        console.log(`Uploading redacted file: ${redactedFilename}`);
-        const response = await fetch(queryParams.signedUrls.uploadRedactedFile, {
-          method: 'POST',
-          body: formData,
-          // Headers are not needed for FormData; browser sets them
-        });
-
-        if (!response.ok) {
-          const errorText = await response.text();
-          throw new Error(`Upload failed: ${response.statusText} - ${errorText}`);
-        }
-
-        const responseData = await response.json();
-        console.log("Upload successful:", responseData);
-        alert($.i18n('refiqdaRedactSuccess'));
-
-      } catch (error) {
-        console.error("Error during redaction and upload:", error);
-        alert($.i18n('refiqdaRedactError', error.message));
-      }
-    })();
+    const redactedXmlBlob = new Blob([redactedXmlString], { type: 'text/x-xml-refiqda' });
+    const originalFilename = file.filename || "project.qdc";
+    const redactedFilename = originalFilename.replace(/(\.qdc)?$/, '-redacted.qdc');
+    uploadRedactedFile(redactedXmlBlob, redactedFilename);
   }
 }
 
@@ -1557,90 +1489,12 @@ function redactCodes(guidsToRedact) {
   const redactedXmlString = new XMLSerializer().serializeToString(redactedXmlDoc);
 
   if (isZipMode() && typeof zip !== 'undefined') {
-    (async () => {
-      try {
-        // Fetch the original zip file as a blob on-demand
-        const zipResponse = await fetch(zipUrl);
-        if (!zipResponse.ok) {
-          throw new Error(`HTTP error! status: ${zipResponse.status}`);
-        }
-        const zipFileBlob = await zipResponse.blob();
-
-        const zipWriter = new zip.ZipWriter(new zip.BlobWriter("application/x-zip-refiqda"));
-        const zipReader = new zip.ZipReader(new zip.BlobReader(zipFileBlob));
-        const entries = await zipReader.getEntries();
-
-        for (const entry of entries) {
-          if (entry.filename === "project.qde") {
-            continue;
-          }
-          await zipWriter.add(entry.filename, new zip.BlobReader(await entry.getData(new zip.BlobWriter())));
-        }
-
-        await zipWriter.add("project.qde", new zip.TextReader(redactedXmlString));
-        const redactedZipBlob = await zipWriter.close();
-
-        const formData = new FormData();
-        const originalFilename = file.filename || "project.qdpx";
-        const redactedFilename = originalFilename.replace(/(\.qdpx)?$/, '-redacted.qdpx');
-
-        formData.append("file", redactedZipBlob, redactedFilename);
-        formData.append("origin", "qdas");
-        formData.append("isPublic", "true");
-        formData.append("type", "qda");
-
-        console.log(`Uploading redacted file: ${redactedFilename}`);
-        const response = await fetch(queryParams.signedUrls.uploadRedactedFile, {
-          method: 'POST',
-          body: formData,
-        });
-
-        if (!response.ok) {
-          const errorText = await response.text();
-          throw new Error(`Upload failed: ${response.statusText} - ${errorText}`);
-        }
-
-        const responseData = await response.json();
-        console.log("Upload successful:", responseData);
-        alert($.i18n('refiqdaRedactSuccess'));
-
-      } catch (error) {
-        console.error("Error during redaction and upload:", error);
-        alert($.i18n('refiqdaRedactError', error.message));
-      }
-    })();
+    createAndUploadRedactedZip(redactedXmlString);
   } else {
-    (async () => {
-      try {
-        const redactedXmlBlob = new Blob([redactedXmlString], { type: 'text/x-xml-refiqda' });
-        const formData = new FormData();
-        const originalFilename = file.filename || "project.qdc";
-        const redactedFilename = originalFilename.replace(/(\.qdc)?$/, '-redacted.qdc');
-
-        formData.append("file", redactedXmlBlob, redactedFilename);
-        formData.append("origin", "qdas");
-        formData.append("isPublic", "true");
-        formData.append("type", "qda");
-
-        console.log(`Uploading redacted file: ${redactedFilename}`);
-        const response = await fetch(queryParams.signedUrls.uploadRedactedFile, {
-          method: 'POST',
-          body: formData,
-        });
-
-        if (!response.ok) {
-          const errorText = await response.text();
-          throw new Error(`Upload failed: ${response.statusText} - ${errorText}`);
-        }
-
-        const responseData = await response.json();
-        console.log("Upload successful:", responseData);
-        alert($.i18n('refiqdaRedactSuccess'));
-
-      } catch (error) {
-        console.error("Error during redaction and upload:", error);
-        alert($.i18n('refiqdaRedactError', error.message));
-      }
-    })();
+    // Fallback for non-zip mode (single XML file)
+    const redactedXmlBlob = new Blob([redactedXmlString], { type: 'text/x-xml-refiqda' });
+    const originalFilename = file.filename || "project.qdc";
+    const redactedFilename = originalFilename.replace(/(\.qdc)?$/, '-redacted.qdc');
+    uploadRedactedFile(redactedXmlBlob, redactedFilename);
   }
 }
diff --git a/previewers/betatest/js/refiqdpx.js b/previewers/betatest/js/refiqdpx.js
index 7ff8252..16933f0 100644
--- a/previewers/betatest/js/refiqdpx.js
+++ b/previewers/betatest/js/refiqdpx.js
@@ -173,3 +173,56 @@ async function downloadSourceFile(sourceGuid, path) {
 async function setProgressBarValue(val) {
     // Dummy function since we don't have a progress bar in the UI yet
 }
+
+/**
+ * Creates a new redacted zip archive and uploads it to Dataverse.
+ * 
+ * @param {string} redactedXmlString The redacted project.qde content.
+ * @param {Set<string>} pathsToRemove A set of file paths to exclude from the zip.
+ */
+async function createAndUploadRedactedZip(redactedXmlString, pathsToRemove = new Set()) {
+    try {
+        // Fetch the original zip file as a blob on-demand
+        const zipResponse = await fetch(zipUrl);
+        if (!zipResponse.ok) {
+            throw new Error(`HTTP error! status: ${zipResponse.status}`);
+        }
+        const zipFileBlob = await zipResponse.blob();
+
+        // 1. Create a new zip archive
+        const zipWriter = new zip.ZipWriter(new zip.BlobWriter("application/x-zip-refiqda"));
+
+        // 2. Read entries from the original zip blob
+        const zipReader = new zip.ZipReader(new zip.BlobReader(zipFileBlob));
+        const entries = await zipReader.getEntries();
+
+        // 3. Copy entries to the new zip, excluding redacted files
+        for (const entry of entries) {
+            if (entry.filename === "project.qde") {
+                // Skip the old project file; we'll add the new one later
+                continue;
+            }
+            if (!pathsToRemove.has(entry.filename)) {
+                await zipWriter.add(entry.filename, new zip.BlobReader(await entry.getData(new zip.BlobWriter())));
+            } else {
+                console.log(`Excluding ${entry.filename} from new zip.`);
+            }
+        }
+
+        // 4. Add the new, redacted project.qde
+        await zipWriter.add("project.qde", new zip.TextReader(redactedXmlString));
+
+        // 5. Finalize the new zip file
+        const redactedZipBlob = await zipWriter.close();
+
+        // 6. Prepare for upload
+        const originalFilename = file.filename || "project.qdpx";
+        const redactedFilename = originalFilename.replace(/(\.qdpx)?$/, '-redacted.qdpx');
+
+        await uploadRedactedFile(redactedZipBlob, redactedFilename);
+
+    } catch (error) {
+        console.error("Error during zip redaction and upload:", error);
+        alert($.i18n('refiqdaRedactError', error.message));
+    }
+}

From 03e0f9530765bf9330ac90c9bf4727fa26c39bf6 Mon Sep 17 00:00:00 2001
From: Jim Myers <qqmyers@hotmail.com>
Date: Wed, 6 May 2026 12:00:15 -0400
Subject: [PATCH 4/6] cleanup

---
 previewers/betatest/js/refiqdacore.js | 58 ++++++++++++++-------------
 1 file changed, 30 insertions(+), 28 deletions(-)

diff --git a/previewers/betatest/js/refiqdacore.js b/previewers/betatest/js/refiqdacore.js
index 4863727..3cd9a5c 100644
--- a/previewers/betatest/js/refiqdacore.js
+++ b/previewers/betatest/js/refiqdacore.js
@@ -4,13 +4,13 @@ var codeMap = new Map();
 var sourceMap = new Map();
 var noteMap = new Map();
 var tableWidth = '90%';
-var selectedGUIDs = new Array();
+var selectedGUIDs = [];
 var noteDataTable;
 var userDataTable;
 var codeDataTable;
 var sourceDataTable;
 var setDataTable;
-var tables = new Array();
+var tables = [];
 
 let file;
 var textSourceCache = new Map(); // Cache for loaded text files
@@ -57,7 +57,7 @@ function parseData(data, filejson) {
   file=filejson;
   $('#waiting').remove();
   wait = $('<div/>').attr('id', 'waiting');
-  $('<img/>').width('15%').attr('src', 'images/Loading_icon.gif').appendTo(wait);
+  $('<img alt="Loading"/>').width('15%').attr('src', 'images/Loading_icon.gif').appendTo(wait);
     $('<span/>').text($.i18n('refiqdaParsingProject')).appendTo(wait);
   wait.appendTo($('.preview'));
 
@@ -72,22 +72,24 @@ function parseData2(data) {
   xmlDoc = parser.parseFromString(data, "text/xml");
 
   if(redactedMode) {
-    let redactedNotice = $('<h2/>').addClass('redacted-notice').text($.i18n('refiqdaRedactedNotice')).appendTo($(".preview"));
+      $('<h2/>').addClass('redacted-notice').text($.i18n('refiqdaRedactedNotice')).appendTo($(".preview"));
   }
     //Add a Filter By option
-  let filterBlock = $('<div/>').width(tableWidth).appendTo($(".preview"));
+  const preview = $('.preview');
+  let filterBlock = $('<div/>').width(tableWidth).appendTo(preview);
   filterBlock.append($("<h2/>").html($.i18n('refiqdaEnableFilteringBy')));
   filterBlock.append($("<p/>").html($.i18n('refiqdaFilteringInstructions')));
   filterBlock.append($('<select/>').prop('id', 'filterby'));
-  $('#filterby').append($('<option/>').prop('value', 'None').text($.i18n('refiqdaNoFiltering')));
+  const filterBy = $('#filterby');
+  filterBy.append($('<option/>').prop('value', 'None').text($.i18n('refiqdaNoFiltering')));
   //As tables are created, they will be added to the option list here
 
   //User table
   var users = xmlDoc.getElementsByTagName("User");
   if (users != null && users.length > 0) {
-    $('#filterby').append($('<option/>').prop('value', 'Users').text($.i18n('refiqdaUsers')));
+      filterBy.append($('<option/>').prop('value', 'Users').text($.i18n('refiqdaUsers')));
 
-    let userBlock = $('<div/>').width(tableWidth).appendTo($(".preview"));
+    let userBlock = $('<div/>').width(tableWidth).appendTo(preview);
     userBlock.append($("<h2>").html($.i18n('refiqdaUsers')));
     //Users only has a "Name" column
     let userTable = createTable($.i18n('refiqdaUsers'), $.i18n('refiqdaName')).appendTo(userBlock);
@@ -105,7 +107,7 @@ function parseData2(data) {
 
     userDataTable = new DataTable(".usertable", {
       //Allow table rows to be selectable if this is the filter by table
-      select: $('#filterby').val() == 'Users',
+      select: $('#filterby').val() === 'Users',
       order: [[0, 'asc']]
     });
     //Draw to set order
@@ -116,7 +118,7 @@ function parseData2(data) {
   console.log("Starting codes");
   var codes = xmlDoc.getElementsByTagName("Code");
   if (codes != null  && codes.length > 0) {
-    $('#filterby').append($('<option/>').prop('value', 'Codes').text($.i18n('refiqdaCodes')));
+      filterBy.append($('<option/>').prop('value', 'Codes').text($.i18n('refiqdaCodes')));
 
     // Check if any codes have a color attribute
     let hasColorAttribute = false;
@@ -178,10 +180,10 @@ function parseData2(data) {
 
     // Configure DataTable with conditional columnDefs
     let dataTableConfig = {
-        select: $('#filterby').val() == 'Codes'
+        select: filterBy.val() == 'Codes'
     };
 
-    if ($('#filterby').val() == 'Codes') {
+    if (filterBy.val() == 'Codes') {
         dataTableConfig.layout = {
             top2End: 'buttons'
         };
@@ -260,7 +262,7 @@ function parseData2(data) {
     dataTableConfig.order = [[usesColumnIndex, "desc"]];
     codeDataTable = new DataTable(".codetable", dataTableConfig);
 
-    if ($('#filterby').val() == 'Codes') {
+    if (filterBy.val() == 'Codes') {
         codeDataTable.on('select deselect', function () {
             var selectedRows = codeDataTable.rows({ selected: true }).count();
             codeDataTable.button('.redact-btn').enable(selectedRows > 0);
@@ -286,7 +288,7 @@ function parseData2(data) {
           let sourceMatches = source.getAttribute("creatingUser") + source.getAttribute("modifyingUser");
           let selections = getSelections(source);
 
-          if (selections != null && selections.length != 0) {
+          if (selections != null && selections.length !== 0) {
             selections.forEach(function(selection) {
               let displayName;
               let selectionMatches;
@@ -597,24 +599,24 @@ function parseData2(data) {
       for (let graph of graphs) {
           let vertexes = graph.getElementsByTagName("Vertex");
           for (let vertex of vertexes) {
-            var data = {};
-            data.id = vertex.getAttribute("guid");
-            data.name = vertex.getAttribute("name");
-            var gnode = {};
+            var vertData = {};
+            vertData.id = vertex.getAttribute("guid");
+            vertData.name = vertex.getAttribute("name");
+            var vertGnode = {};
 
-            gnode.data = data;
-            elements.push(gnode);
+            edgeGnode.data = vertData;
+            elements.push(vertGnode);
           }
           let edges = graph.getElementsByTagName("Edge");
           for (let edge of edges) {
-            var data = {};
-            data.id = edge.getAttribute("guid");
-            data.name = "";
-            data.source = edge.getAttribute("sourceVertex");
-            data.target = edge.getAttribute("targetVertex");
-            var gnode = {};
-            gnode.data = data;
-            elements.push(gnode);
+            var edgeData = {};
+            edgeData.id = edge.getAttribute("guid");
+            edgeData.name = "";
+            edgeData.source = edge.getAttribute("sourceVertex");
+            edgeData.target = edge.getAttribute("targetVertex");
+            var edgeGnode = {};
+            edgeGnode.data = edgeData;
+            elements.push(edgeGnode);
           }
       }
       let cyContainer = $('<div/>').width("100%").height("400px").attr('id', 'cy').appendTo(graphBlock);

From 2392b56edde052018bae66bfe98575d7b15ba996 Mon Sep 17 00:00:00 2001
From: Jim Myers <qqmyers@hotmail.com>
Date: Wed, 6 May 2026 12:55:33 -0400
Subject: [PATCH 5/6] more cleanup

---
 previewers/betatest/js/refiqdacore.js | 111 +++++++++++++-------------
 1 file changed, 54 insertions(+), 57 deletions(-)

diff --git a/previewers/betatest/js/refiqdacore.js b/previewers/betatest/js/refiqdacore.js
index 3cd9a5c..67f3f3e 100644
--- a/previewers/betatest/js/refiqdacore.js
+++ b/previewers/betatest/js/refiqdacore.js
@@ -1,3 +1,4 @@
+/* global $, jQuery, DataTable, cytoscape, tippy, zip, fetchTextExcerpt, resolveInternalZipPaths, createAndUploadRedactedZip, queryParams */
 
 var userMap = new Map();
 var codeMap = new Map();
@@ -39,18 +40,6 @@ var redactedMode;
 
 var wait;
 var cy;
-
-
-
-
-function findDataAttribute(name, attrNamedNodeMap) {
-  let attr = attrNamedNodeMap[name];
-  if (typeof attr !== 'undefined') {
-    return attr.nodeValue;
-  }
-  return '';
-}
-
 // Start parsing project file
 // This function just adds a loading icon and initial text to the page and then calls parseData2
 function parseData(data, filejson) {
@@ -79,8 +68,7 @@ function parseData2(data) {
   let filterBlock = $('<div/>').width(tableWidth).appendTo(preview);
   filterBlock.append($("<h2/>").html($.i18n('refiqdaEnableFilteringBy')));
   filterBlock.append($("<p/>").html($.i18n('refiqdaFilteringInstructions')));
-  filterBlock.append($('<select/>').prop('id', 'filterby'));
-  const filterBy = $('#filterby');
+  const filterBy = $('<select/>').prop('id', 'filterby').appendTo(filterBlock);
   filterBy.append($('<option/>').prop('value', 'None').text($.i18n('refiqdaNoFiltering')));
   //As tables are created, they will be added to the option list here
 
@@ -180,10 +168,10 @@ function parseData2(data) {
 
     // Configure DataTable with conditional columnDefs
     let dataTableConfig = {
-        select: filterBy.val() == 'Codes'
+        select: filterBy.val() === 'Codes'
     };
 
-    if (filterBy.val() == 'Codes') {
+    if (filterBy.val() === 'Codes') {
         dataTableConfig.layout = {
             top2End: 'buttons'
         };
@@ -262,7 +250,7 @@ function parseData2(data) {
     dataTableConfig.order = [[usesColumnIndex, "desc"]];
     codeDataTable = new DataTable(".codetable", dataTableConfig);
 
-    if (filterBy.val() == 'Codes') {
+    if (filterBy.val() === 'Codes') {
         codeDataTable.on('select deselect', function () {
             var selectedRows = codeDataTable.rows({ selected: true }).count();
             codeDataTable.button('.redact-btn').enable(selectedRows > 0);
@@ -373,7 +361,7 @@ function parseData2(data) {
 
       // Create Annotations table if there are any annotations
       if (annotationRows.length > 0) {
-          $('#filterby').append($('<option/>').prop('value', 'Annotations').text($.i18n('refiqdaAnnotations')));
+          filterBy.append($('<option/>').prop('value', 'Annotations').text($.i18n('refiqdaAnnotations')));
 
           let annotationBlock = $('<div/>').width(tableWidth).appendTo($(".preview"));
           annotationBlock.append($("<h2/>").html($.i18n('refiqdaAnnotations')));
@@ -387,7 +375,7 @@ function parseData2(data) {
           });
 
           var annotationDataTable = new DataTable(".annotationtable", {
-              select: $('#filterby').val() == 'Annotations'
+              select: filterBy.val() === 'Annotations'
           });
 
           // Initialize tooltips after table is created (ONLY for annotations table)
@@ -398,7 +386,7 @@ function parseData2(data) {
 
       // Create Sources table if there are any sources
       if (sourceRows.length > 0) {
-        $('#filterby').append($('<option/>').prop('value', 'Sources').text($.i18n('refiqdaSources')));
+        filterBy.append($('<option/>').prop('value', 'Sources').text($.i18n('refiqdaSources')));
 
         let sourceBlock = $('<div/>').width(tableWidth).appendTo($(".preview"));
         sourceBlock.append($("<h2/>").html($.i18n('refiqdaSources')));
@@ -412,13 +400,13 @@ function parseData2(data) {
         });
 
         sourceDataTable = new DataTable(".sourcetable", {
-          select: $('#filterby').val() == 'Sources',
+          select: filterBy.val() === 'Sources',
           order: [[0, 'asc']],
           columnDefs: [
             {
               render: function(data, type, row) {
                 if (type === 'display' && data !== null && data.length > 50) {
-                  return '<span title="' + data + '">' + data.substr(0, 50) + '...</span>';
+                  return '<span title="' + data + '">' + data.substring(0, 50) + '...</span>';
                 }
                 return data;
               },
@@ -437,7 +425,7 @@ function parseData2(data) {
   var notes = xmlDoc.getElementsByTagName("Note");
 
   if (notes != null && notes.length > 0) {
-    $('#filterby').append($('<option/>').prop('value', 'Notes').text($.i18n('refiqdaNotes')));
+    filterBy.append($('<option/>').prop('value', 'Notes').text($.i18n('refiqdaNotes')));
     let noteBlock = $('<div/>').width(tableWidth).appendTo($(".preview"));
     noteBlock.append($("<h2/>").html($.i18n('refiqdaNotes')));
     let noteTable = createTable($.i18n('refiqdaNotes'), $.i18n('refiqdaName'), $.i18n('refiqdaContent'), $.i18n('refiqdaDescription'), $.i18n('refiqdaAuthors')).appendTo(noteBlock);
@@ -484,7 +472,7 @@ function parseData2(data) {
     }
 
     noteDataTable = new DataTable(".notetable", {
-      select: $('#filterby').val() == 'Notes'
+      select: filterBy.val() === 'Notes'
       //columnDefs:[{target:0,visible:false,seachable:false}]
     });
     tables.push(noteDataTable);
@@ -548,7 +536,7 @@ function parseData2(data) {
  
   let sets = xmlDoc.getElementsByTagName("Set");
   if (sets != null && sets.length > 0) {
-    $('#filterby').append($('<option/>').prop('value', 'Sets').text($.i18n('refiqdaSets')));
+    filterBy.append($('<option/>').prop('value', 'Sets').text($.i18n('refiqdaSets')));
     let setBlock = $('<div/>').width(tableWidth).appendTo($(".preview"));
     setBlock.append($("<h2/>").html($.i18n('refiqdaSets')));
     let setTable = createTable($.i18n('refiqdaSets'), $.i18n('refiqdaName'), $.i18n('refiqdaSources'), $.i18n('refiqdaCodes')).appendTo(setBlock);
@@ -585,7 +573,7 @@ function parseData2(data) {
         tr.attr('data-guid', set.getAttribute('guid'));
     }
     setDataTable = new DataTable(".settable", {
-      select: $('#filterby').val() == 'Sets'
+      select: filterBy.val() === 'Sets'
     });
     tables.push(setDataTable);
   }
@@ -664,17 +652,17 @@ $("#filterby")
 
       // Clear selections when changing filter
       selectedGUIDs = [];
-        tables=new Array();
-
+        tables=[];
+      const userTable = $(".usertable");
       // Destroy and recreate userDataTable
       if (userDataTable) {
         userDataTable.destroy();
         //Also remove event handlers
-        $(".usertable").off('select.dt deselect.dt');
+        userTable.off('select.dt deselect.dt');
       }
-      if ($(".usertable").length) {
+      if (userTable.length) {
         userDataTable = new DataTable(".usertable", {
-          select: $('#filterby').val() == 'Users',
+          select: filterBy.val() === 'Users',
           order: [[0, 'asc']]
         });
         attachFilterHandler(userDataTable);
@@ -685,19 +673,20 @@ $("#filterby")
 
       // Destroy and recreate codeDataTable
       let codeTableOrder;
+      const codeTable = $(".codetable");
       if (codeDataTable) {
       codeTableOrder = codeDataTable.order();
         codeDataTable.destroy();
-        $(".codetable").off('select.dt deselect.dt');
+        codeTable.off('select.dt deselect.dt');
       }
-      if ($(".codetable").length) {
+      if (codeTable.length) {
         // Need to check if color column exists before recreating the table
         let hasColorColumn = $('.codetable thead th').length === 5; // 5 columns means Color is present plus # of Uses
         let codeConfig = {
-          select: $('#filterby').val() == 'Codes'
+          select: filterBy.val() === 'Codes'
         };
 
-        if ($('#filterby').val() == 'Codes') {
+        if (filterBy.val() === 'Codes') {
             codeConfig.layout = {
                 top2End: 'buttons'
             };
@@ -778,7 +767,7 @@ $("#filterby")
         }
         codeDataTable = new DataTable(".codetable", codeConfig);
 
-        if ($('#filterby').val() == 'Codes') {
+        if ($('#filterby').val() === 'Codes') {
             codeDataTable.on('select deselect', function () {
                 var selectedRows = codeDataTable.rows({ selected: true }).count();
                 codeDataTable.button('.redact-btn').enable(selectedRows > 0);
@@ -791,13 +780,14 @@ $("#filterby")
       }
 
       // Destroy and recreate sourceDataTable
+        const sourceTable = $(".sourcetable");
       if (sourceDataTable) {
         sourceDataTable.destroy();
-        $(".sourcetable").off('select.dt deselect.dt');
+        sourceTable.off('select.dt deselect.dt');
       }
-      if ($(".sourcetable").length) {
+      if (sourceTable.length) {
         let dtOptions = {
-          select: $('#filterby').val() == 'Sources',
+          select: filterBy.val() === 'Sources',
           columnDefs: [
             {
               render: function(data, type, row) {
@@ -812,7 +802,7 @@ $("#filterby")
           
         };
 
-        if ($('#filterby').val() == 'Sources') {
+        if (filterBy.val() === 'Sources') {
           dtOptions.layout = {
             top2End: 'buttons'
           };
@@ -838,7 +828,7 @@ $("#filterby")
 
         sourceDataTable = new DataTable(".sourcetable", dtOptions);
         
-        if ($('#filterby').val() == 'Sources') {
+        if (filterBy.val() === 'Sources') {
             sourceDataTable.on('select deselect', function () {
                 var selectedRows = sourceDataTable.rows({ selected: true }).count();
                 sourceDataTable.button('.redact-btn').enable(selectedRows > 0);
@@ -852,13 +842,14 @@ $("#filterby")
       }
 
       // Destroy and recreate annotationDataTable
+      const annotationTable = $(".annotationtable");
       if (annotationDataTable) {
         annotationDataTable.destroy();
-        $(".annotationtable").off('select.dt deselect.dt');
+        annotationTable.off('select.dt deselect.dt');
       }
-      if ($(".annotationtable").length) {
+      if (annotationTable.length) {
         annotationDataTable = new DataTable(".annotationtable", {
-          select: $('#filterby').val() == 'Annotations'
+          select: filterBy.val() === 'Annotations'
         });
         attachFilterHandler(annotationDataTable);
         annotationDataTable.draw();
@@ -866,13 +857,14 @@ $("#filterby")
       }
 
       // Destroy and recreate noteDataTable
+      const noteTable = $(".notetable");
       if (noteDataTable) {
         noteDataTable.destroy();
-        $(".notetable").off('select.dt deselect.dt');
+        noteTable.off('select.dt deselect.dt');
       }
-      if ($(".notetable").length) {
+      if (noteTable.length) {
         noteDataTable = new DataTable(".notetable", {
-          select: $('#filterby').val() == 'Notes'
+          select: filterBy.val() === 'Notes'
         });
         attachFilterHandler(noteDataTable);
         noteDataTable.draw();
@@ -880,13 +872,14 @@ $("#filterby")
       }
 
       // Destroy and recreate setDataTable
+        const setTable = $(".settable");
       if (setDataTable) {
         setDataTable.destroy();
-        $(".settable").off('select.dt deselect.dt');
+        setTable.off('select.dt deselect.dt');
       }
-      if ($(".settable").length) {
+      if (setTable.length) {
         setDataTable = new DataTable(".settable", {
-          select: $('#filterby').val() == 'Sets'
+          select: filterBy.val() === 'Sets'
         });
         attachFilterHandler(setDataTable);
         setDataTable.draw();
@@ -906,10 +899,16 @@ function createTable() {
   for (var i = 1; i < arguments.length; i++) {
     tr.append($("<th/>").text(arguments[i]));
   }
-  let tableBody = $("<tbody/>").appendTo(table);
+  $("<tbody/>").appendTo(table);
   return table;
 }
-
+/**
+ * Adds a table row and returns it as a jQuery object.
+ *
+ * @param {jQuery} table
+ * @param {...*} values
+ * @returns {jQuery}
+ */
 function addRow(table, ...values) {
   let tr = $('<tr/>');
   values.forEach(function(value) {
@@ -931,7 +930,7 @@ function attachFilterHandler(dataTable) {
   //When selections are made, update the array of selected GUIDs and redraw other tables so they get filtered.
   dataTable.on('select deselect', function(e, dt, type, indexes) {
     if (type === 'row') {
-      selectedGUIDs = new Array();
+      selectedGUIDs = [];
       dataTable.rows({ selected: true }).nodes().to$().each(function(index, element) {
         selectedGUIDs.push(element.dataset.guid);
       });
@@ -990,7 +989,7 @@ function getSelections(source) {
   let selections = [];
   // If it's a PDF source, we look for both PDF and PlainText selections to merge them
   if (source.nodeName === "PDFSource") {
-    const representation = source.querySelector("Representation");
+    const representation = source.getElementsByTagName("Representation")[0];
     const plainTextSelections = new Map();
 
     // Map PlainTextSelections by their GUID from the Representation, if it exists
@@ -1061,15 +1060,13 @@ function getCodeNames(selection) {
 // Update the createSelectionWithTooltip function to use a simpler data structure
 function createSelectionWithTooltip(selectionName, startPos, endPos, plainTextPath, sourceGuid) {
     // Create a span with data attributes that we'll use for the tooltip
-    let spanHtml = '<span class="selection-with-excerpt" ' +
+    return '<span class="selection-with-excerpt" ' +
         'data-start="' + startPos + '" ' +
         'data-end="' + endPos + '" ' +
         'data-path="' + plainTextPath + '" ' +
         'data-source-guid="' + sourceGuid + '">' +
         selectionName +
         '</span>';
-    
-    return spanHtml;
 }
 
 function createMergedSelectionWithTooltip(selectionName, pdfSel, plainTextSel, sourceGuid) {

From 73a690ee9d43cfdbbe1535b2d087c5e5d43cba72 Mon Sep 17 00:00:00 2001
From: Jim Myers <qqmyers@hotmail.com>
Date: Wed, 6 May 2026 16:58:36 -0400
Subject: [PATCH 6/6] add redact perm check and delete

---
 6.1curlcommands.md                    |  36 ++++++
 previewers/betatest/i18n/en.json      |   4 +
 previewers/betatest/i18n/es.json      |   4 +
 previewers/betatest/i18n/fr.json      |   4 +
 previewers/betatest/js/refiqdacore.js | 175 +++++++++++++++++++++-----
 5 files changed, 195 insertions(+), 28 deletions(-)

diff --git a/6.1curlcommands.md b/6.1curlcommands.md
index 6bd7ccb..f13afca 100644
--- a/6.1curlcommands.md
+++ b/6.1curlcommands.md
@@ -2054,11 +2054,29 @@ curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin
       "urlTemplate": "/api/v1/access/datafile/{fileId}/auxiliary/qdc/1.0",
       "timeOut": 3600
     },
+    {
+      "name": "deleteRedactedFile",
+      "httpMethod": "DELETE",
+      "urlTemplate": "/api/v1/access/datafile/{fileId}/auxiliary/qdc/1.0",
+      "timeOut": 3600
+    },
+    {
+      "name": "listAuxiliaryFiles",
+      "httpMethod": "GET",
+      "urlTemplate": "/api/v1/access/datafile/{fileId}/auxiliary",
+      "timeOut": 3600
+    },
     {
       "name": "getDatasetVersionMetadata",
       "httpMethod": "GET",
       "urlTemplate": "/api/v1/datasets/{datasetId}/versions/{datasetVersion}",
       "timeOut": 3600
+    },
+    {
+      "name": "userPermissions",
+      "httpMethod": "GET",
+      "urlTemplate": "/api/v1/datasets/{datasetId}/userPermissions",
+      "timeOut": 3600
     }
   ]
 }'
@@ -2102,11 +2120,29 @@ curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin
       "urlTemplate": "/api/v1/access/datafile/{fileId}/auxiliary/qdpx/1.0",
       "timeOut": 3600
     },
+    {
+      "name": "deleteRedactedFile",
+      "httpMethod": "DELETE",
+      "urlTemplate": "/api/v1/access/datafile/{fileId}/auxiliary/qdpx/1.0",
+      "timeOut": 3600
+    },
+    {
+      "name": "listAuxiliaryFiles",
+      "httpMethod": "GET",
+      "urlTemplate": "/api/v1/access/datafile/{fileId}/auxiliary",
+      "timeOut": 3600
+    },
     {
       "name": "getDatasetVersionMetadata",
       "httpMethod": "GET",
       "urlTemplate": "/api/v1/datasets/{datasetId}/versions/{datasetVersion}",
       "timeOut": 3600
+    },
+    {
+      "name": "userPermissions",
+      "httpMethod": "GET",
+      "urlTemplate": "/api/v1/datasets/{datasetId}/userPermissions",
+      "timeOut": 3600
     }
   ]
 }'
diff --git a/previewers/betatest/i18n/en.json b/previewers/betatest/i18n/en.json
index 6daad7d..793a0cf 100644
--- a/previewers/betatest/i18n/en.json
+++ b/previewers/betatest/i18n/en.json
@@ -66,6 +66,10 @@
   "refiqdaRedactCodeTooltip": "Create a redacted version of the datafile with the selected codes, and any related annotations, removed.",
   "refiqdaRedactSuccess": "Redacted file has been successfully uploaded to Dataverse.",
   "refiqdaRedactError": "An error occurred during the redaction process: $1",
+  "refiqdaDeleteRedacted": "Delete Redacted",
+  "refiqdaDeleteSuccess": "Existing redacted file has been successfully deleted.",
+  "refiqdaDeleteError": "An error occurred while deleting the redacted file: $1",
+  "refiqdaDeleteConfirm": "Are you sure you want to delete the existing redacted file?",
   "jupyterPreviewText": "Jupyter Notebook Preview",
   "cdiPreviewText": "CDI Preview",
   "prev": "Previous",
diff --git a/previewers/betatest/i18n/es.json b/previewers/betatest/i18n/es.json
index f8198b4..8b5783f 100644
--- a/previewers/betatest/i18n/es.json
+++ b/previewers/betatest/i18n/es.json
@@ -65,6 +65,10 @@
   "refiqdaRedactCodeTooltip": "Cree una versión redactada del archivo de datos con los códigos seleccionados y cualquier anotación relacionada eliminadas.",
   "refiqdaRedactSuccess": "El archivo redactado se ha cargado correctamente en Dataverse.",
   "refiqdaRedactError": "Se produjo un error durante el proceso de redacción: $1",
+  "refiqdaDeleteRedacted": "Eliminar redactado",
+  "refiqdaDeleteSuccess": "El archivo redactado existente se ha eliminado correctamente.",
+  "refiqdaDeleteError": "Se produjo un error al eliminar el archivo redactado: $1",
+  "refiqdaDeleteConfirm": "¿Está seguro de que desea eliminar el archivo redactado existente?",
   "jupyterPreviewText": "Previsualización de Jupyter Notebook",
   "cdiPreviewText": "Previsualización de CDI",
   "prev": "Anterior",
diff --git a/previewers/betatest/i18n/fr.json b/previewers/betatest/i18n/fr.json
index 3db7e85..816686c 100644
--- a/previewers/betatest/i18n/fr.json
+++ b/previewers/betatest/i18n/fr.json
@@ -66,6 +66,10 @@
   "refiqdaRedactCodeTooltip": "Créez une version expurgée du fichier de données en supprimant les codes sélectionnés et toutes les annotations associées.",
   "refiqdaRedactSuccess": "Le fichier expurgé a été téléchargé avec succès sur Dataverse.",
   "refiqdaRedactError": "Une erreur s'est produite lors du processus d'expurgation : $1",
+  "refiqdaDeleteRedacted": "Supprimer l'expurgation",
+  "refiqdaDeleteSuccess": "Le fichier expurgé existant a été supprimé avec succès.",
+  "refiqdaDeleteError": "Une erreur s'est produite lors de la suppression du fichier expurgé: $1",
+  "refiqdaDeleteConfirm": "Êtes-vous sûr de vouloir supprimer le fichier expurgé existant ?",
   "jupyterPreviewText": "Aperçu Jupyter Notebook",
   "cdiPreviewText": "Aperçu CDI",
   "prev": "Précédent",
diff --git a/previewers/betatest/js/refiqdacore.js b/previewers/betatest/js/refiqdacore.js
index 67f3f3e..47b8aa3 100644
--- a/previewers/betatest/js/refiqdacore.js
+++ b/previewers/betatest/js/refiqdacore.js
@@ -37,6 +37,31 @@ function isZipMode() {
 }
 
 var redactedMode;
+var canRedact = false;
+var redactedFileExists = false;
+
+async function checkPermissions() {
+    let permissionsUrl = queryParams.signedUrls ? queryParams.signedUrls.userPermissions : null;
+    if (!permissionsUrl && queryParams.siteUrl && queryParams.datasetid) {
+        permissionsUrl = queryParams.siteUrl + "/api/datasets/" + queryParams.datasetid + "/userPermissions";
+        if (queryParams.key) {
+            permissionsUrl += (permissionsUrl.includes('?') ? '&' : '?') + "key=" + queryParams.key;
+        }
+    }
+    if (permissionsUrl) {
+        try {
+            const response = await fetch(permissionsUrl);
+            if (response.ok) {
+                const json = await response.json();
+                if (json.status === 'OK' && json.data && json.data.permissions) {
+                    canRedact = json.data.permissions.includes('EditDataset');
+                }
+            }
+        } catch (error) {
+            console.error("Error checking permissions:", error);
+        }
+    }
+}
 
 var wait;
 var cy;
@@ -50,7 +75,14 @@ function parseData(data, filejson) {
     $('<span/>').text($.i18n('refiqdaParsingProject')).appendTo(wait);
   wait.appendTo($('.preview'));
 
-  new Promise((resolve) => setTimeout(resolve, 500)).then(() => { parseData2(data) });
+    checkPermissions().then(() => {
+    new Promise((resolve) => setTimeout(resolve, 500)).then(() => { 
+        parseData2(data);
+        if (canRedact && !redactedMode) {
+            checkForRedactedFile();
+        }
+    });
+  });
 }
 
 // Reads the project file and walks through the XML creating tables for all the entry types
@@ -69,6 +101,15 @@ function parseData2(data) {
   filterBlock.append($("<h2/>").html($.i18n('refiqdaEnableFilteringBy')));
   filterBlock.append($("<p/>").html($.i18n('refiqdaFilteringInstructions')));
   const filterBy = $('<select/>').prop('id', 'filterby').appendTo(filterBlock);
+  if (canRedact && !redactedMode) {
+      $('<button/>')
+          .addClass('btn btn-danger delete-redacted-btn')
+          .text($.i18n('refiqdaDeleteRedacted'))
+          .css('margin-left', '10px')
+          .hide()
+          .click(deleteRedactedFile)
+          .appendTo(filterBlock);
+  }
   filterBy.append($('<option/>').prop('value', 'None').text($.i18n('refiqdaNoFiltering')));
   //As tables are created, they will be added to the option list here
 
@@ -177,8 +218,10 @@ function parseData2(data) {
         };
         dataTableConfig.buttons = [
             'selectAll', 
-            'selectNone',
-            {
+            'selectNone'
+        ];
+        if (canRedact) {
+            dataTableConfig.buttons.push({
                 text: $.i18n('refiqdaRedact'),
                 className: 'redact-btn',
                 titleAttr: $.i18n('refiqdaRedactCodeTooltip'),
@@ -191,8 +234,8 @@ function parseData2(data) {
                     redactCodes(codeGuids);
                 },
                 enabled: false
-            }
-        ];
+            });
+        }
     }
 
     if (hasColorAttribute) {
@@ -253,7 +296,9 @@ function parseData2(data) {
     if (filterBy.val() === 'Codes') {
         codeDataTable.on('select deselect', function () {
             var selectedRows = codeDataTable.rows({ selected: true }).count();
-            codeDataTable.button('.redact-btn').enable(selectedRows > 0);
+            if (canRedact) {
+                codeDataTable.button('.redact-btn').enable(selectedRows > 0);
+            }
         });
     }
 
@@ -692,8 +737,10 @@ $("#filterby")
             };
             codeConfig.buttons = [
                 'selectAll', 
-                'selectNone',
-                {
+                'selectNone'
+            ];
+            if (canRedact) {
+                codeConfig.buttons.push({
                     text: $.i18n('refiqdaRedact'),
                     className: 'redact-btn',
                     titleAttr: $.i18n('refiqdaRedactCodeTooltip'),
@@ -706,8 +753,8 @@ $("#filterby")
                         redactCodes(codeGuids);
                     },
                     enabled: false
-                }
-            ];
+                });
+            }
         }
 
         if (hasColorColumn) {
@@ -770,7 +817,9 @@ $("#filterby")
         if ($('#filterby').val() === 'Codes') {
             codeDataTable.on('select deselect', function () {
                 var selectedRows = codeDataTable.rows({ selected: true }).count();
-                codeDataTable.button('.redact-btn').enable(selectedRows > 0);
+                if (canRedact) {
+                    codeDataTable.button('.redact-btn').enable(selectedRows > 0);
+                }
             });
         }
 
@@ -808,22 +857,24 @@ $("#filterby")
           };
           dtOptions.buttons = [
             'selectAll', 
-            'selectNone',
-            {
-              text: $.i18n('refiqdaRedact'),
-              className: 'redact-btn',
-              titleAttr: $.i18n('refiqdaRedactSourceTooltip'),
-              action: function ( e, dt, node, config ) {
-                let selectedRows = dt.rows( { selected: true } );
-                let sourceGuids = [];
-                selectedRows.nodes().to$().each(function() {
-                    sourceGuids.push($(this).data('guid'));
-                });
-                redactSources(sourceGuids);
-              },
-              enabled: false
-            }
+            'selectNone'
           ];
+          if (canRedact) {
+              dtOptions.buttons.push({
+                  text: $.i18n('refiqdaRedact'),
+                  className: 'redact-btn',
+                  titleAttr: $.i18n('refiqdaRedactSourceTooltip'),
+                  action: function ( e, dt, node, config ) {
+                      let selectedRows = dt.rows( { selected: true } );
+                      let sourceGuids = [];
+                      selectedRows.nodes().to$().each(function() {
+                          sourceGuids.push($(this).data('guid'));
+                      });
+                      redactSources(sourceGuids);
+                  },
+                  enabled: false
+              });
+          }
         }
 
         sourceDataTable = new DataTable(".sourcetable", dtOptions);
@@ -831,7 +882,9 @@ $("#filterby")
         if (filterBy.val() === 'Sources') {
             sourceDataTable.on('select deselect', function () {
                 var selectedRows = sourceDataTable.rows({ selected: true }).count();
-                sourceDataTable.button('.redact-btn').enable(selectedRows > 0);
+                if (canRedact) {
+                    sourceDataTable.button('.redact-btn').enable(selectedRows > 0);
+                }
             });
         }
         
@@ -1416,7 +1469,16 @@ async function uploadRedactedFile(blob, filename) {
     formData.append("type", "qda");
 
     console.log(`Uploading redacted file: ${filename}`);
-    const response = await fetch(queryParams.signedUrls.uploadRedactedFile, {
+    let uploadUrl = queryParams.signedUrls ? queryParams.signedUrls.uploadRedactedFile : null;
+    if (!uploadUrl && queryParams.siteUrl && queryParams.fileid) {
+        const type = isZipMode() ? 'qdpx' : 'qdc';
+        uploadUrl = queryParams.siteUrl + "/api/access/datafile/" + queryParams.fileid + "/auxiliary/" + type + "/1.0";
+        if (queryParams.key) {
+            uploadUrl += (uploadUrl.includes('?') ? '&' : '?') + "key=" + queryParams.key;
+        }
+    }
+
+    const response = await fetch(uploadUrl, {
       method: 'POST',
       body: formData,
     });
@@ -1429,6 +1491,7 @@ async function uploadRedactedFile(blob, filename) {
     const responseData = await response.json();
     console.log("Upload successful:", responseData);
     alert($.i18n('refiqdaRedactSuccess'));
+    checkForRedactedFile();
   } catch (error) {
     console.error("Error during upload:", error);
     alert($.i18n('refiqdaRedactError', error.message));
@@ -1497,3 +1560,59 @@ function redactCodes(guidsToRedact) {
     uploadRedactedFile(redactedXmlBlob, redactedFilename);
   }
 }
+
+async function checkForRedactedFile() {
+    let listUrl = queryParams.signedUrls ? queryParams.signedUrls.listAuxiliaryFiles : null;
+    if (!listUrl && queryParams.siteUrl && queryParams.fileid) {
+        listUrl = queryParams.siteUrl + "/api/access/datafile/" + queryParams.fileid + "/auxiliary";
+        if (queryParams.key) {
+            listUrl += (listUrl.includes('?') ? '&' : '?') + "key=" + queryParams.key;
+        }
+    }
+    if (listUrl) {
+        try {
+            const response = await fetch(listUrl);
+            if (response.ok) {
+                const auxFiles = await response.json();
+                const type = isZipMode() ? 'qdpx' : 'qdc';
+                redactedFileExists = auxFiles.some(f => f.formatTag === type && f.formatVersion === '1.0');
+                if (redactedFileExists) {
+                    $('.delete-redacted-btn').show();
+                } else {
+                    $('.delete-redacted-btn').hide();
+                }
+            }
+        } catch (error) {
+            console.error("Error checking for redacted file:", error);
+        }
+    }
+}
+
+async function deleteRedactedFile() {
+    if (confirm($.i18n('refiqdaDeleteConfirm'))) {
+        try {
+            let deleteUrl = queryParams.signedUrls ? queryParams.signedUrls.deleteRedactedFile : null;
+            if (!deleteUrl && queryParams.siteUrl && queryParams.fileid) {
+                const type = isZipMode() ? 'qdpx' : 'qdc';
+                deleteUrl = queryParams.siteUrl + "/api/access/datafile/" + queryParams.fileid + "/auxiliary/" + type + "/1.0";
+                if (queryParams.key) {
+                    deleteUrl += (deleteUrl.includes('?') ? '&' : '?') + "key=" + queryParams.key;
+                }
+            }
+            const response = await fetch(deleteUrl, {
+                method: 'DELETE'
+            });
+            if (response.ok) {
+                alert($.i18n('refiqdaDeleteSuccess'));
+                redactedFileExists = false;
+                $('.delete-redacted-btn').hide();
+            } else {
+                const errorText = await response.text();
+                throw new Error(`Delete failed: ${response.statusText} - ${errorText}`);
+            }
+        } catch (error) {
+            console.error("Error deleting redacted file:", error);
+            alert($.i18n('refiqdaDeleteError', error.message));
+        }
+    }
+}