Update frontend dependencies

aelassas · Apr 5, 2024 · b830dc4 · b830dc4
1 parent 497edb2
commit b830dc4
Show file tree

Hide file tree

Showing 7 changed files with 157 additions and 145 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -4,14 +4,14 @@
   "private": true,
   "dependencies": {
     "@emotion/react": "^11.11.4",
-    "@emotion/styled": "^11.11.0",
-    "@mui/icons-material": "^5.15.13",
-    "@mui/material": "^5.15.13",
-    "@mui/x-data-grid": "^6.19.6",
-    "@mui/x-date-pickers": "^6.19.7",
-    "@types/node": "^20.11.28",
-    "@types/react": "^18.2.67",
-    "@types/react-dom": "^18.2.22",
+    "@emotion/styled": "^11.11.5",
+    "@mui/icons-material": "^5.15.15",
+    "@mui/material": "^5.15.15",
+    "@mui/x-data-grid": "^7.1.1",
+    "@mui/x-date-pickers": "^7.1.1",
+    "@types/node": "^20.12.4",
+    "@types/react": "^18.2.74",
+    "@types/react-dom": "^18.2.24",
     "@types/react-google-recaptcha": "^2.1.9",
     "@types/validator": "^13.11.9",
     "axios": "^1.6.8",
@@ -61,8 +61,8 @@
   "devDependencies": {
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "eslint-config-airbnb": "^19.0.4",
-    "npm-check-updates": "^16.14.17",
-    "stylelint": "^16.2.1",
+    "npm-check-updates": "^16.14.18",
+    "stylelint": "^16.3.1",
     "stylelint-config-standard": "^36.0.0"
   }
 }
diff --git a/frontend/src/assets/css/booking-list.css b/frontend/src/assets/css/booking-list.css
@@ -15,10 +15,12 @@ div.bs-list .empty-list {
 }
 
 div.bs-list div.cell-agency {
-  display: flex;
+  display: inline-flex;
   align-items: center;
   width: 60px;
   height: 30px;
+  position: relative;
+  vertical-align: middle;
 }
 
 div.bs-list div.cell-agency img {
@@ -31,6 +33,10 @@ div.bs-list span.bs {
   width: 80px;
   text-align: center;
   color: #fff;
+  display: inline-flex;
+  height: 26px;
+  justify-content: center;
+  align-items: center;
 }
 
 div.bs-list span.bs-void {
@@ -206,7 +212,7 @@ div.bs-list div.bs-buttons button {
   margin-bottom: 5px;
 }
 
-@media only screen and (width <= 960px) {
+@media only screen and (width <=960px) {
   div.bs-list {
     max-width: 480px;
   }
@@ -216,7 +222,7 @@ div.bs-list div.bs-buttons button {
   }
 }
 
-@media only screen and (width >= 960px) {
+@media only screen and (width >=960px) {
   div.bs-list {
     position: absolute;
     inset: 0;

diff --git a/frontend/src/components/BookingList.tsx b/frontend/src/components/BookingList.tsx
@@ -1,12 +1,9 @@
 import React, { useState, useEffect } from 'react'
 import {
   DataGrid,
-  frFR,
-  enUS,
   GridPaginationModel,
   GridColDef,
   GridRowId,
-  GridValueGetterParams,
   GridRenderCellParams
 } from '@mui/x-data-grid'
 import {
@@ -219,27 +216,27 @@ const BookingList = ({
         field: 'from',
         headerName: commonStrings.FROM,
         flex: 1,
-        valueGetter: ({ value }: GridValueGetterParams<movininTypes.Booking, string>) => getDate(value),
+        valueGetter: (value: string) => getDate(value),
       },
       {
         field: 'to',
         headerName: commonStrings.TO,
         flex: 1,
-        valueGetter: ({ value }: GridValueGetterParams<movininTypes.Booking, string>) => getDate(value),
+        valueGetter: (value: string) => getDate(value),
       },
       {
         field: 'price',
         headerName: strings.PRICE,
         flex: 1,
         renderCell: ({ value }: GridRenderCellParams<movininTypes.Booking, string>) => <span className="bp">{value}</span>,
-        valueGetter: ({ value }: GridValueGetterParams<movininTypes.Booking, number>) => `${movininHelper.formatNumber(value)} ${commonStrings.CURRENCY}`,
+        valueGetter: (value: number) => `${movininHelper.formatNumber(value)} ${commonStrings.CURRENCY}`,
       },
       {
         field: 'status',
         headerName: strings.STATUS,
         flex: 1,
         renderCell: ({ value }: GridRenderCellParams<movininTypes.Booking, movininTypes.BookingStatus>) => <span className={`bs bs-${value?.toLowerCase()}`}>{helper.getBookingStatus(value)}</span>,
-        valueGetter: ({ value }: GridValueGetterParams<movininTypes.Booking, string>) => value,
+        valueGetter: (value: string) => value,
       },
       {
         field: 'action',
@@ -296,7 +293,7 @@ const BookingList = ({
             <span>{value}</span>
           </Tooltip>
         ),
-        valueGetter: ({ value }: GridValueGetterParams<movininTypes.Booking, movininTypes.Property>) => value?.name,
+        valueGetter: (value: movininTypes.Property) => value?.name,
       })
     }
 
@@ -310,7 +307,7 @@ const BookingList = ({
             <img src={movininHelper.joinURL(env.CDN_USERS, (row.agency as movininTypes.User).avatar)} alt={value} />
           </div>
         ),
-        valueGetter: ({ value }: GridValueGetterParams<movininTypes.Booking, movininTypes.User>) => value?.fullName,
+        valueGetter: (value: movininTypes.User) => value?.fullName,
       })
     }
 
@@ -515,7 +512,6 @@ const BookingList = ({
             paginationMode="server"
             paginationModel={paginationModel}
             onPaginationModelChange={setPaginationModel}
-            localeText={(user.language === 'fr' ? frFR : enUS).components.MuiDataGrid.defaultProps.localeText}
             onRowSelectionModelChange={(_selectedIds) => {
               setSelectedIds(Array.from(new Set(_selectedIds)).map((id) => id.toString()))
             }}

diff --git a/frontend/src/components/DatePicker.tsx b/frontend/src/components/DatePicker.tsx
@@ -51,7 +51,6 @@ const DatePicker = ({
           }
         }}
         minDate={minDate}
-        defaultCalendarMonth={minDate}
         slotProps={{
           textField: {
             variant: variant || 'standard',

diff --git a/frontend/src/components/DateTimePicker.tsx b/frontend/src/components/DateTimePicker.tsx
@@ -47,7 +47,6 @@ const DateTimePicker = ({
           }
         }}
         minDate={minDate}
-        defaultCalendarMonth={minDate}
         slotProps={{
           textField: {
             variant: variant || 'standard',

diff --git a/frontend/src/index.tsx b/frontend/src/index.tsx
@@ -6,7 +6,7 @@ import CssBaseline from '@mui/material/CssBaseline'
 
 import { frFR as corefrFR, enUS as coreenUS } from '@mui/material/locale'
 import { frFR, enUS } from '@mui/x-date-pickers/locales'
-import { frFR as dataGridfrFR, enUS as dataGridenUS } from '@mui/x-data-grid'
+import { frFR as dataGridfrFR, enUS as dataGridenUS } from '@mui/x-data-grid/locales'
 import { disableDevTools } from 'disable-react-devtools'
 import * as helper from './common/helper'
 import * as UserService from './services/UserService'