Fix TS not working properly in web-server.

Author: jayantbh

web-server/pages/api/integrations/github/orgs.ts

@@ -4,7 +4,6 @@ import * as yup from 'yup';
 import { Endpoint, nullSchema } from '@/api-helpers/global';
 import { Row, Table } from '@/constants/db';
 import { selectedDBReposMock } from '@/mocks/github';
-import { DB_OrgRepo } from '@/types/resources';
 import { db } from '@/utils/db';
 
 const patchSchema = yup.object().shape({
@@ -19,11 +18,11 @@ const endpoint = new Endpoint(nullSchema);
 type ReqOrgRepo = { org: string; repos: string[] };
 type ReqRepo = { org: string; name: string };
 
-const reqRepoComparator = (reqRepo: ReqRepo) => (tableRepo: DB_OrgRepo) =>
+const reqRepoComparator = (reqRepo: ReqRepo) => (tableRepo: Row<'OrgRepo'>) =>
   reqRepo.org === tableRepo.org_name && reqRepo.name === tableRepo.name;
-const dbRepoComparator = (tableRepo: DB_OrgRepo) => (reqRepo: ReqRepo) =>
+const dbRepoComparator = (tableRepo: Row<'OrgRepo'>) => (reqRepo: ReqRepo) =>
   reqRepo.org === tableRepo.org_name && reqRepo.name === tableRepo.name;
-const dbRepoFilter = (reqRepos: ReqRepo[]) => (tableRepo: DB_OrgRepo) =>
+const dbRepoFilter = (reqRepos: ReqRepo[]) => (tableRepo: Row<'OrgRepo'>) =>
   reqRepos.some(dbRepoComparator(tableRepo));
 
 endpoint.handle.PATCH(patchSchema, async (req, res) => {

web-server/pages/api/internal/[org_id]/integrations/workflows.ts

@@ -3,7 +3,6 @@ import * as yup from 'yup';
 import { handleRequest } from '@/api-helpers/axios';
 import { Endpoint } from '@/api-helpers/global';
 import { CIProvider, Integration } from '@/constants/integrations';
-import { mockWorkflows } from '@/mocks/workflows';
 import { RepoWorkflowResponse, RepoWorkflow } from '@/types/resources';
 
 const pathSchema = yup.object().shape({
@@ -20,8 +19,6 @@ const getSchema = yup.object().shape({
 const endpoint = new Endpoint(pathSchema);
 
 endpoint.handle.GET(getSchema, async (req, res) => {
-  if (req.meta?.features?.use_mock_data) return res.send(mockWorkflows);
-
   const { org_id, provider, org_name, repo_name, repo_slug, next_page_token } =
     req.payload;
 

web-server/pages/api/internal/ai/dora_metrics.ts

@@ -66,7 +66,7 @@ const postSchema = yup.object().shape({
 const endpoint = new Endpoint(nullSchema);
 endpoint.handle.POST(postSchema, async (req, res) => {
   const { data, model, access_token } = req.payload;
-  const dora_data = data as TeamDoraMetricsApiResponseType;
+  const dora_data = data as unknown as TeamDoraMetricsApiResponseType;
 
   try {
     const [
@@ -76,16 +76,14 @@ endpoint.handle.POST(postSchema, async (req, res) => {
       MTTRSummary,
       deploymentFrequencySummary,
       doraTrendSummary
-    ] = await Promise.all(
-      [
-        getDoraMetricsScore,
-        getLeadTimeSummary,
-        getCFRSummary,
-        getMTTRSummary,
-        getDeploymentFrequencySummary,
-        getDoraTrendsCorrelationSummary
-      ].map((fn) => fn(dora_data, model, access_token))
-    );
+    ] = await Promise.all([
+      getDoraMetricsScore(dora_data, model, access_token),
+      getLeadTimeSummary(dora_data, model, access_token),
+      getCFRSummary(dora_data, model, access_token),
+      getMTTRSummary(dora_data, model, access_token),
+      getDeploymentFrequencySummary(dora_data, model, access_token),
+      getDoraTrendsCorrelationSummary(dora_data, model, access_token)
+    ]);
 
     const aggregatedData = {
       ...doraMetricsScore,
@@ -107,18 +105,28 @@ endpoint.handle.POST(postSchema, async (req, res) => {
       ...compiledSummary
     };
 
-    const { status, message } = checkForErrors(responses);
+    const { status, message } = checkForErrors(
+      responses as unknown as Record<
+        string,
+        { status: string; message: string }
+      >
+    );
 
     if (status === 'error') {
       return res.status(400).send({ message });
     }
 
     const simplifiedData = Object.fromEntries(
-      Object.entries(responses).map(([key, value]) => [key, value.data])
+      Object.entries(responses).map(([key, value]) => [
+        key,
+        // TODO: PLEASE FIX THIS TYPE LATER
+        // @ts-ignore
+        value.data
+      ])
     );
 
     return res.status(200).send(simplifiedData);
-  } catch (error) {
+  } catch (error: any) {
     return res.status(500).send({
       message: 'Internal Server Error',
       error: error.message

web-server/pages/api/internal/version.ts

@@ -5,11 +5,10 @@ import { Endpoint, nullSchema } from '@/api-helpers/global';
 const dockerRepoName = 'middlewareeng/middleware';
 const githubOrgName = 'middlewarehq';
 const githubRepoName = 'middleware';
-const defaultBranch = 'main';
 
 const endpoint = new Endpoint(nullSchema);
 
-endpoint.handle.GET(nullSchema, async (req, res) => {
+endpoint.handle.GET(nullSchema, async (_req, res) => {
   return res.send(await checkNewImageRelease());
 });
 
@@ -72,18 +71,6 @@ type TagCompressed = {
   digest: string;
 };
 
-type GitHubCommit = {
-  sha: string;
-  commit: {
-    author: {
-      name: string;
-      email: string;
-      date: string;
-    };
-    message: string;
-  };
-};
-
 function getProjectVersionInfo(): ProjectVersionInfo {
   const merge_commit_sha = process.env.MERGE_COMMIT_SHA;
   const build_date = process.env.BUILD_DATE;

web-server/pages/api/resources/teams/[team_id]/repos.ts

@@ -44,7 +44,6 @@ export const Transition = forwardRef(function Transition(
 });
 
 export const ImageUpdateBanner = () => {
-  const theme = useTheme();
   const { addModal } = useModal();
   const dispatch = useDispatch();
 

web-server/pages/api/resources/unassigned_repos.ts

@@ -1,16 +1,16 @@
 import { Button, Divider } from '@mui/material';
 import { useRouter } from 'next/router';
-import { FC, useMemo, useCallback, useEffect } from 'react';
+import { FC, useCallback, useEffect } from 'react';
 
 import { PullRequestsTableHeadProps } from '@/components/PRTable/PullRequestsTableHead';
 import { useModal } from '@/contexts/ModalContext';
 import { useAuth } from '@/hooks/useAuth';
 import { useEasyState } from '@/hooks/useEasyState';
-import { useFeature } from '@/hooks/useFeature';
 import { useSingleTeamConfig } from '@/hooks/useStateTeamConfig';
 import { updateExcludedPrs, fetchExcludedPrs } from '@/slices/team';
 import { useDispatch, useSelector } from '@/store';
 import { PR } from '@/types/resources';
+import { depFn } from '@/utils/fn';
 
 import { PullRequestsTable } from './PullRequestsTable';
 
@@ -39,27 +39,25 @@ export const PrTableWithPrExclusionMenu: FC<
 
     dispatch(
       updateExcludedPrs({
-        userId,
         teamId,
         excludedPrs: [...excludedPrs, ...selectedPrs]
       })
-    ).then(() => onUpdateCallback());
+    ).then(() => {
+      onUpdateCallback();
+      depFn(selectedPrIds.reset);
+    });
   }, [
     dispatch,
     excludedPrs,
     onUpdateCallback,
     propPrs,
+    selectedPrIds.reset,
     selectedPrIds.value,
-    teamId,
-    userId
+    teamId
   ]);
 
   const isUserRoute = router.pathname.includes('/user');
-  const isPrExclusionEnabled = useFeature('enable_pr_exclusion');
-  const enablePrSelection = useMemo(
-    () => !isUserRoute && isPrExclusionEnabled,
-    [isPrExclusionEnabled, isUserRoute]
-  );
+  const enablePrSelection = !isUserRoute;
 
   useEffect(() => {
     dispatch(fetchExcludedPrs({ teamId }));
@@ -70,15 +68,15 @@ export const PrTableWithPrExclusionMenu: FC<
       propPrs={propPrs}
       selectionMenu={
         enablePrSelection && (
-          <FlexBox>
+          <FlexBox gap1>
             {Boolean(selectedPrIds.value.length) && (
               <Button
                 sx={{ p: 1.5 }}
                 variant="outlined"
                 disabled={!selectedPrIds.value.length}
                 onClick={updateExcludedPrsHandler}
               >
-                Exclude From Team Analytics
+                Exclude For Team
               </Button>
             )}
             {Boolean(excludedPrs?.length) &&
@@ -111,7 +109,6 @@ export const ExcludedPrTable: FC<{
   onUpdateCallback: () => void;
 }> = ({ onUpdateCallback }) => {
   const dispatch = useDispatch();
-  const { userId } = useAuth();
   const teamId = useSingleTeamConfig().singleTeamId;
 
   const excludedPrs = useSelector((s) => s.team.excludedPrs);
@@ -122,19 +119,11 @@ export const ExcludedPrTable: FC<{
     const filteredPrs = excludedPrs.filter((p) => !selectedPrIdsSet.has(p.id));
     dispatch(
       updateExcludedPrs({
-        userId,
         teamId,
         excludedPrs: [...filteredPrs]
       })
     ).then(() => onUpdateCallback());
-  }, [
-    dispatch,
-    excludedPrs,
-    onUpdateCallback,
-    selectedPrIds.value,
-    teamId,
-    userId
-  ]);
+  }, [dispatch, excludedPrs, onUpdateCallback, selectedPrIds.value, teamId]);
 
   return (
     <FlexBox col gap1>

web-server/src/components/ImageUpdateBanner.tsx

@@ -59,7 +59,7 @@ export const TeamProductionBranchSelector: FC<{
 }> = ({ onClose }) => {
   const dispatch = useDispatch();
   const { orgId, integrationSet } = useAuth();
-  const { team, singleTeamId, dates } = useSingleTeamConfig();
+  const { singleTeamId, dates } = useSingleTeamConfig();
   const branches = useStateBranchConfig();
   const isCodeIntegrationLinked = integrationSet.has(IntegrationGroup.CODE);
   const isSaving = useEasyState<boolean>(false);
@@ -150,15 +150,12 @@ export const TeamProductionBranchSelector: FC<{
             }
 
             const fetchDoraArgs = {
-              org_id: orgId,
-              team_id: singleTeamId,
-              from_date: dates.start,
-              to_date: dates.end,
+              orgId: orgId,
+              teamId: singleTeamId,
+              fromDate: dates.start,
+              toDate: dates.end,
               branches:
-                activeBranchMode === ActiveBranchMode.PROD ? null : branches,
-              manager_teams_array: [
-                { team_ids: [singleTeamId], manager_id: team?.manager_id }
-              ]
+                activeBranchMode === ActiveBranchMode.PROD ? null : branches
             };
             await dispatch(fetchTeamDoraMetrics(fetchDoraArgs));
             enqueueSnackbar('Updated Successfully', {
@@ -189,7 +186,6 @@ export const TeamProductionBranchSelector: FC<{
       dates.start,
       dates.end,
       branches,
-      team?.manager_id,
       enqueueSnackbar,
       updateActiveProdBranch
     ]

web-server/src/components/PRTable/PrTableWithPrExclusionMenu.tsx

@@ -540,6 +540,17 @@ export const Columns = {
       anonymous
     }
     return Columns;
+  }),
+  [Table.TeamRelations]: objectEnumFromFn(() => {
+    enum Columns {
+      created_at,
+      updated_at,
+      user_id,
+      relation,
+      related_user_id,
+      org_id
+    }
+    return Columns;
   })
 };