fix(grid): preserve table filter builder state
This commit is contained in:
1 parent
20622bc762
commit
9f0dae1754
1 file changed
+62
-14
@@ -1,6 +1,20 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { ref, shallowRef } from "vue";
|
import { ref, shallowRef } from "vue";
|
||||||
const globalDdlOpen = ref(false);
|
const globalDdlOpen = ref(false);
|
||||||
|
type CachedStructuredFilterRule = {
|
||||||
|
id: string;
|
||||||
|
columnName: string;
|
||||||
|
mode: "equals" | "not-equals" | "is-null" | "is-not-null" | "like" | "not-like" | "less-than" | "greater-than";
|
||||||
|
rawValue: string;
|
||||||
|
conjunction: "AND" | "OR";
|
||||||
|
};
|
||||||
|
type StructuredFilterCacheState = {
|
||||||
|
scopeKey: string;
|
||||||
|
manualWhereInput: string;
|
||||||
|
rules: CachedStructuredFilterRule[];
|
||||||
|
appliedWhereInput: string;
|
||||||
|
};
|
||||||
|
const structuredFilterStateCache = new Map<string, StructuredFilterCacheState>();
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
@@ -426,8 +440,6 @@ const headerPanelDismissGuardUntil = ref(0);
|
|||||||
const localFilterSearch = ref("");
|
const localFilterSearch = ref("");
|
||||||
const localFilterDraft = ref<LocalColumnFilterDraft | null>(null);
|
const localFilterDraft = ref<LocalColumnFilterDraft | null>(null);
|
||||||
const filterBuilderOpen = ref(false);
|
const filterBuilderOpen = ref(false);
|
||||||
const structuredFilterRules = ref<StructuredFilterRule[]>([]);
|
|
||||||
const appliedStructuredWhereInput = ref("");
|
|
||||||
const filterModeOptions: Array<{ value: FilterMode; labelKey: string }> = [
|
const filterModeOptions: Array<{ value: FilterMode; labelKey: string }> = [
|
||||||
{ value: "equals", labelKey: "grid.filterBuilderEquals" },
|
{ value: "equals", labelKey: "grid.filterBuilderEquals" },
|
||||||
{ value: "not-equals", labelKey: "grid.filterBuilderNotEquals" },
|
{ value: "not-equals", labelKey: "grid.filterBuilderNotEquals" },
|
||||||
@@ -440,6 +452,10 @@ const filterModeOptions: Array<{ value: FilterMode; labelKey: string }> = [
|
|||||||
];
|
];
|
||||||
const filterBuilderColumns = computed(() => props.tableMeta?.columns ?? []);
|
const filterBuilderColumns = computed(() => props.tableMeta?.columns ?? []);
|
||||||
const filterBuilderColumnOptions = computed(() => filterBuilderColumns.value.map((column) => column.name));
|
const filterBuilderColumnOptions = computed(() => filterBuilderColumns.value.map((column) => column.name));
|
||||||
|
const structuredFilterCacheKey = computed(() => props.cacheKey || [props.connectionId ?? "", props.database ?? "", props.context ?? "", props.tableMeta?.schema ?? "", props.tableMeta?.tableName ?? ""].join("\u0001"));
|
||||||
|
const structuredFilterScopeKey = computed(() => [props.connectionId ?? "", props.database ?? "", props.schema ?? "", props.context ?? "", props.tableMeta?.schema ?? "", props.tableMeta?.tableName ?? "", filterBuilderColumnOptions.value.join("\0")].join("\u0001"));
|
||||||
|
const structuredFilterRules = ref<StructuredFilterRule[]>([]);
|
||||||
|
const appliedStructuredWhereInput = ref("");
|
||||||
const structuredFilterCount = computed(() => structuredFilterRules.value.filter((rule) => !!rule.columnName && (!filterModeNeedsValue(rule.mode) || rule.rawValue.trim().length > 0)).length);
|
const structuredFilterCount = computed(() => structuredFilterRules.value.filter((rule) => !!rule.columnName && (!filterModeNeedsValue(rule.mode) || rule.rawValue.trim().length > 0)).length);
|
||||||
const hasStructuredFilters = computed(() => !!combineWhereInputs(undefined, appliedStructuredWhereInput.value));
|
const hasStructuredFilters = computed(() => !!combineWhereInputs(undefined, appliedStructuredWhereInput.value));
|
||||||
const formatterOpenColumn = ref<number | null>(null);
|
const formatterOpenColumn = ref<number | null>(null);
|
||||||
@@ -861,6 +877,38 @@ function defaultStructuredFilterRule(): StructuredFilterRule {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function cloneStructuredFilterRules(rules: StructuredFilterRule[]): StructuredFilterRule[] {
|
||||||
|
return rules.map((rule) => ({ ...rule }));
|
||||||
|
}
|
||||||
|
|
||||||
|
function cachedStructuredFilterState(): StructuredFilterCacheState | undefined {
|
||||||
|
const cached = structuredFilterStateCache.get(structuredFilterCacheKey.value);
|
||||||
|
return cached?.scopeKey === structuredFilterScopeKey.value ? cached : undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
function persistStructuredFilterState() {
|
||||||
|
structuredFilterStateCache.set(structuredFilterCacheKey.value, {
|
||||||
|
scopeKey: structuredFilterScopeKey.value,
|
||||||
|
manualWhereInput: whereFilterInput.value,
|
||||||
|
rules: cloneStructuredFilterRules(structuredFilterRules.value),
|
||||||
|
appliedWhereInput: appliedStructuredWhereInput.value,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function loadStructuredFilterStateForScope() {
|
||||||
|
const cached = cachedStructuredFilterState();
|
||||||
|
if (cached) {
|
||||||
|
structuredFilterRules.value = cloneStructuredFilterRules(cached.rules);
|
||||||
|
appliedStructuredWhereInput.value = cached.appliedWhereInput;
|
||||||
|
whereFilterInput.value = cached.manualWhereInput;
|
||||||
|
nextTick(() => emit("update:whereInput", currentWhereInput() ?? ""));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
appliedStructuredWhereInput.value = "";
|
||||||
|
structuredFilterRules.value = filterBuilderColumnOptions.value.length > 0 ? [defaultStructuredFilterRule()] : [];
|
||||||
|
persistStructuredFilterState();
|
||||||
|
}
|
||||||
|
|
||||||
function ensureStructuredFilterRule() {
|
function ensureStructuredFilterRule() {
|
||||||
if (structuredFilterRules.value.length === 0 && filterBuilderColumnOptions.value.length > 0) {
|
if (structuredFilterRules.value.length === 0 && filterBuilderColumnOptions.value.length > 0) {
|
||||||
structuredFilterRules.value = [defaultStructuredFilterRule()];
|
structuredFilterRules.value = [defaultStructuredFilterRule()];
|
||||||
@@ -966,21 +1014,19 @@ async function applyStructuredFilters() {
|
|||||||
await applyWhereFilter();
|
await applyWhereFilter();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
watch([structuredFilterCacheKey, structuredFilterScopeKey], loadStructuredFilterStateForScope, { immediate: true });
|
||||||
|
|
||||||
watch(
|
watch(
|
||||||
filterBuilderColumnOptions,
|
[structuredFilterRules, appliedStructuredWhereInput],
|
||||||
(columns) => {
|
() => {
|
||||||
if (columns.length === 0) {
|
const columns = filterBuilderColumnOptions.value;
|
||||||
structuredFilterRules.value = [];
|
if (columns.length > 0 && structuredFilterRules.value.some((rule) => !columns.includes(rule.columnName))) {
|
||||||
appliedStructuredWhereInput.value = "";
|
structuredFilterRules.value = structuredFilterRules.value.map((rule) => (columns.includes(rule.columnName) ? rule : { ...rule, columnName: columns[0] ?? "" }));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (structuredFilterRules.value.length === 0) {
|
persistStructuredFilterState();
|
||||||
structuredFilterRules.value = [defaultStructuredFilterRule()];
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
structuredFilterRules.value = structuredFilterRules.value.map((rule) => (columns.includes(rule.columnName) ? rule : { ...rule, columnName: columns[0] ?? "" }));
|
|
||||||
},
|
},
|
||||||
{ immediate: true },
|
{ deep: true },
|
||||||
);
|
);
|
||||||
|
|
||||||
function updateSuggestionPosition() {
|
function updateSuggestionPosition() {
|
||||||
@@ -1170,7 +1216,8 @@ function navigateWhereSuggestion(delta: number) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
watch(whereFilterInput, (val) => {
|
watch(whereFilterInput, (val) => {
|
||||||
emit("update:whereInput", val);
|
emit("update:whereInput", currentWhereInput() ?? "");
|
||||||
|
persistStructuredFilterState();
|
||||||
whereSuggestions.value = [];
|
whereSuggestions.value = [];
|
||||||
if (!props.tableMeta?.columns?.length) return;
|
if (!props.tableMeta?.columns?.length) return;
|
||||||
const trimmed = val.trim();
|
const trimmed = val.trim();
|
||||||
@@ -3089,6 +3136,7 @@ async function applyWhereFilter() {
|
|||||||
isApplyingWhere.value = true;
|
isApplyingWhere.value = true;
|
||||||
saveError.value = "";
|
saveError.value = "";
|
||||||
currentPage.value = 1;
|
currentPage.value = 1;
|
||||||
|
emit("update:whereInput", currentWhereInput() ?? "");
|
||||||
try {
|
try {
|
||||||
const tableMeta = await waitForTableMeta();
|
const tableMeta = await waitForTableMeta();
|
||||||
if (!tableMeta) return;
|
if (!tableMeta) return;
|
||||||
|
|||||||
Reference in new issue
Block a user