merge

grai-io · Aug 17, 2023 · 8e198ad · 8e198ad
2 parents 05a2f90 + c184777
commit 8e198ad
Show file tree

Hide file tree

Showing 30 changed files with 816 additions and 545 deletions.
diff --git a/grai-frontend/__generated__/globalTypes.ts b/grai-frontend/__generated__/globalTypes.ts
diff --git a/grai-frontend/src/components/home/HomeCards.test.tsx b/grai-frontend/src/components/home/HomeCards.test.tsx
@@ -22,9 +22,9 @@ test("renders", async () => {
                 filtered: 38,
               },
             },
-            tables: {
+            nodes: {
               meta: {
-                total: 2,
+                filtered: 2,
               },
             },
             connections: {

diff --git a/grai-frontend/src/components/home/HomeCards.tsx b/grai-frontend/src/components/home/HomeCards.tsx
@@ -19,9 +19,9 @@ export const GET_COUNTS = gql`
           filtered
         }
       }
-      tables {
+      nodes(filters: { node_type: { equals: "Table" } }) {
         meta {
-          total
+          filtered
         }
       }
       connections {
@@ -51,7 +51,7 @@ const HomeCards: React.FC = () => {
       {error && <GraphError error={error} />}
       <Grid item md={3}>
         <HomeCard
-          count={data?.workspace.tables.meta.total}
+          count={data?.workspace.nodes.meta.filtered}
           text="Tables"
           color="#8338EC"
           to="tables"

diff --git a/grai-frontend/src/components/home/__generated__/GetCountsHome.ts b/grai-frontend/src/components/home/__generated__/GetCountsHome.ts
diff --git a/grai-frontend/src/components/tables/TableEvents.tsx b/grai-frontend/src/components/tables/TableEvents.tsx
@@ -20,7 +20,7 @@ export const GET_TABLE_EVENTS = gql`
   ) {
     workspace(organisationName: $organisationName, name: $workspaceName) {
       id
-      table(id: $tableId) {
+      node(id: $tableId) {
         id
         events {
           data {
@@ -72,7 +72,7 @@ const TableEvents: React.FC<TableEventsProps> = ({ table, responsive }) => {
   if (error) return <GraphError error={error} />
   if (loading) return <Loading />
 
-  const tableData = data?.workspace?.table
+  const tableData = data?.workspace?.node
 
   if (!tableData) return <NotFound />
 

diff --git a/grai-frontend/src/components/tables/__generated__/GetTableEvents.ts b/grai-frontend/src/components/tables/__generated__/GetTableEvents.ts
diff --git a/grai-frontend/src/pages/Home.test.tsx b/grai-frontend/src/pages/Home.test.tsx
@@ -227,9 +227,9 @@ test("no reports", async () => {
                 filtered: 0,
               },
             },
-            tables: {
+            nodes: {
               meta: {
-                total: 0,
+                filtered: 0,
               },
             },
             connections: {

diff --git a/grai-frontend/src/pages/Home.tsx b/grai-frontend/src/pages/Home.tsx
@@ -28,9 +28,9 @@ export const GET_WORKSPACE = gql`
           filtered
         }
       }
-      tables {
+      nodes(filters: { node_type: { equals: "Table" } }) {
         meta {
-          total
+          filtered
         }
       }
       connections {
@@ -88,7 +88,7 @@ const Home: React.FC = () => {
         <WelcomeCard search={search} setSearch={setSearch} />
         <HomeCards />
         {workspace.connections.meta.total === 0 &&
-          workspace.tables.meta.total === 0 && <GettingStarted />}
+          workspace.nodes.meta.filtered === 0 && <GettingStarted />}
         <ReportsCard />
         <SourceGraph workspaceId={workspace.id} />
       </Box>

diff --git a/grai-frontend/src/pages/__generated__/GetWorkspaceHome.ts b/grai-frontend/src/pages/__generated__/GetWorkspaceHome.ts
diff --git a/grai-frontend/src/pages/edges/Edges.tsx b/grai-frontend/src/pages/edges/Edges.tsx
@@ -23,7 +23,7 @@ export const GET_EDGES = gql`
       edges(
         pagination: { limit: 20, offset: $offset }
         search: $search
-        filter: $filter
+        filters: $filter
       ) {
         data {
           id

diff --git a/grai-frontend/src/pages/nodes/Nodes.tsx b/grai-frontend/src/pages/nodes/Nodes.tsx
@@ -24,7 +24,7 @@ export const GET_NODES = gql`
       nodes(
         pagination: { limit: 20, offset: $offset }
         search: $search
-        filter: $filter
+        filters: $filter
         order: $order
       ) {
         data {

diff --git a/grai-frontend/src/testing/schema.json b/grai-frontend/src/testing/schema.json
@@ -271,7 +271,7 @@
                 "defaultValue": null
               },
               {
-                "name": "filter",
+                "name": "filters",
                 "description": null,
                 "type": {
                   "kind": "INPUT_OBJECT",
@@ -359,7 +359,7 @@
                 "defaultValue": null
               },
               {
-                "name": "filter",
+                "name": "filters",
                 "description": null,
                 "type": {
                   "kind": "INPUT_OBJECT",
@@ -1526,6 +1526,16 @@
             },
             "defaultValue": null
           },
+          {
+            "name": "metadata__grai__node_type",
+            "description": null,
+            "type": {
+              "kind": "ENUM",
+              "name": "Ordering",
+              "ofType": null
+            },
+            "defaultValue": null
+          },
           {
             "name": "is_active",
             "description": null,