@malloy-publisher/sdk 0.0.142 → 0.0.144

package/package.json

@@ -1,7 +1,7 @@
 {
    "name": "@malloy-publisher/sdk",
    "description": "Malloy Publisher SDK",
-   "version": "0.0.142",
+   "version": "0.0.144",
    "type": "module",
    "main": "dist/index.cjs.js",
    "module": "dist/index.es.js",

package/src/components/Notebook/Notebook.tsx

@@ -153,23 +153,27 @@ export default function Notebook({
       async (filtersToApply: FilterSelection[] = []) => {
          if (!isSuccess || !notebook?.notebookCells) return;
 
+         // Initialize or reset cells
+         setEnhancedCells((prev) => {
+            if (prev.length === 0) {
+               return notebook.notebookCells.map((cell) => ({ ...cell }));
+            }
+            return prev.map((cell) => ({
+               ...cell,
+               result: undefined,
+            }));
+         });
+
          setIsExecuting(true);
          setExecutionError(null);
-         const cells: EnhancedNotebookCell[] = [];
 
          try {
             // Execute cells sequentially
             for (let i = 0; i < notebook.notebookCells.length; i++) {
                const rawCell = notebook.notebookCells[i];
 
-               // Markdown cells don't need execution - use raw content directly
-               if (rawCell.type === "markdown") {
-                  cells.push({
-                     type: rawCell.type,
-                     text: rawCell.text,
-                  });
-                  continue;
-               }
+               // Markdown cells don't need execution
+               if (rawCell.type === "markdown") continue;
 
                // Execute code cells
                const cellText = rawCell.text || "";
@@ -179,6 +183,9 @@ export default function Notebook({
                   /^\s*(run|query)\s*:/m.test(cellText);
 
                try {
+                  let result: string | undefined;
+                  let newSources: string[] | undefined;
+
                   if (hasQuery && modelPath && filtersToApply.length > 0) {
                      // Query cell - use models API with optional filters
                      let queryToExecute = cellText;
@@ -234,12 +241,7 @@ export default function Notebook({
                            versionId,
                         },
                      );
-
-                     cells.push({
-                        type: rawCell.type,
-                        text: rawCell.text,
-                        result: response.data.result,
-                     });
+                     result = response.data.result;
                   } else {
                      // Non-query code cell (or no filters applied) - use notebook cell execution API
                      const response =
@@ -252,24 +254,29 @@ export default function Notebook({
                         );
 
                      const executedCell = response.data;
-                     cells.push({
-                        type: rawCell.type,
-                        text: rawCell.text,
-                        result: executedCell.result,
-                        newSources: executedCell.newSources,
-                     });
+                     result = executedCell.result;
+                     newSources = rawCell.newSources || executedCell.newSources;
                   }
+
+                  // Update state incrementally
+                  setEnhancedCells((prev) => {
+                     const next = [...prev];
+                     // Ensure we have a cell to update (in case state was reset externally, though unlikely)
+                     if (!next[i]) {
+                        next[i] = { ...rawCell };
+                     }
+                     next[i] = {
+                        ...next[i],
+                        result,
+                        newSources,
+                     };
+                     return next;
+                  });
                } catch (cellError) {
-                  // If a cell fails, add it without execution results
                   console.error(`Error executing cell ${i}:`, cellError);
-                  cells.push({
-                     type: rawCell.type,
-                     text: rawCell.text,
-                  });
+                  // Don't update result on error, leave as is (undefined)
                }
             }
-
-            setEnhancedCells(cells);
          } catch (error) {
             console.error("Error executing notebook cells:", error);
             setExecutionError(error as Error);
@@ -412,26 +419,23 @@ export default function Notebook({
                )}
 
                {/* Loading State */}
-               {(!isSuccess || isExecuting) && !isError && (
-                  <Loading
-                     text={
-                        isExecuting
-                           ? "Executing Notebook..."
-                           : "Fetching Notebook..."
-                     }
-                  />
+               {!isSuccess && !isError && (
+                  <Loading text={"Fetching Notebook..."} />
                )}
 
                {/* Notebook Cells */}
                {isSuccess &&
-                  !isExecuting &&
-                  enhancedCells.map((cell, index) => (
+                  (enhancedCells.length > 0
+                     ? enhancedCells
+                     : notebook?.notebookCells || []
+                  ).map((cell, index) => (
                      <NotebookCell
-                        cell={cell}
+                        cell={cell as EnhancedNotebookCell}
                         key={index}
                         index={index}
                         resourceUri={resourceUri}
                         maxResultSize={maxResultSize}
+                        isExecuting={isExecuting}
                      />
                   ))}
 

package/src/components/Notebook/NotebookCell.tsx

@@ -5,6 +5,7 @@ import LinkOutlinedIcon from "@mui/icons-material/LinkOutlined";
 import SearchIcon from "@mui/icons-material/Search";
 import {
    Box,
+   CircularProgress,
    Dialog,
    DialogContent,
    DialogTitle,
@@ -33,6 +34,7 @@ interface NotebookCellProps {
    resourceUri: string;
    index: number;
    maxResultSize?: number;
+   isExecuting?: boolean;
 }
 
 export function NotebookCell({
@@ -42,6 +44,7 @@ export function NotebookCell({
    resourceUri,
    index,
    maxResultSize,
+   isExecuting,
 }: NotebookCellProps) {
    const [codeDialogOpen, setCodeDialogOpen] = React.useState<boolean>(false);
    const [embeddingDialogOpen, setEmbeddingDialogOpen] =
@@ -214,45 +217,37 @@ export function NotebookCell({
                      marginBottom: "16px",
                   }}
                >
-                  {cell.newSources &&
-                     cell.newSources.length > 0 &&
-                     hasValidImport && (
-                        <CleanMetricCard
+                  {cell.newSources && cell.newSources.length > 0 && (
+                     <CleanMetricCard
+                        sx={{
+                           position: "relative",
+                           padding: "0",
+                        }}
+                     >
+                        <Box
                            sx={{
-                              position: "relative",
-                              padding: "0",
+                              display: "flex",
+                              alignItems: "center",
+                              justifyContent: "space-between",
+                              paddingLeft: "24px",
+                              paddingRight: "8px",
                            }}
                         >
-                           <Box
-                              sx={{
-                                 display: "flex",
-                                 alignItems: "center",
-                                 justifyContent: "space-between",
-                                 paddingLeft: "24px",
-                                 paddingRight: "8px",
-                              }}
-                           >
-                              {/* This shouldn't be needed but there's a compiler bug */}
-                              {highlightedMalloyCode && (
-                                 <span
-                                    dangerouslySetInnerHTML={{
-                                       __html:
-                                          cell.text.length > 50 &&
-                                          highlightedMalloyCode
-                                             ? `${highlightedMalloyCode.substring(0, 50)}...`
-                                             : highlightedMalloyCode,
-                                    }}
-                                    style={{
-                                       fontFamily: "monospace",
-                                       fontSize: "14px",
-                                       flex: 1,
-                                       whiteSpace: "nowrap",
-                                       overflow: "hidden",
-                                       textOverflow: "ellipsis",
-                                       marginRight: "8px",
-                                    }}
-                                 />
-                              )}
+                           {/* This shouldn't be needed but there's a compiler bug */}
+                           {highlightedMalloyCode && (
+                              <span
+                                 dangerouslySetInnerHTML={{
+                                    __html: highlightedMalloyCode,
+                                 }}
+                                 style={{
+                                    fontFamily: "monospace",
+                                    fontSize: "14px",
+                                    flex: 1,
+                                    marginRight: "8px",
+                                 }}
+                              />
+                           )}
+                           {hasValidImport && (
                               <IconButton
                                  sx={{
                                     backgroundColor: "rgba(255, 255, 255, 0.9)",
@@ -270,9 +265,10 @@ export function NotebookCell({
                                     sx={{ fontSize: "18px", color: "#666666" }}
                                  />
                               </IconButton>
-                           </Box>
-                        </CleanMetricCard>
-                     )}
+                           )}
+                        </Box>
+                     </CleanMetricCard>
+                  )}
                </Stack>
             )}
 
@@ -407,6 +403,23 @@ export function NotebookCell({
                title="Results"
             />
 
+            {/* Loading state for executing code cells (not import cells) */}
+            {isExecuting &&
+               !cell.result &&
+               !hasValidImport &&
+               !(cell.newSources && cell.newSources.length > 0) && (
+                  <CleanMetricCard
+                     sx={{
+                        display: "flex",
+                        justifyContent: "center",
+                        alignItems: "center",
+                        minHeight: 200,
+                     }}
+                  >
+                     <CircularProgress size={32} />
+                  </CleanMetricCard>
+               )}
+
             {cell.result && (
                <CleanMetricCard
                   sx={{

package/src/hooks/useDimensionalFilterRangeData.ts

@@ -359,6 +359,8 @@ function parseIndexQueryResult(
             return cell.number_value ?? null;
          case "boolean_cell":
             return cell.boolean_value ?? null;
+         case "null_cell":
+            return null;
          default:
             console.log("Unknown cell kind: " + cell.kind);
             return null;