From 6a71f4476c5f312916f7a4514b3d337a02ddfb52 Mon Sep 17 00:00:00 2001 From: Joey Marshment-Howell Date: Thu, 1 Dec 2022 15:44:13 +0000 Subject: [PATCH] =?UTF-8?q?=F0=9F=AA=9F=20=F0=9F=8E=A8=20Update=20text=20d?= =?UTF-8?q?escribing=20connection=20geography=20(#19879)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/CreateConnection/DataResidency.tsx | 8 +++++++- .../UpdateConnectionDataResidency.tsx | 7 ++++++- airbyte-webapp/src/locales/en.json | 3 ++- .../workspaces/DataResidencyView/DataResidencyView.tsx | 2 +- airbyte-webapp/src/utils/links.ts | 4 +++- 5 files changed, 19 insertions(+), 5 deletions(-) diff --git a/airbyte-webapp/src/components/CreateConnection/DataResidency.tsx b/airbyte-webapp/src/components/CreateConnection/DataResidency.tsx index 088a72f7b13f..deb49d071e68 100644 --- 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 = ({ name = "geography" ( + ipLink: (node: React.ReactNode) => ( {node} ), + docLink: (node: React.ReactNode) => ( + + {node} + + ), }} /> } diff --git a/airbyte-webapp/src/components/connection/UpdateConnectionDataResidency/UpdateConnectionDataResidency.tsx b/airbyte-webapp/src/components/connection/UpdateConnectionDataResidency/UpdateConnectionDataResidency.tsx index 9bf9c44372d0..3f2cbfadb03c 100644 --- a/airbyte-webapp/src/components/connection/UpdateConnectionDataResidency/UpdateConnectionDataResidency.tsx +++ b/airbyte-webapp/src/components/connection/UpdateConnectionDataResidency/UpdateConnectionDataResidency.tsx @@ -50,11 +50,16 @@ export const UpdateConnectionDataResidency: React.FC = () => { ( + ipLink: (node: React.ReactNode) => ( {node} ), + docLink: (node: React.ReactNode) => ( + + {node} + + ), }} /> } diff --git a/airbyte-webapp/src/locales/en.json b/airbyte-webapp/src/locales/en.json index 602628fdf062..2204b83338e3 100644 --- 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 add IP addresses to your allowlist.", + "connection.geographyDescription": "Choose where the data for this connection will be processed. Depending on your network configuration, you may need to add IP addresses to your allowlist. Learn more.", "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 add IP addresses 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. Learn more.", "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 index 553e9508ef62..a72be59554d0 100644 --- 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={} message={ ( diff --git a/airbyte-webapp/src/utils/links.ts b/airbyte-webapp/src/utils/links.ts index 2c4f332bfea3..369aea1bda52 100644 --- 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;