🪟🔧 Connector builder: Switch on builder navigation (#6341)

airbytehq · May 11, 2023 · 5310435 · 5310435
1 parent cb46216
commit 5310435
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 34 deletions.
diff --git a/airbyte-webapp/src/components/source/SelectConnector/ConnectorGrid.tsx b/airbyte-webapp/src/components/source/SelectConnector/ConnectorGrid.tsx
@@ -27,7 +27,7 @@ export const ConnectorGrid = <T extends ConnectorDefinition>({
   showConnectorBuilderButton = false,
 }: ConnectorGridProps<T>) => {
   const [searchTerm, setSearchTerm] = useState("");
-  const showBuilderNavigationLinks = useExperiment("connectorBuilder.showNavigationLinks", false);
+  const showBuilderNavigationLinks = useExperiment("connectorBuilder.showNavigationLinks", true);
 
   const filteredDefinitions = useMemo(
     () =>

diff --git a/airbyte-webapp/src/packages/cloud/cloudRoutes.tsx b/airbyte-webapp/src/packages/cloud/cloudRoutes.tsx
@@ -55,7 +55,7 @@ const MainRoutes: React.FC = () => {
   );
   useAnalyticsRegisterValues(analyticsContext);
 
-  const showBuilderNavigationLinks = useExperiment("connectorBuilder.showNavigationLinks", false);
+  const showBuilderNavigationLinks = useExperiment("connectorBuilder.showNavigationLinks", true);
 
   return (
     <ApiErrorBoundary>

diff --git a/airbyte-webapp/src/pages/SettingsPage/pages/ConnectorsPage/SourcesPage.tsx b/airbyte-webapp/src/pages/SettingsPage/pages/ConnectorsPage/SourcesPage.tsx
@@ -22,7 +22,7 @@ const SourcesPage: React.FC = () => {
   const { sources } = useSourceList();
   const sourceDefinitions = useAvailableSourceDefinitions();
 
-  const showBuilderNavigationLinks = useExperiment("connectorBuilder.showNavigationLinks", false);
+  const showBuilderNavigationLinks = useExperiment("connectorBuilder.showNavigationLinks", true);
 
   const { mutateAsync: updateSourceDefinition } = useUpdateSourceDefinition();
   const [updatingDefinitionId, setUpdatingDefinitionId] = useState<string>();

diff --git a/airbyte-webapp/src/pages/SettingsPage/pages/ConnectorsPage/components/CreateConnector.tsx b/airbyte-webapp/src/pages/SettingsPage/pages/ConnectorsPage/components/CreateConnector.tsx
@@ -38,7 +38,7 @@ const CreateConnector: React.FC<IProps> = ({ type }) => {
     setIsModalOpen(!isModalOpen);
     setErrorMessage("");
   };
-  const showBuilderNavigationLinks = useExperiment("connectorBuilder.showNavigationLinks", false);
+  const showBuilderNavigationLinks = useExperiment("connectorBuilder.showNavigationLinks", true);
 
   const { formatMessage } = useIntl();
 

diff --git a/airbyte-webapp/src/pages/source/CreateSourcePage/SourceForm.tsx b/airbyte-webapp/src/pages/source/CreateSourcePage/SourceForm.tsx
@@ -2,21 +2,14 @@ import React, { useState } from "react";
 import { FormattedMessage } from "react-intl";
 import { useLocation } from "react-router-dom";
 
-import { BuilderPrompt } from "components/connectorBuilder/BuilderPrompt";
-import { Card } from "components/ui/Card";
-
 import { ConnectionConfiguration } from "core/domain/connection";
 import { SourceDefinitionRead } from "core/request/AirbyteClient";
 import { LogsRequestError } from "core/request/LogsRequestError";
-import { useExperiment } from "hooks/services/Experiment";
-import { RoutePaths } from "pages/routePaths";
 import { useGetSourceDefinitionSpecificationAsync } from "services/connector/SourceDefinitionSpecificationService";
 import { FormError } from "utils/errorStatusMessage";
 import { ConnectorCard } from "views/Connector/ConnectorCard";
 import { ConnectorCardValues } from "views/Connector/ConnectorForm/types";
 
-import styles from "./SourceForm.module.scss";
-
 export interface SourceFormValues {
   name: string;
   serviceType: string;
@@ -66,28 +59,20 @@ export const SourceForm: React.FC<SourceFormProps> = ({
       ...values,
       sourceDefinitionId: sourceDefinitionSpecification?.sourceDefinitionId,
     });
-  const showBuilderNavigationLinks = useExperiment("connectorBuilder.showNavigationLinks", false);
 
   return (
-    <>
-      <ConnectorCard
-        formType="source"
-        title={<FormattedMessage id="onboarding.sourceSetUp" />}
-        description={<FormattedMessage id="sources.description" />}
-        isLoading={isLoading}
-        fetchingConnectorError={sourceDefinitionError instanceof Error ? sourceDefinitionError : null}
-        availableConnectorDefinitions={sourceDefinitions}
-        onConnectorDefinitionSelect={onDropDownSelect}
-        selectedConnectorDefinitionSpecification={sourceDefinitionSpecification}
-        selectedConnectorDefinitionId={sourceDefinitionId}
-        onSubmit={onSubmitForm}
-        jobInfo={LogsRequestError.extractJobInfo(error)}
-      />
-      {showBuilderNavigationLinks && !sourceDefinitionSpecification && (
-        <Card fullWidth className={styles.builderPrompt}>
-          <BuilderPrompt builderRoutePath={`../../${RoutePaths.ConnectorBuilder}`} />
-        </Card>
-      )}
-    </>
+    <ConnectorCard
+      formType="source"
+      title={<FormattedMessage id="onboarding.sourceSetUp" />}
+      description={<FormattedMessage id="sources.description" />}
+      isLoading={isLoading}
+      fetchingConnectorError={sourceDefinitionError instanceof Error ? sourceDefinitionError : null}
+      availableConnectorDefinitions={sourceDefinitions}
+      onConnectorDefinitionSelect={onDropDownSelect}
+      selectedConnectorDefinitionSpecification={sourceDefinitionSpecification}
+      selectedConnectorDefinitionId={sourceDefinitionId}
+      onSubmit={onSubmitForm}
+      jobInfo={LogsRequestError.extractJobInfo(error)}
+    />
   );
 };
diff --git a/...orForm/components/Controls/ConnectorServiceTypeControl/ConnectorDefinitionTypeControl.tsx b/...orForm/components/Controls/ConnectorServiceTypeControl/ConnectorDefinitionTypeControl.tsx
@@ -39,7 +39,7 @@ import { WarningMessage } from "../../WarningMessage";
 type MenuWithRequestButtonProps = MenuListProps<DropDownOptionDataItem, false> & { selectProps: any };
 
 const ConnectorList: React.FC<React.PropsWithChildren<MenuWithRequestButtonProps>> = ({ children, ...props }) => {
-  const showBuilderNavigationLinks = useExperiment("connectorBuilder.showNavigationLinks", false);
+  const showBuilderNavigationLinks = useExperiment("connectorBuilder.showNavigationLinks", true);
 
   return (
     <>

diff --git a/airbyte-webapp/src/views/layout/SideBar/MainNavItems.tsx b/airbyte-webapp/src/views/layout/SideBar/MainNavItems.tsx
@@ -12,7 +12,7 @@ import SourceIcon from "./components/SourceIcon";
 import styles from "./MainNavItems.module.scss";
 
 export const MainNavItems: React.FC = () => {
-  const showBuilderNavigationLinks = useExperiment("connectorBuilder.showNavigationLinks", false);
+  const showBuilderNavigationLinks = useExperiment("connectorBuilder.showNavigationLinks", true);
 
   return (
     <MenuContent data-testid="navMainItems">