Combine duplicate imports (#893)

kmcginnes · web-flow · commit 1240090d0f0e · 2025-04-17T18:33:00.000-05:00
diff --git a/packages/graph-explorer/src/components/SelectField.tsx b/packages/graph-explorer/src/components/SelectField.tsx
@@ -4,8 +4,7 @@ import type {
   ForwardedRef,
   ReactNode,
 } from "react";
-import { forwardRef } from "react";
-import React from "react";
+import React, { forwardRef } from "react";
 import { cn } from "@/utils";
 import { Label } from "./Label";
 import {
diff --git a/packages/graph-explorer/src/components/Tabular/Tabular.tsx b/packages/graph-explorer/src/components/Tabular/Tabular.tsx
@@ -1,4 +1,4 @@
-import { cn } from "@/utils";
+import { cn, getChildOfType } from "@/utils";
 import {
   ForwardedRef,
   forwardRef,
@@ -13,7 +13,6 @@ import useDeepCompareEffect from "use-deep-compare-effect";
 
 import { useWithTheme } from "@/core";
 import { useDeepMemo } from "@/hooks";
-import { getChildOfType } from "@/utils";
 
 import {
   PaginationControl,
diff --git a/packages/graph-explorer/src/components/Workspace/Workspace.tsx b/packages/graph-explorer/src/components/Workspace/Workspace.tsx
@@ -1,7 +1,6 @@
-import { cn } from "@/utils";
+import { cn, getChildrenOfType } from "@/utils";
 import type { PropsWithChildren, ReactElement } from "react";
 import { useMemo } from "react";
-import { getChildrenOfType } from "@/utils";
 import getChildOfType from "@/utils/getChildOfType";
 import WorkspaceFooter from "./components/WorkspaceFooter";
 import WorkspaceNavBar from "./components/WorkspaceNavBar";
diff --git a/packages/graph-explorer/src/components/Workspace/components/WorkspaceTopBar.tsx b/packages/graph-explorer/src/components/Workspace/components/WorkspaceTopBar.tsx
@@ -1,7 +1,6 @@
-import { cn } from "@/utils";
+import { cn, groupChildrenByType } from "@/utils";
 import type { PropsWithChildren, ReactElement } from "react";
 import { useMemo } from "react";
-import { groupChildrenByType } from "@/utils";
 import NavBarLogo from "./NavBarLogo";
 import WorkspaceTopBarAdditionalControls from "./WorkspaceTopBarAdditionalControls";
 import WorkspaceTopBarContent from "./WorkspaceTopBarContent";
diff --git a/packages/graph-explorer/src/connector/useGEFetchTypes.ts b/packages/graph-explorer/src/connector/useGEFetchTypes.ts
@@ -2,9 +2,12 @@ import {
   ConfigurationContextProps,
   EdgeTypeConfig,
   VertexTypeConfig,
+  Edge,
+  EdgeId,
+  Vertex,
+  VertexId,
 } from "@/core";
 import { ConnectionConfig } from "@shared/types";
-import { Edge, EdgeId, Vertex, VertexId } from "@/core";
 
 export type QueryOptions = RequestInit & {
   queryId?: string;
diff --git a/packages/graph-explorer/src/core/StateProvider/displayAttribute.ts b/packages/graph-explorer/src/core/StateProvider/displayAttribute.ts
@@ -1,7 +1,6 @@
-import { Vertex, Edge } from "@/core";
+import { Vertex, Edge, AttributeConfig } from "@/core";
 import { MISSING_DISPLAY_VALUE, formatDate } from "@/utils";
 import { TextTransformer } from "@/hooks";
-import { AttributeConfig } from "@/core";
 
 /** Represents an attribute's display information after all transformations have been applied. */
 export type DisplayAttribute = {
diff --git a/packages/graph-explorer/src/core/StateProvider/displayEdge.test.ts b/packages/graph-explorer/src/core/StateProvider/displayEdge.test.ts
@@ -1,4 +1,4 @@
-import { Edge } from "@/core";
+import { Edge, getRawId } from "@/core";
 import {
   createRandomEdge,
   createRandomEdgeTypeConfig,
@@ -21,7 +21,6 @@ import { Schema } from "../ConfigurationProvider";
 import { MutableSnapshot } from "recoil";
 import { schemaAtom } from "./schema";
 import { QueryEngine } from "@shared/types";
-import { getRawId } from "@/core";
 
 describe("useDisplayEdgeFromEdge", () => {
   it("should keep the same ID", () => {
diff --git a/packages/graph-explorer/src/core/StateProvider/displayEdge.ts b/packages/graph-explorer/src/core/StateProvider/displayEdge.ts
@@ -1,7 +1,9 @@
-import { Edge, EdgeId, getRawId, Vertex, VertexId } from "@/core";
-import { selector, selectorFamily, useRecoilValue } from "recoil";
-import { textTransformSelector } from "@/hooks";
 import {
+  Edge,
+  EdgeId,
+  getRawId,
+  Vertex,
+  VertexId,
   DisplayEdgeTypeConfig,
   displayEdgeTypeConfigSelector,
   DisplayAttribute,
@@ -13,6 +15,8 @@ import {
   edgeSelector,
   edgeTypeAttributesSelector,
 } from "@/core";
+import { selector, selectorFamily, useRecoilValue } from "recoil";
+import { textTransformSelector } from "@/hooks";
 import {
   MISSING_DISPLAY_VALUE,
   RESERVED_ID_PROPERTY,
diff --git a/packages/graph-explorer/src/hooks/useExpandNode.tsx b/packages/graph-explorer/src/hooks/useExpandNode.tsx
@@ -9,9 +9,13 @@ import {
 import { loggerSelector, useExplorer } from "@/core/connector";
 import { useRecoilValue } from "recoil";
 import { useMutation, useQueryClient } from "@tanstack/react-query";
-import { useFetchedNeighborsCallback, Vertex, VertexId } from "@/core";
+import {
+  useFetchedNeighborsCallback,
+  Vertex,
+  VertexId,
+  useNeighborsCallback,
+} from "@/core";
 import { createDisplayError } from "@/utils/createDisplayError";
-import { useNeighborsCallback } from "@/core";
 import { useAddToGraph } from "./useAddToGraph";
 
 export type ExpandNodeFilters = Omit<
diff --git a/packages/graph-explorer/src/hooks/useNeighborsOptions.ts b/packages/graph-explorer/src/hooks/useNeighborsOptions.ts
@@ -1,11 +1,11 @@
 import { useMemo } from "react";
-import { VertexId } from "@/core";
-import { SelectOption } from "@/components";
 import {
+  VertexId,
   DisplayVertexTypeConfig,
   useDisplayVertexTypeConfigs,
   useNeighbors,
 } from "@/core";
+import { SelectOption } from "@/components";
 
 export type NeighborOption = SelectOption & {
   config: DisplayVertexTypeConfig;
diff --git a/packages/graph-explorer/src/modules/EntitiesTabular/components/NodesTabular.tsx b/packages/graph-explorer/src/modules/EntitiesTabular/components/NodesTabular.tsx
@@ -9,7 +9,11 @@ import {
   TabularEmptyBodyControls,
 } from "@/components/Tabular/controls";
 import Tabular from "@/components/Tabular/Tabular";
-import { DisplayVertex, useDisplayVerticesInCanvas } from "@/core";
+import {
+  DisplayVertex,
+  useDisplayVerticesInCanvas,
+  useAllNeighbors,
+} from "@/core";
 import { edgesSelectedIdsAtom } from "@/core/StateProvider/edges";
 import {
   nodesFilteredIdsAtom,
@@ -19,7 +23,6 @@ import {
 
 import { useDeepMemo, useTranslations } from "@/hooks";
 import { recoilDiffSets } from "@/utils/recoilState";
-import { useAllNeighbors } from "@/core";
 
 type ToggleVertex = DisplayVertex & {
   __is_visible: boolean;
diff --git a/packages/graph-explorer/src/modules/GraphViewer/GraphViewer.tsx b/packages/graph-explorer/src/modules/GraphViewer/GraphViewer.tsx
@@ -19,11 +19,11 @@ import {
   PanelHeaderDivider,
   PanelTitle,
   VertexSymbol,
+  IconButton,
 } from "@/components";
 import Graph from "@/components/Graph";
 import { GraphRef } from "@/components/Graph/Graph";
 import { ElementEventCallback } from "@/components/Graph/hooks/useAddClickEvents";
-import { IconButton } from "@/components";
 import SelectField from "@/components/SelectField";
 import {
   edgesOutOfFocusRenderedIdsAtom,
diff --git a/packages/graph-explorer/src/modules/GraphViewer/internalComponents/ContextMenu.tsx b/packages/graph-explorer/src/modules/GraphViewer/internalComponents/ContextMenu.tsx
@@ -18,7 +18,12 @@ import {
   ZoomInIcon,
   ZoomOutIcon,
 } from "@/components/icons";
-import { useDisplayEdgesInCanvas, useDisplayVerticesInCanvas } from "@/core";
+import {
+  useDisplayEdgesInCanvas,
+  useDisplayVerticesInCanvas,
+  EdgeId,
+  VertexId,
+} from "@/core";
 import { edgesSelectedIdsAtom } from "@/core/StateProvider/edges";
 import { nodesSelectedIdsAtom } from "@/core/StateProvider/nodes";
 import {
@@ -27,7 +32,6 @@ import {
 } from "@/core/StateProvider/userPreferences";
 import { useClearGraph, useRemoveFromGraph, useTranslations } from "@/hooks";
 import useGraphGlobalActions from "../useGraphGlobalActions";
-import { EdgeId, VertexId } from "@/core";
 import { MinusCircleIcon } from "lucide-react";
 import { customizeNodeTypeAtom } from "@/modules/NodesStyling";
 import { customizeEdgeTypeAtom } from "@/modules/EdgesStyling";
diff --git a/packages/graph-explorer/src/modules/GraphViewer/useGraphStyles.ts b/packages/graph-explorer/src/modules/GraphViewer/useGraphStyles.ts
@@ -1,14 +1,17 @@
 import Color from "color";
 import { useEffect, useState } from "react";
-import { getEdgeIdFromRenderedEdgeId, RenderedEdgeId } from "@/core";
+import {
+  getEdgeIdFromRenderedEdgeId,
+  RenderedEdgeId,
+  useDisplayEdgesInCanvas,
+} from "@/core";
 import type { GraphProps } from "@/components";
 import useTextTransform from "@/hooks/useTextTransform";
 import { renderNode } from "./renderNode";
 import {
   useEdgeTypeConfigs,
   useVertexTypeConfigs,
 } from "@/core/ConfigurationProvider/useConfiguration";
-import { useDisplayEdgesInCanvas } from "@/core";
 import { MISSING_DISPLAY_VALUE } from "@/utils/constants";
 
 const LINE_PATTERN = {
diff --git a/packages/graph-explorer/src/modules/GraphViewer/useNodeBadges.ts b/packages/graph-explorer/src/modules/GraphViewer/useNodeBadges.ts
@@ -1,8 +1,11 @@
 import { useCallback } from "react";
 import { Badge, BadgeRenderer } from "@/components/Graph/hooks/useRenderBadges";
-import { getVertexIdFromRenderedVertexId, RenderedVertexId } from "@/core";
-import { useDisplayVerticesInCanvas } from "@/core";
-import { useAllNeighbors } from "@/core";
+import {
+  getVertexIdFromRenderedVertexId,
+  RenderedVertexId,
+  useDisplayVerticesInCanvas,
+  useAllNeighbors,
+} from "@/core";
 
 const useNodeBadges = () => {
   const displayNodes = useDisplayVerticesInCanvas();
diff --git a/packages/graph-explorer/src/modules/Namespaces/GeneratedPrefixes.tsx b/packages/graph-explorer/src/modules/Namespaces/GeneratedPrefixes.tsx
@@ -1,4 +1,4 @@
-import { ComponentPropsWithoutRef, useMemo } from "react";
+import React, { ComponentPropsWithoutRef, useMemo } from "react";
 import {
   ListRow,
   ListRowContent,
@@ -11,7 +11,6 @@ import {
 } from "@/components";
 import { PrefixTypeConfig, useConfiguration } from "@/core";
 import { Virtuoso } from "react-virtuoso";
-import React from "react";
 
 const GeneratedPrefixes = () => {
   const items = useGeneratedPrefixes();
diff --git a/packages/graph-explorer/src/modules/Namespaces/UserPrefixes.tsx b/packages/graph-explorer/src/modules/Namespaces/UserPrefixes.tsx
@@ -1,5 +1,5 @@
 import { Modal } from "@mantine/core";
-import { useCallback, useMemo, useState } from "react";
+import React, { useCallback, useMemo, useState } from "react";
 import { useRecoilCallback } from "recoil";
 import {
   AddIcon,
@@ -25,7 +25,6 @@ import {
 } from "@/core";
 import { schemaAtom } from "@/core/StateProvider/schema";
 import { Virtuoso } from "react-virtuoso";
-import React from "react";
 
 type PrefixForm = {
   prefix: string;
diff --git a/packages/graph-explorer/src/modules/SearchSidebar/useKeywordSearch.test.ts b/packages/graph-explorer/src/modules/SearchSidebar/useKeywordSearch.test.ts
@@ -1,7 +1,10 @@
 import useKeywordSearch from "./useKeywordSearch";
 import { QueryEngine } from "@shared/types";
-import { createRandomSchema, renderHookWithRecoilRoot } from "@/utils/testing";
-import { createRandomRawConfiguration } from "@/utils/testing";
+import {
+  createRandomSchema,
+  renderHookWithRecoilRoot,
+  createRandomRawConfiguration,
+} from "@/utils/testing";
 import {
   activeConfigurationAtom,
   configurationAtom,
diff --git a/packages/graph-explorer/src/modules/common/NeighborsList/NeighborsList.tsx b/packages/graph-explorer/src/modules/common/NeighborsList/NeighborsList.tsx
@@ -1,5 +1,9 @@
 import { cn } from "@/utils";
-import { VertexId } from "@/core";
+import {
+  VertexId,
+  useNeighbors,
+  useNeighborByType as useNeighborsByType,
+} from "@/core";
 import {
   Button,
   Chip,
@@ -9,7 +13,6 @@ import {
   VertexIcon,
   VisibleIcon,
 } from "@/components";
-import { useNeighbors, useNeighborByType as useNeighborsByType } from "@/core";
 import useNeighborsOptions, {
   NeighborOption,
 } from "@/hooks/useNeighborsOptions";
diff --git a/packages/graph-explorer/src/workspaces/Connections/Connections.tsx b/packages/graph-explorer/src/workspaces/Connections/Connections.tsx
@@ -1,7 +1,12 @@
 import { useState } from "react";
 import { Link } from "react-router";
 import { useRecoilValue } from "recoil";
-import { buttonStyles } from "@/components";
+import {
+  buttonStyles,
+  Panel,
+  PanelContent,
+  PanelEmptyState,
+} from "@/components";
 import { ExplorerIcon, GearIcon } from "@/components/icons";
 import Workspace from "@/components/Workspace/Workspace";
 import { useConfiguration } from "@/core";
@@ -10,7 +15,6 @@ import { useIsSyncing } from "@/hooks/useSchemaSync";
 import AvailableConnections from "@/modules/AvailableConnections";
 import ConnectionDetail from "@/modules/ConnectionDetail";
 import { APP_NAME } from "@/utils/constants";
-import { Panel, PanelContent, PanelEmptyState } from "@/components";
 import GraphExplorerIcon from "@/components/icons/GraphExplorerIcon";
 import { cn } from "@/utils";
 
diff --git a/packages/graph-explorer/src/workspaces/DataExplorer/DataExplorer.tsx b/packages/graph-explorer/src/workspaces/DataExplorer/DataExplorer.tsx
@@ -8,7 +8,15 @@ import {
 } from "@tanstack/react-query";
 import { Link, useParams, useSearchParams } from "react-router";
 import { useSetRecoilState } from "recoil";
-import { useUpdateSchemaFromEntities, Vertex } from "@/core";
+import {
+  useUpdateSchemaFromEntities,
+  Vertex,
+  DisplayVertex,
+  useConfiguration,
+  useDisplayVertexTypeConfig,
+  useDisplayVerticesFromVertices,
+  useWithTheme,
+} from "@/core";
 import {
   Button,
   buttonStyles,
@@ -34,13 +42,6 @@ import {
 import Tabular from "@/components/Tabular/Tabular";
 import Workspace from "@/components/Workspace/Workspace";
 import { KeywordSearchRequest, searchQuery } from "@/connector";
-import {
-  DisplayVertex,
-  useConfiguration,
-  useDisplayVertexTypeConfig,
-  useDisplayVerticesFromVertices,
-  useWithTheme,
-} from "@/core";
 import { useExplorer } from "@/core/connector";
 import {
   userStylingAtom,
