revert(grid): remove export action from data grid top toolbar
Reverts PR #11148 (0f59ecd18).
This commit is contained in:
2 files changed
+2
-30
No files matched your search
@@ -382,7 +382,6 @@ import {
|
|||||||
type DataGridToolbarActionCapability,
|
type DataGridToolbarActionCapability,
|
||||||
type DataGridToolbarAddRowCapability,
|
type DataGridToolbarAddRowCapability,
|
||||||
type DataGridToolbarAutoRefreshCapability,
|
type DataGridToolbarAutoRefreshCapability,
|
||||||
type DataGridToolbarExportCapability,
|
|
||||||
type DataGridToolbarSaveCapability,
|
type DataGridToolbarSaveCapability,
|
||||||
} from "@/lib/dataGrid/dataGridToolbar";
|
} from "@/lib/dataGrid/dataGridToolbar";
|
||||||
import { getTableMetadataCapabilities } from "@/lib/table/tableMetadataCapabilities";
|
import { getTableMetadataCapabilities } from "@/lib/table/tableMetadataCapabilities";
|
||||||
@@ -8622,13 +8621,6 @@ function selectExportMenuItem(value: string) {
|
|||||||
actions[value]?.();
|
actions[value]?.();
|
||||||
}
|
}
|
||||||
|
|
||||||
const exportToolbarCapability = computed<DataGridToolbarExportCapability>(() => ({
|
|
||||||
label: t("grid.export"),
|
|
||||||
visible: props.result.columns.length > 0,
|
|
||||||
items: exportMenuItems.value,
|
|
||||||
onSelect: selectExportMenuItem,
|
|
||||||
}));
|
|
||||||
|
|
||||||
// --- Cell selection and detail ---
|
// --- Cell selection and detail ---
|
||||||
function hydrateCellDetailTarget(target: { rowIndex: number; col: number }) {
|
function hydrateCellDetailTarget(target: { rowIndex: number; col: number }) {
|
||||||
const item = displayItemAt(target.rowIndex);
|
const item = displayItemAt(target.rowIndex);
|
||||||
@@ -12409,7 +12401,6 @@ watch(
|
|||||||
defineExpose({
|
defineExpose({
|
||||||
tableInfoToolbarCapability,
|
tableInfoToolbarCapability,
|
||||||
goToColumnToolbarCapability,
|
goToColumnToolbarCapability,
|
||||||
exportToolbarCapability,
|
|
||||||
useTransaction,
|
useTransaction,
|
||||||
transactionActive,
|
transactionActive,
|
||||||
isSaving,
|
isSaving,
|
||||||
@@ -13029,7 +13020,6 @@ useUpdateBlocker(() => (hasPendingChanges.value || hasPendingDataEditorDraft.val
|
|||||||
:auto-refresh="autoRefreshToolbarCapability"
|
:auto-refresh="autoRefreshToolbarCapability"
|
||||||
:add-row="addRowToolbarCapability"
|
:add-row="addRowToolbarCapability"
|
||||||
:delete-row="deleteRowToolbarCapability"
|
:delete-row="deleteRowToolbarCapability"
|
||||||
:export-data="exportToolbarCapability"
|
|
||||||
:layer-preview="layerPreviewToolbarCapability"
|
:layer-preview="layerPreviewToolbarCapability"
|
||||||
:preview="previewToolbarCapability"
|
:preview="previewToolbarCapability"
|
||||||
:save="saveToolbarCapability"
|
:save="saveToolbarCapability"
|
||||||
|
|||||||
+2
-20
@@ -6,7 +6,7 @@ import { afterEach, describe, expect, it, vi } from "vitest";
|
|||||||
import i18n from "@/i18n";
|
import i18n from "@/i18n";
|
||||||
import type { QueryResult } from "@/types/database";
|
import type { QueryResult } from "@/types/database";
|
||||||
import { TooltipProvider } from "@/components/ui/tooltip";
|
import { TooltipProvider } from "@/components/ui/tooltip";
|
||||||
import type { DataGridToolbarActionCapability, DataGridToolbarExportCapability } from "@/lib/dataGrid/dataGridToolbar";
|
import type { DataGridToolbarActionCapability } from "@/lib/dataGrid/dataGridToolbar";
|
||||||
|
|
||||||
vi.mock("@/composables/useDataGridColumnResize", async (importOriginal) => {
|
vi.mock("@/composables/useDataGridColumnResize", async (importOriginal) => {
|
||||||
const actual = await importOriginal<typeof import("@/composables/useDataGridColumnResize")>();
|
const actual = await importOriginal<typeof import("@/composables/useDataGridColumnResize")>();
|
||||||
@@ -109,10 +109,7 @@ function mountGrid() {
|
|||||||
affected_rows: 0,
|
affected_rows: 0,
|
||||||
execution_time_ms: 0,
|
execution_time_ms: 0,
|
||||||
});
|
});
|
||||||
const grid = ref<{
|
const grid = ref<{ goToColumnToolbarCapability: DataGridToolbarActionCapability }>();
|
||||||
goToColumnToolbarCapability: DataGridToolbarActionCapability;
|
|
||||||
exportToolbarCapability: DataGridToolbarExportCapability;
|
|
||||||
}>();
|
|
||||||
const host = document.createElement("div");
|
const host = document.createElement("div");
|
||||||
document.body.append(host);
|
document.body.append(host);
|
||||||
const Root = defineComponent({
|
const Root = defineComponent({
|
||||||
@@ -215,21 +212,6 @@ describe("data grid icon-only toolbar tooltips", () => {
|
|||||||
expect(host.querySelector("[data-column-lookup-panel]")).not.toBeNull();
|
expect(host.querySelector("[data-column-lookup-panel]")).not.toBeNull();
|
||||||
expect(host.querySelector('[data-slot="popover-content"]')).toBeNull();
|
expect(host.querySelector('[data-slot="popover-content"]')).toBeNull();
|
||||||
});
|
});
|
||||||
|
|
||||||
it("provides export capability and renders the export button in the top toolbar", async () => {
|
|
||||||
const { host, grid } = mountGrid();
|
|
||||||
await settle();
|
|
||||||
|
|
||||||
expect(grid.value?.exportToolbarCapability.visible).toBe(true);
|
|
||||||
expect(grid.value?.exportToolbarCapability.label).toBe("Export");
|
|
||||||
expect(grid.value?.exportToolbarCapability.items.length).toBeGreaterThan(0);
|
|
||||||
|
|
||||||
const button = toolbarButton(host, "exportData");
|
|
||||||
expect(button).not.toBeNull();
|
|
||||||
await click(button);
|
|
||||||
|
|
||||||
expectPositionedSurface("dropdown-menu-content");
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
// Reka resolves the popper anchor from the nearest popper root. Wrapping an overlay
|
// Reka resolves the popper anchor from the nearest popper root. Wrapping an overlay
|
||||||
|
|||||||
Reference in new issue
Block a user