rename 'ElementsData' to 'BlockData'

docs/src/components/nodes/types/nodeProps.ts

@@ -47,7 +47,7 @@ type CtrlData = Record<
     : never
 >;
 
-export type ElementsData = {
+export type BlockData = {
   id: string;
   label: string;
   type: string;
@@ -68,4 +68,4 @@ export type TextData = {
   text: string;
 };
 
-export type CustomNodeProps = NodeProps<ElementsData>;
+export type CustomNodeProps = NodeProps<BlockData>;

src/renderer/data/RECIPES.ts

@@ -1,9 +1,9 @@
-import { ElementsData } from "@/renderer/types";
+import { BlockData } from "@/renderer/types";
 import { ReactFlowJsonObject } from "reactflow";
 import { defaultApp } from "./apps";
 
 export const NOISY_SINE =
-  defaultApp.rfInstance as ReactFlowJsonObject<ElementsData>;
+  defaultApp.rfInstance as ReactFlowJsonObject<BlockData>;
 
 export const EMPTY_CANVAS = {
   elements: [],

src/renderer/hooks/useFlowChartGraph.ts

@@ -1,4 +1,4 @@
-import { ElementsData } from "@/renderer/types";
+import { BlockData } from "@/renderer/types";
 import { useAtom } from "jotai";
 import { atomWithImmer } from "jotai-immer";
 import { useCallback, useMemo } from "react";
@@ -15,10 +15,10 @@ import useWithPermission from "./useWithPermission";
 
 const project = resolveDefaultProjectReference();
 const projectData = resolveProjectReference(project) || RECIPES.NOISY_SINE;
-const initialNodes: Node<ElementsData>[] = projectData.nodes;
+const initialNodes: Node<BlockData>[] = projectData.nodes;
 const initialEdges: Edge[] = projectData.edges;
 
-const nodesAtom = atomWithImmer<Node<ElementsData>[]>(initialNodes);
+const nodesAtom = atomWithImmer<Node<BlockData>[]>(initialNodes);
 export const textNodesAtom = atomWithImmer<Node<TextData>[]>([]);
 const edgesAtom = atomWithImmer<Edge[]>(initialEdges);
 
@@ -30,8 +30,8 @@ export const useFlowChartGraph = () => {
   const setNodes = withPermissionCheck(setNodesOriginal);
   const setEdges = withPermissionCheck(setEdgesOriginal);
   const { selectedNodes, unSelectedNodes } = useMemo(() => {
-    const selectedNodes: Node<ElementsData>[] = [];
-    const unSelectedNodes: Node<ElementsData>[] = [];
+    const selectedNodes: Node<BlockData>[] = [];
+    const unSelectedNodes: Node<BlockData>[] = [];
     for (const n of nodes) {
       if (n.selected) {
         selectedNodes.push(n);
@@ -44,7 +44,7 @@ export const useFlowChartGraph = () => {
   const nodesMetadata = useFullMetadata();
 
   const loadFlowExportObject = useCallback(
-    (flow: ReactFlowJsonObject<ElementsData>, textNodes?: Node<TextData>[]) => {
+    (flow: ReactFlowJsonObject<BlockData>, textNodes?: Node<TextData>[]) => {
       if (!flow) {
         return false;
       }
@@ -80,7 +80,7 @@ export const useFlowChartGraph = () => {
 
   const updateCtrlInputDataForNode = (
     nodeId: string,
-    inputData: ElementsData["ctrls"][string],
+    inputData: BlockData["ctrls"][string],
   ) => {
     setNodesOriginal((element) => {
       const node = element.find((e) => e.id === nodeId);
@@ -96,7 +96,7 @@ export const useFlowChartGraph = () => {
 
   const updateInitCtrlInputDataForNode = (
     nodeId: string,
-    inputData: ElementsData["ctrls"][string],
+    inputData: BlockData["ctrls"][string],
   ) => {
     setNodesOriginal((element) => {
       const node = element.find((e) => e.id === nodeId);
@@ -145,7 +145,7 @@ export const useFlowChartGraph = () => {
   };
 
   const handleNodeChanges = (
-    cb: (nodes: Node<ElementsData>[]) => Node<ElementsData>[],
+    cb: (nodes: Node<BlockData>[]) => Node<BlockData>[],
   ) => {
     setNodesOriginal(cb);
   };

src/renderer/hooks/useFlowChartState.ts

@@ -1,12 +1,12 @@
-import { ElementsData } from "@/renderer/types";
+import { BlockData } from "@/renderer/types";
 import { TextData } from "@/renderer/types/node";
 import { atom } from "jotai";
 import { atomWithImmer } from "jotai-immer";
 import { ReactFlowJsonObject, Node } from "reactflow";
 
 export type Project = {
   name?: string;
-  rfInstance?: ReactFlowJsonObject<ElementsData>;
+  rfInstance?: ReactFlowJsonObject<BlockData>;
   textNodes?: Node<TextData>[];
 };
 

src/renderer/lib/save.ts

@@ -1,12 +1,12 @@
 import { Project } from "@/renderer/hooks/useFlowChartState";
-import { ElementsData } from "@/renderer/types";
+import { BlockData } from "@/renderer/types";
 import { TextData } from "@/renderer/types/node";
 import saveAs from "file-saver";
 import { Node, Edge } from "reactflow";
 
 export const makeAppFileContent = (
   project: Project,
-  nodes: Node<ElementsData>[],
+  nodes: Node<BlockData>[],
   edges: Edge[],
   textNodes: Node<TextData>[],
 ) => {
@@ -24,7 +24,7 @@ export const makeAppFileContent = (
 
 export const saveFileAs = async (
   project: Project,
-  nodes: Node<ElementsData>[],
+  nodes: Node<BlockData>[],
   edges: Edge[],
   textNodes: Node<TextData>[],
 ): Promise<string | undefined> => {

src/renderer/lib/sync.ts

@@ -1,4 +1,4 @@
-import { ElementsData } from "@/renderer/types";
+import { BlockData } from "@/renderer/types";
 import { BlocksMetadataMap } from "@/renderer/types/blocks-metadata";
 import { Leaf, RootNode, TreeNode } from "@/renderer/utils/ManifestLoader";
 import { Edge, Node } from "reactflow";
@@ -8,18 +8,18 @@ import { isCompatibleType } from "@/renderer/utils/TypeCheck";
 import _ from "lodash";
 
 export function syncFlowchartWithManifest(
-  nodes: Node<ElementsData>[],
+  nodes: Node<BlockData>[],
   edges: Edge[],
   blockManifest: RootNode,
   blockMetadata: BlocksMetadataMap,
-): [Node<ElementsData>[], Edge[]] {
+): [Node<BlockData>[], Edge[]] {
   const blocks = flattenManifest(blockManifest);
 
   const inEdges = _.groupBy(edges, (e: Edge) => e.target);
-  const newNodes: Node<ElementsData>[] = [];
+  const newNodes: Node<BlockData>[] = [];
   const newEdges: Edge[] = [];
 
-  const validEdge = (e: Edge, inputs?: ElementsData["inputs"]) => {
+  const validEdge = (e: Edge, inputs?: BlockData["inputs"]) => {
     const outBlock = blocks.get(blockFuncFromId(e.source));
     if (!outBlock) {
       // If there is an unknown block in the flow chart,

src/renderer/routes/flow_chart/FlowChartTabView.tsx

@@ -64,7 +64,7 @@ import {
   useManifest,
   useNodesMetadata,
 } from "@/renderer/hooks/useManifest";
-import { ElementsData } from "@/renderer/types";
+import { BlockData } from "@/renderer/types";
 import { createNodeId, createNodeLabel } from "@/renderer/utils/NodeUtils";
 import useKeyboardShortcut from "@/renderer/hooks/useKeyboardShortcut";
 import { filterMap } from "@/renderer/utils/ArrayUtils";
@@ -207,11 +207,11 @@ const FlowChartTab = () => {
   const addTextNode = useAddTextNode();
 
   const duplicateNode = useCallback(
-    (node: Node<ElementsData>) => {
+    (node: Node<BlockData>) => {
       const funcName = node.data.func;
       const id = createNodeId(funcName);
 
-      const newNode: Node<ElementsData> = {
+      const newNode: Node<BlockData> = {
         ...node,
         id,
         data: {
@@ -400,7 +400,7 @@ const FlowChartTab = () => {
   const ref = useRef<HTMLDivElement | null>(null);
 
   const onNodeContextMenu = useCallback(
-    (event, node: Node<ElementsData>) => {
+    (event, node: Node<BlockData>) => {
       // Prevent native context menu from showing
       event.preventDefault();
 

src/renderer/routes/flow_chart/components/NodeContextMenu.tsx

@@ -1,5 +1,5 @@
 import { Button } from "@/renderer/components/ui/button";
-import { ElementsData } from "@/renderer/types";
+import { BlockData } from "@/renderer/types";
 import { Code, CopyPlus, Info, LucideIcon, Pencil, X } from "lucide-react";
 import { useCallback } from "react";
 import { useStore, Node, useReactFlow } from "reactflow";
@@ -51,7 +51,7 @@ type ContextMenuProps = {
   bottom?: number;
   fullPath: string;
   onClick?: () => void;
-  duplicateNode: (node: Node<ElementsData>) => void;
+  duplicateNode: (node: Node<BlockData>) => void;
   setNodeModalOpen: (open: boolean) => void;
 };
 

src/renderer/routes/flow_chart/components/node-edit-menu/NodeEditModal.tsx

@@ -1,5 +1,5 @@
 import { Node } from "reactflow";
-import { ElementsData } from "@/renderer/types";
+import { BlockData } from "@/renderer/types";
 import { memo, useEffect, useState } from "react";
 import Draggable from "react-draggable";
 import { useFlowChartGraph } from "@/renderer/hooks/useFlowChartGraph";
@@ -13,8 +13,8 @@ import useWithPermission from "@/renderer/hooks/useWithPermission";
 import { useFlowchartStore } from "@/renderer/stores/flowchart";
 
 type NodeEditModalProps = {
-  node: Node<ElementsData>;
-  otherNodes: Node<ElementsData>[] | null;
+  node: Node<BlockData>;
+  otherNodes: Node<BlockData>[] | null;
   setNodeModalOpen: (open: boolean) => void;
   handleDelete: (nodeId: string, nodeLabel: string) => void;
 };

src/renderer/routes/flow_chart/components/node-edit-menu/ParamField.tsx

@@ -1,4 +1,4 @@
-import { ElementsData } from "@/renderer/types";
+import { BlockData } from "@/renderer/types";
 import { ParamValueType } from "@/renderer/routes/common/types/ParamValueType";
 import { Input } from "@/renderer/components/ui/input";
 import {
@@ -22,9 +22,9 @@ import { useFlowchartStore } from "@/renderer/stores/flowchart";
 
 type ParamFieldProps = {
   nodeId: string;
-  nodeCtrl: ElementsData["ctrls"][string];
+  nodeCtrl: BlockData["ctrls"][string];
   type: ParamValueType;
-  updateFunc: (nodeId: string, data: ElementsData["ctrls"][string]) => void;
+  updateFunc: (nodeId: string, data: BlockData["ctrls"][string]) => void;
   options?: string[];
   nodeReferenceOptions?: {
     label: string;

src/renderer/routes/flow_chart/components/node-edit-menu/ParamList.tsx

@@ -1,12 +1,12 @@
 import { ParamValueType } from "@/renderer/routes/common/types/ParamValueType";
 import { ParamTooltip } from "@/renderer/components/common/ParamTooltip";
-import { ElementsData } from "@/renderer/types/node";
+import { BlockData } from "@/renderer/types/node";
 import ParamField from "./ParamField";
 
 type ParamListProps = {
   nodeId: string;
-  ctrls: ElementsData["ctrls"];
-  updateFunc: (nodeId: string, data: ElementsData["ctrls"][string]) => void;
+  ctrls: BlockData["ctrls"];
+  updateFunc: (nodeId: string, data: BlockData["ctrls"][string]) => void;
   nodeReferenceOptions?: {
     label: string;
     value: string;

src/renderer/routes/flow_chart/hooks/useAddNewNode.tsx

@@ -2,7 +2,7 @@ import { Leaf as NodeElement } from "@/renderer/utils/ManifestLoader";
 import { Draft } from "immer";
 import { useCallback } from "react";
 import { Node } from "reactflow";
-import { ElementsData } from "@/renderer/types";
+import { BlockData } from "@/renderer/types";
 import { sendEventToMix } from "@/renderer/services/MixpanelServices";
 import { centerPositionAtom } from "@/renderer/hooks/useFlowChartState";
 import { useAtomValue } from "jotai";
@@ -21,8 +21,8 @@ export type AddNewNode = (node: NodeElement) => void;
 export const useAddNewNode = (
   setNodes: (
     update:
-      | Node<ElementsData>[]
-      | ((draft: Draft<Node<ElementsData>>[]) => void),
+      | Node<BlockData>[]
+      | ((draft: Draft<Node<BlockData>>[]) => void),
   ) => void,
   getTakenNodeLabels: (func: string) => string[][],
   nodesMetadataMap: BlocksMetadataMap | undefined | null,
@@ -64,7 +64,7 @@ export const useAddNewNode = (
       const nodeCtrls = ctrlsFromParams(params, funcName, hardwareDevices);
       const initCtrls = ctrlsFromParams(initParams, funcName);
 
-      const newNode: Node<ElementsData> = {
+      const newNode: Node<BlockData> = {
         id: nodeId,
         type: uiComponentId ?? type,
         data: {

src/renderer/routes/flow_chart/views/BlockExpandMenu.tsx

@@ -1,7 +1,7 @@
 import { NodeResult } from "@/renderer/routes/common/types/ResultsType";
 // import { useFlowChartState } from "@/renderer/hooks/useFlowChartState";
 import { Node } from "reactflow";
-import { ElementsData } from "@/renderer/types";
+import { BlockData } from "@/renderer/types";
 import BlockModal from "./BlockModal";
 import { useEffect, useState } from "react";
 // import { useFlowChartTabState } from "../FlowChartTabState";
@@ -10,7 +10,7 @@ type BlockExpandMenuProps = {
   modalIsOpen: boolean;
   setModalOpen: (open: boolean) => void;
   nodeResults: NodeResult[];
-  selectedNode: Node<ElementsData> | null;
+  selectedNode: Node<BlockData> | null;
   pythonString: string;
   blockFilePath: string;
   blockFullPath: string;

src/renderer/routes/flow_chart/views/BlockModal.tsx

@@ -14,7 +14,7 @@ import {
   DialogTitle,
 } from "@/renderer/components/ui/dialog";
 import { NodeResult } from "@/renderer/routes/common/types/ResultsType";
-import { ElementsData } from "@/renderer/types/node";
+import { BlockData } from "@/renderer/types/node";
 import { ScrollArea, ScrollBar } from "@/renderer/components/ui/scroll-area";
 import { useTheme } from "@/renderer/providers/themeProvider";
 import { Button } from "@/renderer/components/ui/button";
@@ -53,7 +53,7 @@ export type BlockModalProps = {
   pythonString: string;
   blockFilePath: string;
   blockFullPath: string;
-  selectedNode: Node<ElementsData>;
+  selectedNode: Node<BlockData>;
 };
 
 const BlockModal = ({
@@ -179,7 +179,7 @@ const BlockModal = ({
 
 type NodeModalDataVizProps = {
   nd: NodeResult;
-  selectedNode: Node<ElementsData>;
+  selectedNode: Node<BlockData>;
   theme: "light" | "dark";
 };
 

src/renderer/routes/flow_chart/views/ControlBar/FlowControlButtons.tsx

@@ -1,6 +1,6 @@
 import { useFlowChartGraph } from "@/renderer/hooks/useFlowChartGraph";
 import { Node, Edge } from "reactflow";
-import { ElementsData } from "@/renderer/types";
+import { BlockData } from "@/renderer/types";
 import { Ban, Play } from "lucide-react";
 import { Button } from "@/renderer/components/ui/button";
 import { projectAtom } from "@/renderer/hooks/useFlowChartState";
@@ -42,7 +42,7 @@ const FlowControlButtons = () => {
       alert("There is no running job on server.");
     }
   };
-  const onRun = async (nodes: Node<ElementsData>[], edges: Edge[]) => {
+  const onRun = async (nodes: Node<BlockData>[], edges: Edge[]) => {
     if (project.rfInstance && nodes.length > 0) {
       if (_.some(nodes, (n) => n.data.invalid)) {
         toast.error(

src/renderer/routes/flow_chart/views/ControlBar/WatchBtn.tsx

@@ -1,6 +1,6 @@
 import { useEffect, useState } from "react";
 import { Node, Edge } from "reactflow";
-import { ElementsData } from "@/renderer/types";
+import { BlockData } from "@/renderer/types";
 import { useFlowChartGraph } from "@/renderer/hooks/useFlowChartGraph";
 import { Label } from "@/renderer/components/ui/label";
 import { Switch } from "@/renderer/components/ui/switch";
@@ -14,7 +14,7 @@ import { toast } from "sonner";
 import { useFlowchartStore } from "@/renderer/stores/flowchart";
 
 interface WatchBtnProps {
-  playFC: (nodes: Node<ElementsData>[], edges: Edge[]) => void;
+  playFC: (nodes: Node<BlockData>[], edges: Edge[]) => void;
   cancelFC: () => void;
 }
 

src/renderer/services/FlowChartServices.ts

@@ -1,6 +1,6 @@
 import { Setting } from "../hooks/useSettings";
 import { ReactFlowJsonObject } from "reactflow";
-import { ElementsData } from "@/renderer/types";
+import { BlockData } from "@/renderer/types";
 import { Result } from "src/types/result";
 import { captain } from "@/renderer/lib/ky";
 import { HTTPError } from "ky";
@@ -39,7 +39,7 @@ export function saveAndRunFlowChartInServer({
   jobId,
   settings,
 }: {
-  rfInstance?: ReactFlowJsonObject<ElementsData>;
+  rfInstance?: ReactFlowJsonObject<BlockData>;
   jobId: string;
   settings: Setting[];
 }) {
@@ -62,7 +62,7 @@ export function saveAndRunFlowChartInServer({
 }
 
 export function cancelFlowChartRun(
-  rfInstance: ReactFlowJsonObject<ElementsData>,
+  rfInstance: ReactFlowJsonObject<BlockData>,
   jobId: string,
 ) {
   if (rfInstance) {