From a13fe0f3f4f896b16491b422e0d1336ad789c3cf Mon Sep 17 00:00:00 2001 From: Tim Roes Date: Tue, 22 Nov 2022 21:15:31 +0100 Subject: [PATCH 1/2] Make sure to filter out connectors correctly --- airbyte-webapp/src/core/domain/connector/constants.ts | 2 +- .../SignupSourceDropdown/useGetSourceDefinitions.tsx | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/airbyte-webapp/src/core/domain/connector/constants.ts b/airbyte-webapp/src/core/domain/connector/constants.ts index a8ca0d30e1877..11985fab16ce6 100644 --- a/airbyte-webapp/src/core/domain/connector/constants.ts +++ b/airbyte-webapp/src/core/domain/connector/constants.ts @@ -15,7 +15,7 @@ export const DEV_IMAGE_TAG = "dev"; * @param {string} workspaceId The workspace Id * @returns {array} List of connectorIds that should be filtered out */ -export const getExcludedConnectorIds = (workspaceId: string) => +export const getExcludedConnectorIds = (workspaceId?: string) => isCloudApp() ? [ "707456df-6f4f-4ced-b5c6-03f73bcad1c5", // hide Cassandra Destination https://github.com/airbytehq/airbyte-cloud/issues/2606 diff --git a/airbyte-webapp/src/packages/cloud/components/experiments/SignupSourceDropdown/useGetSourceDefinitions.tsx b/airbyte-webapp/src/packages/cloud/components/experiments/SignupSourceDropdown/useGetSourceDefinitions.tsx index a798487d61ce5..b657bbe9cc534 100644 --- a/airbyte-webapp/src/packages/cloud/components/experiments/SignupSourceDropdown/useGetSourceDefinitions.tsx +++ b/airbyte-webapp/src/packages/cloud/components/experiments/SignupSourceDropdown/useGetSourceDefinitions.tsx @@ -16,10 +16,11 @@ const fetchCatalog = async (): Promise => { }; export const useGetSourceDefinitions = () => { - return useQuery("cloud_catalog", fetchCatalog, { + return useQuery("cloud_catalog", fetchCatalog, { select: (data) => { + const filteredConnectors = getExcludedConnectorIds(); return data.sources - .filter(() => getExcludedConnectorIds("")) + .filter((source) => !filteredConnectors.includes(source.sourceDefinitionId)) .map((source) => { const icon = availableSourceDefinitions.sourceDefinitions.find( (src) => src.sourceDefinitionId === source.sourceDefinitionId From 20b466d5ed7947ca41372c966b3e24a2e94d1a34 Mon Sep 17 00:00:00 2001 From: Tim Roes Date: Tue, 22 Nov 2022 23:14:49 +0100 Subject: [PATCH 2/2] Rename variable --- .../SignupSourceDropdown/useGetSourceDefinitions.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/airbyte-webapp/src/packages/cloud/components/experiments/SignupSourceDropdown/useGetSourceDefinitions.tsx b/airbyte-webapp/src/packages/cloud/components/experiments/SignupSourceDropdown/useGetSourceDefinitions.tsx index b657bbe9cc534..81f43ae1b8978 100644 --- a/airbyte-webapp/src/packages/cloud/components/experiments/SignupSourceDropdown/useGetSourceDefinitions.tsx +++ b/airbyte-webapp/src/packages/cloud/components/experiments/SignupSourceDropdown/useGetSourceDefinitions.tsx @@ -18,9 +18,9 @@ const fetchCatalog = async (): Promise => { export const useGetSourceDefinitions = () => { return useQuery("cloud_catalog", fetchCatalog, { select: (data) => { - const filteredConnectors = getExcludedConnectorIds(); + const excludedConnectorIds = getExcludedConnectorIds(); return data.sources - .filter((source) => !filteredConnectors.includes(source.sourceDefinitionId)) + .filter((source) => !excludedConnectorIds.includes(source.sourceDefinitionId)) .map((source) => { const icon = availableSourceDefinitions.sourceDefinitions.find( (src) => src.sourceDefinitionId === source.sourceDefinitionId