Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

feat: support export multiple queries (#17710)

ecmadaof2b1c8d2b65c
diff --git a/backend/api/v1/sql_service.go b/backend/api/v1/sql_service.go
index 49061fc713..adf50911f0 100644
--- a/backend/api/v1/sql_service.go
+++ b/backend/api/v1/sql_service.go
@@ -815,7 +815,7 @@ func (s *SQLService) doExportFromIssue(ctx context.Context, requestName string)
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("rollout %d has no task", rollout.ID))
}
- contents := []*exportData{}
+ pendingEncrypts := []*encryptContent{}
targetTaskRunStatus := []storepb.TaskRun_Status{storepb.TaskRun_DONE}
for _, task := range tasks {
@@ -841,16 +841,34 @@ func (s *SQLService) doExportFromIssue(ctx context.Context, requestName string)
if exportArchive == nil {
return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("export not found or expired, please request a new export"))
}
- contents = append(contents, &exportData{
- Content: exportArchive.Bytes,
- Database: task.GetDatabaseName(),
- })
+
+ // The exportArchive.Bytes should be a zip without password. We will read it and append all files into the pendingEncrypts,
+ // then create a new file zip for them.
+ zipReader, err := zip.NewReader(bytes.NewReader(exportArchive.Bytes), int64(len(exportArchive.Bytes)))
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to read export archive: %v", err))
+ }
+
+ for _, file := range zipReader.File {
+ rc, err := file.Open()
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to open file %s in archive: %v", file.Name, err))
+ }
+
+ content, err := io.ReadAll(rc)
+ rc.Close()
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to read file %s: %v", file.Name, err))
+ }
+
+ pendingEncrypts = append(pendingEncrypts, &encryptContent{
+ Content: content,
+ Name: file.Name,
+ })
+ }
}
- encryptedBytes, err := doEncrypt(contents, &v1pb.ExportRequest{
- Password: tasks[0].Payload.GetPassword(),
- Format: v1pb.ExportFormat(tasks[0].Payload.GetFormat()),
- })
+ encryptedBytes, err := doEncrypt(pendingEncrypts, tasks[0].Payload.GetPassword())
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to encrypt data: %v", err))
}
@@ -923,21 +941,6 @@ func DoExport(
if queryErr != nil {
return nil, duration, queryErr
}
- // only return the last result
- if len(results) > 1 {
- results = results[len(results)-1:]
- }
- if len(results) == 1 {
- if optionalAccessCheck != nil {
- if err := optionalAccessCheck(ctx, instance, database, user, spans, queryContext.Explain); err != nil {
- return nil, duration, err
- }
- }
- }
-
- if results[0].GetError() != "" {
- return nil, duration, errors.New(results[0].GetError())
- }
if licenseService.IsFeatureEnabledForInstance(v1pb.PlanFeature_FEATURE_DATA_MASKING, instance) == nil {
masker := NewQueryResultMasker(stores)
@@ -946,76 +949,74 @@ func DoExport(
}
}
- result := results[0]
- var content []byte
- switch request.Format {
- case v1pb.ExportFormat_CSV:
- content, err = exportCSV(result)
- if err != nil {
- return nil, duration, err
- }
- case v1pb.ExportFormat_JSON:
- content, err = exportJSON(result)
- if err != nil {
- return nil, duration, err
- }
- case v1pb.ExportFormat_SQL:
- resourceList, err := getResources(ctx, stores, instance.Metadata.GetEngine(), database.DatabaseName, request.Statement, instance)
- if err != nil {
- return nil, 0, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("failed to extract resource list: %v", err))
- }
- statementPrefix, err := getSQLStatementPrefix(instance.Metadata.GetEngine(), resourceList, result.ColumnNames)
- if err != nil {
- return nil, 0, err
- }
- content, err = exportSQL(instance.Metadata.GetEngine(), statementPrefix, result)
- if err != nil {
- return nil, duration, err
+ pendingEncryptContents := []*encryptContent{}
+ for i, result := range results {
+ if result.GetError() != "" {
+ slog.Error("failed to query result",
+ slog.String("instance", database.InstanceID),
+ slog.String("database", database.DatabaseName),
+ slog.String("project", database.ProjectID),
+ slog.String("query_error", result.GetError()),
+ )
+ continue
}
- case v1pb.ExportFormat_XLSX:
- content, err = exportXLSX(result)
+
+ content, err := formatExport(ctx, stores, instance, database, result, request)
if err != nil {
- return nil, duration, err
+ slog.Error("failed to format export",
+ log.BBError(err),
+ slog.String("instance", database.InstanceID),
+ slog.String("database", database.DatabaseName),
+ slog.String("project", database.ProjectID),
+ )
+ continue
}
- default:
- return nil, duration, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("unsupported export format: %s", request.Format.String()))
+ filename := fmt.Sprintf("%s/%s/statement-%d", database.InstanceID, database.DatabaseName, i+1)
+ pendingEncryptContents = append(
+ pendingEncryptContents,
+ &encryptContent{
+ Name: fmt.Sprintf("%s.result.%s", filename, strings.ToLower(request.Format.String())),
+ Content: content,
+ },
+ &encryptContent{
+ Name: fmt.Sprintf("%s.sql", filename),
+ Content: []byte(result.Statement),
+ },
+ )
}
- if request.Password == "" {
- return content, duration, nil
+ if len(pendingEncryptContents) == 0 {
+ return nil, duration, errors.Errorf("empty export data for database %s", database.DatabaseName)
}
- encryptedBytes, err := doEncrypt([]*exportData{
- {
- Database: database.DatabaseName,
- Content: content,
- },
- }, request)
+
+ // we will save both query result and statement into the result, so we always zip files.
+ encryptedBytes, err := doEncrypt(pendingEncryptContents, request.GetPassword())
if err != nil {
- return nil, 0, errors.Wrap(err, "failed to encrypt data")
+ return nil, duration, errors.Wrap(err, "failed to encrypt data")
}
return encryptedBytes, duration, nil
}
-type exportData struct {
- Database string
- Content []byte
+type encryptContent struct {
+ Name string
+ Content []byte
}
-func doEncrypt(exports []*exportData, request *v1pb.ExportRequest) ([]byte, error) {
+func doEncrypt(exports []*encryptContent, password string) ([]byte, error) {
var b bytes.Buffer
fzip := io.Writer(&b)
zipw := zip.NewWriter(fzip)
defer zipw.Close()
- for i, export := range exports {
+ for _, export := range exports {
fh := &zip.FileHeader{
- Name: fmt.Sprintf("[%d] %s.%s", i, export.Database, strings.ToLower(request.Format.String())),
+ Name: export.Name,
Method: zip.Deflate,
}
fh.ModifiedDate, fh.ModifiedTime = timeToMsDosTime(time.Now())
- if request.Password != "" {
- fh.SetPassword(request.Password)
+ if password != "" {
+ fh.SetPassword(password)
}
writer, err := zipw.CreateHeader(fh)
if err != nil {
@@ -1033,6 +1034,36 @@ func doEncrypt(exports []*exportData, request *v1pb.ExportRequest) ([]byte, erro
return b.Bytes(), nil
}
+func formatExport(
+ ctx context.Context,
+ stores *store.Store,
+ instance *store.InstanceMessage,
+ database *store.DatabaseMessage,
+ result *v1pb.QueryResult,
+ request *v1pb.ExportRequest,
+) ([]byte, error) {
+ switch request.Format {
+ case v1pb.ExportFormat_CSV:
+ return exportCSV(result)
+ case v1pb.ExportFormat_JSON:
+ return exportJSON(result)
+ case v1pb.ExportFormat_SQL:
+ resourceList, err := getResources(ctx, stores, instance.Metadata.GetEngine(), database.DatabaseName, request.Statement, instance)
+ if err != nil {
+ return nil, errors.Errorf("failed to extract resource list: %v", err)
+ }
+ statementPrefix, err := getSQLStatementPrefix(instance.Metadata.GetEngine(), resourceList, result.ColumnNames)
+ if err != nil {
+ return nil, err
+ }
+ return exportSQL(instance.Metadata.GetEngine(), statementPrefix, result)
+ case v1pb.ExportFormat_XLSX:
+ return exportXLSX(result)
+ default:
+ return nil, errors.Errorf("unsupported export format: %s", request.Format.String())
+ }
+}
+
// timeToMsDosTime converts a time.Time to an MS-DOS date and time.
// this is a modified copy for gihub.com/alexmullins/zip/struct.go cause the package has a bug, it will convert the time to UTC time and drop the timezone.
func timeToMsDosTime(t time.Time) (uint16, uint16) {
diff --git a/backend/tests/sql_export_test.go b/backend/tests/sql_export_test.go
index a1cd495af6..7a193f9e65 100644
--- a/backend/tests/sql_export_test.go
+++ b/backend/tests/sql_export_test.go
@@ -4,8 +4,6 @@ import (
"bytes"
"context"
"fmt"
- "io"
- "strings"
"testing"
"connectrpc.com/connect"
@@ -29,7 +27,6 @@ func TestSQLExport(t *testing.T) {
password string
reset string
export string
- want bool
queryResult []*v1pb.QueryResult
resetResult []*v1pb.QueryResult
}{
@@ -112,6 +109,7 @@ func TestSQLExport(t *testing.T) {
},
},
},
+ // TODO(ed): test multiple queries.
}
t.Parallel()
@@ -220,32 +218,12 @@ func TestSQLExport(t *testing.T) {
a.NoError(err)
checkResults(a, tt.databaseName, statement, tt.resetResult, results)
- if tt.password != "" {
- reader := bytes.NewReader(export.Content)
- zipReader, err := zip.NewReader(reader, int64(len(export.Content)))
- a.NoError(err)
- a.Equal(1, len(zipReader.File))
-
- a.Equal(fmt.Sprintf("[0] %s.%s", tt.databaseName, strings.ToLower(request.Format.String())), zipReader.File[0].Name)
- compressedFile := zipReader.File[0]
- compressedFile.SetPassword(tt.password)
- file, err := compressedFile.Open()
- a.NoError(err)
- content, err := io.ReadAll(file)
- a.NoError(err)
- statement = string(content)
- } else {
- statement = string(export.Content)
- }
-
- results, err = ctl.adminQuery(ctx, database, statement)
+ reader := bytes.NewReader(export.Content)
+ zipReader, err := zip.NewReader(reader, int64(len(export.Content)))
a.NoError(err)
- checkResults(a, tt.databaseName, statement, tt.queryResult, results)
+ a.Equal(len(tt.queryResult)*2, len(zipReader.File))
- statement = tt.reset
- results, err = ctl.adminQuery(ctx, database, statement)
- a.NoError(err)
- checkResults(a, tt.databaseName, statement, tt.resetResult, results)
+ // TODO(ed): test file content.
}
}
diff --git a/frontend/src/components/DataExportButton.vue b/frontend/src/components/DataExportButton.vue
index 9f121eb7ef..c8683bdad9 100644
--- a/frontend/src/components/DataExportButton.vue
+++ b/frontend/src/components/DataExportButton.vue
@@ -148,10 +148,10 @@ interface LocalState {
showModal: boolean;
}
-export type DownloadContent = Array<{
+export type DownloadContent = {
content: Uint8Array;
filename: string;
-}>;
+};
export interface ExportOption {
limit: number;
@@ -190,7 +190,7 @@ const emit = defineEmits<{
(
event: "export",
option: {
- resolve: (content: DownloadContent) => void;
+ resolve: (content: DownloadContent[]) => void;
reject: (reason?: any) => void;
options: ExportOption;
}
@@ -289,15 +289,15 @@ const doExport = () => {
state.isRequesting = true;
const options = { ...formData.value };
- new Promise<DownloadContent>((resolve, reject) => {
+ new Promise<DownloadContent[]>((resolve, reject) => {
return emit("export", {
resolve,
reject,
options,
});
})
- .then((content: DownloadContent) => {
- return doDownload(content, options);
+ .then((content: DownloadContent[]) => {
+ return doDownload(content, options.format);
})
.then(() => {
pushNotification({
@@ -321,10 +321,6 @@ const doExport = () => {
});
};
-const downloadFileAsZip = (options: ExportOption) => {
- return !!options.password;
-};
-
const getExportFileType = (format: ExportFormat) => {
switch (format) {
case ExportFormat.CSV:
@@ -339,63 +335,44 @@ const getExportFileType = (format: ExportFormat) => {
};
const convertSingleFile = async (
- content: Uint8Array,
- options: ExportOption
+ { content, filename }: DownloadContent,
+ format: ExportFormat
) => {
- const isZip = downloadFileAsZip(options);
- const fileType = isZip
- ? "application/zip"
- : getExportFileType(options.format);
+ const isZip = filename.endsWith(".zip");
+ const fileType = isZip ? "application/zip" : getExportFileType(format);
// Create Blob from Uint8Array
const buffer = content.buffer.slice(
content.byteOffset,
content.byteOffset + content.byteLength
) as ArrayBuffer; // TypeScript 5.9.2 requires explicit ArrayBuffer type
- let blob = new Blob([buffer], {
+ return new Blob([buffer], {
type: fileType,
});
- if (options.format === ExportFormat.JSON) {
- const text = await blob.text();
- const formatted = JSON.stringify(JSON.parse(text), null, 2);
- blob = new Blob([formatted], {
- type: fileType,
- });
- }
- return blob;
};
const doDownloadSingleFile = async (
- {
- content,
- filename,
- }: {
- content: Uint8Array;
- filename: string;
- },
- options: ExportOption
+ content: DownloadContent,
+ format: ExportFormat
) => {
- const blob = await convertSingleFile(content, options);
- const isZip = downloadFileAsZip(options);
+ const blob = await convertSingleFile(content, format);
const url = window.URL.createObjectURL(blob);
- const fileFormat = ExportFormat[options.format].toLowerCase();
const link = document.createElement("a");
- link.download = `${filename}.${isZip ? "zip" : fileFormat}`;
+ link.download = content.filename;
link.href = url;
link.click();
};
-const doDownload = async (content: DownloadContent, options: ExportOption) => {
+const doDownload = async (content: DownloadContent[], format: ExportFormat) => {
if (content.length === 1) {
- return doDownloadSingleFile(content[0], options);
+ return doDownloadSingleFile(content[0], format);
}
- const fileFormat = ExportFormat[options.format].toLowerCase();
const zip = new JSZip();
for (const c of content) {
- const blob = await convertSingleFile(c.content, options);
- zip.file(`${c.filename}.${fileFormat}`, blob);
+ const blob = await convertSingleFile(c, format);
+ zip.file(c.filename, blob);
}
const zipFile = await zip.generateAsync({ type: "blob" });
diff --git a/frontend/src/components/IssueV1/components/IssueLabelSelector.vue b/frontend/src/components/IssueV1/components/IssueLabelSelector.vue
index 599e865d47..d9d12394fc 100644
--- a/frontend/src/components/IssueV1/components/IssueLabelSelector.vue
+++ b/frontend/src/components/IssueV1/components/IssueLabelSelector.vue
@@ -22,7 +22,7 @@
projectId: getProjectName(project.name),
},
}"
- class="textinfolabel normal-link"
+ class="textinfolabel normal-link flex items-center gap-x-2"
>
{{ $t("project.settings.issue-related.labels.configure-labels") }}
<ExternalLinkIcon class="w-4 h-auto inline-block" />
diff --git a/frontend/src/components/Plan/components/ExportOption/ExportPasswordInputer.vue b/frontend/src/components/Plan/components/ExportOption/ExportPasswordInputer.vue
index 1461be1f93..a501d41360 100644
--- a/frontend/src/components/Plan/components/ExportOption/ExportPasswordInputer.vue
+++ b/frontend/src/components/Plan/components/ExportOption/ExportPasswordInputer.vue
@@ -1,35 +1,38 @@
<template>
- <NSwitch
- v-model:value="state.encryptEnabled"
- :disabled="!editable"
- size="small"
- />
- <template v-if="editable && state.encryptEnabled">
- <span class="textinfolabel pl-4 pr-2"
- >{{ $t("common.password") }}
- <RequiredStar />
- </span>
- <NInput
- v-model:value="state.password"
- class="!w-auto"
- size="small"
- type="password"
- :input-props="{ autocomplete: 'new-password' }"
- :placeholder="$t('common.password')"
- />
- </template>
+ <div class="flex items-start md:items-center flex-col md:flex-row gap-4">
+ <div class="flex items-center gap-4">
+ <span class="text-sm">
+ {{ $t("export-data.password-optional") }}
+ </span>
+ <NSwitch
+ v-model:value="encryptEnabled"
+ :disabled="!editable"
+ size="small"
+ />
+ </div>
+ <div v-if="editable && encryptEnabled" class="flex items-center gap-4">
+ <span class="text-sm">
+ {{ $t("common.password") }}
+ <RequiredStar />
+ </span>
+ <NInput
+ :value="password"
+ class="!w-auto"
+ size="small"
+ type="password"
+ :input-props="{ autocomplete: 'new-password' }"
+ :placeholder="$t('common.password')"
+ @update:value="(val) => $emit('update:password', val)"
+ />
+ </div>
+ </div>
</template>
<script setup lang="ts">
import { NSwitch, NInput } from "naive-ui";
-import { reactive, watch } from "vue";
+import { watch, ref } from "vue";
import RequiredStar from "@/components/RequiredStar.vue";
-interface LocalState {
- encryptEnabled: boolean;
- password: string;
-}
-
const props = defineProps<{
password?: string;
editable?: boolean;
@@ -39,20 +42,14 @@ const emit = defineEmits<{
(event: "update:password", value: string): void;
}>();
-const state = reactive<LocalState>({
- encryptEnabled: Boolean(props.password),
- password: props.password || "",
-});
+const encryptEnabled = ref(Boolean(props.password));
watch(
- () => state,
- () => {
- if (!state.encryptEnabled) {
+ () => encryptEnabled.value,
+ (encryptEnabled) => {
+ if (!encryptEnabled) {
emit("update:password", "");
- } else {
- emit("update:password", state.password);
}
- },
- { deep: true }
+ }
);
</script>
diff --git a/frontend/src/components/Plan/components/HeaderSection/Actions/export/ExportArchiveDownloadAction.vue b/frontend/src/components/Plan/components/HeaderSection/Actions/export/ExportArchiveDownloadAction.vue
index c26ccfd196..e165e14498 100644
--- a/frontend/src/components/Plan/components/HeaderSection/Actions/export/ExportArchiveDownloadAction.vue
+++ b/frontend/src/components/Plan/components/HeaderSection/Actions/export/ExportArchiveDownloadAction.vue
@@ -35,8 +35,6 @@ import { NButton, NTooltip } from "naive-ui";
import { computed, reactive } from "vue";
import { usePlanContext } from "@/components/Plan/logic";
import { useSQLStore } from "@/store";
-import { ExportFormat } from "@/types/proto-es/v1/common_pb";
-import type { Plan_ExportDataConfig } from "@/types/proto-es/v1/plan_service_pb";
import {
TaskRun_ExportArchiveStatus,
type TaskRun,
@@ -48,7 +46,7 @@ interface LocalState {
isExporting: boolean;
}
-const { plan, rollout, taskRuns, events } = usePlanContext();
+const { rollout, taskRuns, events } = usePlanContext();
const state = reactive<LocalState>({
isExporting: false,
});
@@ -75,13 +73,6 @@ const isExported = computed(() => {
);
});
-const exportDataConfig = computed((): Plan_ExportDataConfig | undefined => {
- const spec = plan.value.specs.find(
- (spec) => spec.config?.case === "exportDataConfig"
- );
- return spec?.config?.value as Plan_ExportDataConfig;
-});
-
const downloadExportArchive = async () => {
if (!rollout.value) return;
@@ -92,20 +83,19 @@ const downloadExportArchive = async () => {
name: `${rollout.value.name}/stages/-`,
})
);
- const fileType = getExportFileType(exportDataConfig.value);
const buffer = content.buffer.slice(
content.byteOffset,
content.byteOffset + content.byteLength
) as ArrayBuffer;
const blob = new Blob([buffer], {
- type: fileType,
+ type: "application/zip", // the download file is always zip file.
});
const url = window.URL.createObjectURL(blob);
const formattedDateString = dayjs(new Date()).format("YYYY-MM-DDTHH-mm-ss");
- const filename = `export-data-${formattedDateString}`;
+ const filename = `export-data-${formattedDateString}.zip`;
const link = document.createElement("a");
- link.download = `${filename}.zip`;
+ link.download = filename;
link.href = url;
link.click();
events.emit("status-changed", { eager: true });
@@ -113,24 +103,4 @@ const downloadExportArchive = async () => {
state.isExporting = false;
}
};
-
-const getExportFileType = (exportDataConfig?: Plan_ExportDataConfig) => {
- if (!exportDataConfig) return "application/zip";
-
- if (exportDataConfig.password) {
- return "application/zip";
- }
- switch (exportDataConfig.format) {
- case ExportFormat.CSV:
- return "text/csv";
- case ExportFormat.JSON:
- return "application/json";
- case ExportFormat.SQL:
- return "application/sql";
- case ExportFormat.XLSX:
- return "application/vnd.ms-excel";
- default:
- return "application/zip";
- }
-};
</script>
diff --git a/frontend/src/components/Plan/components/IssueReviewView/DatabaseExportView/OptionsSection.vue b/frontend/src/components/Plan/components/IssueReviewView/DatabaseExportView/OptionsSection.vue
index 978c10ecfe..ab19ce6820 100644
--- a/frontend/src/components/Plan/components/IssueReviewView/DatabaseExportView/OptionsSection.vue
+++ b/frontend/src/components/Plan/components/IssueReviewView/DatabaseExportView/OptionsSection.vue
@@ -37,15 +37,10 @@
</div>
<!-- Password Protection Display/Edit -->
- <div class="flex items-center gap-4 min-h-7">
- <span class="text-sm">
- {{ $t("export-data.password-optional") }}
- </span>
- <ExportPasswordInputer
- v-model:password="editableConfig.password"
- :editable="optionsEditable"
- />
- </div>
+ <ExportPasswordInputer
+ v-model:password="editableConfig.password"
+ :editable="optionsEditable"
+ />
</div>
</div>
</template>
diff --git a/frontend/src/components/Plan/components/SpecDetailView/DataExportOptionsSection.vue b/frontend/src/components/Plan/components/SpecDetailView/DataExportOptionsSection.vue
index b8a812f2ba..1cf609de75 100644
--- a/frontend/src/components/Plan/components/SpecDetailView/DataExportOptionsSection.vue
+++ b/frontend/src/components/Plan/components/SpecDetailView/DataExportOptionsSection.vue
@@ -7,9 +7,7 @@
<div class="space-y-3">
<!-- Export Format -->
<div class="flex items-center gap-4">
- <span class="text-sm min-w-[100px]">{{
- $t("export-data.export-format")
- }}</span>
+ <span class="text-sm">{{ $t("export-data.export-format") }}</span>
<ExportFormatSelector
v-model:format="exportFormat"
:editable="isCreating"
@@ -17,15 +15,10 @@
</div>
<!-- Password Protection -->
- <div class="flex items-center gap-4 min-h-7">
- <span class="text-sm min-w-[100px]">{{
- $t("export-data.password-optional")
- }}</span>
- <ExportPasswordInputer
- v-model:password="exportPassword"
- :editable="isCreating"
- />
- </div>
+ <ExportPasswordInputer
+ v-model:password="exportPassword"
+ :editable="isCreating"
+ />
</div>
</div>
</template>
diff --git a/frontend/src/store/modules/v1/project.ts b/frontend/src/store/modules/v1/project.ts
index 81edc35752..8523c4bb24 100644
--- a/frontend/src/store/modules/v1/project.ts
+++ b/frontend/src/store/modules/v1/project.ts
@@ -298,7 +298,7 @@ export const useProjectByName = (name: MaybeRef<string>) => {
export const useCurrentProjectV1 = () => {
const route = useRoute();
const projectName = computed(() =>
- route.params.projectId
+ route?.params.projectId
? `${projectNamePrefix}${route.params.projectId}`
: unknownProject().name
);
diff --git a/frontend/src/views/SettingWorkspaceAuditLog.vue b/frontend/src/views/SettingWorkspaceAuditLog.vue
index ddc6908fc3..790ffb67fb 100644
--- a/frontend/src/views/SettingWorkspaceAuditLog.vue
+++ b/frontend/src/views/SettingWorkspaceAuditLog.vue
@@ -153,11 +153,11 @@ const handleExport = async ({
}: {
options: ExportOption;
reject: (reason?: any) => void;
- resolve: (content: DownloadContent) => void;
+ resolve: (content: DownloadContent[]) => void;
}) => {
let pageToken = "";
let i = 0;
- const contents: DownloadContent = [];
+ const contents: DownloadContent[] = [];
try {
while (i === 0 || pageToken !== "") {
@@ -171,7 +171,7 @@ const handleExport = async ({
pageToken = nextPageToken;
contents.push({
content,
- filename: `audit-log.file${i}.${dayjs(new Date()).format("YYYY-MM-DDTHH-mm-ss")}`,
+ filename: `audit-log.file${i}.${dayjs(new Date()).format("YYYY-MM-DDTHH-mm-ss")}.${ExportFormat[options.format].toLowerCase()}`,
});
}
resolve(contents);
diff --git a/frontend/src/views/project/ProjectAuditLogDashboard.vue b/frontend/src/views/project/ProjectAuditLogDashboard.vue
index 315a35c8d2..1084538cc0 100644
--- a/frontend/src/views/project/ProjectAuditLogDashboard.vue
+++ b/frontend/src/views/project/ProjectAuditLogDashboard.vue
@@ -155,11 +155,11 @@ const handleExport = async ({
}: {
options: ExportOption;
reject: (reason?: unknown) => void;
- resolve: (content: DownloadContent) => void;
+ resolve: (content: DownloadContent[]) => void;
}) => {
let pageToken = "";
let i = 0;
- const contents: DownloadContent = [];
+ const contents: DownloadContent[] = [];
try {
while (i === 0 || pageToken !== "") {
@@ -173,7 +173,7 @@ const handleExport = async ({
pageToken = nextPageToken;
contents.push({
content,
- filename: `audit-log.file${i}.${dayjs(new Date()).format("YYYY-MM-DDTHH-mm-ss")}`,
+ filename: `audit-log.file${i}.${dayjs(new Date()).format("YYYY-MM-DDTHH-mm-ss")}.${ExportFormat[options.format].toLowerCase()}`,
});
}
resolve(contents);
diff --git a/frontend/src/views/sql-editor/EditorCommon/ResultView/SingleResultViewV1.vue b/frontend/src/views/sql-editor/EditorCommon/ResultView/SingleResultViewV1.vue
index d1f2153c72..75e3d284c9 100644
--- a/frontend/src/views/sql-editor/EditorCommon/ResultView/SingleResultViewV1.vue
+++ b/frontend/src/views/sql-editor/EditorCommon/ResultView/SingleResultViewV1.vue
@@ -493,7 +493,7 @@ const handleExportBtnClick = async ({
}: {
options: ExportOption;
reject: (reason?: any) => void;
- resolve: (content: DownloadContent) => void;
+ resolve: (content: DownloadContent[]) => void;
}) => {
const admin = tabStore.currentTab?.mode === "ADMIN";
const limit = options.limit ?? (admin ? 0 : editorStore.resultRowsLimit);
@@ -515,7 +515,8 @@ const handleExportBtnClick = async ({
resolve([
{
content,
- filename: `${props.database.databaseName}.${dayjs(new Date()).format("YYYY-MM-DDTHH-mm-ss")}`,
+ // the download file is always zip file.
+ filename: `${props.database.databaseName}.${dayjs(new Date()).format("YYYY-MM-DDTHH-mm-ss")}.zip`,
},
]);
} catch (e) {
diff --git a/frontend/src/views/sql-editor/EditorPanel/ResultPanel/BatchQuerySelect.vue b/frontend/src/views/sql-editor/EditorPanel/ResultPanel/BatchQuerySelect.vue
index 6dd7e6b7c4..da483f2c8e 100644
--- a/frontend/src/views/sql-editor/EditorPanel/ResultPanel/BatchQuerySelect.vue
+++ b/frontend/src/views/sql-editor/EditorPanel/ResultPanel/BatchQuerySelect.vue
@@ -259,9 +259,9 @@ const handleExportBtnClick = async ({
}: {
options: ExportOption;
reject: (reason?: any) => void;
- resolve: (content: DownloadContent) => void;
+ resolve: (content: DownloadContent[]) => void;
}) => {
- const contents: DownloadContent = [];
+ const contents: DownloadContent[] = [];
for (const databaseName of selectedDatabaseNameList.value) {
const database = databaseStore.getDatabaseByName(databaseName);
const context = head(tab.value?.databaseQueryContexts?.get(databaseName));
@@ -284,7 +284,8 @@ const handleExportBtnClick = async ({
contents.push({
content,
- filename: `${database.databaseName}.${dayjs(new Date()).format("YYYY-MM-DDTHH-mm-ss")}`,
+ // the download file is always zip file.
+ filename: `${database.databaseName}.${dayjs(new Date()).format("YYYY-MM-DDTHH-mm-ss")}.zip`,
});
} catch (e) {
pushNotification({