From 22b4bcdeeb520c685232b8fdda242348a5a1d217 Mon Sep 17 00:00:00 2001 From: Satya Nishanth Date: Thu, 10 Aug 2023 16:05:26 +0530 Subject: [PATCH] fix: showing default apps by Cal like Cal-Video in installed apps (#10611) Co-authored-by: Satya Nishanth Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com> --- packages/lib/apps/getEnabledApps.ts | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/lib/apps/getEnabledApps.ts b/packages/lib/apps/getEnabledApps.ts index 796798a753..4ac0590de3 100644 --- a/packages/lib/apps/getEnabledApps.ts +++ b/packages/lib/apps/getEnabledApps.ts @@ -4,6 +4,8 @@ import { prisma } from "@calcom/prisma"; import type { Prisma } from ".prisma/client"; +type EnabledApp = ReturnType[number] & { enabled: boolean }; + /** * * @param credentials - Can be user or team credentials @@ -39,14 +41,13 @@ const getEnabledApps = async (credentials: CredentialDataWithTeamName[], filterO select: { slug: true, enabled: true }, }); const apps = getApps(credentials, filterOnCredentials); - - const filteredApps = enabledApps.reduce((reducedArray, app) => { - const appMetadata = apps.find((metadata) => metadata.slug === app.slug); - if (appMetadata) { - reducedArray.push({ ...appMetadata, enabled: app.enabled }); + const filteredApps = apps.reduce((reducedArray, app) => { + const appDbQuery = enabledApps.find((metadata) => metadata.slug === app.slug); + if (appDbQuery?.enabled || app.isGlobal) { + reducedArray.push({ ...app, enabled: true }); } return reducedArray; - }, [] as (ReturnType[number] & { enabled: boolean })[]); + }, [] as EnabledApp[]); return filteredApps; };