Change yarn install command to include frozen lockfile images. (#608)

* Remove package.json and yarn.lock from root. * Make --frozen-lockfile be supplied to yarn install everywhere. * Remove commented code and logs. * Delete web-server/README.md * Update integration cards + shift force-sync/team creation CTA.
middlewarehq · Oct 23, 2024 · f491a5b · f491a5b
1 parent e0f666a
commit f491a5b
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 66 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -105,7 +105,7 @@ RUN apt-get update && \
     && chmod 0644 /etc/cron.d/cronjob \
     && crontab /etc/cron.d/cronjob \
     && cd /app/web-server \
-    && yarn install --network-timeout 1000000 && yarn build \
+    && yarn install --frozen-lockfile --network-timeout 1000000 && yarn build \
     && rm -rf ./artifacts \
     && cd /app/ \
     && tar cfz web-server.tar.gz ./web-server \

diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -64,7 +64,7 @@ RUN crontab /etc/cron.d/cronjob
 RUN /app/setup_utils/generate_config_ini.sh -t /app/backend/analytics_server/mhq/config
 
 WORKDIR /app/web-server
-RUN --mount=type=cache,target=/root/.yarn YARN_CACHE_FOLDER=/root/.yarn yarn install
+RUN --mount=type=cache,target=/root/.yarn YARN_CACHE_FOLDER=/root/.yarn yarn install --frozen-lockfile
 
 
 ENV POSTGRES_DB_ENABLED=true

diff --git a/package.json b/package.json
diff --git a/web-server/pages/integrations.tsx b/web-server/pages/integrations.tsx
@@ -1,6 +1,6 @@
-import { Add } from '@mui/icons-material';
+import { AddRounded, InfoRounded } from '@mui/icons-material';
 import { LoadingButton } from '@mui/lab';
-import { Button, Divider, Card } from '@mui/material';
+import { Button, Card, Divider } from '@mui/material';
 import { differenceInMilliseconds } from 'date-fns';
 import { millisecondsInMinute } from 'date-fns/constants';
 import { useEffect, useMemo } from 'react';
@@ -87,9 +87,12 @@ const Content = () => {
 
   const showForceSyncBtn = useMemo(() => {
     if (!hasCodeProviderLinked) return false;
+    if (!teamCount) return false;
+
     if (!lastSyncMap.length) return true;
+
     return lastSyncMap.every((diff) => diff >= TIME_LIMIT_FOR_FORCE_SYNC);
-  }, [hasCodeProviderLinked, lastSyncMap]);
+  }, [hasCodeProviderLinked, lastSyncMap, teamCount]);
 
   const enableForceSyncBtn = useMemo(() => {
     const diff = differenceInMilliseconds(
@@ -138,13 +141,17 @@ const Content = () => {
   );
 
   return (
-    <FlexBox col gap2>
-      <FlexBox justifyBetween height={'52px'} alignCenter>
+    <FlexBox col gap2 fill>
+      <FlexBox justifyBetween height={'52px'} alignCenter gap2>
         <Line white fontSize={'24px'}>
-          Integrate your Code Providers to fetch DORA for your team
+          Link your Code Services to view Dora Metrics for your team
         </Line>
         {showDoraCTA && (
-          <Button href={ROUTES.DORA_METRICS.PATH} variant="contained">
+          <Button
+            href={ROUTES.DORA_METRICS.PATH}
+            variant="contained"
+            sx={{ flexShrink: 0 }}
+          >
             <FlexBox centered fullWidth p={2 / 3}>
               Continue to Dora {'->'}
             </FlexBox>
@@ -153,13 +160,47 @@ const Content = () => {
       </FlexBox>
 
       <Divider sx={{ mb: '10px' }} />
-      {showForceSyncBtn && (
-        <FlexBox component={Card} justifyBetween p={1} alignCenter>
-          <Line>
-            Initiate force sync will force a sync of all integrations. This is
-            useful if you have made changes to your integrations outside of
-            middleware.
+      <FlexBox gap={2}>
+        <GithubIntegrationCard />
+        <GitlabIntegrationCard />
+      </FlexBox>
+      {showCreationCTA && (
+        <FlexBox mt={'56px'} col fit alignStart>
+          <Line fontSize={'24px'} semibold white>
+            Make a team to get started!
           </Line>
+          <Line fontSize={'16px'} mt="9px">
+            Just add the team's name, add repos and you're good to go.
+          </Line>
+          <Button
+            variant="contained"
+            sx={{ mt: 3 }}
+            href={ROUTES.TEAMS.PATH}
+            startIcon={<AddRounded />}
+            size="large"
+          >
+            <FlexBox gap1>
+              <Line white>Create Team</Line>
+            </FlexBox>
+          </Button>
+        </FlexBox>
+      )}
+
+      {showForceSyncBtn && (
+        <FlexBox component={Card} justifyBetween p={1} alignCenter mt="auto">
+          <FlexBox fit gap1 centered ml={1}>
+            <InfoRounded fontSize="small" />
+            <FlexBox col>
+              <Line>
+                <Line bold>Initiate force sync</Line> will force a sync of all
+                linked integrations.
+              </Line>
+              <Line tiny secondary>
+                This is useful if you want to view updated data right now,
+                instead of waiting for the next sync cycle.
+              </Line>
+            </FlexBox>
+          </FlexBox>
           <LoadingButton
             type="submit"
             variant="outlined"
@@ -192,31 +233,6 @@ const Content = () => {
           </LoadingButton>
         </FlexBox>
       )}
-
-      <FlexBox gap={2}>
-        <GithubIntegrationCard />
-        <GitlabIntegrationCard />
-      </FlexBox>
-      {showCreationCTA && (
-        <FlexBox mt={'56px'} col fit alignStart>
-          <Line fontSize={'24px'} semibold white>
-            Create team structure to see DORA
-          </Line>
-          <Line fontSize={'16px'} mt="9px">
-            Just add team's name, add repos and you're good to go.
-          </Line>
-          <Button
-            variant="contained"
-            sx={{ mt: '24px' }}
-            href={ROUTES.TEAMS.PATH}
-          >
-            <FlexBox gap1>
-              <Add />
-              <Line white>Create Team</Line>
-            </FlexBox>
-          </Button>
-        </FlexBox>
-      )}
     </FlexBox>
   );
 };
diff --git a/web-server/src/content/Dashboards/GitlabIntegrationCard.tsx b/web-server/src/content/Dashboards/GitlabIntegrationCard.tsx
@@ -1,4 +1,8 @@
-import { ArrowForwardIosRounded, SettingsRounded } from '@mui/icons-material';
+import {
+  ArrowForwardIosRounded,
+  SettingsRounded,
+  ChevronRightRounded
+} from '@mui/icons-material';
 import { Button, useTheme } from '@mui/material';
 import CircularProgress from '@mui/material/CircularProgress';
 import { useSnackbar } from 'notistack';
@@ -121,11 +125,16 @@ export const GitlabIntegrationCard = () => {
               label={!isGitlabIntegrated ? 'Link' : 'Unlink'}
               bgOpacity={!isGitlabIntegrated ? 0.45 : 0.25}
               endIcon={
-                isLoading && (
+                isLoading ? (
                   <CircularProgress
                     size={theme.spacing(1)}
                     sx={{ ml: 1 / 2 }}
                   />
+                ) : (
+                  <ChevronRightRounded
+                    fontSize="small"
+                    sx={{ ml: 1 / 2, mr: -2 / 3 }}
+                  />
                 )
               }
               minWidth="72px"

diff --git a/web-server/src/content/DoraMetrics/DoraMetricsBody.tsx b/web-server/src/content/DoraMetrics/DoraMetricsBody.tsx
@@ -66,11 +66,7 @@ export const DoraMetricsBody = () => {
 
   const { addPage } = useOverlayPage();
 
-  console.log('DEbugging', isCodeProviderIntegrated);
-
   useEffect(() => {
-    // if (!singleTeamId) return;
-    // if (!isCodeProviderIntegrated) return;
     dispatch(
       fetchTeamDoraMetrics({
         orgId,

diff --git a/yarn.lock b/yarn.lock