Simplify file structure

aws · May 10, 2024 · abdb822 · abdb822
1 parent 5546cac
commit abdb822
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 49 deletions.
diff --git a/packages/graph-explorer/src/connector/gremlin/useGremlin.ts b/packages/graph-explorer/src/connector/gremlin/useGremlin.ts
@@ -7,7 +7,7 @@ import keywordSearch from "./queries/keywordSearch";
 import { fetchDatabaseRequest } from "../fetchDatabaseRequest";
 import { GraphSummary } from "./types";
 import { v4 } from "uuid";
-import { Explorer } from "../../core/ConnectorProvider/types";
+import { Explorer } from "../useGEFetchTypes";
 
 function _gremlinFetch(connection: ConnectionConfig, options: any) {
   return async (queryTemplate: string) => {

diff --git a/packages/graph-explorer/src/connector/openCypher/useOpenCypher.ts b/packages/graph-explorer/src/connector/openCypher/useOpenCypher.ts
@@ -7,7 +7,7 @@ import { GraphSummary } from "./types";
 import { fetchDatabaseRequest } from "../fetchDatabaseRequest";
 import { ConnectionConfig } from "../../core";
 import { DEFAULT_SERVICE_TYPE } from "../../utils/constants";
-import { Explorer } from "../../core/ConnectorProvider/types";
+import { Explorer } from "../useGEFetchTypes";
 
 function _openCypherFetch(connection: ConnectionConfig, options: any) {
   return async (queryTemplate: string) => {

diff --git a/packages/graph-explorer/src/connector/sparql/useSPARQL.ts b/packages/graph-explorer/src/connector/sparql/useSPARQL.ts
@@ -1,5 +1,6 @@
 import type {
   Criterion,
+  Explorer,
   KeywordSearchRequest,
   KeywordSearchResponse,
   NeighborsResponse,
@@ -21,7 +22,6 @@ import {
 } from "./types";
 import { ConnectionConfig } from "../../core";
 import { v4 } from "uuid";
-import { Explorer } from "../../core/ConnectorProvider/types";
 
 const replaceBlankNodeFromSearch = (
   blankNodes: BlankNodesMap,

diff --git a/packages/graph-explorer/src/connector/useGEFetchTypes.ts b/packages/graph-explorer/src/connector/useGEFetchTypes.ts
@@ -201,3 +201,27 @@ export type ConfigurationWithConnection = Omit<
   "connection"
 > &
   Required<Pick<ConfigurationContextProps, "connection">>;
+
+/**
+ * Abstracted interface to the common database queries used by
+ * Graph Explorer.
+ */
+export type Explorer = {
+  fetchSchema: (options?: any) => Promise<SchemaResponse>;
+  fetchVertexCountsByType: (
+    req: CountsByTypeRequest,
+    options?: any
+  ) => Promise<CountsByTypeResponse>;
+  fetchNeighbors: (
+    req: NeighborsRequest,
+    options?: any
+  ) => Promise<NeighborsResponse>;
+  fetchNeighborsCount: (
+    req: NeighborsCountRequest,
+    options?: any
+  ) => Promise<NeighborsCountResponse>;
+  keywordSearch: (
+    req: KeywordSearchRequest,
+    options?: any
+  ) => Promise<KeywordSearchResponse>;
+};
diff --git a/packages/graph-explorer/src/core/ConnectorProvider/types.ts b/packages/graph-explorer/src/core/ConnectorProvider/types.ts
diff --git a/...r/src/core/ConnectorProvider/connector.ts → ...ages/graph-explorer/src/core/connector.ts b/...r/src/core/ConnectorProvider/connector.ts → ...ages/graph-explorer/src/core/connector.ts
@@ -1,11 +1,11 @@
 import { every, isEqual } from "lodash";
-import LoggerConnector from "../../connector/LoggerConnector";
-import { createGremlinExplorer } from "../../connector/gremlin/useGremlin";
-import { createOpenCypherExplorer } from "../../connector/openCypher/useOpenCypher";
-import { createSparqlExplorer } from "../../connector/sparql/useSPARQL";
-import { mergedConfigurationSelector } from "../StateProvider/configuration";
+import LoggerConnector from "../connector/LoggerConnector";
+import { createGremlinExplorer } from "../connector/gremlin/useGremlin";
+import { createOpenCypherExplorer } from "../connector/openCypher/useOpenCypher";
+import { createSparqlExplorer } from "../connector/sparql/useSPARQL";
+import { mergedConfigurationSelector } from "./StateProvider/configuration";
 import { selector } from "recoil";
-import { equalSelector } from "../../utils/recoilState";
+import { equalSelector } from "../utils/recoilState";
 
 /**
  * Active connection where the value will only change when one of the

diff --git a/packages/graph-explorer/src/hooks/useExpandNode.ts b/packages/graph-explorer/src/hooks/useExpandNode.ts
@@ -1,7 +1,7 @@
 import { useCallback } from "react";
 import { useNotification } from "../components/NotificationProvider";
 import type { NeighborsRequest } from "../connector/useGEFetchTypes";
-import { explorerSelector } from "../core/ConnectorProvider/connector";
+import { explorerSelector } from "../core/connector";
 import useEntities from "./useEntities";
 import { Vertex } from "../@types/entities";
 import { useRecoilValue } from "recoil";

diff --git a/packages/graph-explorer/src/hooks/useFetchNode.ts b/packages/graph-explorer/src/hooks/useFetchNode.ts
@@ -1,6 +1,6 @@
 import { useCallback } from "react";
 import { Vertex } from "../@types/entities";
-import { explorerSelector } from "../core/ConnectorProvider/connector";
+import { explorerSelector } from "../core/connector";
 import useEntities from "./useEntities";
 import { NeighborsCountRequest } from "../connector/useGEFetchTypes";
 import { useRecoilValue } from "recoil";

diff --git a/packages/graph-explorer/src/hooks/useSchemaSync.ts b/packages/graph-explorer/src/hooks/useSchemaSync.ts
@@ -2,10 +2,7 @@ import { useCallback, useRef } from "react";
 import { useNotification } from "../components/NotificationProvider";
 import type { SchemaResponse } from "../connector/useGEFetchTypes";
 import useConfiguration from "../core/ConfigurationProvider/useConfiguration";
-import {
-  explorerSelector,
-  loggerSelector,
-} from "../core/ConnectorProvider/connector";
+import { explorerSelector, loggerSelector } from "../core/connector";
 import usePrefixesUpdater from "./usePrefixesUpdater";
 import useUpdateSchema from "./useUpdateSchema";
 import { createDisplayError } from "../utils/createDisplayError";

diff --git a/packages/graph-explorer/src/hooks/useUpdateVertexTypeCounts.ts b/packages/graph-explorer/src/hooks/useUpdateVertexTypeCounts.ts
@@ -1,7 +1,7 @@
 import { useEffect, useMemo } from "react";
 import { useQuery } from "@tanstack/react-query";
 import { useConfiguration } from "../core";
-import { explorerSelector } from "../core/ConnectorProvider/connector";
+import { explorerSelector } from "../core/connector";
 import useUpdateSchema from "./useUpdateSchema";
 import { useRecoilValue } from "recoil";
 

diff --git a/packages/graph-explorer/src/modules/KeywordSearch/useKeywordSearchQuery.ts b/packages/graph-explorer/src/modules/KeywordSearch/useKeywordSearchQuery.ts
@@ -1,7 +1,7 @@
 import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { useNotification } from "../../components/NotificationProvider";
 import { useConfiguration } from "../../core";
-import { explorerSelector } from "../../core/ConnectorProvider/connector";
+import { explorerSelector } from "../../core/connector";
 import usePrefixesUpdater from "../../hooks/usePrefixesUpdater";
 import { useCallback, useEffect, useMemo } from "react";
 import { createDisplayError } from "../../utils/createDisplayError";

diff --git a/packages/graph-explorer/src/workspaces/DataExplorer/DataExplorer.tsx b/packages/graph-explorer/src/workspaces/DataExplorer/DataExplorer.tsx
@@ -35,7 +35,7 @@ import {
   useWithTheme,
   withClassNamePrefix,
 } from "../../core";
-import { explorerSelector } from "../../core/ConnectorProvider/connector";
+import { explorerSelector } from "../../core/connector";
 import {
   userStylingAtom,
   VertexPreferences,