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

Jump to bottom

(User roles) Fix client issues on user roles branch #7811

Merged
merged 5 commits into from
Oct 28, 2024
Merged

(User roles) Fix client issues on user roles branch #7811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
df914f0
chore: reorder navigation items
Nil20 Oct 22, 2024
05b40cd
fix: update correct record button logic in record audit
Nil20 Oct 22, 2024
d6926b6
chore: add certify scope in all scopes list
Nil20 Oct 23, 2024
3ea82b5
fix: update tabs for field agent
Nil20 Oct 24, 2024
4ddfa26
Merge branch 'remove-legacy-scopes' into client-issues-fix
Nil20 Oct 24, 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
28 changes: 14 additions & 14 deletions packages/client/src/components/interface/Navigation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,17 +326,17 @@ const NavigationView = (props: IFullProps) => {
}}
/>
)}
{hasAccess(WORKQUEUE_TABS.sentForApproval) && (
{hasAccess(WORKQUEUE_TABS.readyForReview) && (
<NavigationItem
icon={() => <DeclarationIconSmall color={'grey'} />}
id={`navigation_${WORKQUEUE_TABS.sentForApproval}`}
icon={() => <DeclarationIconSmall color={'orange'} />}
id={`navigation_${WORKQUEUE_TABS.readyForReview}`}
label={intl.formatMessage(
navigationMessages[WORKQUEUE_TABS.sentForApproval]
navigationMessages[WORKQUEUE_TABS.readyForReview]
)}
count={declarationCount.sentForApproval}
isSelected={tabId === WORKQUEUE_TABS.sentForApproval}
count={declarationCount.readyForReview}
isSelected={tabId === WORKQUEUE_TABS.readyForReview}
onClick={() => {
props.goToHomeTab(WORKQUEUE_TABS.sentForApproval)
props.goToHomeTab(WORKQUEUE_TABS.readyForReview)
menuCollapse && menuCollapse()
}}
/>
Expand All @@ -356,17 +356,17 @@ const NavigationView = (props: IFullProps) => {
}}
/>
)}
{hasAccess(WORKQUEUE_TABS.readyForReview) && (
{hasAccess(WORKQUEUE_TABS.sentForApproval) && (
<NavigationItem
icon={() => <DeclarationIconSmall color={'orange'} />}
id={`navigation_${WORKQUEUE_TABS.readyForReview}`}
icon={() => <DeclarationIconSmall color={'grey'} />}
id={`navigation_${WORKQUEUE_TABS.sentForApproval}`}
label={intl.formatMessage(
navigationMessages[WORKQUEUE_TABS.readyForReview]
navigationMessages[WORKQUEUE_TABS.sentForApproval]
)}
count={declarationCount.readyForReview}
isSelected={tabId === WORKQUEUE_TABS.readyForReview}
count={declarationCount.sentForApproval}
isSelected={tabId === WORKQUEUE_TABS.sentForApproval}
onClick={() => {
props.goToHomeTab(WORKQUEUE_TABS.readyForReview)
props.goToHomeTab(WORKQUEUE_TABS.sentForApproval)
menuCollapse && menuCollapse()
}}
/>
Expand Down
3 changes: 2 additions & 1 deletion packages/client/src/views/OfficeHome/inProgress/InProgress.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,8 @@ class InProgressComponent extends React.Component<
])
}

if (tabs.sections.length === 0) return undefined
if (tabs.sections.length === 0 || tabs.sections.length === 1)
return undefined

return (
<FormTabs
Expand Down
3 changes: 2 additions & 1 deletion packages/client/src/views/RecordAudit/RecordAudit.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,8 @@ function RecordAuditBody({
draft?.submissionStatus === SUBMISSION_STATUS.DRAFT

if (
hasScope(SCOPES.RECORD_REGISTRATION_CORRECT) &&
(hasScope(SCOPES.RECORD_REGISTRATION_CORRECT) ||
hasScope(SCOPES.RECORD_REGISTRATION_REQUEST_CORRECTION)) &&
isDownloaded &&
declaration.type !== Event.Marriage &&
(declaration.status === SUBMISSION_STATUS.REGISTERED ||
Expand Down
Loading