Merge branch 'main' into GideonStowell/update-java-aws-sdk-version

airbytehq · Aug 28, 2024 · d70ffdd · d70ffdd
2 parents 6dcc5f5 + d376f5a
commit d70ffdd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 15 deletions.
diff --git a/airbyte-webapp/src/components/connectorBuilder/MenuBar/PublishButton.tsx b/airbyte-webapp/src/components/connectorBuilder/MenuBar/PublishButton.tsx
@@ -1,14 +1,13 @@
 import { useCallback, useMemo, useState } from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 
-import { Button, ButtonProps } from "components/ui/Button";
+import { ButtonProps } from "components/ui/Button";
 import { DropdownButton } from "components/ui/DropdownButton";
 import { Icon } from "components/ui/Icon";
 import { Tooltip } from "components/ui/Tooltip";
 
 import { Action, Namespace, useAnalyticsService } from "core/services/analytics";
 import { useConfirmationModalService } from "hooks/services/ConfirmationModal";
-import { useExperiment } from "hooks/services/Experiment";
 import {
   useConnectorBuilderFormState,
   useConnectorBuilderTestRead,
@@ -109,9 +108,8 @@ export const PublishButton: React.FC<PublishButtonProps> = ({ className }) => {
     type: "button",
   };
   const { formatMessage } = useIntl();
-  const isMarketplaceContributionFeatureEnabled = useExperiment("connectorBuilder.contributeToMarketplace", true);
   const isMarketplaceContributionActionDisabled = streamsWithWarnings.length > 0;
-  const publishButton = isMarketplaceContributionFeatureEnabled ? (
+  const publishButton = (
     <DropdownButton
       {...buttonProps}
       dropdown={{
@@ -144,10 +142,6 @@ export const PublishButton: React.FC<PublishButtonProps> = ({ className }) => {
     >
       <FormattedMessage id="connectorBuilder.publish" />
     </DropdownButton>
-  ) : (
-    <Button {...buttonProps}>
-      <FormattedMessage id="connectorBuilder.publish" />
-    </Button>
   );
 
   return (

diff --git a/airbyte-webapp/src/components/connectorBuilder/MenuBar/PublishModal.tsx b/airbyte-webapp/src/components/connectorBuilder/MenuBar/PublishModal.tsx
@@ -31,7 +31,6 @@ import { useFormatError } from "core/errors";
 import { Action, Namespace, useAnalyticsService } from "core/services/analytics";
 import { NON_I18N_ERROR_TYPE } from "core/utils/form";
 import { useLocalStorage } from "core/utils/useLocalStorage";
-import { useExperiment } from "hooks/services/Experiment";
 import { useNotificationService } from "hooks/services/Notification";
 import {
   useConnectorBuilderFormState,
@@ -204,8 +203,6 @@ const PublishToWorkspace: React.FC<InnerModalProps> = ({ onClose, setPublishType
 
   const publishTypeSwitcher = <PublishTypeSwitcher selectedPublishType="marketplace" setPublishType={setPublishType} />;
 
-  const isMarketplaceContributionEnabled = useExperiment("connectorBuilder.contributeToMarketplace", true);
-
   if (isLoadingVersions) {
     return (
       <ModalBody>
@@ -230,9 +227,7 @@ const PublishToWorkspace: React.FC<InnerModalProps> = ({ onClose, setPublishType
     >
       <ModalBody>
         <FlexContainer direction="column" gap="xl">
-          {isMarketplaceContributionEnabled && (
-            <PublishTypeSwitcher selectedPublishType="workspace" setPublishType={setPublishType} />
-          )}
+          <PublishTypeSwitcher selectedPublishType="workspace" setPublishType={setPublishType} />
           <Message
             text={
               <FormattedMessage

diff --git a/airbyte-webapp/src/hooks/services/Experiment/experiments.ts b/airbyte-webapp/src/hooks/services/Experiment/experiments.ts
@@ -23,7 +23,6 @@ export interface Experiments {
   "settings.showAdvancedSettings": boolean;
   "upcomingFeaturesPage.url": string;
   "connection.syncCatalogV2": boolean;
-  "connectorBuilder.contributeToMarketplace": boolean;
   "connectorBuilder.aiAssist.enabled": boolean;
   "billing.organizationBillingPage": boolean;
 }