Skip to content

Commit e13db93

Browse files
Merge pull request #3292 from bcgov/fix/hamed-update-issue-assessment-label-3231
Fix: Update Issue Assessment Button Label for Non-Assessment Reports - 3231
2 parents 4424194 + 85d7ab5 commit e13db93

File tree

5 files changed

+753
-176
lines changed

5 files changed

+753
-176
lines changed

frontend/src/assets/locales/en/reports.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
"recommendReportAnalystBtn": "Recommend to compliance manager",
7171
"recommendReportManagerBtn": "Recommend to director",
7272
"assessReportBtn": "Issue assessment",
73+
"issueNonAssessmentBtn": "Issue non-assessment",
7374
"reAssessReportBtn": "Re-assess report",
7475
"deleteSupplementalReportBtn": "Delete supplemental report",
7576
"deleteAnalystAdjustmentBtn": "Delete analyst adjustment",

frontend/src/views/ComplianceReports/EditViewComplianceReport.jsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -528,6 +528,7 @@ export const EditViewComplianceReport = ({ isError, error }) => {
528528
isOriginalReport: reportData?.report?.version === 0,
529529
isAnalystAdjustment:
530530
currentStatus === COMPLIANCE_REPORT_STATUSES.ANALYST_ADJUSTMENT,
531+
isNonAssessment: reportData?.report?.isNonAssessment || false,
531532

532533
// Conflict detection
533534
hasDraftSupplemental,
@@ -559,6 +560,7 @@ export const EditViewComplianceReport = ({ isError, error }) => {
559560
isSigningAuthorityDeclared,
560561
hasDraftSupplemental,
561562
reportData?.report?.version,
563+
reportData?.report?.isNonAssessment,
562564
isSupplemental,
563565
isDeleted,
564566
isDeleting,

0 commit comments

Comments
 (0)