diff --git a/app/client/src/pages/Editor/IntegrationEditor/APIOrSaasPlugins.tsx b/app/client/src/pages/Editor/IntegrationEditor/APIOrSaasPlugins.tsx index 8d47abbd36da..c5053a010a8c 100644 --- a/app/client/src/pages/Editor/IntegrationEditor/APIOrSaasPlugins.tsx +++ b/app/client/src/pages/Editor/IntegrationEditor/APIOrSaasPlugins.tsx @@ -328,10 +328,12 @@ const mapStateToProps = ( FEATURE_FLAG.release_external_saas_plugins_enabled, ); + const pluginNames = allPlugins.map((plugin) => plugin.name); + const premiumPlugins = props.showSaasAPIs && props.isPremiumDatasourcesViewEnabled ? (filterSearch( - getFilteredPremiumIntegrations(isExternalSaasEnabled), + getFilteredPremiumIntegrations(isExternalSaasEnabled, pluginNames), searchedPlugin, ) as PremiumIntegration[]) : []; diff --git a/app/client/src/pages/Editor/IntegrationEditor/EmptySearchedPlugins.tsx b/app/client/src/pages/Editor/IntegrationEditor/EmptySearchedPlugins.tsx index a99a13509471..1295f8857e40 100644 --- a/app/client/src/pages/Editor/IntegrationEditor/EmptySearchedPlugins.tsx +++ b/app/client/src/pages/Editor/IntegrationEditor/EmptySearchedPlugins.tsx @@ -44,6 +44,8 @@ export default function EmptySearchedPlugins({ ), ); + const pluginNames = plugins.map((plugin) => plugin.name); + const searchedItems = filterSearch( [ @@ -51,7 +53,7 @@ export default function EmptySearchedPlugins({ { name: createMessage(CREATE_NEW_DATASOURCE_AUTHENTICATED_REST_API) }, ...mockDatasources, ...(isPremiumDatasourcesViewEnabled - ? getFilteredPremiumIntegrations(isExternalSaasEnabled) + ? getFilteredPremiumIntegrations(isExternalSaasEnabled, pluginNames) : []), ], searchedPlugin, diff --git a/app/client/src/pages/Editor/IntegrationEditor/PremiumDatasources/Constants.ts b/app/client/src/pages/Editor/IntegrationEditor/PremiumDatasources/Constants.ts index ba3bcb202401..4138681de0fc 100644 --- a/app/client/src/pages/Editor/IntegrationEditor/PremiumDatasources/Constants.ts +++ b/app/client/src/pages/Editor/IntegrationEditor/PremiumDatasources/Constants.ts @@ -27,11 +27,11 @@ export const PREMIUM_INTEGRATIONS: PremiumIntegration[] = [ export const getFilteredPremiumIntegrations = ( isExternalSaasEnabled: boolean, + pluginNames: string[], ) => { return isExternalSaasEnabled ? PREMIUM_INTEGRATIONS.filter( - (integration) => - integration.name !== "Salesforce" && integration.name !== "Zendesk", + (integration) => !pluginNames.includes(integration.name), ) : PREMIUM_INTEGRATIONS; };