console: minor bug fixes (Tracking UI, Connect DB)

PR-URL: https://github.com/hasura/graphql-engine-mono/pull/8807
Co-authored-by: Luca Restagno <59067245+lucarestagno@users.noreply.github.com>
GitOrigin-RevId: f681dfb5b4ace38efe087e18aef6dde8dbd8b940

frontend/libs/console/legacy-ce/src/lib/features/ConnectDBRedesign/ConnectDbBody/parts/Cloud.tsx

@@ -28,7 +28,7 @@ export const Cloud = ({
           <NeonConnect
             allDatabases={sourceNames ?? []}
             dispatch={dispatch}
-            connectDbUrl={'data/v2/manage/connect'}
+            connectDbUrl={'/data/v2/manage/connect'}
           />
         </div>
       )}

frontend/libs/console/legacy-ce/src/lib/features/ConnectDBRedesign/components/ConnectGDCSourceWidget/ConnectGDCSourceWidget.tsx

@@ -17,9 +17,9 @@ import { adaptGraphQLCustomization } from '../GraphQLCustomization/utils/adaptRe
 import { generateGDCRequestPayload } from './utils/generateRequest';
 import { hasuraToast } from '../../../../new-components/Toasts';
 import { useManageDatabaseConnection } from '../../hooks/useManageDatabaseConnection';
-import { capitaliseFirstLetter } from '../../../../components/Common/ConfigureTransformation/utils';
 import { Collapsible } from '../../../../new-components/Collapsible';
 import { DisplayToastErrorMessage } from '../Common/DisplayToastErrorMessage';
+import { useAvailableDrivers } from '../../../ConnectDB/hooks';
 
 interface ConnectGDCSourceWidgetProps {
   driver: string;
@@ -57,6 +57,10 @@ export const ConnectGDCSourceWidget = (props: ConnectGDCSourceWidgetProps) => {
   const { driver, dataSourceName } = props;
   const [tab, setTab] = useState('connection_details');
 
+  const { data: drivers } = useAvailableDrivers();
+  const driverDisplayName =
+    drivers?.find(d => d.name === driver)?.displayName ?? driver;
+
   const { data: metadataSource } = useMetadata(m =>
     m.metadata.sources.find(source => source.name === dataSourceName)
   );
@@ -135,8 +139,8 @@ export const ConnectGDCSourceWidget = (props: ConnectGDCSourceWidgetProps) => {
     <div>
       <div className="text-xl text-gray-600 font-semibold">
         {isEditMode
-          ? `Edit ${capitaliseFirstLetter(driver)} Connection`
+          ? `Edit ${driverDisplayName} Connection`
-          : `Connect New ${capitaliseFirstLetter(driver)} Database`}
+          : `Connect ${driverDisplayName} Database`}
       </div>
       <Form onSubmit={handleSubmit}>
         <Tabs

frontend/libs/console/legacy-ce/src/lib/features/ConnectDBRedesign/components/ConnectMssqlWidget/utils/adaptResponse.ts

@@ -17,8 +17,9 @@ export const adaptMssqlConnectionInfo = (
             envVar: connectionInfo.connection_string.from_env,
           },
     poolSettings: {
-      totalMaxConnections: connectionInfo.pool_settings?.total_max_connections,
+      totalMaxConnections:
-      idleTimeout: connectionInfo.pool_settings?.idle_timeout,
+        connectionInfo.pool_settings?.total_max_connections ?? undefined,
+      idleTimeout: connectionInfo.pool_settings?.idle_timeout ?? undefined,
     },
   };
 };

frontend/libs/console/legacy-ce/src/lib/features/ConnectDBRedesign/hooks/useConnectDatabaseDrivers.tsx

@@ -14,7 +14,7 @@ type useDatabaseConnectDriversProps = {
 const SuperConnectorDrivers: readonly DriverInfo[] = [
   {
     name: 'mysqlgdc',
-    displayName: 'MySql',
+    displayName: 'MySQL',
     native: false,
     release: 'Alpha',
     enterprise: true,

frontend/libs/console/legacy-ce/src/lib/features/Data/TrackResources/components/hooks/useTrackedRelationships.ts

@@ -1,8 +1,7 @@
 import { useQuery } from 'react-query';
 import { useAllSuggestedRelationships } from '../../../../DatabaseRelationships/components/SuggestedRelationships/hooks/useAllSuggestedRelationships';
 import { tableRelationships as getTableRelationships } from '../../../../DatabaseRelationships/utils/tableRelationships';
-import { exportMetadata } from '../../../../DataSource';
+import { useMetadata } from '../../../../hasura-metadata-api';
-import { useHttpClient } from '../../../../Network';
 
 export const getTrackedRelationshipsCacheKey = (dataSourceName: string) => [
   'tracked_relationships',
@@ -10,18 +9,16 @@ export const getTrackedRelationshipsCacheKey = (dataSourceName: string) => [
 ];
 
 export const useTrackedRelationships = (dataSourceName: string) => {
-  const httpClient = useHttpClient();
-
   const { suggestedRelationships } = useAllSuggestedRelationships({
     dataSourceName,
     isEnabled: true,
     omitTracked: false,
   });
 
-  const fetchRelationships = async () => {
+  const { data: metadata } = useMetadata(m => m.metadata);
-    const { metadata } = await exportMetadata({ httpClient });
 
-    const currentMetadataSource = metadata.sources?.find(
+  const fetchRelationships = async () => {
+    const currentMetadataSource = metadata?.sources?.find(
       source => source.name === dataSourceName
     );
 

frontend/libs/console/legacy-ce/src/lib/features/Data/hooks/introspection/useDatabaseSchemas.ts

@@ -20,5 +20,6 @@ export function useGetDatabaseSchemas(dataSourceName: string) {
         return result;
       }
     },
+    refetchOnWindowFocus: false,
   });
 }

frontend/libs/console/legacy-ce/src/lib/features/Data/hooks/useTrackTables.ts

@@ -43,6 +43,7 @@ export const useTrackTables = ({
               args: {
                 table: trackableTable.table,
                 source: dataSourceName,
+                configuration: trackableTable.configuration,
               },
             })),
           },

frontend/libs/console/legacy-ce/src/lib/features/EETrial/components/MultipleJWTSecrets/MultipleJWTSecretsPage.tsx

@@ -35,7 +35,7 @@ export const MultipleJWTSecretsPage = () => {
         <MultipleJWTSecretsSvg />
         {isFeatureActive ? (
           <p className="mt-md text-muted">
-            <strong>Setup Multiple Admin Secrets</strong>
+            <strong>Setup Multiple JWT Secrets</strong>
             <br />
             <a
               className="font-bold text-secondary"

frontend/libs/console/legacy-ce/src/lib/features/hasura-metadata-types/source/configuration.ts

@@ -63,7 +63,7 @@ export interface MssqlConfiguration {
   connection_info: {
     connection_string: string | FromEnv;
     pool_settings?: {
-      total_max_connections?: number;
+      total_max_connections?: number | null;
       idle_timeout?: number;
     };
   };

frontend/libs/console/legacy-ce/src/lib/utils/getDataRoute.ts

@@ -4,7 +4,7 @@ export const getRoute = () => ({
   connectDatabase: (driver?: string) =>
     driver
       ? `/data/v2/manage/database/add?driver=${driver}`
-      : 'data/v2/manage/connect',
+      : '/data/v2/manage/connect',
   database: (dataSourceName: string) =>
     encodeURI(`/data/v2/manage/database?database=${dataSourceName}`),
   table: (dataSourceName: string, table: Table, operation?: string) => {