🪟🐛 Connector builder: Prevent read request with wrong / missing strea…

…m name (#5939)
airbytehq · Apr 18, 2023 · 9825e10 · 9825e10
1 parent f6db1b0
commit 9825e10
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/airbyte-webapp/src/components/connectorBuilder/StreamTestingPanel/StreamTestButton.tsx b/airbyte-webapp/src/components/connectorBuilder/StreamTestingPanel/StreamTestButton.tsx
@@ -17,13 +17,15 @@ interface StreamTestButtonProps {
   hasTestInputJsonErrors: boolean;
   hasStreamListErrors: boolean;
   setTestInputOpen: (open: boolean) => void;
+  isFetchingStreamList: boolean;
 }
 
 export const StreamTestButton: React.FC<StreamTestButtonProps> = ({
   readStream,
   hasTestInputJsonErrors,
   hasStreamListErrors,
   setTestInputOpen,
+  isFetchingStreamList,
 }) => {
   const { editorView, yamlIsValid } = useConnectorBuilderFormState();
   const { hasErrors, validateAndTouch } = useBuilderErrors();
@@ -45,6 +47,11 @@ export const StreamTestButton: React.FC<StreamTestButtonProps> = ({
   let showWarningIcon = false;
   let tooltipContent = undefined;
 
+  if (isFetchingStreamList && editorView === "yaml") {
+    buttonDisabled = true;
+    tooltipContent = <FormattedMessage id="connectorBuilder.resolvingStreamList" />;
+  }
+
   if (editorView === "yaml" && !yamlIsValid) {
     buttonDisabled = true;
     showWarningIcon = true;

diff --git a/airbyte-webapp/src/components/connectorBuilder/StreamTestingPanel/StreamTester.tsx b/airbyte-webapp/src/components/connectorBuilder/StreamTestingPanel/StreamTester.tsx
@@ -117,6 +117,7 @@ export const StreamTester: React.FC<{
             stream_name: streamName,
           });
         }}
+        isFetchingStreamList={isFetchingStreamList}
         hasTestInputJsonErrors={hasTestInputJsonErrors}
         hasStreamListErrors={Boolean(streamListErrorMessage)}
         setTestInputOpen={setTestInputOpen}

diff --git a/airbyte-webapp/src/locales/en.json b/airbyte-webapp/src/locales/en.json
@@ -886,6 +886,7 @@
   "connectorBuilder.warnings.noRecords": "No records could be extracted from responses, make sure the record selector is set correctly.",
   "connectorBuilder.warnings.primaryKeyMissing": "In at least one record, the configured primary key is not set. Make sure it is always available.",
   "connectorBuilder.warnings.primaryKeyDuplicate": "Primary key is not unique - found <b>{duplicateKey}</b> more than once.",
+  "connectorBuilder.resolvingStreamList": "Checking configuration",
 
   "jobs.noAttemptsFailure": "Failed to start job.",
 

diff --git a/airbyte-webapp/src/services/connectorBuilder/ConnectorBuilderStateService.tsx b/airbyte-webapp/src/services/connectorBuilder/ConnectorBuilderStateService.tsx
@@ -391,7 +391,8 @@ function getSavingState(
 
 export const ConnectorBuilderTestStateProvider: React.FC<React.PropsWithChildren<unknown>> = ({ children }) => {
   const { formatMessage } = useIntl();
-  const { lastValidJsonManifest, selectedView, projectId } = useConnectorBuilderFormState();
+  const { lastValidJsonManifest, selectedView, projectId, editorView, builderFormValues } =
+    useConnectorBuilderFormState();
 
   const manifest = lastValidJsonManifest ?? DEFAULT_JSON_MANIFEST_VALUES;
 
@@ -424,9 +425,12 @@ export const ConnectorBuilderTestStateProvider: React.FC<React.PropsWithChildren
     }
   }, [selectedView]);
 
+  const streamName =
+    editorView === "ui" ? builderFormValues.streams[testStreamIndex]?.name : streams[testStreamIndex]?.name;
+
   const streamRead = useReadStream(projectId, {
     manifest,
-    stream: streams[testStreamIndex]?.name,
+    stream: streamName,
     config: testInputWithDefaults,
   });