Merge pull request #275 from rpbouman/dev

fix export bug
rpbouman · Dec 2, 2024 · 27ccae2 · 27ccae2
2 parents 043cd77 + bab3b54
commit 27ccae2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/src/AttributeUi/AttributeUi.css b/src/AttributeUi/AttributeUi.css
@@ -17,9 +17,11 @@ main.layout:has( .workarea > .pivotTableUiContainer[aria-busy=true] ) > nav#side
   details[role=treeitem] {
 
     > summary {
-
+      white-space: nowrap;
+
       > span.label  {
         max-width: calc(100% - 166px);
+        width: 100%;
       }
 
       > span.label::before {

diff --git a/src/AttributeUi/AttributeUi.js b/src/AttributeUi/AttributeUi.js
@@ -638,24 +638,25 @@ class AttributeUi {
     var head = createEl('summary', {
     });
 
+    var caption = AttributeUi.#getUiNodeCaption(config);
     var title = config.title;
     if (!title){
       switch (config.type) {
         case 'column':
-          title = `"${columnExpression}": ${config.profile.column_type}`;
+          title = `${config.profile.column_type}`;
           break;
         case 'member':
-          title = `${columnExpression}: ${config.columnType}`;
+          title = `${config.columnType} ${columnExpression}`;
           break;
         case 'aggregate':
         case 'derived':
           var expressionTemplate = config.expressionTemplate;
           title = extrapolateColumnExpression(expressionTemplate, columnExpression);
           break;
       }
+      title = `${caption}: ${title}`;
     }
 
-    var caption = AttributeUi.#getUiNodeCaption(config);
     var label = createEl('span', {
       "class": 'label',
       "title": title,

diff --git a/src/ExportUi/ExportDialog.js b/src/ExportUi/ExportDialog.js
@@ -136,7 +136,7 @@ class ExportUi {
           escape = exportSettings[exportType + 'Escape'];
           dateFormat = exportSettings[exportType + 'DateFormat'];
           timestampFormat = exportSettings[exportType + 'TimestampFormat'];
-          compression = exportSettings[exportType + 'Compression'].value;
+          compression = exportSettings[exportType + 'Compression'];
 
           copyStatementOptions = {
             "FORMAT": 'CSV',
@@ -153,7 +153,7 @@ class ExportUi {
           fileExtension = 'csv';
           break;
         case 'exportJson':
-          compression = exportSettings[exportType + 'Compression'].value;
+          compression = exportSettings[exportType + 'Compression'];
           dateFormat = exportSettings[exportType + 'DateFormat'];
           timestampFormat = exportSettings[exportType + 'TimestampFormat'];
           rowDelimiter = exportSettings[exportType + 'RowDelimiter'];
@@ -168,7 +168,7 @@ class ExportUi {
           fileExtension = 'json';
           break;
         case 'exportParquet':
-          compression = exportSettings[exportType + 'Compression'].value;
+          compression = exportSettings[exportType + 'Compression'];
           copyStatementOptions = {
             "FORMAT": 'PARQUET',
             "COMPRESSION": compression,
@@ -178,9 +178,9 @@ class ExportUi {
           break;
         case 'exportSql':
           sqlOptions = {
-            keywordLettercase: exportSettings[exportType + 'KeywordLettercase'].value,
+            keywordLettercase: exportSettings[exportType + 'KeywordLettercase'],
             alwaysQuoteIdentifiers: exportSettings[exportType + 'AlwaysQuoteIdentifiers'],
-            commaStyle: exportSettings[exportType + 'CommaStyle'].value
+            commaStyle: exportSettings[exportType + 'CommaStyle']
           };
           mimeType = 'text/plain';
           fileExtension = 'sql';
@@ -388,8 +388,6 @@ class ExportDialog {
             var valueProperty;
             switch (control.type){
               case 'radio':
-                valueProperty = 'selected';
-                break;
               case 'checkbox':
                 valueProperty = 'checked';
                 break;