Merge branch 'release-0.2.0' into feat/kevin-1441

bcgov · Dec 18, 2024 · 451e15c · 451e15c
2 parents c6b8295 + f3b404d
commit 451e15c
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 12 deletions.
diff --git a/frontend/src/assets/locales/en/finalSupplyEquipment.json b/frontend/src/assets/locales/en/finalSupplyEquipment.json
@@ -2,6 +2,7 @@
   "fseTitle": "Final supply equipment (FSE)",
   "addFSErowsTitle": "Add new final supply equipment(s) (FSE)",
   "fseSubtitle": "Report dates of supply for your FSE. If your billing location is different from your equipment location provided below use the Notes field. Use the Notes field if you use any Other options.",
+  "reportingResponsibilityInfo": "If you are reporting on behalf of an FSE for which you hold allocated reporting responsibility, please list the utility account holder's organization name associated with the specific station, rather than your own organization's name.",
   "newFinalSupplyEquipmentBtn": "New final supply equipment",
   "noFinalSupplyEquipmentsFound": "No final supply equipments found",
   "finalSupplyEquipmentDownloadBtn": "Download as Excel",

diff --git a/frontend/src/views/FinalSupplyEquipments/AddEditFinalSupplyEquipments.jsx b/frontend/src/views/FinalSupplyEquipments/AddEditFinalSupplyEquipments.jsx
@@ -282,11 +282,19 @@ export const AddEditFinalSupplyEquipments = () => {
           <BCTypography
             variant="body4"
             color="primary"
-            sx={{ marginY: '2rem' }}
+            sx={{ marginTop: '2rem' }}
             component="div"
           >
             {t('finalSupplyEquipment:fseSubtitle')}
           </BCTypography>
+          <BCTypography
+            variant="body4"
+            color="primary"
+            sx={{ marginBottom: '2rem', marginTop: '1rem' }}
+            component="div"
+          >
+            {t('finalSupplyEquipment:reportingResponsibilityInfo')}
+          </BCTypography>
         </div>
         <BCBox my={2} component="div" style={{ height: '100%', width: '100%' }}>
           <BCGridEditor

diff --git a/frontend/src/views/Transfers/AddEditViewTransfer.jsx b/frontend/src/views/Transfers/AddEditViewTransfer.jsx
@@ -7,7 +7,7 @@ import {
   useNavigate,
   useParams
 } from 'react-router-dom'
-import { roles } from '@/constants/roles'
+import { roles, govRoles } from '@/constants/roles'
 import { ROUTES } from '@/constants/routes'
 import { TRANSACTIONS } from '@/constants/routes/routes'
 import { TRANSFER_STATUSES } from '@/constants/statuses'
@@ -47,6 +47,7 @@ import { buttonClusterConfigFn } from './buttonConfigs'
 import { CategoryCheckbox } from './components/CategoryCheckbox'
 import { Recommendation } from './components/Recommendation'
 import SigningAuthority from './components/SigningAuthority'
+import InternalComments from '@/components/InternalComments'
 
 export const AddEditViewTransfer = () => {
   const queryClient = useQueryClient()
@@ -444,6 +445,20 @@ export const AddEditViewTransfer = () => {
                 </>
               )}
 
+            {/* Internal Comments */}
+            {!editorMode && (
+              <Role roles={govRoles}>
+                {transferId && (
+                  <BCBox py={2}>
+                    <InternalComments
+                      entityType="Transfer"
+                      entityId={transferId}
+                    />
+                  </BCBox>
+                )}
+              </Role>
+            )}
+
             {/* Signing Authority Confirmation show it to FromOrg user when in draft and ToOrg when in Sent status */}
             {(!currentStatus ||
               (currentStatus === TRANSFER_STATUSES.DRAFT &&

diff --git a/frontend/src/views/Transfers/components/TransferView.jsx b/frontend/src/views/Transfers/components/TransferView.jsx
@@ -1,7 +1,6 @@
 import BCBox from '@/components/BCBox'
-import InternalComments from '@/components/InternalComments'
-import { Role } from '@/components/Role'
-import { roles, govRoles } from '@/constants/roles'
+
+import { roles } from '@/constants/roles'
 import {
   TRANSFER_STATUSES,
   getAllTerminalTransferStatuses
@@ -89,13 +88,6 @@ export const TransferView = ({ transferId, editorMode, transferData }) => {
         />
       )}
 
-      {/* Internal Comments */}
-      <Role roles={govRoles}>
-        {transferId && (
-          <InternalComments entityType="Transfer" entityId={transferId} />
-        )}
-      </Role>
-
       {/* List of attachments */}
       {/* <AttachmentList attachments={demoData.attachments} /> */}