Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🪟 🎨 Update text describing connection geography #19879

Merged
merged 2 commits into from
Dec 1, 2022
Merged

🪟 🎨 Update text describing connection geography #19879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7730588
update text about connection data geography
josephkmh Nov 29, 2022
921990f
more descriptive node names
josephkmh Nov 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion airbyte-webapp/src/components/CreateConnection/DataResidency.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
Expand Down Expand Up @@ -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>
),
}}
/>
}
Expand Down
7 changes: 6 additions & 1 deletion ...src/components/connection/UpdateConnectionDataResidency/UpdateConnectionDataResidency.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
),
}}
/>
}
Expand Down
3 changes: 2 additions & 1 deletion airbyte-webapp/src/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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.",
krishnaglick marked this conversation as resolved.
Show resolved Hide resolved
"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.",
Expand Down
2 changes: 1 addition & 1 deletion airbyte-webapp/src/packages/cloud/views/workspaces/DataResidencyView/DataResidencyView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
4 changes: 3 additions & 1 deletion airbyte-webapp/src/utils/links.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I noticed the URL for the docs was changed as well - not 404-ing, but the link to the heading was broken 🙂

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;

Expand Down