Merge branch 'main' into update-dependencies

PeerDB-io · Dec 18, 2023 · 3415fdb · 3415fdb
2 parents 015418f + 49b152e
commit 3415fdb
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 219 deletions.
diff --git a/flow/concurrency/bound_selector.go b/flow/concurrency/bound_selector.go
@@ -13,7 +13,7 @@ type BoundSelector struct {
 	ferrors []error
 }
 
-func NewBoundSelector(limit int, total int, ctx workflow.Context) *BoundSelector {
+func NewBoundSelector(limit int, ctx workflow.Context) *BoundSelector {
 	return &BoundSelector{
 		ctx:   ctx,
 		limit: limit,

diff --git a/flow/connectors/bigquery/qrecord_value_saver.go b/flow/connectors/bigquery/qrecord_value_saver.go
diff --git a/flow/workflows/snapshot_flow.go b/flow/workflows/snapshot_flow.go
@@ -187,7 +187,6 @@ func (s *SnapshotFlowExecution) cloneTable(
 	return nil
 }
 
-// startChildQrepWorkflow starts a child workflow for query based replication.
 func (s *SnapshotFlowExecution) cloneTables(
 	ctx workflow.Context,
 	slotInfo *protos.SetupReplicationOutput,
@@ -196,8 +195,7 @@ func (s *SnapshotFlowExecution) cloneTables(
 	slog.Info(fmt.Sprintf("cloning tables for slot name %s and snapshotName %s",
 		slotInfo.SlotName, slotInfo.SnapshotName))
 
-	numTables := len(s.config.TableMappings)
-	boundSelector := concurrency.NewBoundSelector(maxParallelClones, numTables, ctx)
+	boundSelector := concurrency.NewBoundSelector(maxParallelClones, ctx)
 
 	for _, v := range s.config.TableMappings {
 		source := v.SourceTableIdentifier

diff --git a/ui/app/peers/page.tsx b/ui/app/peers/page.tsx
@@ -1,22 +1,23 @@
+'use client';
 import { Button } from '@/lib/Button';
 import { Icon } from '@/lib/Icon';
 import { Label } from '@/lib/Label';
 import { LayoutMain } from '@/lib/Layout';
 import { Panel } from '@/lib/Panel';
 import Link from 'next/link';
 import { Header } from '../../lib/Header';
-import { getTruePeer } from '../api/peers/route';
-import prisma from '../utils/prisma';
 import PeersTable from './peersTable';
 export const dynamic = 'force-dynamic';
 
-async function fetchPeers() {
-  const peers = await prisma.peers.findMany({});
-  return peers;
-}
+import { ProgressCircle } from '@/lib/ProgressCircle';
+
+import useSWR from 'swr';
+
+const fetcher = (...args: [any]) => fetch(...args).then((res) => res.json());
+
+export default function Peers() {
+  const { data: peers, error, isLoading } = useSWR('/api/peers', fetcher);
 
-export default async function Peers() {
-  let peers = await fetchPeers();
   return (
     <LayoutMain alignSelf='flex-start' justifySelf='flex-start' width='full'>
       <Panel>
@@ -41,10 +42,17 @@ export default async function Peers() {
         </Header>
       </Panel>
       <Panel>
-        <PeersTable
-          title='All peers'
-          peers={peers.map((peer) => getTruePeer(peer))}
-        />
+        {isLoading && (
+          <div className='h-screen flex items-center justify-center'>
+            <ProgressCircle variant='determinate_progress_circle' />
+          </div>
+        )}
+        {!isLoading && (
+          <PeersTable
+            title='All peers'
+            peers={peers.map((peer: any) => peer)}
+          />
+        )}
       </Panel>
     </LayoutMain>
   );