removes provider check from fetchTeams, instead brings up all repos from all providers (github and gitlab)

Author: e-for-eshaan

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

@@ -42,7 +42,7 @@ const repoSchema = yup.object().shape({
 
 const getSchema = yup.object().shape({
   providers: yup.array(
-    yup.string().oneOf(Object.values(Integration)).required()
+    yup.string().oneOf(Object.values(Integration)).optional()
   )
 });
 
@@ -86,7 +86,9 @@ endpoint.handle.GET(getSchema, async (req, res) => {
   const teams = await getQuery;
   const reposWithWorkflows = await getSelectedReposForOrg(
     org_id,
-    providers as Integration[]
+    providers?.length
+      ? (providers as Integration[])
+      : [Integration.GITHUB, Integration.GITLAB]
   ).then((res) => res.flat());
 
   res.send({

web-server/pages/integrations.tsx

@@ -110,8 +110,7 @@ const Content = () => {
     if (hasCodeProviderLinked && !teamCount) {
       dispatch(
         fetchTeams({
-          org_id: orgId,
-          providers: integrationList
+          org_id: orgId
         })
       ).finally(loadedTeams.true);
     }

web-server/pages/teams/index.tsx

@@ -24,12 +24,11 @@ function Page() {
     depFn(loading.true);
     await dispatch(
       fetchTeams({
-        org_id: orgId,
-        providers: integrationList
+        org_id: orgId
       })
     );
     depFn(loading.false);
-  }, [dispatch, integrationList, loading.false, loading.true, orgId]);
+  }, [dispatch, loading.false, loading.true, orgId]);
 
   useEffect(() => {
     if (!orgId) return;

web-server/src/components/TeamSelector/useTeamSelectorSetup.tsx

@@ -52,10 +52,10 @@ export const useTeamSelectorSetup = ({ mode }: UseTeamSelectorSetupArgs) => {
 
   const fetchAllTeams = useCallback(async () => {
     await Promise.all([
-      dispatch(fetchTeams({ org_id: orgId, providers: integrationList })),
+      dispatch(fetchTeams({ org_id: orgId })),
       dispatch(updateTeamBranchesMap({ orgId }))
     ]);
-  }, [dispatch, integrationList, orgId]);
+  }, [dispatch, orgId]);
 
   const apiTeams = useSelector((state) => state.team.teams);
   const loadingTeams = useSelector(

web-server/src/components/Teams/useTeamsConfig.tsx

@@ -86,7 +86,7 @@ export const TeamsCRUDProvider: React.FC<{
   const dispatch = useDispatch();
   const teamReposMaps = useSelector((s) => s.team.teamReposMaps);
   const teams = useSelector((s) => s.team.teams);
-  const { orgId, integrationList } = useAuth();
+  const { orgId } = useAuth();
 
   const isPageLoading = useSelector(
     (s) => s.team.requests?.teams === FetchState.REQUEST
@@ -97,11 +97,10 @@ export const TeamsCRUDProvider: React.FC<{
     dispatch(fetchCurrentOrg());
     dispatch(
       fetchTeams({
-        org_id: orgId,
-        providers: integrationList
+        org_id: orgId
       })
     );
-  }, [dispatch, integrationList, orgId]);
+  }, [dispatch, orgId]);
 
   // team name logic
   const teamName = useEasyState('');

web-server/src/components/TeamsList.tsx

@@ -257,7 +257,7 @@ const TeamCard: React.FC<TeamCardProps> = ({ team, onEdit }) => {
 const MoreOptions = ({ teamId }: { teamId: ID }) => {
   const dispatch = useDispatch();
   const { enqueueSnackbar } = useSnackbar();
-  const { orgId, integrationList } = useAuth();
+  const { orgId } = useAuth();
   const anchorEl = useEasyState();
   const loading = useBoolState(false);
   const cancelMenu = useBoolState(false);
@@ -285,7 +285,7 @@ const MoreOptions = ({ teamId }: { teamId: ID }) => {
               variant: 'success',
               autoHideDuration: 2000
             });
-            dispatch(fetchTeams({ org_id: orgId, providers: integrationList }));
+            dispatch(fetchTeams({ org_id: orgId }));
             handleCloseMenu();
           } else {
             enqueueSnackbar('Failed to delete team', {
@@ -301,7 +301,6 @@ const MoreOptions = ({ teamId }: { teamId: ID }) => {
       dispatch,
       enqueueSnackbar,
       handleCloseMenu,
-      integrationList,
       loading.false,
       loading.true,
       orgId

web-server/src/content/Dashboards/ConfigureGithubModalBody.tsx

@@ -23,7 +23,7 @@ export const ConfigureGithubModalBody: FC<{
   onClose: () => void;
 }> = ({ onClose }) => {
   const token = useEasyState('');
-  const { orgId, integrationList } = useAuth();
+  const { orgId } = useAuth();
   const { enqueueSnackbar } = useSnackbar();
   const dispatch = useDispatch();
   const isLoading = useBoolState();
@@ -78,8 +78,7 @@ export const ConfigureGithubModalBody: FC<{
         dispatch(fetchCurrentOrg());
         dispatch(
           fetchTeams({
-            org_id: orgId,
-            providers: integrationList
+            org_id: orgId
           })
         );
         enqueueSnackbar('Github linked successfully', {
@@ -96,7 +95,6 @@ export const ConfigureGithubModalBody: FC<{
   }, [
     dispatch,
     enqueueSnackbar,
-    integrationList,
     isLoading.false,
     isLoading.true,
     onClose,

web-server/src/content/Dashboards/ConfigureGitlabModalBody.tsx

@@ -24,7 +24,7 @@ export const ConfigureGitlabModalBody: FC<{
 }> = ({ onClose }) => {
   const token = useEasyState('');
   const customDomain = useEasyState('');
-  const { orgId, integrationList } = useAuth();
+  const { orgId } = useAuth();
   const { enqueueSnackbar } = useSnackbar();
   const dispatch = useDispatch();
   const isLoading = useBoolState();
@@ -105,8 +105,7 @@ export const ConfigureGitlabModalBody: FC<{
         dispatch(fetchCurrentOrg());
         dispatch(
           fetchTeams({
-            org_id: orgId,
-            providers: integrationList
+            org_id: orgId
           })
         );
         enqueueSnackbar('Gitlab linked successfully', {
@@ -124,7 +123,6 @@ export const ConfigureGitlabModalBody: FC<{
     customDomain.value,
     dispatch,
     enqueueSnackbar,
-    integrationList,
     isLoading.false,
     isLoading.true,
     onClose,

web-server/src/slices/team.ts

@@ -135,7 +135,7 @@ export const teamSlice = createSlice({
 
 export const fetchTeams = createAsyncThunk(
   'teams/fetchTeams',
-  async (params: { org_id: ID; providers: Integration[] }) => {
+  async (params: { org_id: ID; providers?: Integration[] }) => {
     return await handleApi<{
       teams: Team[];
       teamReposMap: Record<ID, DB_OrgRepo[]>;