converts checks for github to include all integrations

Author: e-for-eshaan

web-server/pages/api/resources/orgs/[org_id]/teams/v2.ts

@@ -47,7 +47,6 @@ const getSchema = yup.object().shape({
 });
 
 const postSchema = yup.object().shape({
-  provider: yup.string().oneOf(Object.values(Integration)).required(),
   name: yup.string().required(),
   org_repos: yup.lazy((obj) =>
     yup.object(mapObjIndexed(() => yup.array().of(repoSchema), obj))

web-server/pages/dora-metrics/index.tsx

@@ -15,9 +15,7 @@ function Page() {
   const isLoading = useSelector(
     (s) => s.doraMetrics.requests?.metrics_summary === FetchState.REQUEST
   );
-  const {
-    integrations: { github: isGithubIntegrated }
-  } = useAuth();
+  const { integrationList } = useAuth();
 
   return (
     <PageWrapper
@@ -30,7 +28,7 @@ function Page() {
       isLoading={isLoading}
       teamDateSelectorMode="single"
     >
-      {isGithubIntegrated ? <DoraMetricsBody /> : <Loader />}
+      {integrationList.length > 0 ? <DoraMetricsBody /> : <Loader />}
     </PageWrapper>
   );
 }

web-server/pages/settings.tsx

@@ -1,21 +1,19 @@
+import { Box } from '@mui/material';
 import { Authenticated } from 'src/components/Authenticated';
 
 import { FlexBox } from '@/components/FlexBox';
+import { SyncDaysSetting } from '@/components/Settings/SyncDaysSetting';
 import { FetchState } from '@/constants/ui-states';
+import { useRedirectWithSession } from '@/constants/useRoute';
 import { PageWrapper } from '@/content/PullRequests/PageWrapper';
+import { useAuth } from '@/hooks/useAuth';
 import ExtendedSidebarLayout from '@/layouts/ExtendedSidebarLayout';
 import { useSelector } from '@/store';
 import { PageLayout } from '@/types/resources';
-import { SyncDaysSetting } from '@/components/Settings/SyncDaysSetting';
-import { Box } from '@mui/material';
-import { useRedirectWithSession } from '@/constants/useRoute';
-import { useAuth } from '@/hooks/useAuth';
 
 function Settings() {
   useRedirectWithSession();
-  const {
-    integrations: { github: isGithubIntegrated }
-  } = useAuth();
+  const { integrationList } = useAuth();
   const isLoading = useSelector(
     (s) => s.org.requests?.defaultSyncDays === FetchState.REQUEST
   );
@@ -33,7 +31,7 @@ function Settings() {
         showEvenIfNoTeamSelected={true}
         isLoading={isLoading}
       >
-        {isGithubIntegrated && <Content />}
+        {integrationList.length > 0 && <Content />}
       </PageWrapper>
     </>
   );

web-server/src/content/DoraMetrics/DoraMetricsBody.tsx

@@ -1,7 +1,7 @@
 import { AutoGraphRounded } from '@mui/icons-material';
 import { Grid, Divider, Button } from '@mui/material';
 import Link from 'next/link';
-import { FC, useEffect } from 'react';
+import { FC, useEffect, useMemo } from 'react';
 
 import { AiButton } from '@/components/AiButton';
 import { DoraMetricsConfigurationSettings } from '@/components/DoraMetricsConfigurationSettings';
@@ -37,10 +37,11 @@ import { WeeklyDeliveryVolumeCard } from './DoraCards/WeeklyDeliveryVolumeCard';
 
 export const DoraMetricsBody = () => {
   const dispatch = useDispatch();
-  const {
-    orgId,
-    integrations: { github: isGithubIntegrated }
-  } = useAuth();
+  const { orgId, integrationList } = useAuth();
+  const isCodeProviderIntegrated = useMemo(
+    () => integrationList.length > 0,
+    [integrationList.length]
+  );
   const { singleTeamId, dates } = useSingleTeamConfig();
   const branchPayloadForPrFilters = useBranchesForPrFilters();
   const isLoading = useSelector(
@@ -65,9 +66,11 @@ export const DoraMetricsBody = () => {
 
   const { addPage } = useOverlayPage();
 
+  console.log('DEbugging', isCodeProviderIntegrated);
+
   useEffect(() => {
-    if (!singleTeamId) return;
-    if (!isGithubIntegrated) return;
+    // if (!singleTeamId) return;
+    // if (!isCodeProviderIntegrated) return;
     dispatch(
       fetchTeamDoraMetrics({
         orgId,
@@ -83,7 +86,7 @@ export const DoraMetricsBody = () => {
     dispatch,
     orgId,
     singleTeamId,
-    isGithubIntegrated,
+    isCodeProviderIntegrated,
     branchPayloadForPrFilters
   ]);
 

web-server/src/layouts/ExtendedSidebarLayout/Sidebar/SidebarMenu/useFilteredSidebarItems.tsx

@@ -16,9 +16,7 @@ const checkTag = (tag: string | number[] | number, check: string | number) => {
 };
 
 export const useFilteredSidebarItems = () => {
-  const {
-    integrations: { github: isGithubIntegrated }
-  } = useAuth();
+  const { integrationList } = useAuth();
 
   const flagFilteredMenuItems = useMemo(() => {
     return menuItems();
@@ -27,7 +25,10 @@ export const useFilteredSidebarItems = () => {
   const sidebarItems = useMemo(() => {
     const filterCheck = (item: MenuItem): boolean => {
       if (checkTag(item.tag, ItemTags.HideItem)) return false;
-      if (!isGithubIntegrated && item.name !== SideBarItems.MANAGE_INTEGRATIONS)
+      if (
+        !integrationList.length &&
+        item.name !== SideBarItems.MANAGE_INTEGRATIONS
+      )
         return false;
       return true;
     };
@@ -45,7 +46,7 @@ export const useFilteredSidebarItems = () => {
         items: itemsFilter(section.items)
       }))
       .filter((section) => section.items?.length);
-  }, [flagFilteredMenuItems, isGithubIntegrated]);
+  }, [flagFilteredMenuItems, integrationList]);
 
   return sidebarItems;
 };