Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 36 additions & 1 deletion src/components/gui/export/export-result-button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,15 @@ import OptimizeTableState, {
} from "../table-optimized/optimize-table-state";

export type ExportTarget = "clipboard" | "file";
export type ExportFormat = "csv" | "delimited" | "json" | "sql" | "xlsx";
export type ExportFormat =
| "csv"
| "delimited"
| "json"
| "sql"
| "xlsx"
| "xml"
| "md"
| "tsv";
export type ExportSelection =
| "complete"
| "selected_row"
Expand Down Expand Up @@ -319,6 +327,33 @@ export default function ExportResultButton({
Excel
</Label>
</div>
<div className="flex items-center space-x-2">
<RadioGroupItem value="xml" id="export-format-xml" />
<Label
htmlFor="export-format-xml"
className="flex-1 font-normal"
>
XML
</Label>
</div>
<div className="flex items-center space-x-2">
<RadioGroupItem value="md" id="export-format-md" />
<Label
htmlFor="export-format-md"
className="flex-1 font-normal"
>
Markdown
</Label>
</div>
<div className="flex items-center space-x-2">
<RadioGroupItem value="tsv" id="export-format-tsv" />
<Label
htmlFor="export-format-tsv"
className="flex-1 font-normal"
>
TSV
</Label>
</div>
</RadioGroup>
</div>
<div className="grow">
Expand Down
89 changes: 89 additions & 0 deletions src/lib/export-helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,81 @@ export function exportDataAsDelimitedText(
return content;
}

export function exportRowsToXml(
headers: string[],
records: unknown[][],
exportTarget?: ExportTarget
): string {
const escapeXml = (unsafe: string) =>
unsafe
.replace(/&/g, "&amp;")
.replace(/</g, "&lt;")
.replace(/>/g, "&gt;")
.replace(/"/g, "&quot;")
.replace(/'/g, "&apos;");

let xml = '<?xml version="1.0" encoding="UTF-8"?>\n<rows>\n';

for (const record of records) {
xml += " <row>\n";
for (let i = 0; i < headers.length; i++) {
const header = escapeXml(headers[i]);
const value = record[i] != null ? escapeXml(String(record[i])) : "";
xml += ` <${header}>${value}</${header}>\n`;
}
xml += " </row>\n";
}

xml += "</rows>";

if (exportTarget === "clipboard") {
copyToClipboard(xml);
return "";
}

return xml;
}

export function exportToMarkdown(
headers: string[],
records: unknown[][],
exportTarget?: ExportTarget
) {
let result = `| ${headers.join(" | ")} | \n`;
result += `| ${headers.map(() => "---").join(" | ")} | \n`;

for (const record of records) {
const row = record.map((value) => `| ${value} `).join(" ") + " |";
result += row + "\n";
}

if (exportTarget === "clipboard") {
copyToClipboard(result);
return "";
}

return result;
}

export function exportToTSV(
headers: string[],
records: unknown[][],
exportTarget?: ExportTarget
) {
let result = `${headers.join("\t")}\n`;
for (const record of records) {
const row = record.join("\t");
result += row + "\n";
}

if (exportTarget === "clipboard") {
copyToClipboard(result);
return "";
}

return result;
}

export function getFormatHandlers(
data: OptimizeTableState,
exportTarget: ExportTarget,
Expand Down Expand Up @@ -278,6 +353,9 @@ export function getFormatHandlers(
exportTarget,
exportOptions?.nullValue || "NULL"
),
xml: () => exportRowsToXml(headers, records, exportTarget),
md: () => exportToMarkdown(headers, records, exportTarget),
tsv: () => exportToTSV(headers, records, exportTarget),
};
}

Expand Down Expand Up @@ -310,6 +388,14 @@ export async function exportTableData(
exportTarget: ExportTarget,
options?: ExportOptions
): Promise<string | Blob> {
console.log(
"Exporting",
schemaName,
tableName,
format,
exportTarget,
options
);
const result = await databaseDriver.query(
`SELECT * FROM ${databaseDriver.escapeId(schemaName)}.${databaseDriver.escapeId(tableName)}`
);
Expand Down Expand Up @@ -338,6 +424,9 @@ export async function exportTableData(
options?.encloser || '"',
exportTarget
),
xml: () => exportRowsToXml(headers, records, exportTarget),
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have users who want to transform null values into specific values. Please add support for this in the new export format.

md: () => exportToMarkdown(headers, records, exportTarget),
tsv: () => exportToTSV(headers, records, exportTarget),
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tsv: () => exportDataAsDelimitedText( headers, records, "\t", "\n", '"', exportTarget, exportOptions?.nullValue || "NULL" ),

  • You can use function exportDataAsDelimitedText to export as tsv, we just need to put the right separators.
  • It also seems consistent to display TSV separators in our UI.

};

const handler = formatHandlers[format];
Expand Down