1 parent
9c23e3198b
commit
0fd1d6108f
12 files changed
+1007
-184
No files matched your search
@@ -374,7 +374,7 @@ import { useDataGridColumnFormatter } from "@/composables/useDataGridColumnForma
|
||||
import { useDataGridTableMetadataLoaders } from "@/composables/useDataGridTableMetadataLoaders";
|
||||
import { DATA_GRID_SERVER_COLUMN_FILTER_LIMIT, useDataGridColumnFilters } from "@/composables/useDataGridColumnFilters";
|
||||
import { useDataGridLargeValues } from "@/composables/useDataGridLargeValues";
|
||||
import { useSalesforceSaveConfirmation } from "@/composables/useSalesforceSaveConfirmation";
|
||||
import { useDataGridSaveConfirmation } from "@/composables/useDataGridSaveConfirmation";
|
||||
|
||||
const SqlPreviewPanel = defineAsyncComponent(() => import("@/components/editor/SqlPreviewPanel.vue"));
|
||||
const ImagePreviewDialog = defineAsyncComponent(() => import("@/components/grid/ImagePreviewDialog.vue"));
|
||||
@@ -3274,6 +3274,7 @@ const resultSourceColumns = computed(() => props.result.columns.map((column, ind
|
||||
const canEditExistingRows = computed(
|
||||
() => !!props.customSaveHandler || (canEditExistingTableRows(props.databaseType, hiveTableTransactional.value, props.tableMeta?.primaryKeys ?? []) && hasCompleteTdengineRowIdentity(props.databaseType, props.tableMeta?.primaryKeys ?? [], resultSourceColumns.value)),
|
||||
);
|
||||
const canUpdateExistingRows = computed(() => canEditExistingRows.value && props.customSaveHandler?.canUpdate !== false);
|
||||
const customReadonlyColumns = computed(() => new Set((props.customSaveHandler?.readonlyColumns ?? []).map((column) => column.toLowerCase())));
|
||||
const hasDataGridSaveTarget = computed(() => !!props.tableMeta || !!props.customSaveHandler);
|
||||
const hasDataGridInsertTarget = computed(() => {
|
||||
@@ -3813,22 +3814,22 @@ async function refreshSavedRows(request: { dirtyRows: ReadonlyMap<number, Readon
|
||||
return true;
|
||||
}
|
||||
|
||||
// Salesforce applies one REST call per record with no transaction, so every grid
|
||||
// save is reviewed here first. The identity lines are advisory only — Salesforce
|
||||
// enforces the real object/field permissions, and a failed identity lookup just
|
||||
// omits the line rather than blocking the write.
|
||||
// Non-transactional or specialized mutations can require a final review of the
|
||||
// exact statements after changes have been staged. Salesforce and guarded
|
||||
// InfluxDB 1.x deletion share the promise-backed dialog state below.
|
||||
const {
|
||||
open: salesforceSaveConfirmOpen,
|
||||
updates: salesforceSaveConfirmUpdates,
|
||||
inserts: salesforceSaveConfirmInserts,
|
||||
deletes: salesforceSaveConfirmDeletes,
|
||||
total: salesforceSaveConfirmTotal,
|
||||
targetLabel: salesforceSaveConfirmTarget,
|
||||
statements: salesforceSaveConfirmStatements,
|
||||
request: requestSalesforceSaveConfirmation,
|
||||
confirm: confirmSalesforceSave,
|
||||
} = useSalesforceSaveConfirmation();
|
||||
open: saveConfirmOpen,
|
||||
updates: saveConfirmUpdates,
|
||||
inserts: saveConfirmInserts,
|
||||
deletes: saveConfirmDeletes,
|
||||
total: saveConfirmTotal,
|
||||
targetLabel: saveConfirmTarget,
|
||||
statements: saveConfirmStatements,
|
||||
request: requestDataGridSaveConfirmation,
|
||||
confirm: confirmDataGridSave,
|
||||
} = useDataGridSaveConfirmation();
|
||||
const isSalesforceGrid = computed(() => resolvedDatabaseType.value === "salesforce");
|
||||
const isInfluxDbV1DeleteGrid = computed(() => props.customSaveHandler?.confirmation === "influxdb-v1-delete");
|
||||
const salesforceIdentity = computed(() => (isSalesforceGrid.value && props.connectionId ? connectionStore.salesforceCurrentUser(props.connectionId) : null));
|
||||
const salesforceIdentityLabel = computed(() => {
|
||||
const identity = salesforceIdentity.value;
|
||||
@@ -3837,9 +3838,9 @@ const salesforceIdentityLabel = computed(() => {
|
||||
});
|
||||
const salesforceSaveConfirmSummary = computed(() => {
|
||||
const parts: string[] = [];
|
||||
if (salesforceSaveConfirmUpdates.value > 0) parts.push(t("grid.salesforceSaveUpdates", { count: salesforceSaveConfirmUpdates.value }));
|
||||
if (salesforceSaveConfirmInserts.value > 0) parts.push(t("grid.salesforceSaveInserts", { count: salesforceSaveConfirmInserts.value }));
|
||||
if (salesforceSaveConfirmDeletes.value > 0) parts.push(t("grid.salesforceSaveDeletes", { count: salesforceSaveConfirmDeletes.value }));
|
||||
if (saveConfirmUpdates.value > 0) parts.push(t("grid.salesforceSaveUpdates", { count: saveConfirmUpdates.value }));
|
||||
if (saveConfirmInserts.value > 0) parts.push(t("grid.salesforceSaveInserts", { count: saveConfirmInserts.value }));
|
||||
if (saveConfirmDeletes.value > 0) parts.push(t("grid.salesforceSaveDeletes", { count: saveConfirmDeletes.value }));
|
||||
return parts.join(" · ");
|
||||
});
|
||||
// The save dialog names the profile alongside the user: writability comes from
|
||||
@@ -3849,7 +3850,7 @@ const salesforceIdentityProfile = computed(() => {
|
||||
return profileName ? t("grid.salesforceSaveProfile", { name: profileName }) : t("toolbar.salesforceIdentityUnknownProfile");
|
||||
});
|
||||
const salesforceSaveConfirmDetails = computed(() => {
|
||||
const lines = [salesforceSaveConfirmSummary.value, t("grid.salesforceSaveTarget", { object: salesforceSaveConfirmTarget.value || t("grid.salesforceSaveUnknownObject") })];
|
||||
const lines = [salesforceSaveConfirmSummary.value, t("grid.salesforceSaveTarget", { object: saveConfirmTarget.value || t("grid.salesforceSaveUnknownObject") })];
|
||||
if (salesforceIdentity.value) {
|
||||
const identity = { user: salesforceIdentityLabel.value, profile: salesforceIdentityProfile.value };
|
||||
if (salesforceIdentity.value.isAdmin === true) lines.push(t("grid.salesforceSaveAdminIdentity", identity));
|
||||
@@ -3858,9 +3859,13 @@ const salesforceSaveConfirmDetails = computed(() => {
|
||||
}
|
||||
return lines.filter((line) => !!line).join("\n");
|
||||
});
|
||||
const salesforceSaveConfirmSql = computed(() => salesforceSaveConfirmStatements.value.join("\n"));
|
||||
watch(salesforceSaveConfirmOpen, (isOpen) => {
|
||||
if (!isOpen || !props.connectionId) return;
|
||||
const saveConfirmSql = computed(() => saveConfirmStatements.value.join("\n"));
|
||||
const saveConfirmTitle = computed(() => (isInfluxDbV1DeleteGrid.value ? t("grid.influxDeleteConfirmTitle") : t("grid.salesforceSaveConfirmTitle")));
|
||||
const saveConfirmMessage = computed(() => (isInfluxDbV1DeleteGrid.value ? t("grid.influxDeleteConfirmMessage", { count: saveConfirmDeletes.value }) : t("grid.salesforceSaveConfirmMessage", { count: saveConfirmTotal.value })));
|
||||
const saveConfirmDetails = computed(() => (isInfluxDbV1DeleteGrid.value ? t("grid.influxDeleteTarget", { measurement: saveConfirmTarget.value || "—" }) : salesforceSaveConfirmDetails.value));
|
||||
const saveConfirmLabel = computed(() => (isInfluxDbV1DeleteGrid.value ? t("grid.influxDeleteConfirm") : t("grid.salesforceSaveConfirm")));
|
||||
watch(saveConfirmOpen, (isOpen) => {
|
||||
if (!isOpen || !isSalesforceGrid.value || !props.connectionId) return;
|
||||
void connectionStore.loadSalesforceCurrentUser(props.connectionId);
|
||||
});
|
||||
|
||||
@@ -3888,8 +3893,7 @@ const editor = useDataGridEditor({
|
||||
rowStatusFilter,
|
||||
dataGridQuickEntryEnabled: computed(() => settingsStore.editorSettings.dataGridQuickEntry),
|
||||
confirmDangerousRowDeletion: computed(() => settingsStore.editorSettings.confirmDangerousSqlExecution),
|
||||
// Only Salesforce opts in: its writes cannot be rolled back once issued.
|
||||
confirmSaveRequest: computed(() => (isSalesforceGrid.value ? requestSalesforceSaveConfirmation : undefined)),
|
||||
confirmSaveRequest: computed(() => (isSalesforceGrid.value || isInfluxDbV1DeleteGrid.value ? requestDataGridSaveConfirmation : undefined)),
|
||||
includeDatabaseNameInSaveSql: computed(() => settingsStore.editorSettings.generateSqlIncludeDatabaseName),
|
||||
initialEditColumn: firstVisibleColumnIndex,
|
||||
cellEditorText: cellEditorTextForValue,
|
||||
@@ -4083,7 +4087,8 @@ function canEditRowItem(item: RowItem | undefined): boolean {
|
||||
}
|
||||
|
||||
function canEditCellItem(item: RowItem | undefined, columnIndex: number): boolean {
|
||||
if (!canEditRowItem(item) || !canEditColumn(columnIndex)) return false;
|
||||
if (!canEditRowItem(item) || !item || !canEditColumn(columnIndex)) return false;
|
||||
if (!item.isNew && !item.isDraft && !canUpdateExistingRows.value) return false;
|
||||
if (isSavingNewRow(item)) return false;
|
||||
const column = props.result.columns[columnIndex] ?? "";
|
||||
if (customReadonlyColumns.value.has(column.toLowerCase())) return false;
|
||||
@@ -4346,7 +4351,7 @@ function isDecimalColumnType(dataType: string): boolean {
|
||||
|
||||
function canDeleteRowItem(item: RowItem | undefined): boolean {
|
||||
if (!item) return false;
|
||||
return canDeleteGridRowItem({
|
||||
const canDelete = canDeleteGridRowItem({
|
||||
editable: !!props.editable && canDeleteRows.value,
|
||||
isDraft: !!item.isDraft,
|
||||
isDeleted: item.isDeleted,
|
||||
@@ -4354,6 +4359,8 @@ function canDeleteRowItem(item: RowItem | undefined): boolean {
|
||||
canEditExistingRows: canEditExistingRows.value && canDeleteExistingRows.value,
|
||||
isSavingNewRow: isSavingNewRow(item),
|
||||
});
|
||||
if (!canDelete || item.isNew || !props.customSaveHandler?.canDeleteRow) return canDelete;
|
||||
return item.sourceIndex !== undefined && props.customSaveHandler.canDeleteRow(item.sourceIndex, item.data);
|
||||
}
|
||||
|
||||
function resetInfiniteScrollState() {
|
||||
@@ -5743,7 +5750,11 @@ function affectedRowIds(): number[] {
|
||||
}
|
||||
|
||||
function deletableRowIds(rowIds: number[]): number[] {
|
||||
return rowIds.filter((rowId) => canDeleteRowItem(getRowItem(rowId)));
|
||||
const eligible = rowIds.filter((rowId) => canDeleteRowItem(getRowItem(rowId)));
|
||||
// A custom row-safety predicate is an all-or-nothing contract. Never silently
|
||||
// drop an unsafe row from a multi-row request while deleting its neighbors.
|
||||
if (props.customSaveHandler?.canDeleteRow && eligible.length !== rowIds.length) return [];
|
||||
return eligible;
|
||||
}
|
||||
|
||||
function exportSelectedRowsCsv() {
|
||||
@@ -8370,7 +8381,7 @@ function selectedRangeTargetsOnlyDraftRow(): boolean {
|
||||
return displayItemAt(range.startRow)?.isDraft === true;
|
||||
}
|
||||
|
||||
const replaceAvailable = computed(() => !!props.editable && hasDataGridSaveTarget.value && canEditExistingRows.value && !resolvedConnectionConfig.value?.read_only && !isConditionalUpdateActive.value);
|
||||
const replaceAvailable = computed(() => !!props.editable && hasDataGridSaveTarget.value && canUpdateExistingRows.value && !resolvedConnectionConfig.value?.read_only && !isConditionalUpdateActive.value);
|
||||
const replaceResolving = ref(false);
|
||||
const replaceBusy = computed(() => replaceResolving.value || isSaving.value || gridSurfaceBusy.value || props.loading === true);
|
||||
|
||||
@@ -11918,6 +11929,8 @@ function exportSubmenu(): ContextMenuItem {
|
||||
const gridContextMenuItems = computed<ContextMenuItem[]>(() => {
|
||||
const row = contextRowItem.value;
|
||||
const rowLabels = rowActionLabels();
|
||||
const rowIdsForDelete = isMultiRow.value ? affectedRowIds() : row ? [row.id] : [];
|
||||
const deletableContextRowIds = deletableRowIds(rowIdsForDelete);
|
||||
const hasEditableSelection = selectionHasEditableCells();
|
||||
const selectedColumnCount = selectedVisibleColumnIndexes().length;
|
||||
const gridSnapshotContext = contextHeaderColumn.value && hasColumnSelection.value ? "columns" : contextCell.value?.col === -1 && affectedRowIds().length > 0 ? "rows" : contextCell.value && hasCellSelection.value && selectedCellMatrix.value ? "cells" : null;
|
||||
@@ -12087,13 +12100,15 @@ const gridContextMenuItems = computed<ContextMenuItem[]>(() => {
|
||||
hasRow: !!row,
|
||||
canClone: !!row && canInsertRows.value && !row.isDraft,
|
||||
deleted: !!row?.isDeleted,
|
||||
canDelete: !!row && canDeleteRowItem(row),
|
||||
canDelete: deletableContextRowIds.length > 0,
|
||||
labels: rowLabels,
|
||||
icons: { clone: CopyPlus, restore: Undo2, delete: Trash2 },
|
||||
actions: {
|
||||
clone: () => void (isMultiRow.value ? cloneRows(affectedRowIds()) : row && cloneRow(row.id)),
|
||||
restore: () => (isMultiRow.value ? restoreRows(affectedRowIds()) : row && restoreRow(row.id)),
|
||||
delete: () => (isMultiRow.value ? requestDeleteRows(deletableRowIds(affectedRowIds())) : row && requestDeleteRow(row.id)),
|
||||
delete: () => {
|
||||
if (deletableContextRowIds.length > 0) requestDeleteRows(deletableContextRowIds);
|
||||
},
|
||||
},
|
||||
}),
|
||||
[exportSubmenu()],
|
||||
@@ -14289,18 +14304,9 @@ useUpdateBlocker(() => (hasPendingChanges.value || hasPendingDataEditorDraft.val
|
||||
:close-on-confirm="false"
|
||||
@confirm="confirmDropAllMongoIndexes"
|
||||
/>
|
||||
<!-- Salesforce applies each record with its own REST call and cannot roll back, so the
|
||||
save is reviewed here first. Cancel (or closing) denies it and keeps the edits staged. -->
|
||||
<DangerConfirmDialog
|
||||
v-model:open="salesforceSaveConfirmOpen"
|
||||
:title="t('grid.salesforceSaveConfirmTitle')"
|
||||
:message="t('grid.salesforceSaveConfirmMessage', { count: salesforceSaveConfirmTotal })"
|
||||
:details-text="salesforceSaveConfirmDetails"
|
||||
:sql="salesforceSaveConfirmSql"
|
||||
:confirm-label="t('grid.salesforceSaveConfirm')"
|
||||
:close-on-confirm="false"
|
||||
@confirm="confirmSalesforceSave"
|
||||
/>
|
||||
<!-- Specialized non-transactional saves are reviewed here first. Cancel (or closing)
|
||||
denies the request and keeps the pending rows staged. -->
|
||||
<DangerConfirmDialog v-model:open="saveConfirmOpen" :title="saveConfirmTitle" :message="saveConfirmMessage" :details-text="saveConfirmDetails" :sql="saveConfirmSql" :confirm-label="saveConfirmLabel" :close-on-confirm="false" @confirm="confirmDataGridSave" />
|
||||
<ImagePreviewDialog v-if="imagePreviewMounted" v-model:open="imagePreviewOpen" :src="imagePreviewSrc" :title="imagePreviewTitle" />
|
||||
<component v-if="previewDialogOpen && previewDialogConfig" :is="previewDialogConfig.component" v-model:open="previewDialogOpen" v-bind="previewDialogConfig.props" />
|
||||
<ExportProgressDialog
|
||||
|
||||
@@ -177,6 +177,7 @@ import type { SqlInsertMode } from "@/lib/export/sqlInsertMode";
|
||||
import { queryResultExportBaseName } from "@/lib/export/saveTextFile";
|
||||
import { applyMongoGridChangesToDocument, applyMongoGridChangesToDocumentBaseline, serializeMongoDocumentId, type MongoInputValue } from "@/lib/mongo/mongoDocumentValues";
|
||||
import { buildMongoQueryResultOperations, formatMongoQueryResultOperationPreview } from "@/lib/mongo/mongoQueryResultEditing";
|
||||
import { buildInfluxDbV1DeleteStatements, canDeleteInfluxDbV1Row, resolveInfluxDbV1DeleteTarget } from "@/lib/influxdb/influxDbV1Delete";
|
||||
import type { DataGridSortMode } from "@/lib/dataGrid/dataGridSort";
|
||||
import { isDataGridToolbarCompact, type DataGridReloadIntent } from "@/lib/dataGrid/dataGridToolbar";
|
||||
import { useTabScroll } from "@/composables/useTabScroll";
|
||||
@@ -715,6 +716,45 @@ const mongoQueryResultSaveHandler = computed<CustomSaveHandler | undefined>(() =
|
||||
|
||||
return { save, preview, applySavedChanges, canInsert: false, canDelete: true, supportsInsert: false, readonlyColumns: [target.idColumn], targetLabel: target.collection };
|
||||
});
|
||||
const influxDbV1DeleteSaveHandler = computed<CustomSaveHandler | undefined>(() => {
|
||||
const tab = props.activeTab;
|
||||
const result = tab.result;
|
||||
const tableMeta = activeTableMeta.value;
|
||||
const connection = connectionStore.getConfig(tab.connectionId) ?? props.activeConnection;
|
||||
const database = activeDataTabExecutionDatabase.value;
|
||||
if (tab.mode !== "data" || tab.tableMetaPending || !result || !tableMeta || !tab.connectionId || !database.trim()) return undefined;
|
||||
|
||||
const target = resolveInfluxDbV1DeleteTarget({
|
||||
connection,
|
||||
measurement: tableMeta.tableName,
|
||||
tableColumns: tableMeta.columns,
|
||||
resultColumns: result.columns,
|
||||
});
|
||||
if (!target) return undefined;
|
||||
|
||||
const preview: NonNullable<CustomSaveHandler["preview"]> = async (changes) => buildInfluxDbV1DeleteStatements(target, changes);
|
||||
const save: CustomSaveHandler["save"] = async (changes) => {
|
||||
const statements = buildInfluxDbV1DeleteStatements(target, changes);
|
||||
if (statements.length === 0) throw new Error("InfluxDB deletion requires at least one guarded statement.");
|
||||
for (const statement of statements) {
|
||||
await api.executeQuery(tab.connectionId, database, statement);
|
||||
}
|
||||
};
|
||||
|
||||
return {
|
||||
save,
|
||||
preview,
|
||||
canInsert: false,
|
||||
canUpdate: false,
|
||||
canDelete: true,
|
||||
canDeleteRow: (_sourceIndex, row) => canDeleteInfluxDbV1Row(target, row),
|
||||
confirmation: "influxdb-v1-delete",
|
||||
reloadOnFailure: true,
|
||||
supportsInsert: false,
|
||||
readonlyColumns: [...result.columns],
|
||||
targetLabel: target.measurement,
|
||||
};
|
||||
});
|
||||
const resultsPaneOpen = ref(false);
|
||||
const resultsPaneSize = ref(Number(safeLocalStorageGet("dbx-results-pane-size")) || DEFAULT_QUERY_RESULTS_PANE_SIZE);
|
||||
// In editor-only mode the results pane is never mounted in this splitpanes,
|
||||
@@ -2748,7 +2788,8 @@ defineExpose({
|
||||
:initial-order-by-input="activeTab.orderByInput"
|
||||
:sql="activeTab.sql"
|
||||
:loading="activeTab.isExecuting"
|
||||
:editable="!activeTab.tableMetaPending && isTableDataEditable(activeEffectiveDatabaseType, activeTableMeta?.primaryKeys ?? [], activeTableMeta?.tableType)"
|
||||
:editable="!activeTab.tableMetaPending && (isTableDataEditable(activeEffectiveDatabaseType, activeTableMeta?.primaryKeys ?? [], activeTableMeta?.tableType) || !!influxDbV1DeleteSaveHandler)"
|
||||
:custom-save-handler="influxDbV1DeleteSaveHandler"
|
||||
context="table-data"
|
||||
:initial-where-input="activeTab.whereInput"
|
||||
:database-type="activeEffectiveDatabaseType"
|
||||
|
||||
+192
@@ -0,0 +1,192 @@
|
||||
// @vitest-environment happy-dom
|
||||
import { createApp, defineComponent, h, nextTick, type App } from "vue";
|
||||
import { createPinia, setActivePinia } from "pinia";
|
||||
import { createI18n } from "vue-i18n";
|
||||
import { afterEach, describe, expect, it, vi } from "vitest";
|
||||
import type { ColumnInfo, ConnectionConfig, QueryResult, QueryTab } from "@/types/database";
|
||||
import type { CustomSaveHandler } from "@/composables/useDataGridEditor";
|
||||
import { INFLUXDB_V1_FIELD_COLUMN_EXTRA, INFLUXDB_V1_TAG_COLUMN_EXTRA, INFLUXDB_V1_TIME_COLUMN_EXTRA } from "@/lib/influxdb/influxDbV1Delete";
|
||||
|
||||
const mocks = vi.hoisted(() => ({ executeQuery: vi.fn(), handler: undefined as unknown }));
|
||||
|
||||
vi.mock("@/components/editor/QueryEditor.vue", () => ({ default: { render: () => null } }));
|
||||
vi.mock("@/components/grid/DataGridColumnLayoutPopover.vue", () => ({ default: { render: () => null } }));
|
||||
vi.mock("@/lib/backend/api", async (importOriginal) => ({ ...(await importOriginal<typeof import("@/lib/backend/api")>()), executeQuery: mocks.executeQuery }));
|
||||
vi.mock("@/components/grid/DataGrid.vue", () => ({
|
||||
__esModule: true,
|
||||
default: defineComponent({
|
||||
name: "DataGridStub",
|
||||
props: {
|
||||
editable: Boolean,
|
||||
customSaveHandler: Object,
|
||||
result: Object,
|
||||
},
|
||||
setup(props) {
|
||||
return () => {
|
||||
const handler = props.customSaveHandler as CustomSaveHandler | undefined;
|
||||
mocks.handler = handler;
|
||||
const result = props.result as QueryResult;
|
||||
return h("div", {
|
||||
"data-test": "data-grid",
|
||||
"data-editable": String(props.editable),
|
||||
"data-delete-handler": handler?.confirmation ?? "none",
|
||||
"data-can-update": String(handler?.canUpdate ?? false),
|
||||
"data-reload-on-failure": String(handler?.reloadOnFailure ?? false),
|
||||
"data-readonly-columns": handler?.readonlyColumns?.join(",") ?? "",
|
||||
"data-first-row-deletable": String(handler?.canDeleteRow?.(0, result.rows[0] ?? []) ?? false),
|
||||
});
|
||||
};
|
||||
},
|
||||
}),
|
||||
}));
|
||||
|
||||
import ContentArea from "../ContentArea.vue";
|
||||
import { useConnectionStore } from "@/stores/connectionStore";
|
||||
|
||||
const mounted: Array<{ app: App<Element>; host: HTMLElement }> = [];
|
||||
|
||||
function column(name: string, extra: string, primary = false): ColumnInfo {
|
||||
return {
|
||||
name,
|
||||
data_type: extra === INFLUXDB_V1_TIME_COLUMN_EXTRA ? "timestamp" : "string",
|
||||
is_nullable: extra !== INFLUXDB_V1_TIME_COLUMN_EXTRA,
|
||||
column_default: null,
|
||||
is_primary_key: primary,
|
||||
extra,
|
||||
};
|
||||
}
|
||||
|
||||
function connection(db_type: ConnectionConfig["db_type"], version?: string): ConnectionConfig {
|
||||
return {
|
||||
id: `connection-${db_type}-${version ?? "legacy"}`,
|
||||
name: "Influx test",
|
||||
db_type,
|
||||
host: "localhost",
|
||||
port: 8086,
|
||||
username: "",
|
||||
password: "",
|
||||
database: "metrics",
|
||||
external_config: version === undefined ? undefined : { version },
|
||||
};
|
||||
}
|
||||
|
||||
function dataTab(connectionId: string, options: { tagValue?: string | null; metadataRole?: string } = {}): QueryTab {
|
||||
const columns = [column("time", INFLUXDB_V1_TIME_COLUMN_EXTRA, true), column("host", options.metadataRole ?? INFLUXDB_V1_TAG_COLUMN_EXTRA, true), column("usage", INFLUXDB_V1_FIELD_COLUMN_EXTRA)];
|
||||
return {
|
||||
id: "data-cpu",
|
||||
title: "cpu",
|
||||
connectionId,
|
||||
database: "metrics",
|
||||
mode: "data",
|
||||
sql: "cpu",
|
||||
isExecuting: false,
|
||||
result: {
|
||||
columns: ["time", "host", "usage"],
|
||||
rows: [["2026-09-27T10:11:12Z", options.tagValue === undefined ? "web01" : options.tagValue, 42]],
|
||||
affected_rows: 1,
|
||||
execution_time_ms: 1,
|
||||
},
|
||||
tableMeta: { tableName: "cpu", columns, primaryKeys: ["time", "host"] },
|
||||
};
|
||||
}
|
||||
|
||||
async function mount(connectionConfig: ConnectionConfig, tab = dataTab(connectionConfig.id)) {
|
||||
const pinia = createPinia();
|
||||
setActivePinia(pinia);
|
||||
useConnectionStore().connections = [connectionConfig];
|
||||
const host = document.createElement("div");
|
||||
document.body.appendChild(host);
|
||||
const app = createApp(
|
||||
defineComponent({
|
||||
setup: () => () =>
|
||||
h(ContentArea, {
|
||||
activeTab: tab,
|
||||
activeConnection: connectionConfig,
|
||||
activeOutputView: "result",
|
||||
executableSql: "",
|
||||
formatSqlRequest: null,
|
||||
compressSqlRequest: null,
|
||||
selectedSql: "",
|
||||
cursorPos: 0,
|
||||
blockDangerousRedisCommands: false,
|
||||
}),
|
||||
}),
|
||||
);
|
||||
app.use(pinia);
|
||||
app.use(createI18n({ legacy: false, locale: "en", messages: { en: {} }, missingWarn: false, fallbackWarn: false }));
|
||||
app.mount(host);
|
||||
mounted.push({ app, host });
|
||||
await nextTick();
|
||||
await new Promise((resolve) => setTimeout(resolve, 0));
|
||||
await nextTick();
|
||||
const grid = host.querySelector<HTMLElement>('[data-test="data-grid"]');
|
||||
expect(grid).not.toBeNull();
|
||||
return grid!;
|
||||
}
|
||||
|
||||
afterEach(() => {
|
||||
for (const { app, host } of mounted.splice(0)) {
|
||||
app.unmount();
|
||||
host.remove();
|
||||
}
|
||||
mocks.executeQuery.mockReset();
|
||||
mocks.handler = undefined;
|
||||
localStorage.clear();
|
||||
});
|
||||
|
||||
describe("ContentArea InfluxDB 1.x delete gating", () => {
|
||||
it("enables only the delete handler while keeping every value column read-only", async () => {
|
||||
const grid = await mount(connection("influxdb", "1"));
|
||||
|
||||
expect(grid.dataset.editable).toBe("true");
|
||||
expect(grid.dataset.deleteHandler).toBe("influxdb-v1-delete");
|
||||
expect(grid.dataset.canUpdate).toBe("false");
|
||||
expect(grid.dataset.reloadOnFailure).toBe("true");
|
||||
expect(grid.dataset.readonlyColumns).toBe("time,host,usage");
|
||||
expect(grid.dataset.firstRowDeletable).toBe("true");
|
||||
});
|
||||
|
||||
it("executes the guarded preview verbatim and propagates backend failures", async () => {
|
||||
const config = connection("influxdb", "1");
|
||||
await mount(config);
|
||||
const handler = mocks.handler as CustomSaveHandler;
|
||||
const changes = {
|
||||
dirtyRows: new Map(),
|
||||
newRows: [],
|
||||
newRowMeta: [],
|
||||
deletedRows: new Set([0]),
|
||||
columns: ["time", "host", "usage"],
|
||||
rows: [["2026-09-27T10:11:12Z", "web01", 42]],
|
||||
};
|
||||
const statements = await handler.preview!(changes);
|
||||
mocks.executeQuery.mockResolvedValue({ columns: [], rows: [], affected_rows: 0, execution_time_ms: 1 });
|
||||
|
||||
await handler.save(changes);
|
||||
|
||||
expect(mocks.executeQuery).toHaveBeenCalledWith(config.id, "metrics", statements[0]);
|
||||
|
||||
mocks.executeQuery.mockRejectedValueOnce(new Error("InfluxDB rejected the delete"));
|
||||
await expect(handler.save(changes)).rejects.toThrow("InfluxDB rejected the delete");
|
||||
});
|
||||
|
||||
it("keeps a row with a missing tag unavailable for deletion", async () => {
|
||||
const config = connection("influxdb", "1");
|
||||
const grid = await mount(config, dataTab(config.id, { tagValue: null }));
|
||||
|
||||
expect(grid.dataset.deleteHandler).toBe("influxdb-v1-delete");
|
||||
expect(grid.dataset.firstRowDeletable).toBe("false");
|
||||
});
|
||||
|
||||
it.each([
|
||||
{ dbType: "influxdb" as const, version: "2", metadataRole: INFLUXDB_V1_TAG_COLUMN_EXTRA, existingEditable: false },
|
||||
{ dbType: "influxdb3" as const, version: "3", metadataRole: INFLUXDB_V1_TAG_COLUMN_EXTRA, existingEditable: true },
|
||||
{ dbType: "influxdb" as const, version: "1", metadataRole: "", existingEditable: false },
|
||||
])("does not add the delete path for an unsupported engine or metadata shape ($dbType/$version)", async ({ dbType, version, metadataRole, existingEditable }) => {
|
||||
const config = connection(dbType, version);
|
||||
const grid = await mount(config, dataTab(config.id, { metadataRole }));
|
||||
|
||||
expect(grid.dataset.editable).toBe(String(existingEditable));
|
||||
expect(grid.dataset.deleteHandler).toBe("none");
|
||||
expect(grid.dataset.firstRowDeletable).toBe("false");
|
||||
});
|
||||
});
|
||||
Reference in new issue
Block a user