Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Relocate 'Comments to the Director' widget - #1454 #1483

Merged
merged 6 commits into from
Dec 18, 2024
Merged

Fix: Relocate 'Comments to the Director' widget - #1454 #1483

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cef77fd
fix: relocate 'Comments to the Director' widget to correct position
hamed-valiollahi Dec 17, 2024
161fbd9
Merge branch 'release-0.2.0' into fix/hamed-relocate-comments-widget-…
hamed-valiollahi Dec 17, 2024
c33d1b5
refactor: remove unnecessary React fragment wrapper
hamed-valiollahi Dec 17, 2024
81b833f
chore: Merge branch 'fix/hamed-relocate-comments-widget-1454' of http…
hamed-valiollahi Dec 17, 2024
5ad8fc1
Merge branch 'release-0.2.0' into fix/hamed-relocate-comments-widget-…
hamed-valiollahi Dec 17, 2024
3bc241e
Merge branch 'release-0.2.0' into fix/hamed-relocate-comments-widget-…
dhaselhan Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion frontend/src/views/Transfers/AddEditViewTransfer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -444,6 +445,22 @@ export const AddEditViewTransfer = () => {
</>
)}

{/* Internal Comments */}
{!editorMode && (
<>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion: I don't think you need the wrapper component <> since you are returning a single component.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch! Removed the unnecessary <></> wrapper. Thanks!

<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 &&
Expand Down
12 changes: 2 additions & 10 deletions frontend/src/views/Transfers/components/TransferView.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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} /> */}

Expand Down