Merge pull request #989 from MTES-MCT/main

Mise en production 30/10/2024
MTES-MCT · Oct 30, 2024 · c63e100 · c63e100
2 parents 546da02 + 2e20e89
commit c63e100
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 26 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -55,4 +55,4 @@ jobs:
           ORGA_ID: ${{ secrets.CLEVER_ORG }}
         run: |
           clever link --org $ORGA_ID --alias ${{ inputs.alias }} '${{ inputs.app }}'
-          clever deploy --alias ${{ inputs.alias }} --force
+          clever deploy --alias ${{ inputs.alias }} --same-commit-policy rebuild
diff --git a/.github/workflows/review-app.yml b/.github/workflows/review-app.yml
@@ -121,7 +121,7 @@ jobs:
       - name: Deploy the app
         run: |
           clever domain add $APP_ALIAS.cleverapps.io -a $APP_ALIAS
-          clever deploy -a $APP_ALIAS
+          clever deploy -a $APP_ALIAS --same-commit-policy rebuild
 
       - name: Scale down for the run
         run: clever scale --flavor S -a $APP_ALIAS
@@ -186,7 +186,7 @@ jobs:
       - name: Deploy the app
         run: |
           clever domain add $APP_ALIAS.cleverapps.io -a $APP_ALIAS
-          clever deploy -a $APP_ALIAS
+          clever deploy -a $APP_ALIAS --same-commit-policy rebuild
 
       - name: Scale down for the run
         run: clever scale --flavor M -a $APP_ALIAS
@@ -244,7 +244,7 @@ jobs:
       - name: Deploy the app
         run: |
           clever domain add $APP_ALIAS.cleverapps.io -a $APP_ALIAS
-          clever deploy -a $APP_ALIAS
+          clever deploy -a $APP_ALIAS --same-commit-policy rebuild
 
       - name: Scale down for the run
         run: clever scale --flavor XS -a $APP_ALIAS
@@ -281,7 +281,7 @@ jobs:
         run: clever scale --flavor M -a $APP_ALIAS
 
       - name: Update the app
-        run: clever deploy --force -a $APP_ALIAS
+        run: clever deploy --force -a $APP_ALIAS --same-commit-policy rebuild
 
       - name: Scale down for the run
         run: clever scale --flavor S -a $APP_ALIAS
@@ -318,7 +318,7 @@ jobs:
         run: clever scale --flavor M -a $APP_ALIAS
 
       - name: Update the app
-        run: clever deploy --force -a $APP_ALIAS
+        run: clever deploy --force -a $APP_ALIAS --same-commit-policy rebuild
 
       - name: Scale down for the run
         run: clever scale --flavor XS -a $APP_ALIAS
@@ -355,7 +355,7 @@ jobs:
         run: clever scale --flavor M -a $APP_ALIAS
 
       - name: Update the app
-        run: clever deploy --force -a $APP_ALIAS
+        run: clever deploy --force -a $APP_ALIAS --same-commit-policy rebuild
 
       - name: Scale down for the run
         run: clever scale --flavor M -a $APP_ALIAS

diff --git a/frontend/src/components/GroupCard/group-card.module.scss b/frontend/src/components/GroupCard/group-card.module.scss
@@ -19,6 +19,6 @@
 .title {
   font-weight: 500 !important;
   text-overflow: ellipsis;
-  overflow-x: hidden;
+  overflow: hidden;
   white-space: nowrap;
 }
diff --git a/frontend/src/views/HousingList/HousingListTab.tsx b/frontend/src/views/HousingList/HousingListTab.tsx
@@ -2,7 +2,7 @@ import { useEffect, useState } from 'react';
 import { useSelection } from '../../hooks/useSelection';
 import HousingList from '../../components/HousingList/HousingList';
 import SelectableListHeaderActions from '../../components/SelectableListHeader/SelectableListHeaderActions';
-import { Row, Text } from '../../components/_dsfr';
+import { Row } from '../../components/_dsfr';
 import CampaignCreationModal from '../../components/modals/CampaignCreationModal/CampaignCreationModal';
 import HousingListEditionSideMenu from '../../components/HousingEdition/HousingListEditionSideMenu';
 import SelectableListHeader from '../../components/SelectableListHeader/SelectableListHeader';
@@ -33,6 +33,7 @@ import Button from '@codegouvfr/react-dsfr/Button';
 import { useCreateCampaignMutation } from '../../services/campaign.service';
 import fp from 'lodash/fp';
 import { HousingStatus } from '@zerologementvacant/models';
+import Typography from '@mui/material/Typography';
 
 export type HousingListTabProps = {
   isActive: boolean;
@@ -230,14 +231,14 @@ const HousingListTab = ({
       {(showCount ?? true) &&
         filteredHousingCount !== undefined &&
         filteredOwnerCount !== undefined && (
-          <Text spacing="mb-2w">
+          <Typography sx={{ padding: 2 }}>
             {displayHousingCount({
               filteredHousingCount,
               filteredOwnerCount,
               totalCount,
               status
             })}
-          </Text>
+          </Typography>
         )}
       <HousingList filters={filters} onSelectHousing={setSelected}>
         <SelectableListHeader entity="logement" default={<></>}>

diff --git a/frontend/src/views/HousingList/HousingListTabs.tsx b/frontend/src/views/HousingList/HousingListTabs.tsx
@@ -1,3 +1,4 @@
+import { fr } from '@codegouvfr/react-dsfr';
 import Tabs from '@codegouvfr/react-dsfr/Tabs';
 import fp from 'lodash/fp';
 
@@ -47,6 +48,9 @@ const HousingListTabs = ({
 
   return (
     <Tabs
+      classes={{
+        panel: fr.cx('fr-p-0')
+      }}
       className="tabs-no-border statusTabs"
       selectedTabId={activeTab}
       onTabChange={(tab: string) => setActiveTab(tab)}

diff --git a/frontend/src/views/HousingList/HousingListView.tsx b/frontend/src/views/HousingList/HousingListView.tsx
@@ -8,7 +8,7 @@ import HousingFiltersBadges from '../../components/HousingFiltersBadges/HousingF
 
 import {
   TrackEventActions,
-  TrackEventCategories,
+  TrackEventCategories
 } from '../../models/TrackEvent';
 import AppSearchBar from '../../components/_app/AppSearchBar/AppSearchBar';
 import { useFilters } from '../../hooks/useFilters';
@@ -32,7 +32,7 @@ const HousingListView = () => {
     onChangeFilters,
     onResetFilters,
     setExpand,
-    removeFilter,
+    removeFilter
   } = useFilters();
 
   const { view } = useAppSelector((state) => state.housing);
@@ -41,19 +41,19 @@ const HousingListView = () => {
     trackEvent({
       category: TrackEventCategories.HousingList,
       action: TrackEventActions.HousingList.Search,
-      name: query,
+      name: query
     });
     setFilters({
       ...filters,
-      query,
+      query
     });
   };
 
   const router = useHistory<RouterState | undefined>();
   const [alert, setAlert] = useState(router.location.state?.alert ?? '');
   function onFinish() {
     setAlert(
-      'Le logement sélectionné a bien été ajouté à votre parc de logements.',
+      'Le logement sélectionné a bien été ajouté à votre parc de logements.'
     );
   }
 
@@ -93,23 +93,25 @@ const HousingListView = () => {
             <HousingDisplaySwitch />
           </Grid>
           <Grid xs="auto">
-            { !isVisitor && <HousingCreationModal onFinish={onFinish} /> }
+            {!isVisitor && <HousingCreationModal onFinish={onFinish} />}
           </Grid>
         </Grid>
 
         <Grid mb={3} xs={12}>
           <HousingFiltersBadges filters={filters} onChange={removeFilter} />
         </Grid>
 
-        {view === 'map' ? (
-          <HousingListMap filters={filters} />
-        ) : (
-          <HousingListTabs
-            filters={filters}
-            showCreateCampaign
-            showCreateGroup
-          />
-        )}
+        <Grid mb={1} xs={12}>
+          {view === 'map' ? (
+            <HousingListMap filters={filters} />
+          ) : (
+            <HousingListTabs
+              filters={filters}
+              showCreateCampaign
+              showCreateGroup
+            />
+          )}
+        </Grid>
       </Grid>
     </Grid>
   );