Merge branch 'main' into update-dependencies

PeerDB-io · May 6, 2024 · ab812da · ab812da
2 parents 9200ef9 + cad7eb1
commit ab812da
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 25 deletions.
diff --git a/ui/app/mirrors/create/cdc/cdc.tsx b/ui/app/mirrors/create/cdc/cdc.tsx
@@ -5,7 +5,7 @@ import { Icon } from '@/lib/Icon';
 import { Dispatch, SetStateAction, useEffect, useMemo, useState } from 'react';
 import { CDCConfig, MirrorSetter, TableMapRow } from '../../../dto/MirrorsDTO';
 import { IsQueuePeer, fetchPublications } from '../handlers';
-import { MirrorSetting } from '../helpers/common';
+import { AdvancedSettingType, MirrorSetting } from '../helpers/common';
 import CDCField from './fields';
 import TableMapping from './tablemapping';
 
@@ -46,12 +46,32 @@ export default function CDCConfigForm({
   };
 
   const normalSettings = useMemo(() => {
-    return settings.filter((setting) => setting.advanced != true);
-  }, [settings]);
+    return settings!.filter(
+      (setting) =>
+        !(
+          (IsQueuePeer(mirrorConfig.destination?.type) &&
+            setting.advanced === AdvancedSettingType.QUEUE) ||
+          setting.advanced === AdvancedSettingType.ALL
+        )
+    );
+  }, [settings, mirrorConfig.destination?.type]);
 
   const advancedSettings = useMemo(() => {
-    return settings.filter((setting) => setting.advanced == true);
-  }, [settings]);
+    return settings!
+      .map((setting) => {
+        if (
+          IsQueuePeer(mirrorConfig.destination?.type) &&
+          setting.advanced === AdvancedSettingType.QUEUE
+        ) {
+          setting.stateHandler(600, setter);
+          return { ...setting, default: 600 };
+        }
+        if (setting.advanced === AdvancedSettingType.ALL) {
+          return setting;
+        }
+      })
+      .filter((setting) => setting !== undefined);
+  }, [settings, mirrorConfig.destination?.type, setter]);
 
   const paramDisplayCondition = (setting: MirrorSetting) => {
     const label = setting.label.toLowerCase();
@@ -91,15 +111,15 @@ export default function CDCConfigForm({
   if (mirrorConfig.source != undefined && mirrorConfig.destination != undefined)
     return (
       <>
-        {normalSettings.map((setting, id) => {
+        {normalSettings!.map((setting, id) => {
           return (
-            paramDisplayCondition(setting) && (
+            paramDisplayCondition(setting!) && (
               <CDCField
                 key={id}
                 handleChange={handleChange}
-                setting={setting}
+                setting={setting!}
                 options={
-                  setting.label === 'Publication Name'
+                  setting?.label === 'Publication Name'
                     ? publications
                     : undefined
                 }
@@ -128,13 +148,13 @@ export default function CDCConfigForm({
         </Button>
 
         {show &&
-          advancedSettings.map((setting, id) => {
+          advancedSettings!.map((setting, id) => {
             return (
-              paramDisplayCondition(setting) && (
+              paramDisplayCondition(setting!) && (
                 <CDCField
-                  key={setting.label}
+                  key={setting?.label}
                   handleChange={handleChange}
-                  setting={setting}
+                  setting={setting!}
                 />
               )
             );

diff --git a/ui/app/mirrors/create/helpers/cdc.ts b/ui/app/mirrors/create/helpers/cdc.ts
@@ -1,6 +1,6 @@
 import { TypeSystem } from '@/grpc_generated/flow';
 import { CDCConfig } from '../../../dto/MirrorsDTO';
-import { MirrorSetting } from './common';
+import { AdvancedSettingType, MirrorSetting } from './common';
 export const cdcSettings: MirrorSetting[] = [
   {
     label: 'Initial Copy',
@@ -24,7 +24,7 @@ export const cdcSettings: MirrorSetting[] = [
     tips: 'The number of rows PeerDB will pull from source at a time. If left empty, the default value is 1,000,000 rows.',
     type: 'number',
     default: '1000000',
-    advanced: true,
+    advanced: AdvancedSettingType.ALL,
   },
   {
     label: 'Sync Interval (Seconds)',
@@ -38,6 +38,7 @@ export const cdcSettings: MirrorSetting[] = [
     type: 'number',
     default: '60',
     required: true,
+    advanced: AdvancedSettingType.QUEUE,
   },
   {
     label: 'Publication Name',
@@ -71,7 +72,7 @@ export const cdcSettings: MirrorSetting[] = [
     tips: 'PeerDB splits up table data into partitions for increased performance. This setting controls the number of rows per partition. The default value is 1000000.',
     default: '1000000',
     type: 'number',
-    advanced: true,
+    advanced: AdvancedSettingType.ALL,
   },
   {
     label: 'Parallelism for Initial Load',
@@ -95,7 +96,7 @@ export const cdcSettings: MirrorSetting[] = [
     tips: 'Specify the number of tables to sync perform initial load for, in parallel. The default value is 1.',
     default: '1',
     type: 'number',
-    advanced: true,
+    advanced: AdvancedSettingType.ALL,
   },
   {
     label: 'Snapshot Staging Path',
@@ -105,7 +106,7 @@ export const cdcSettings: MirrorSetting[] = [
         snapshotStagingPath: value as string | '',
       })),
     tips: 'You can specify staging path for Snapshot sync mode AVRO. For Snowflake as destination peer, this must be either empty or an S3 bucket URL. For BigQuery, this must be either empty or an existing GCS bucket name. In both cases, if empty, the local filesystem will be used.',
-    advanced: true,
+    advanced: AdvancedSettingType.ALL,
   },
   {
     label: 'CDC Staging Path',
@@ -115,7 +116,7 @@ export const cdcSettings: MirrorSetting[] = [
         cdcStagingPath: (value as string) || '',
       })),
     tips: 'You can specify staging path for CDC sync mode AVRO. For Snowflake as destination peer, this must be either empty or an S3 bucket URL. For BigQuery, this must be either empty or an existing GCS bucket name. In both cases, if empty, the local filesystem will be used.',
-    advanced: true,
+    advanced: AdvancedSettingType.ALL,
   },
   {
     label: 'Soft Delete',
@@ -138,7 +139,7 @@ export const cdcSettings: MirrorSetting[] = [
       })),
     tips: 'If set, PeerDB will only perform initial load and will not perform CDC sync.',
     type: 'switch',
-    advanced: true,
+    advanced: AdvancedSettingType.ALL,
   },
   {
     label: 'Script',
@@ -148,7 +149,7 @@ export const cdcSettings: MirrorSetting[] = [
         script: (value as string) || '',
       })),
     tips: 'Associate PeerDB script with this mirror.',
-    advanced: true,
+    advanced: AdvancedSettingType.ALL,
   },
   {
     label: 'Use Postgres type system',
@@ -160,7 +161,7 @@ export const cdcSettings: MirrorSetting[] = [
     type: 'switch',
     default: false,
     tips: 'Decide if PeerDB should use native Postgres types directly',
-    advanced: true,
+    advanced: AdvancedSettingType.ALL,
   },
   {
     label: 'Synced-At Column Name',
@@ -170,7 +171,7 @@ export const cdcSettings: MirrorSetting[] = [
         syncedAtColName: value as string | '',
       })),
     tips: 'A field to set the name of PeerDBs synced_at column. If not set, a default name will be set',
-    advanced: true,
+    advanced: AdvancedSettingType.ALL,
   },
   {
     label: 'Soft Delete Column Name',
@@ -180,6 +181,6 @@ export const cdcSettings: MirrorSetting[] = [
         softDeleteColName: value as string | '',
       })),
     tips: 'A field to set the name of PeerDBs soft delete column.',
-    advanced: true,
+    advanced: AdvancedSettingType.ALL,
   },
 ];
diff --git a/ui/app/mirrors/create/helpers/common.ts b/ui/app/mirrors/create/helpers/common.ts
@@ -1,5 +1,11 @@
 import { FlowConnectionConfigs, TypeSystem } from '@/grpc_generated/flow';
 
+export enum AdvancedSettingType {
+  QUEUE = 'queue',
+  ALL = 'all',
+  NONE = 'none',
+}
+
 export interface MirrorSetting {
   label: string;
   stateHandler: (value: any, setter: any) => void;
@@ -8,7 +14,7 @@ export interface MirrorSetting {
   tips?: string;
   helpfulLink?: string;
   default?: string | number | boolean;
-  advanced?: boolean; // whether it should come under an 'Advanced' section
+  advanced?: AdvancedSettingType; // whether it should come under an 'Advanced' section
   command?: string;
 }