@agent-native/core-corpus 0.201.0 → 0.201.1

package/corpus/templates/analytics/app/pages/adhoc/sql-dashboard/ViewsMenu.tsx

@@ -5,7 +5,7 @@ import {
   IconTrash,
   IconLayoutGrid,
 } from "@tabler/icons-react";
-import { useMemo, useState } from "react";
+import { useId, useMemo, useState } from "react";
 import { useSearchParams } from "react-router";
 import { toast } from "sonner";
 
@@ -20,7 +20,9 @@ import {
   AlertDialogHeader,
   AlertDialogTitle,
 } from "@/components/ui/alert-dialog";
+import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
+import { Checkbox } from "@/components/ui/checkbox";
 import {
   Dialog,
   DialogContent,
@@ -47,7 +49,7 @@ import {
   type DashboardView,
 } from "@/hooks/use-dashboard-views";
 
-import { FILTER_PARAM_PREFIX } from "./DashboardFilterBar";
+import { FILTER_PARAM_PREFIX } from "./filter-vars";
 
 interface ViewsMenuProps {
   dashboardId: string;
@@ -98,8 +100,10 @@ export function ViewsMenu({ dashboardId, canEdit = true }: ViewsMenuProps) {
   const [menuOpen, setMenuOpen] = useState(false);
   const [saveDialogOpen, setSaveDialogOpen] = useState(false);
   const [viewName, setViewName] = useState("");
+  const [setAsDefault, setSetAsDefault] = useState(false);
   const [savingView, setSavingView] = useState(false);
   const [deleteTarget, setDeleteTarget] = useState<DashboardView | null>(null);
+  const defaultCheckboxId = useId();
 
   const currentFilters = useMemo(
     () => extractCurrentFilters(searchParams),
@@ -141,16 +145,18 @@ export function ViewsMenu({ dashboardId, canEdit = true }: ViewsMenuProps) {
         id: slugify(name),
         name,
         filters: currentFilters,
+        isDefault: setAsDefault,
       });
       setViewName("");
+      setSetAsDefault(false);
       setSaveDialogOpen(false);
     } catch (error) {
       toast.error(
-        t("sqlDashboard.saveFailedWithMessage", {
+        t("sqlDashboard.saveViewFailedWithMessage", {
           message:
             error instanceof Error
               ? error.message
-              : t("sqlDashboard.saveFailed"),
+              : t("sqlDashboard.saveViewFailed"),
         }),
       );
     } finally {
@@ -206,7 +212,14 @@ export function ViewsMenu({ dashboardId, canEdit = true }: ViewsMenuProps) {
                   applyView(v);
                 }}
               >
-                <span className="truncate flex-1">{v.name}</span>
+                <span className="flex min-w-0 flex-1 items-center gap-2">
+                  <span className="truncate">{v.name}</span>
+                  {v.isDefault && (
+                    <Badge variant="secondary" className="shrink-0">
+                      {t("sqlDashboard.defaultView")}
+                    </Badge>
+                  )}
+                </span>
                 {canEdit ? (
                   <Tooltip>
                     <TooltipTrigger asChild>
@@ -250,7 +263,16 @@ export function ViewsMenu({ dashboardId, canEdit = true }: ViewsMenuProps) {
         </DropdownMenuContent>
       </DropdownMenu>
 
-      <Dialog open={canEdit && saveDialogOpen} onOpenChange={setSaveDialogOpen}>
+      <Dialog
+        open={canEdit && saveDialogOpen}
+        onOpenChange={(open) => {
+          setSaveDialogOpen(open);
+          if (!open) {
+            setViewName("");
+            setSetAsDefault(false);
+          }
+        }}
+      >
         <DialogContent className="sm:max-w-[400px]">
           <DialogHeader>
             <DialogTitle>{t("sqlDashboard.saveView")}</DialogTitle>
@@ -265,6 +287,17 @@ export function ViewsMenu({ dashboardId, canEdit = true }: ViewsMenuProps) {
               }}
               autoFocus
             />
+            <label
+              htmlFor={defaultCheckboxId}
+              className="mt-3 flex cursor-pointer items-center gap-2 text-sm"
+            >
+              <Checkbox
+                id={defaultCheckboxId}
+                checked={setAsDefault}
+                onCheckedChange={(checked) => setSetAsDefault(checked === true)}
+              />
+              <span>{t("sqlDashboard.setAsDefault")}</span>
+            </label>
             {Object.keys(currentFilters).length === 0 && (
               <p className="mt-2 text-xs text-muted-foreground">
                 {t("sqlDashboard.noActiveFilters")}
@@ -275,7 +308,11 @@ export function ViewsMenu({ dashboardId, canEdit = true }: ViewsMenuProps) {
             <Button
               variant="outline"
               size="sm"
-              onClick={() => setSaveDialogOpen(false)}
+              onClick={() => {
+                setSaveDialogOpen(false);
+                setViewName("");
+                setSetAsDefault(false);
+              }}
               disabled={savingView}
             >
               {t("sidebar.cancel")}

package/corpus/templates/analytics/app/pages/adhoc/sql-dashboard/dashboard-filter-restore.ts

@@ -0,0 +1,196 @@
+import { FILTER_PARAM_PREFIX } from "./filter-vars";
+
+export interface DashboardFilterRestore {
+  filters: Record<string, string>;
+  viewId?: string;
+  source: "dashboard-default" | "personal";
+}
+
+export type DashboardFilterRestoreProgress =
+  | { status: "pending" }
+  | {
+      status: "fallback-applied";
+      filters: Record<string, string>;
+      viewId?: string;
+    }
+  | {
+      status: "views-failed";
+      filters: Record<string, string>;
+      viewId?: string;
+    }
+  | { status: "complete" };
+
+export interface DashboardFilterPreferenceSaveGuard {
+  filters: Record<string, string>;
+  viewId?: string;
+  previousFilters: Record<string, string>;
+  previousViewId?: string;
+}
+
+export interface DashboardFilterRestoreStep {
+  progress: DashboardFilterRestoreProgress;
+  restore: DashboardFilterRestore | null;
+}
+
+export function canPersistDashboardFilterPreference(
+  progress: DashboardFilterRestoreProgress,
+  currentFilters: Record<string, string>,
+  currentViewId: string | undefined,
+): boolean {
+  if (progress.status === "complete") return true;
+  if (progress.status !== "views-failed") return false;
+  return (
+    !sameDashboardFilterMap(progress.filters, currentFilters) ||
+    progress.viewId !== currentViewId
+  );
+}
+
+export function dashboardFilterPreferenceSaveState(
+  guard: DashboardFilterPreferenceSaveGuard | null,
+  currentFilters: Record<string, string>,
+  currentViewId: string | undefined,
+): "none" | "pending" | "applied" | "changed" {
+  if (!guard) return "none";
+  if (
+    sameDashboardFilterMap(guard.filters, currentFilters) &&
+    guard.viewId === currentViewId
+  ) {
+    return "applied";
+  }
+  if (
+    sameDashboardFilterMap(guard.previousFilters, currentFilters) &&
+    guard.previousViewId === currentViewId
+  ) {
+    return "pending";
+  }
+  return "changed";
+}
+
+export function dashboardFilterParams(
+  searchParams: URLSearchParams,
+): Record<string, string> {
+  const filters: Record<string, string> = {};
+  searchParams.forEach((value, key) => {
+    if (key.startsWith(FILTER_PARAM_PREFIX)) filters[key] = value;
+  });
+  return filters;
+}
+
+export function sameDashboardFilterMap(
+  a: Record<string, string> | undefined,
+  b: Record<string, string> | undefined,
+): boolean {
+  const aKeys = Object.keys(a ?? {});
+  if (aKeys.length !== Object.keys(b ?? {}).length) return false;
+  return aKeys.every((key) => a![key] === b![key]);
+}
+
+export function matchesDashboardFilterRestoreState(
+  searchParams: URLSearchParams,
+  filters: Record<string, string>,
+  viewId: string | undefined,
+): boolean {
+  return (
+    sameDashboardFilterMap(filters, dashboardFilterParams(searchParams)) &&
+    (searchParams.get("view") ?? undefined) === viewId
+  );
+}
+
+function hasExplicitFilterState(searchParams: URLSearchParams): boolean {
+  return (
+    searchParams.has("view") ||
+    Array.from(searchParams.keys()).some((key) =>
+      key.startsWith(FILTER_PARAM_PREFIX),
+    )
+  );
+}
+
+function nonEmptyFilters(
+  filters: Record<string, string> | undefined,
+): Record<string, string> {
+  return Object.fromEntries(
+    Object.entries(filters ?? {}).filter(([, value]) => value),
+  );
+}
+
+export function resolveDashboardFilterRestoreStep({
+  searchParams,
+  defaultView,
+  savedFilters,
+  viewsState,
+  savedFiltersState,
+  progress,
+}: {
+  searchParams: URLSearchParams;
+  defaultView: { id: string; filters: Record<string, string> } | undefined;
+  savedFilters: Record<string, string> | undefined;
+  viewsState: "loading" | "error" | "success";
+  savedFiltersState: "loading" | "error" | "success";
+  progress: DashboardFilterRestoreProgress;
+}): DashboardFilterRestoreStep {
+  if (progress.status === "complete") return { progress, restore: null };
+
+  if (
+    progress.status === "fallback-applied" ||
+    progress.status === "views-failed"
+  ) {
+    if (
+      !matchesDashboardFilterRestoreState(
+        searchParams,
+        progress.filters,
+        progress.viewId,
+      )
+    ) {
+      return { progress: { status: "complete" }, restore: null };
+    }
+  } else if (hasExplicitFilterState(searchParams)) {
+    return { progress: { status: "complete" }, restore: null };
+  }
+
+  if (viewsState === "loading") return { progress, restore: null };
+
+  if (viewsState === "error") {
+    if (progress.status === "fallback-applied") {
+      return { progress, restore: null };
+    }
+    const failedProgress =
+      progress.status === "views-failed"
+        ? progress
+        : {
+            status: "views-failed" as const,
+            filters: dashboardFilterParams(searchParams),
+            viewId: searchParams.get("view") ?? undefined,
+          };
+    if (savedFiltersState !== "success") {
+      return { progress: failedProgress, restore: null };
+    }
+    const filters = nonEmptyFilters(savedFilters);
+    if (Object.keys(filters).length === 0) {
+      return { progress: failedProgress, restore: null };
+    }
+    return {
+      progress: { status: "fallback-applied", filters },
+      restore: { filters, source: "personal" },
+    };
+  }
+
+  if (defaultView) {
+    return {
+      progress: { status: "complete" },
+      restore: {
+        filters: nonEmptyFilters(defaultView.filters),
+        viewId: defaultView.id,
+        source: "dashboard-default",
+      },
+    };
+  }
+
+  if (savedFiltersState !== "success") return { progress, restore: null };
+
+  const filters = nonEmptyFilters(savedFilters);
+  return {
+    progress: { status: "complete" },
+    restore:
+      Object.keys(filters).length > 0 ? { filters, source: "personal" } : null,
+  };
+}

package/corpus/templates/analytics/app/pages/adhoc/sql-dashboard/filter-vars.ts

@@ -1,5 +1,7 @@
 import type { DashboardFilter, FilterType } from "./types";
 
+export const FILTER_PARAM_PREFIX = "f_";
+
 const ALL_TIME_START = "1970-01-01";
 const ISO_DATE_RE = /^\d{4}-\d{2}-\d{2}$/;
 const DATE_FILTER_TYPES: ReadonlySet<FilterType> = new Set([

package/corpus/templates/analytics/app/pages/adhoc/sql-dashboard/index.tsx

@@ -139,6 +139,16 @@ import { useAutoFocusSelect } from "@/lib/use-auto-focus-select";
 
 import BlankDashboard from "../BlankDashboard";
 import { DashboardSkeleton } from "../DashboardSkeleton";
+import {
+  canPersistDashboardFilterPreference,
+  dashboardFilterParams,
+  dashboardFilterPreferenceSaveState,
+  matchesDashboardFilterRestoreState,
+  resolveDashboardFilterRestoreStep,
+  sameDashboardFilterMap,
+  type DashboardFilterPreferenceSaveGuard,
+  type DashboardFilterRestoreProgress,
+} from "./dashboard-filter-restore";
 import {
   availableDropSlotIdsForPanel,
   buildDashboardPanelGroups,
@@ -177,6 +187,7 @@ import {
   clampDashboardColumns,
   DEFAULT_DASHBOARD_COLUMNS,
   type DashboardCertification,
+  type DashboardFilter,
   type SqlDashboardConfig,
   type SqlPanel,
 } from "./types";
@@ -189,15 +200,6 @@ type DashboardTabGroup = {
   tabs: Array<{ value: string; label: string }>;
 };
 
-function sameFilterMap(
-  a: Record<string, string> | undefined,
-  b: Record<string, string>,
-): boolean {
-  const aKeys = Object.keys(a ?? {});
-  if (aKeys.length !== Object.keys(b).length) return false;
-  return aKeys.every((key) => a![key] === b[key]);
-}
-
 function groupDashboardTabs(tabs: string[]): {
   groups: DashboardTabGroup[];
   hasNestedTabs: boolean;
@@ -265,6 +267,7 @@ function DashboardDragPreview({ panel }: { panel: SqlPanel | null }) {
 const PanelCell = memo(function PanelCell({
   panel,
   vars,
+  timeRangeFilter,
   remoteEditor,
   editable,
   eagerLoad,
@@ -279,6 +282,7 @@ const PanelCell = memo(function PanelCell({
 }: {
   panel: SqlPanel;
   vars: Record<string, string>;
+  timeRangeFilter: DashboardFilter | undefined;
   remoteEditor: { color: string; name: string } | undefined;
   editable: boolean;
   eagerLoad: boolean;
@@ -294,6 +298,14 @@ const PanelCell = memo(function PanelCell({
   onSavePanel: (panel: SqlPanel) => Promise<void>;
   dashboardExtensionContext: Record<string, unknown>;
 }) {
+  const [timeRangeOverride, setTimeRangeOverride] = useState<string | null>(
+    null,
+  );
+  const effectiveVars = useMemo(
+    () =>
+      timeRangeOverride ? { ...vars, timeRange: timeRangeOverride } : vars,
+    [vars, timeRangeOverride],
+  );
   const resolved = useMemo(
     () =>
       panel.config?.description
@@ -301,16 +313,20 @@ const PanelCell = memo(function PanelCell({
             ...panel,
             config: {
               ...panel.config,
-              description: interpolate(panel.config.description, vars),
+              description: interpolate(panel.config.description, effectiveVars),
             },
           }
         : panel,
-    [panel, vars],
+    [panel, effectiveVars],
   );
   const resolvedSql = useMemo(
     () =>
-      interpolateDashboardPanelSql(serializePanelSql(panel.sql), vars, panel),
-    [panel.sql, vars],
+      interpolateDashboardPanelSql(
+        serializePanelSql(panel.sql),
+        effectiveVars,
+        panel,
+      ),
+    [panel.sql, effectiveVars],
   );
   const handleSelectForChat = useCallback(
     (options?: SelectDashboardPanelOptions) => {
@@ -377,7 +393,10 @@ const PanelCell = memo(function PanelCell({
             ? dashboardExtensionContext.dashboardId
             : ""
         }
-        filters={vars}
+        filters={effectiveVars}
+        timeRangeFilter={timeRangeFilter}
+        timeRangeOverride={timeRangeOverride}
+        onTimeRangeOverrideChange={setTimeRangeOverride}
         extensionContext={
           panel.chartType === "extension"
             ? {
@@ -905,17 +924,28 @@ function SqlDashboardPageContent({
   const filterPrefKey = dashboardId ? `dashboard-filters:${dashboardId}` : "";
   const {
     data: savedFilters,
-    isLoading: filtersLoading,
     isSuccess: filtersLoaded,
+    isError: filtersError,
     save: saveFilterPref,
   } = useUserPref<{ filters: Record<string, string> }>(filterPrefKey);
 
-  const { saveView } = useDashboardViews(dashboardId ?? undefined);
-
-  const appliedSaved = useRef(false);
+  const {
+    views,
+    isSuccess: dashboardViewsLoaded,
+    isSettled: dashboardViewsSettled,
+    saveView,
+  } = useDashboardViews(dashboardId ?? undefined);
+  const defaultView = views.find((view) => view.isDefault);
+
+  const filterRestoreProgress = useRef<DashboardFilterRestoreProgress>({
+    status: "pending",
+  });
+  const skipFilterPreferenceSave =
+    useRef<DashboardFilterPreferenceSaveGuard | null>(null);
 
   useEffect(() => {
-    appliedSaved.current = false;
+    filterRestoreProgress.current = { status: "pending" };
+    skipFilterPreferenceSave.current = null;
     setLoaded(false);
     setDashboard(null);
     setArchivedAt(null);
@@ -1018,49 +1048,98 @@ function SqlDashboardPageContent({
   useEffect(() => {
     if (
       reportScreenshot ||
-      appliedSaved.current ||
-      filtersLoading ||
-      !filtersLoaded ||
+      filterRestoreProgress.current.status === "complete" ||
       !loaded ||
       !dashboard
     )
       return;
-    appliedSaved.current = true;
-
-    const viewId = searchParams.get("view");
-    if (viewId) return;
 
-    const hasUrlFilters = Array.from(searchParams.keys()).some((k) =>
-      k.startsWith(FILTER_PARAM_PREFIX),
-    );
-    if (hasUrlFilters) return;
+    const previousProgress = filterRestoreProgress.current;
+    const restoreStep = resolveDashboardFilterRestoreStep({
+      searchParams,
+      defaultView,
+      savedFilters: savedFilters?.filters,
+      viewsState: dashboardViewsLoaded
+        ? "success"
+        : dashboardViewsSettled
+          ? "error"
+          : "loading",
+      savedFiltersState: filtersLoaded
+        ? "success"
+        : filtersError
+          ? "error"
+          : "loading",
+      progress: previousProgress,
+    });
+    filterRestoreProgress.current = restoreStep.progress;
+    const filterRestore = restoreStep.restore;
+    if (!filterRestore) return;
 
     try {
       const appliedAt = Number(
         sessionStorage.getItem("__agentUrlAppliedAt__") || 0,
       );
-      if (appliedAt && Date.now() - appliedAt < 5000) return;
+      if (appliedAt && Date.now() - appliedAt < 5000) {
+        filterRestoreProgress.current = { status: "complete" };
+        return;
+      }
     } catch {
       // sessionStorage unavailable — fall through.
     }
 
-    if (savedFilters?.filters && Object.keys(savedFilters.filters).length > 0) {
-      setSearchParams(
-        (prev) => {
-          const next = new URLSearchParams(prev);
-          for (const [key, value] of Object.entries(savedFilters.filters)) {
-            if (value) next.set(key, value);
-          }
-          return next;
-        },
-        { replace: true },
-      );
+    if (filterRestore.source === "dashboard-default") {
+      skipFilterPreferenceSave.current = {
+        filters: filterRestore.filters,
+        viewId: filterRestore.viewId,
+        previousFilters: dashboardFilterParams(searchParams),
+        previousViewId: searchParams.get("view") ?? undefined,
+      };
     }
+
+    setSearchParams(
+      (prev) => {
+        if (previousProgress.status === "fallback-applied") {
+          if (
+            !matchesDashboardFilterRestoreState(
+              prev,
+              previousProgress.filters,
+              previousProgress.viewId,
+            )
+          ) {
+            return prev;
+          }
+        } else if (
+          prev.has("view") ||
+          Array.from(prev.keys()).some((key) =>
+            key.startsWith(FILTER_PARAM_PREFIX),
+          )
+        ) {
+          return prev;
+        }
+        const next = new URLSearchParams(prev);
+        for (const key of Array.from(next.keys())) {
+          if (key.startsWith(FILTER_PARAM_PREFIX)) next.delete(key);
+        }
+        for (const [key, value] of Object.entries(filterRestore.filters)) {
+          if (value) next.set(key, value);
+        }
+        if (filterRestore.viewId) {
+          next.set("view", filterRestore.viewId);
+        } else {
+          next.delete("view");
+        }
+        return next;
+      },
+      { replace: true },
+    );
   }, [
-    filtersLoading,
     filtersLoaded,
+    filtersError,
+    dashboardViewsLoaded,
+    dashboardViewsSettled,
     loaded,
     dashboard,
+    defaultView,
     savedFilters,
     reportScreenshot,
     searchParams,
@@ -1073,7 +1152,12 @@ function SqlDashboardPageContent({
       reportScreenshot ||
       !loaded ||
       !dashboard?.filters?.length ||
-      !dashboardId
+      !dashboardId ||
+      !canPersistDashboardFilterPreference(
+        filterRestoreProgress.current,
+        dashboardFilterParams(searchParams),
+        searchParams.get("view") ?? undefined,
+      )
     )
       return;
     clearTimeout(saveTimer.current);
@@ -1084,7 +1168,20 @@ function SqlDashboardPageContent({
           currentFilters[k] = v;
         }
       });
-      if (sameFilterMap(savedFilters?.filters, currentFilters)) return;
+      const filterPreferenceSaveState = dashboardFilterPreferenceSaveState(
+        skipFilterPreferenceSave.current,
+        currentFilters,
+        searchParams.get("view") ?? undefined,
+      );
+      if (filterPreferenceSaveState === "applied") {
+        skipFilterPreferenceSave.current = null;
+        return;
+      }
+      if (filterPreferenceSaveState === "pending") return;
+      if (filterPreferenceSaveState === "changed") {
+        skipFilterPreferenceSave.current = null;
+      }
+      if (sameDashboardFilterMap(savedFilters?.filters, currentFilters)) return;
       saveFilterPref({ filters: currentFilters });
     }, 1500);
     return () => clearTimeout(saveTimer.current);
@@ -1096,6 +1193,10 @@ function SqlDashboardPageContent({
     savedFilters,
     saveFilterPref,
     reportScreenshot,
+    filtersLoaded,
+    filtersError,
+    dashboardViewsLoaded,
+    dashboardViewsSettled,
   ]);
 
   const enqueueDashboardSave = useCallback(
@@ -1509,6 +1610,11 @@ function SqlDashboardPageContent({
     return { ...(dashboard?.variables ?? {}), ...filterValues };
   }, [dashboard?.variables, dashboard?.filters, searchParams]);
 
+  const timeRangeFilter = useMemo<DashboardFilter | undefined>(
+    () => dashboard?.filters?.find((f) => f.id === "timeRange"),
+    [dashboard?.filters],
+  );
+
   const dashboardExtensionContext = useMemo<Record<string, unknown>>(
     () => ({
       dashboardId,
@@ -1839,13 +1945,17 @@ function SqlDashboardPageContent({
   ]);
 
   const handleSaveView = useCallback(
-    async (name: string, filters: Record<string, string>) => {
+    async (
+      name: string,
+      filters: Record<string, string>,
+      isDefault: boolean,
+    ) => {
       const id = name
         .toLowerCase()
         .replace(/[^a-z0-9]+/g, "-")
         .replace(/^-|-$/g, "")
         .slice(0, 60);
-      await saveView({ id, name, filters });
+      await saveView({ id, name, filters, isDefault });
     },
     [saveView],
   );
@@ -2547,6 +2657,7 @@ function SqlDashboardPageContent({
                               <PanelCell
                                 panel={panel}
                                 vars={vars}
+                                timeRangeFilter={timeRangeFilter}
                                 remoteEditor={
                                   reportScreenshot
                                     ? undefined

package/corpus/templates/analytics/app/pages/adhoc/sql-dashboard/types.ts

@@ -11,6 +11,7 @@ export type ChartType =
   | "line"
   | "area"
   | "bar"
+  | "combo"
   | "metric"
   | "table"
   | "pie"
@@ -80,6 +81,7 @@ export interface SqlPanelConfig {
   yFormatter?: "number" | "currency" | "percent";
   rightYKeys?: string[];
   rightYFormatter?: "number" | "currency" | "percent";
+  barKeys?: string[];
   seriesLabels?: Record<string, string>;
   description?: string;
   pivot?: PivotConfig;

package/corpus/templates/analytics/changelog/2026-10-05-custom-date-controls-stay-beside-the-range-selector-and-dash.md

@@ -0,0 +1,6 @@
+---
+type: improved
+date: 2026-10-05
+---
+
+Custom date controls stay beside the range selector, and dashboards can save a shared default view.