Merge pull request #1483 from bcgov/fix/hamed-relocate-comments-widge…

…t-1454 Fix: Relocate 'Comments to the Director' widget - #1454
bcgov · Dec 18, 2024 · f3b404d · f3b404d
2 parents deab8ae + 3bc241e
commit f3b404d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
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} /> */}