refactor (console): relationship tab components for GDC, local types …

…& stories PR-URL: hasura/graphql-engine-mono#6801 GitOrigin-RevId: d1e97752bc52633a3a853a8d474efb6c437ba5dd
ccalvarez · Nov 16, 2022 · 980813c · 980813c
1 parent 4722029
commit 980813c
Show file tree

Hide file tree

Showing 62 changed files with 2,069 additions and 1,239 deletions.
diff --git a/console/src/components/Services/Data/TableInsertItem/hooks/useTableEnums.ts b/console/src/components/Services/Data/TableInsertItem/hooks/useTableEnums.ts
@@ -1,5 +1,6 @@
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 import Endpoints from '@/Endpoints';
+import { areTablesEqual } from '@/features/RelationshipsTable';
 import { useHttpClient } from '@/features/Network';
 import { useQuery, UseQueryResult } from 'react-query';
 import { useTablesForeignKeys } from './useTableForeignKeys';
@@ -40,7 +41,7 @@ export const useTableEnums = ({
         for (const table of tables) {
           const relation = foreignKeys.reduce(
             (tally: ForeignKeyMapping | null, fk: ForeignKeyMapping[]) => {
-              const found = fk.find(f => f.to.table === table.name);
+              const found = fk.find(f => areTablesEqual(f.to.table, table));
               if (!found) return tally;
               return found;
             },

diff --git a/console/src/features/Data/ManageTable/ManageTable.tsx b/console/src/features/Data/ManageTable/ManageTable.tsx
@@ -1,5 +1,5 @@
 import { BrowseRowsContainer } from '@/features/BrowseRows';
-import { DatabaseRelationshipsContainer } from '@/features/DataRelationships';
+import { DatabaseRelationships } from '@/features/DatabaseRelationships';
 import { getTableName } from '@/features/DataSource';
 import { PermissionsTab } from '@/features/PermissionsTab';
 import { Table } from '@/features/hasura-metadata-types';
@@ -47,10 +47,7 @@ const availableTabs = (
     value: 'relationships',
     label: 'Relationships',
     content: (
-      <DatabaseRelationshipsContainer
-        dataSourceName={dataSourceName}
-        table={table}
-      />
+      <DatabaseRelationships dataSourceName={dataSourceName} table={table} />
     ),
   },
   {

diff --git a/...hips/components/DatabaseRelationshipsContainer/DatabaseRelationshipsContainer.stories.tsx b/...hips/components/DatabaseRelationshipsContainer/DatabaseRelationshipsContainer.stories.tsx
diff --git a/...elationships/components/DatabaseRelationshipsContainer/DatabaseRelationshipsContainer.tsx b/...elationships/components/DatabaseRelationshipsContainer/DatabaseRelationshipsContainer.tsx
diff --git a/console/src/features/DataRelationships/components/DatabaseRelationshipsContainer/index.ts b/console/src/features/DataRelationships/components/DatabaseRelationshipsContainer/index.ts
diff --git a/...res/DataRelationships/components/DatabaseRelationshipsTable/DatabaseRelationshipTable.tsx b/...res/DataRelationships/components/DatabaseRelationshipsTable/DatabaseRelationshipTable.tsx
@@ -20,6 +20,10 @@ import { useListAllRelationshipsFromMetadata } from './hooks/useListAllRelations
 export const columns = ['NAME', 'SOURCE', 'TYPE', 'RELATIONSHIP', null];
 
 const getTableDisplayName = (table: Table): string => {
+  /*
+  this function isn't entirely generic but it will hold for the current set of native DBs we have & GDC as well
+  */
+
   if (Array.isArray(table)) return table.join('.');
 
   if (!table) return 'Empty Object';

diff --git a/...nships/components/ManualLocalRelationshipWidget/ManualLocalRelationshipWidget.stories.tsx b/...nships/components/ManualLocalRelationshipWidget/ManualLocalRelationshipWidget.stories.tsx