A reactive notebook for Python — run reproducible experiments, query with SQL, execute as a script, deploy as an app, and version with git. Stored as pure Python. All in a modern, AI-native editor.
Python artificial-intelligencedagdata-sciencedata-visualizationdataflowdeveloper-toolsmachine-learningnotebookspipelinepythonreactivesqlweb-app
fix timing issue to apply edits after data has come in (#8025)
Shahmir Varqhae43701791ce3
diff --git a/frontend/src/plugins/impl/DataEditorPlugin.tsx b/frontend/src/plugins/impl/DataEditorPlugin.tsxindex 45b2af732e..3147278587 100644--- a/frontend/src/plugins/impl/DataEditorPlugin.tsx+++ b/frontend/src/plugins/impl/DataEditorPlugin.tsx@@ -132,7 +132,7 @@ const LoadingDataEditor = (props: Props) => {columnFields={columnFields}setColumnFields={setColumnFields}editableColumns={props.editableColumns}- edits={props.edits.edits} // TODO: This is returning old edits upon refresh+ edits={props.edits.edits}onAddEdits={(edits) => {props.onEdits((v) => ({ ...v, edits: [...v.edits, ...edits] }));}}diff --git a/frontend/src/plugins/impl/data-editor/glide-data-editor.tsx b/frontend/src/plugins/impl/data-editor/glide-data-editor.tsxindex d42284b2b0..df2543d4b0 100644--- a/frontend/src/plugins/impl/data-editor/glide-data-editor.tsx+++ b/frontend/src/plugins/impl/data-editor/glide-data-editor.tsx@@ -14,7 +14,13 @@ import DataEditor, {type Rectangle,} from "@glideapps/glide-data-grid";import { CopyIcon, TrashIcon } from "lucide-react";-import React, { useCallback, useMemo, useRef, useState } from "react";+import React, {+ useCallback,+ useEffect,+ useMemo,+ useRef,+ useState,+} from "react";import useEvent from "react-use-event-hook";import type { FieldTypes } from "@/components/data-table/types";import {@@ -40,7 +46,6 @@ import { ErrorBoundary } from "@/components/editor/boundary/ErrorBoundary";import { Button } from "@/components/ui/button";import { toast } from "@/components/ui/use-toast";import type { DataType } from "@/core/kernel/messages";-import { useOnMount } from "@/hooks/useLifecycle";import { useNonce } from "@/hooks/useNonce";import { logNever } from "@/utils/assertNever";import { Events } from "@/utils/events";@@ -93,9 +98,47 @@ export const GlideDataEditor = <T,>({const [columnWidths, setColumnWidths] = useState<Record<string, number>>({});const rerender = useNonce();+ const hasAppliedEdits = useRef(false);- // Handle initial edits passed in- useOnMount(() => {+ const columns: ModifiedGridColumn[] = useMemo(() => {+ const columns: ModifiedGridColumn[] = [];+ for (const [columnName, fieldType] of Object.entries(columnFields)) {+ const editable =+ editableColumns === "all" || editableColumns.includes(columnName);++ columns.push({+ id: columnName,+ title: columnName,+ width: columnWidths[columnName], // Enables resizing+ icon: editable+ ? getColumnHeaderIcon(fieldType)+ : GridColumnIcon.ProtectedColumnOverlay,+ style: "normal",+ kind: getColumnKind(fieldType),+ dataType: fieldType,+ hasMenu: true,+ themeOverride: editable+ ? undefined+ : {+ bgCell: theme === "light" ? "#F9F9FA" : "#1e1e21",+ },+ });+ }++ return columns;+ }, [columnFields, columnWidths, editableColumns, theme]);++ // Apply initial edits after data has loaded+ useEffect(() => {+ // Don't apply if already applied or data hasn't loaded yet+ if (hasAppliedEdits.current || data.length === 0) {+ return;+ }++ // Mark as applied once data loads - prevents re-applying user edits+ hasAppliedEdits.current = true;++ // No initial edits to applyif (edits.length === 0) {return;}@@ -184,35 +227,8 @@ export const GlideDataEditor = <T,>({// Force re-render to update the total rowsrerender();- });-- const columns: ModifiedGridColumn[] = useMemo(() => {- const columns: ModifiedGridColumn[] = [];- for (const [columnName, fieldType] of Object.entries(columnFields)) {- const editable =- editableColumns === "all" || editableColumns.includes(columnName);-- columns.push({- id: columnName,- title: columnName,- width: columnWidths[columnName], // Enables resizing- icon: editable- ? getColumnHeaderIcon(fieldType)- : GridColumnIcon.ProtectedColumnOverlay,- style: "normal",- kind: getColumnKind(fieldType),- dataType: fieldType,- hasMenu: true,- themeOverride: editable- ? undefined- : {- bgCell: theme === "light" ? "#F9F9FA" : "#1e1e21",- },- });- }-- return columns;- }, [columnFields, columnWidths, editableColumns, theme]);+ // eslint-disable-next-line react-hooks/exhaustive-deps+ }, [data.length]);const getCellContent = useCallback((cell: Item): GridCell => {