From aeb6801683364a4d3293895f182787f9ee5a8c84 Mon Sep 17 00:00:00 2001 From: Alex Birdsall Date: Tue, 29 Nov 2022 11:48:22 -0800 Subject: [PATCH 01/11] Allow overriding cloud env in start:cloud script (#19857) Uses basic bash variable substitution syntax to define `frontend-dev` as a default value for `$AB_ENV` instead of hardcoded; tested and working in bash, zsh, and fish shells. To specify different environments: ```sh # `$AB_ENV` is the default value, `"frontend-dev"` npm run start:cloud # `$AB_ENV` is the user-supplied value, `"dev-2"`; expects a corresponding `.env.dev-2` file to exist AB_ENV=dev-2 npm run start:cloud ``` --- airbyte-webapp/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airbyte-webapp/package.json b/airbyte-webapp/package.json index 2371fde0d81b1..e392b5bf0a2eb 100644 --- a/airbyte-webapp/package.json +++ b/airbyte-webapp/package.json @@ -10,7 +10,7 @@ "prestart": "npm run generate-client", "start": "craco start", "prestart:cloud": "npm run generate-client", - "start:cloud": "AB_ENV=frontend-dev node -r ./scripts/environment.js ./node_modules/.bin/craco start", + "start:cloud": "AB_ENV=${AB_ENV-frontend-dev} node -r ./scripts/environment.js ./node_modules/.bin/craco start", "prebuild": "npm run generate-client", "build": "BUILD_PATH='./build/app' craco build", "pretest": "npm run generate-client", From 56a5565bb297deb349f80d56fbeca7fedae14e23 Mon Sep 17 00:00:00 2001 From: "Krishna (kc) Glick" Date: Tue, 29 Nov 2022 14:53:53 -0500 Subject: [PATCH 02/11] Invoke handleChatUs button (#19882) --- .../src/packages/cloud/views/layout/SideBar/SideBar.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/airbyte-webapp/src/packages/cloud/views/layout/SideBar/SideBar.tsx b/airbyte-webapp/src/packages/cloud/views/layout/SideBar/SideBar.tsx index c5c5091c62c11..8db1d3bdd1dc5 100644 --- a/airbyte-webapp/src/packages/cloud/views/layout/SideBar/SideBar.tsx +++ b/airbyte-webapp/src/packages/cloud/views/layout/SideBar/SideBar.tsx @@ -10,7 +10,7 @@ import { NavLink } from "react-router-dom"; import { Link } from "components"; import { CreditsIcon } from "components/icons/CreditsIcon"; import { DocsIcon } from "components/icons/DocsIcon"; -import { DropdownMenu } from "components/ui/DropdownMenu"; +import { DropdownMenu, DropdownMenuOptionType } from "components/ui/DropdownMenu"; import { Text } from "components/ui/Text"; import { FeatureItem, IfFeatureEnabled } from "hooks/services/Feature"; @@ -39,7 +39,7 @@ const SideBar: React.FC = () => { const cloudWorkspace = useGetCloudWorkspace(workspace.workspaceId); const { show } = useIntercom(); const { formatMessage } = useIntl(); - const handleChatUs = () => show(); + const handleChatUs = (data: DropdownMenuOptionType) => data.value === "chatUs" && show(); return (