🪟 🎨 Update text describing connection geography (#19879)

airbytehq · Dec 1, 2022 · 6a71f44 · 6a71f44
1 parent 9736352
commit 6a71f44
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 5 deletions.
diff --git a/airbyte-webapp/src/components/CreateConnection/DataResidency.tsx b/airbyte-webapp/src/components/CreateConnection/DataResidency.tsx
@@ -1,4 +1,5 @@
 import { Field, FieldProps, useFormikContext } from "formik";
+import React from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 
 import { DataGeographyDropdown } from "components/common/DataGeographyDropdown";
@@ -33,11 +34,16 @@ export const DataResidency: React.FC<DataResidencyProps> = ({ name = "geography"
                   <FormattedMessage
                     id="connection.geographyDescription"
                     values={{
-                      lnk: (node: React.ReactNode) => (
+                      ipLink: (node: React.ReactNode) => (
                         <a href={links.cloudAllowlistIPsLink} target="_blank" rel="noreferrer">
                           {node}
                         </a>
                       ),
+                      docLink: (node: React.ReactNode) => (
+                        <a href={links.connectionDataResidency} target="_blank" rel="noreferrer">
+                          {node}
+                        </a>
+                      ),
                     }}
                   />
                 }

diff --git a/...src/components/connection/UpdateConnectionDataResidency/UpdateConnectionDataResidency.tsx b/...src/components/connection/UpdateConnectionDataResidency/UpdateConnectionDataResidency.tsx
@@ -50,11 +50,16 @@ export const UpdateConnectionDataResidency: React.FC = () => {
               <FormattedMessage
                 id="connection.geographyDescription"
                 values={{
-                  lnk: (node: React.ReactNode) => (
+                  ipLink: (node: React.ReactNode) => (
                     <a href={links.cloudAllowlistIPsLink} target="_blank" rel="noreferrer">
                       {node}
                     </a>
                   ),
+                  docLink: (node: React.ReactNode) => (
+                    <a href={links.connectionDataResidency} target="_blank" rel="noreferrer">
+                      {node}
+                    </a>
+                  ),
                 }}
               />
             }

diff --git a/airbyte-webapp/src/locales/en.json b/airbyte-webapp/src/locales/en.json
@@ -344,7 +344,7 @@
 
   "connection.geographyTitle": "Data residency",
   "connection.requestNewGeography": "Request a new geography",
-  "connection.geographyDescription": "Depending on your network configuration, you may need to <lnk>add IP addresses</lnk> to your allowlist.",
+  "connection.geographyDescription": "Choose where the data for this connection will be processed. Depending on your network configuration, you may need to <ipLink>add IP addresses</ipLink> to your allowlist. <docLink>Learn more</docLink>.",
   "connection.geography.auto": "Airbyte Default",
   "connection.geography.us": "United States",
   "connection.geography.eu": "European Union",
@@ -494,6 +494,7 @@
   "settings.cookiePreferences": "Cookie Preferences",
   "settings.dataResidency": "Data Residency",
   "settings.defaultDataResidency": "Default Data Residency",
+  "settings.geographyDescription": "Depending on your network configuration, you may need to <lnk>add IP addresses</lnk> to your allowlist.",
   "settings.defaultGeography": "Geography",
   "settings.defaultDataResidencyDescription": "Choose the default preferred data processing location for all of your connections. The default data residency setting only affects new connections. Existing connections will retain their data residency setting. <lnk>Learn more</lnk>.",
   "settings.defaultDataResidencyUpdateError": "There was an error updating the default data residency for this workspace.",

diff --git a/airbyte-webapp/src/packages/cloud/views/workspaces/DataResidencyView/DataResidencyView.tsx b/airbyte-webapp/src/packages/cloud/views/workspaces/DataResidencyView/DataResidencyView.tsx
@@ -80,7 +80,7 @@ export const DataResidencyView: React.FC = () => {
                       label={<FormattedMessage id="settings.defaultGeography" />}
                       message={
                         <FormattedMessage
-                          id="connection.geographyDescription"
+                          id="settings.geographyDescription"
                           values={{
                             lnk: (node: React.ReactNode) => (
                               <a href={links.cloudAllowlistIPsLink} target="_blank" rel="noreferrer">

diff --git a/airbyte-webapp/src/utils/links.ts b/airbyte-webapp/src/utils/links.ts
@@ -29,8 +29,10 @@ export const links = {
   webhookVideoGuideLink: "https://www.youtube.com/watch?v=NjYm8F-KiFc",
   webhookGuideLink: `${BASE_DOCS_LINK}/operator-guides/configuring-sync-notifications/`,
   cronReferenceLink: "http://www.quartz-scheduler.org/documentation/quartz-2.3.0/tutorials/crontrigger.html",
-  cloudAllowlistIPsLink: `${BASE_DOCS_LINK}/cloud/getting-started-with-airbyte-cloud/#allowlist-ip-address`,
+  cloudAllowlistIPsLink: `${BASE_DOCS_LINK}/cloud/getting-started-with-airbyte-cloud/#allowlist-ip-addresses`,
   dataResidencySurvey: "https://forms.gle/Dr7MPTdt9k3xTinL8",
+  connectionDataResidency:
+    "https://docs.airbyte.com/cloud/managing-airbyte-cloud/#choose-the-data-residency-for-a-connection",
   lowCodeYamlDescription: `${BASE_DOCS_LINK}/connector-development/config-based/understanding-the-yaml-file/yaml-overview`,
 } as const;