Merge branch 'main' into peerdb-unified-image

PeerDB-io · Nov 30, 2023 · 4963dcd · 4963dcd
2 parents d002407 + 505e524
commit 4963dcd
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 17 deletions.
diff --git a/flow/cmd/handler.go b/flow/cmd/handler.go
@@ -164,13 +164,15 @@ func (h *FlowRequestHandler) CreateCDCFlow(
 	if req.CreateCatalogEntry {
 		err := h.createCdcJobEntry(ctx, req, workflowID)
 		if err != nil {
+			log.Errorf("unable to create flow job entry: %v", err)
 			return nil, fmt.Errorf("unable to create flow job entry: %w", err)
 		}
 	}
 
 	var err error
 	err = h.updateFlowConfigInCatalog(cfg)
 	if err != nil {
+		log.Errorf("unable to update flow config in catalog: %v", err)
 		return nil, fmt.Errorf("unable to update flow config in catalog: %w", err)
 	}
 
@@ -184,6 +186,7 @@ func (h *FlowRequestHandler) CreateCDCFlow(
 		state,                              // workflow state
 	)
 	if err != nil {
+		log.Errorf("unable to start PeerFlow workflow: %v", err)
 		return nil, fmt.Errorf("unable to start PeerFlow workflow: %w", err)
 	}
 

diff --git a/flow/cmd/peer_data.go b/flow/cmd/peer_data.go
@@ -44,7 +44,7 @@ func (h *FlowRequestHandler) GetSchemas(
 
 	defer peerPool.Close()
 	rows, err := peerPool.Query(ctx, "SELECT schema_name"+
-		" FROM information_schema.schemata;")
+		" FROM information_schema.schemata WHERE schema_name !~ '^pg_' AND schema_name <> 'information_schema';")
 	if err != nil {
 		return &protos.PeerSchemasResponse{Schemas: nil}, err
 	}
@@ -106,7 +106,7 @@ func (h *FlowRequestHandler) GetAllTables(
 
 	defer peerPool.Close()
 	rows, err := peerPool.Query(ctx, "SELECT table_schema || '.' || table_name AS schema_table "+
-		"FROM information_schema.tables;")
+		"FROM information_schema.tables WHERE table_schema !~ '^pg_' AND table_schema <> 'information_schema'")
 	if err != nil {
 		return &protos.AllTablesResponse{Tables: nil}, err
 	}

diff --git a/ui/app/peers/peersTable.tsx b/ui/app/peers/peersTable.tsx
@@ -1,12 +1,15 @@
 'use client';
 import { DropDialog } from '@/components/DropDialog';
 import PeerButton from '@/components/PeerComponent';
-import PeerTypeLabel from '@/components/PeerTypeComponent';
-import { Peer } from '@/grpc_generated/peers';
+import PeerTypeLabel, {
+  DBTypeToGoodText,
+} from '@/components/PeerTypeComponent';
+import { DBType, Peer } from '@/grpc_generated/peers';
 import { Label } from '@/lib/Label';
 import { SearchField } from '@/lib/SearchField';
 import { Table, TableCell, TableRow } from '@/lib/Table';
 import { useMemo, useState } from 'react';
+import ReactSelect from 'react-select';
 
 function PeerRow({ peer }: { peer: Peer }) {
   return (
@@ -31,26 +34,56 @@ function PeerRow({ peer }: { peer: Peer }) {
 
 function PeersTable({ title, peers }: { title: string; peers: Peer[] }) {
   const [searchQuery, setSearchQuery] = useState<string>('');
+  const [filteredType, setFilteredType] = useState<DBType | undefined>(
+    undefined
+  );
   const rows = useMemo(
     () =>
-      peers.filter((peer) => {
-        return peer.name.toLowerCase().includes(searchQuery.toLowerCase());
-      }),
-    [peers, searchQuery]
+      peers
+        .filter((peer) => {
+          return peer.name.toLowerCase().includes(searchQuery.toLowerCase());
+        })
+        .filter((peer) => {
+          return filteredType == undefined || peer.type == filteredType;
+        }),
+    [peers, searchQuery, filteredType]
   );
+  const allTypesOption: { value: DBType | undefined; label: string } = {
+    value: undefined,
+    label: 'All',
+  };
+  const availableTypes: { value: DBType | undefined; label: string }[] =
+    Array.from(
+      new Map( // Map filters out duplicates
+        peers.flatMap((peer) => [
+          [peer.type, { value: peer.type, label: DBTypeToGoodText(peer.type) }],
+        ])
+      ).values()
+    );
+  availableTypes.unshift(allTypesOption);
 
   return (
     <Table
       title={<Label variant='headline'>{title}</Label>}
       toolbar={{
         left: <></>,
         right: (
-          <SearchField
-            placeholder='Search by peer name'
-            onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
-              setSearchQuery(e.target.value)
-            }
-          />
+          <>
+            <ReactSelect
+              className='w-48'
+              options={availableTypes}
+              onChange={(val, _) => {
+                setFilteredType(val?.value);
+              }}
+              defaultValue={allTypesOption}
+            />
+            <SearchField
+              placeholder='Search by peer name'
+              onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
+                setSearchQuery(e.target.value)
+              }
+            />
+          </>
         ),
       }}
       header={

diff --git a/ui/components/PeerTypeComponent.tsx b/ui/components/PeerTypeComponent.tsx
@@ -4,7 +4,7 @@ import { Label } from '@/lib/Label';
 import Image from 'next/image';
 import { DBTypeToImageMapping } from './PeerComponent';
 
-const DBTypeToGoodText = (ptype: DBType) => {
+export const DBTypeToGoodText = (ptype: DBType) => {
   switch (ptype) {
     case DBType.POSTGRES:
       return 'PostgreSQL';
@@ -13,7 +13,7 @@ const DBTypeToGoodText = (ptype: DBType) => {
     case DBType.EVENTHUB:
       return 'Event Hubs';
     case DBType.EVENTHUB_GROUP:
-      return 'Event Hubs';
+      return 'Event Hubs (Group)';
     case DBType.BIGQUERY:
       return 'BigQuery';
     case DBType.S3:

diff --git a/ui/tsconfig.json b/ui/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "es6",
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,