chore: resolve conflicts.

bcgov · Dec 5, 2024 · 09f594e · 09f594e
2 parents 1a30273 + a1aa138
commit 09f594e
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 44 deletions.
diff --git a/backend/lcfs/prestart.sh b/backend/lcfs/prestart.sh
@@ -1,6 +1,13 @@
 #!/usr/bin/env bash
 
-echo "running prestart.sh from $(pwd)"
+echo "Running prestart.sh from $(pwd)"
+
+# Check for Alembic head conflicts
+HEAD_COUNT=$(poetry run alembic heads | wc -l)
+if [ "$HEAD_COUNT" -gt 1 ]; then
+    echo "Alembic head conflict detected: Multiple migration heads present."
+    exit 1
+fi
 
 # Apply base database migrations
 echo "Applying base migrations."
@@ -23,5 +30,4 @@ if [ $? -ne 0 ]; then
 fi
 
 echo "Migrations and seeding completed successfully."
-
-echo "done running prestart.sh from $(pwd)"
+echo "Done running prestart.sh from $(pwd)"
diff --git a/backend/lcfs/start.sh b/backend/lcfs/start.sh
@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+# Enable strict error handling
+set -e
+
 # Wait for the database to be ready
 ./wait-for-it.sh $LCFS_DB_HOST:5432 --timeout=30
 

diff --git a/frontend/src/components/BCNavbar/components/DefaultNavbarLink.jsx b/frontend/src/components/BCNavbar/components/DefaultNavbarLink.jsx
@@ -31,7 +31,7 @@ function DefaultNavbarLink({
       mb={isMobileView ? 0.2 : -1}
       mr={isMobileView ? 2 : 1}
       py={1}
-      px={2}
+      px={1}
       display="flex"
       alignItems="center"
       sx={({ transitions, palette }) => ({
@@ -54,8 +54,7 @@ function DefaultNavbarLink({
           backgroundColor: isMobileView
             ? 'rgba(0, 0, 0, 0.2)'
             : 'rgba(0, 0, 0, 0.3)',
-          paddingBottom: isMobileView ? '11px' : '12px',
-          paddingLeft: isMobileView ? '13px' : 2
+          paddingBottom: isMobileView ? '11px' : '12px'
         },
         transform: 'translateX(0)',
         transition: transitions.create('transform', {
@@ -87,7 +86,9 @@ function DefaultNavbarLink({
           lineHeight: 0,
           '&:hover': {
             textDecoration: 'none'
-          }
+          },
+          whiteSpace: 'nowrap',
+          flexShrink: 0
         }}
       >
         {name}

diff --git a/frontend/src/components/BCNavbar/components/MenuBar.jsx b/frontend/src/components/BCNavbar/components/MenuBar.jsx
@@ -17,18 +17,19 @@ const MenuBar = (props) => {
         backdropFilter: `saturate(200%) blur(30px)`,
         color: white.main,
         maxHeight: '50px',
-        display: { xs: 'none', sm: 'flex' }
+        display: { xs: 'none', sm: 'flex' },
+        justifyContent: 'space-between'
       })}
       disableGutters
       variant="dense"
     >
       <BCBox
         sx={{
-          flexGrow: 1,
           display: { xs: 'none', lg: 'flex' },
           flexDirection: 'row',
           margin: 0,
-          padding: 0
+          padding: 0,
+          marginLeft: 1
         }}
       >
         {routes.map(

diff --git a/frontend/src/components/Header.jsx b/frontend/src/components/Header.jsx
diff --git a/frontend/src/layouts/MainLayout/components/UserProfileActions.jsx b/frontend/src/layouts/MainLayout/components/UserProfileActions.jsx
@@ -50,12 +50,23 @@ export const UserProfileActions = () => {
       <BCBox
         display="flex"
         alignItems="center"
-        justifyContent="space-around"
+        justifyContent="space-between"
         mr={3}
       >
         {currentUser?.firstName && (
           <>
-            <BCTypography variant="subtitle1" color="light" mx={3}>
+            <BCTypography
+              style={{
+                whiteSpace: 'nowrap',
+                overflow: 'hidden',
+                textOverflow: 'ellipsis',
+                flexShrink: 1,
+                marginRight: '12px',
+                maxWidth: '17vw'
+              }}
+              variant="subtitle1"
+              color="light"
+            >
               {`${currentUser.firstName} ${currentUser.lastName}`}
             </BCTypography>
             <Divider
@@ -108,6 +119,7 @@ export const UserProfileActions = () => {
           />
         </>
         <BCButton
+          style={{ whiteSpace: 'nowrap', flexShrink: 0 }}
           onClick={logout}
           color="light"
           size="small"

diff --git a/frontend/src/views/FinalSupplyEquipments/_schema.jsx b/frontend/src/views/FinalSupplyEquipments/_schema.jsx
@@ -5,16 +5,22 @@ import {
   RequiredHeader,
   DateRangeCellEditor,
   TextCellEditor,
-  AsyncSuggestionEditor
+  AsyncSuggestionEditor,
+  NumberEditor
 } from '@/components/BCDataGrid/components'
 import i18n from '@/i18n'
 import { actions, validation } from '@/components/BCDataGrid/columns'
 import moment from 'moment'
 import { CommonArrayRenderer } from '@/utils/grid/cellRenderers'
 import { StandardCellErrors } from '@/utils/grid/errorRenderers'
 import { apiRoutes } from '@/constants/routes'
+import { numberFormatter } from '@/utils/formatters.js'
 
-export const finalSupplyEquipmentColDefs = (optionsData, compliancePeriod, errors) => [
+export const finalSupplyEquipmentColDefs = (
+  optionsData,
+  compliancePeriod,
+  errors
+) => [
   validation,
   actions({
     enableDuplicate: true,
@@ -76,13 +82,15 @@ export const finalSupplyEquipmentColDefs = (optionsData, compliancePeriod, error
       'finalSupplyEquipment:finalSupplyEquipmentColLabels.kwhUsage'
     ),
     minWidth: 220,
-    cellEditor: 'agTextCellEditor',
-    cellDataType: 'text',
-    cellStyle: (params) => StandardCellErrors(params, errors),
-    valueFormatter: (params) => {
-      const value = parseFloat(params.value)
-      return !isNaN(value) ? value.toFixed(2) : ''
-    }
+    valueFormatter: numberFormatter,
+    cellEditor: NumberEditor,
+    type: 'numericColumn',
+    cellEditorParams: {
+      precision: 0,
+      min: 0,
+      showStepperButtons: false
+    },
+    cellStyle: (params) => StandardCellErrors(params, errors)
   },
   {
     field: 'serialNbr',