Skip to content

Commit

Permalink
PSP-8856 fix + Research File MOTI Label fixed (#4193)
Browse files Browse the repository at this point in the history
  • Loading branch information
stairaku authored Jul 15, 2024
1 parent 02eb016 commit ff66894
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { Col, Row } from 'react-bootstrap';

import { Section } from '@/components/common/Section/Section';
import { SectionField } from '@/components/common/Section/SectionField';
import TooltipIcon from '@/components/common/TooltipIcon';
import { ApiGen_CodeTypes_LeaseStatusTypes } from '@/models/api/generated/ApiGen_CodeTypes_LeaseStatusTypes';
import { ApiGen_Concepts_Lease } from '@/models/api/generated/ApiGen_Concepts_Lease';
import { prettyFormatDate } from '@/utils';
Expand All @@ -22,7 +23,33 @@ export const LeaseDetailView: React.FunctionComponent<
return (
<Section header="Details">
<SectionField label="Ministry project">{projectName}</SectionField>
<SectionField label="Status" labelWidth="3" contentWidth="4">
<SectionField
label="Status"
labelWidth="3"
contentWidth="4"
tooltip={
<TooltipIcon
toolTipId="lease-status-tooltip"
toolTip={
<ul>
<li>Draft: In progress but not finalized.</li>
<li>
Active: Finalized and all requirements met. Lease/Licence being actively managed.
</li>
<li>
Terminated: The expiry date of the last agreement if by effluxion of time or the
early termination date for cause.
</li>
<li>Cancelled: Request cancelled by requestor or MOTI.</li>
<li>Duplicate: Duplicate file created by accident or data transfer.</li>
<li>Hold: Agreement in progress but will not be immediately addressed.</li>
<li>Archived: File to be archived as per ARCS/ORCS.</li>
</ul>
}
placement="right"
></TooltipIcon>
}
>
{lease.fileStatusTypeCode.description}
</SectionField>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,7 @@ exports[`ResearchContainer component > renders as expected 1`] = `
<label
class="c10"
>
MoTI region:
MOTI region:
</label>
</div>
<div
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ const ResearchHeader: React.FunctionComponent<
<HeaderField label="File name:" labelWidth={leftColumnLabel} contentWidth="9">
{researchFile?.fileName}
</HeaderField>
<HeaderField label="MoTI region:" labelWidth={leftColumnLabel} contentWidth="9">
<HeaderField label="MOTI region:" labelWidth={leftColumnLabel} contentWidth="9">
{regions}
</HeaderField>
<HeaderField label="Ministry district:" labelWidth={leftColumnLabel} contentWidth="9">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ exports[`ResearchHeader component > renders as expected when provided no researc
<label
class="c1"
>
MoTI region:
MOTI region:
</label>
</div>
<div
Expand Down

0 comments on commit ff66894

Please sign in to comment.