feat: enable mappings UI in Enterprise, upsell in OSS (#15073)

airbytehq · Jan 23, 2025 · 859608a · 859608a
1 parent df00c06
commit 859608a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/airbyte-webapp/src/core/services/features/constants.ts b/airbyte-webapp/src/core/services/features/constants.ts
@@ -17,7 +17,7 @@ export const defaultEnterpriseFeatures = [
   FeatureItem.EnterpriseLicenseChecking,
   FeatureItem.FieldHashing,
   FeatureItem.IndicateGuestUsers,
-  FeatureItem.MappingsUI, // Also governed by connection.mappingsUI experiment.  This flag indicates whether the user has the right level of product.  The experiment indicates whether the UI is "on" overall.
+  FeatureItem.MappingsUI, // Indicates configuration UI is present.  connection.mappingsUI experiment also required to be true.
   FeatureItem.MultiWorkspaceUI,
   FeatureItem.RBAC,
 ];

diff --git a/airbyte-webapp/src/hooks/services/Experiment/experiments.ts b/airbyte-webapp/src/hooks/services/Experiment/experiments.ts
@@ -35,7 +35,7 @@ export const defaultExperimentValues: Experiments = {
   "billing.early-sync-enabled": false,
   "connection.columnSelection": true,
   "connection.hashingUI": true, // also requires FeatureItem.FieldHashing
-  "connection.mappingsUI": false,
+  "connection.mappingsUI": true, // requires FeatureItem.MappingsUI to enable configuration
   "connection.onboarding.destinations": "",
   "connection.onboarding.sources": "",
   "connection.rateLimitedUI": false,

diff --git a/airbyte-webapp/src/pages/connections/ConnectionMappingsPage/EncryptionRow.tsx b/airbyte-webapp/src/pages/connections/ConnectionMappingsPage/EncryptionRow.tsx
@@ -80,6 +80,9 @@ export const EncryptionForm: React.FC<EncryptionFormProps> = ({ streamDescriptor
       ...(mapping.mapperConfiguration.algorithm === "AES" && {
         targetField: mapping.mapperConfiguration.targetField ?? "",
         fieldNameSuffix: mapping.mapperConfiguration.fieldNameSuffix ?? "_encrypted",
+        key: mapping.mapperConfiguration.key ?? "",
+        mode: mapping.mapperConfiguration.mode ?? "CBC",
+        padding: mapping.mapperConfiguration.padding ?? "PKCS5Padding",
       }),
     },
     resolver: autoSubmitResolver<EncryptionMapperConfiguration>(encryptionMapperSchema, (formValues) => {