Using update_only when doing background discover and content change

src/api/discovers.ts

@@ -4,12 +4,14 @@ export const discover = (
     entityName: string,
     config: any,
     connectorID: string,
-    draftID: string
+    draftID: string,
+    updateOnly?: boolean
 ) => {
     return insertSupabase(TABLES.DISCOVERS, {
         capture_name: entityName,
         endpoint_config: config,
         connector_tag_id: connectorID,
         draft_id: draftID,
+        update_only: updateOnly ?? false,
     });
 };

src/components/capture/GenerateButton.tsx

@@ -1,12 +1,14 @@
 import { Button } from '@mui/material';
 import { buttonSx } from 'components/shared/Entity/Header';
+import { useEntityWorkflow_Editing } from 'context/Workflow';
 import { Dispatch, SetStateAction, useEffect } from 'react';
 import { FormattedMessage } from 'react-intl';
 import {
     useDetailsForm_connectorImage_connectorId,
     useDetailsForm_entityNameChanged,
     useDetailsForm_previousConnectorImage_connectorId,
 } from 'stores/DetailsForm/hooks';
+import { useEndpointConfigStore_changed } from 'stores/EndpointConfig/hooks';
 import { useFormStateStore_status } from 'stores/FormState/hooks';
 import { FormStatus } from 'stores/FormState/types';
 import { useResourceConfig_rediscoveryRequired } from 'stores/ResourceConfig/hooks';
@@ -27,10 +29,18 @@ function CaptureGenerateButton({
     disabled,
     createWorkflowMetadata,
 }: Props) {
+    const isEdit = useEntityWorkflow_Editing();
+    const endpointConfigChanged = useEndpointConfigStore_changed();
     const rediscoveryRequired = useResourceConfig_rediscoveryRequired();
+
     const { generateCatalog, isSaving, formActive } = useDiscoverCapture(
         entityType,
         {
+            // We only want to set updateOnly if the user is editing and not updating the config
+            //  This should cover when a user has enable previously disabled collection(s)
+            updateOnly: Boolean(
+                rediscoveryRequired && isEdit && !endpointConfigChanged()
+            ),
             initiateDiscovery: createWorkflowMetadata?.initiateDiscovery,
             initiateRediscovery: rediscoveryRequired,
         }

src/components/capture/useDiscoverCapture.ts

@@ -28,7 +28,11 @@ import useDiscoverStartDiscovery from './useDiscoverStartDiscovery';
 
 function useDiscoverCapture(
     entityType: Entity,
-    options?: { initiateRediscovery?: boolean; initiateDiscovery?: boolean }
+    options?: {
+        initiateRediscovery?: boolean;
+        initiateDiscovery?: boolean;
+        updateOnly?: boolean;
+    }
 ) {
     const draftUpdate = useDiscoverDraftUpdate(options);
     const configEncrypt = useDiscoverConfigEncrypt();
@@ -111,7 +115,8 @@ function useDiscoverCapture(
                 const discoveryStartSuccess = await startDiscovery(
                     processedEntityName,
                     encryptedEndpointConfig.data,
-                    options.initiateRediscovery
+                    options.initiateRediscovery,
+                    options.updateOnly
                 );
 
                 return discoveryStartSuccess;
@@ -138,6 +143,7 @@ function useDiscoverCapture(
             endpointConfigErrorsExist,
             options?.initiateDiscovery,
             options?.initiateRediscovery,
+            options?.updateOnly,
             persistedDraftId,
             processedEntityName,
             resetEditorState,

src/components/capture/useDiscoverStartDiscovery.ts

@@ -4,6 +4,7 @@
 import {
     useEditorStore_persistedDraftId,
     useEditorStore_setCatalogName,
+    useEditorStore_setId,
 } from 'components/editor/Store/hooks';
 import useEntityWorkflowHelpers from 'components/shared/Entity/hooks/useEntityWorkflowHelpers';
 import { useCallback } from 'react';
@@ -19,6 +20,7 @@
         useDiscoverStartSubscription(entityType);
     const { callFailed } = useEntityWorkflowHelpers();
 
+    const setDraftId = useEditorStore_setId();
     const persistedDraftId = useEditorStore_persistedDraftId();
     const setCatalogName = useEditorStore_setCatalogName();
 
@@ -32,7 +34,8 @@
         async (
             processedEntityName: string,
             encryptedEndpointConfigResponse: any,
-            rediscover?: boolean
+            rediscover?: boolean,
+            updateOnly?: boolean
         ) => {
             // If we are doing a rediscovery and we have a draft then go ahead and use that draft
             //  that way the most recent changes to bindings and endpoints will get added to the draft before rediscovery
@@ -64,9 +67,16 @@
                 processedEntityName,
                 encryptedEndpointConfigResponse,
                 imageConnectorTagId,
-                newDraftId
+                newDraftId,
+                updateOnly
             );
+
             if (discoverResponse.error) {
+                // If we failed at discovery we need to clear draft ID like we do
+                //  when we createDiscoversSubscription. Otherwise, the Test|Save
+                //  buttons will appear.
+                setDraftId(null);
+
                 callFailed({
                     error: {
                         title: 'captureCreate.generate.failedErrorTitle',
@@ -88,7 +98,7 @@
 
             return true;
         },
         [
             callFailed,
             createDiscoversSubscription,
             endpointConfigData,

src/lang/en-US.ts

@@ -787,7 +787,7 @@ const CaptureEdit: ResolvedIntlConfig['messages'] = {
     'captureEdit.editor.default': `Before you can edit the capture specification, you must fill out the Connection Configuration section and click "${CTAs['cta.generateCatalog.capture']}." `,
     'captureEdit.finalReview.instructions': `The following Flow specification was generated from the details you provided. To make changes, you can enter new values in the form above or edit the YAML file directly. Click "${CTAs['cta.saveEntity']}" to proceed.`,
 
-    'captureEdit.collections.heading': `3. Source Collections`,
+    'captureEdit.collections.heading': `3. Target Collections`,
     'captureEdit.collectionSelector.heading': `Collection Selector`,
     'captureEdit.collectionSelector.instructions': `The collections bound to your existing capture. To update the configuration, please update the fields under the Config tab. To update the schema, click Edit under the Collection tab.`,