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.

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

psp-8898 remove periods at end of tooltips, update Exercised to Exerc… #4215

Merged
merged 1 commit into from
Jul 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ export const FilterContentForm: React.FC<React.PropsWithChildren<IFilterContentF
label="Lease Transaction"
labelWidth="12"
contentWidth="12"
tooltip="Selecting the Payable and Receivable lease transaction option will display properties that have both a payable and a receivable lease on them."
tooltip="Selecting the Payable and Receivable lease transaction option will display properties that have both a payable and a receivable lease on them"
>
<Select
field="leasePayRcvblType"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ const OrganizationView: React.FunctionComponent<OrganizationViewProps> = ({ orga
label="Connected to this organization"
labelWidth="auto"
valueTestId="contact-organization-person-list"
tooltip="To unlink a contact from this organization, or edit a contact's information, click on the name and unlink from the individual contact page."
tooltip="To unlink a contact from this organization, or edit a contact's information, click on the name and unlink from the individual contact page"
>
{organization.persons &&
organization.persons.map((person: IContactPerson, index: number) => (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ const UpdateOrganization: React.FC<FormikProps<IEditableOrganizationForm>> = ({
<SectionField
label="Connected to this organization"
labelWidth="auto"
tooltip="To unlink a contact from this organization, or edit a contact's information, click on the name and unlink from the individual contact page."
tooltip="To unlink a contact from this organization, or edit a contact's information, click on the name and unlink from the individual contact page"
>
{persons &&
persons.map((person, index: number) => (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ const DownloadDocumentButton: React.FunctionComponent<
<TooltipIcon
toolTipId="document-not-available-tooltip"
data-testid="document-not-available-tooltip"
toolTip="This document is still being processed and is not yet available to view or download. Please try again in a few minutes. If you continue to see this error, please contact the system administrator."
toolTip="This document is still being processed and is not yet available to view or download. Please try again in a few minutes. If you continue to see this error, please contact the system administrator"
></TooltipIcon>
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const FeeDeterminationSubForm: React.FunctionComponent<IFeeDeterminationSubFormP

<SectionField
label="Suggested fee"
tooltip="Licence Administration Fee (LAF) *: If the financial gain far outweighs the public benefit, Fair Market Value should be considered over Licence Administration Fee."
tooltip="Licence Administration Fee (LAF) *: If the financial gain far outweighs the public benefit, Fair Market Value should be considered over Licence Administration Fee"
labelWidth="2"
contentWidth="8"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ export const LeaseDetailSubForm: React.FunctionComponent<ILeaseDetailsSubFormPro
tooltip={
<TooltipIcon
toolTipId="lease-commencement-tooltip"
toolTip="The start date defined in the original agreement."
toolTip="The start date defined in the original agreement"
placement="right"
/>
}
Expand All @@ -163,7 +163,7 @@ export const LeaseDetailSubForm: React.FunctionComponent<ILeaseDetailsSubFormPro
tooltip={
<TooltipIcon
toolTipId="lease-expiry-tooltip"
toolTip="The end date specified in the original agreement."
toolTip="The end date specified in the original agreement"
placement="right"
/>
}
Expand All @@ -181,7 +181,7 @@ export const LeaseDetailSubForm: React.FunctionComponent<ILeaseDetailsSubFormPro
tooltip={
<TooltipIcon
toolTipId="lease-termination-tooltip"
toolTip="The expiry date of the last agreement if by effluxion of time or the early termination date for cause."
toolTip="The expiry date of the last agreement if by effluxion of time or the early termination date for cause"
placement="right"
/>
}
Expand Down
2 changes: 1 addition & 1 deletion source/frontend/src/features/leases/add/RenewalSubForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export const RenewalSubForm: React.FunctionComponent<IRenewalSubFormProps> = ({
tooltip={
<TooltipIcon
toolTipId="lease-renewal-expiry-tooltip"
toolTip="The end date specified in the original agreement or renewal, as applicable."
toolTip="The end date specified in the original agreement or renewal, as applicable"
placement="right"
/>
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ function depositActions(
{hasClaim(Claims.LEASE_EDIT) && original.depositReturnCount > 0 && (
<TooltipIcon
toolTipId={`no-delete-tooltip-${original.id}`}
toolTip="A deposit with associated return(s) cannot be deleted. To delete this deposit first delete any associated return(s)."
toolTip="A deposit with associated return(s) cannot be deleted. To delete this deposit first delete any associated return(s)"
innerClassName="mt-3"
/>
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export const DetailFeeDetermination: React.FunctionComponent<

<SectionField
label="Suggested fee"
tooltip="Licence Administration Fee (LAF) *: If the financial gain far outweighs the public benefit, Fair Market Value should be considered over Licence Administration Fee."
tooltip="Licence Administration Fee (LAF) *: If the financial gain far outweighs the public benefit, Fair Market Value should be considered over Licence Administration Fee"
labelWidth="3"
>
<span data-testid="suggestedFee">{getSuggestedFee(isPublicBenefit, isFinancialGain)}</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export const AddImprovementsForm: React.FunctionComponent<
<TooltipIcon
toolTipId="contactInfoToolTip"
innerClassName="ml-4 mb-1"
toolTip="This could include lighting, fencing, irrigation, parking etc."
toolTip="This could include lighting, fencing, irrigation, parking etc"
/>
</div>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export const Improvement: React.FunctionComponent<React.PropsWithChildren<IImpro
<TooltipIcon
toolTipId="contactInfoToolTip"
innerClassName="ml-4 mb-1"
toolTip="This could include lighting, fencing, irrigation, parking etc."
toolTip="This could include lighting, fencing, irrigation, parking etc"
/>
</div>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ const PaymentFormContent: React.FunctionComponent<
<Styled.FlexRight>
<TooltipIcon
toolTipId="actual-calculation-tooltip"
toolTip="If left blank, these values are calculated based on the total received. Enter values here only to override the system calculation."
toolTip="If left blank, these values are calculated based on the total received. Enter values here only to override the system calculation"
/>
</Styled.FlexRight>
<InlineFlexDiv>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ export const PeriodForm: React.FunctionComponent<React.PropsWithChildren<IPeriod
<SectionField
label="Select payment type"
labelWidth="12"
tooltip="Predetermined Payment Period only accept fixed payment amounts. Select Variable payment type to track variable payments."
tooltip="Predetermined Payment Period only accept fixed payment amounts. Select Variable payment type to track variable payments"
>
<StyledRadioGroup
field="isVariable"
Expand All @@ -105,7 +105,7 @@ export const PeriodForm: React.FunctionComponent<React.PropsWithChildren<IPeriod
<Select
label="Period duration:"
field="isFlexible"
tooltip="Fixed Payment Period Duration has end date. Select Flexible payment period duration to track hold over payments."
tooltip="Fixed Payment Period Duration has end date. Select Flexible payment period duration to track hold over payments"
options={flexiblePeriodOptions}
/>
</Col>
Expand All @@ -117,7 +117,7 @@ export const PeriodForm: React.FunctionComponent<React.PropsWithChildren<IPeriod
label="Start date:"
field="startDate"
formikProps={formikProps}
tooltip="Start Date: The start date defined for the period."
tooltip="Start Date: The start date defined for the period"
/>
</Col>
<Col>
Expand All @@ -129,7 +129,7 @@ export const PeriodForm: React.FunctionComponent<React.PropsWithChildren<IPeriod
}
field="expiryDate"
formikProps={formikProps}
tooltip="End Date: The end date specified for the period."
tooltip="End Date: The end date specified for the period"
required={formikProps.values.isFlexible === 'false'}
/>
</Col>
Expand Down Expand Up @@ -174,9 +174,10 @@ export const PeriodForm: React.FunctionComponent<React.PropsWithChildren<IPeriod
<Row>
<Col md={6}>
<Select
label="Term status"
label="Period status"
field="statusTypeCode.id"
options={leasePeriodStatusOptions}
tooltip="Exercise period to add payments"
/>
</Col>
</Row>
Expand All @@ -195,9 +196,10 @@ export const PeriodForm: React.FunctionComponent<React.PropsWithChildren<IPeriod
<Row>
<Col md={6}>
<Select
label="Term status"
label="Period status"
field="statusTypeCode.id"
options={leasePeriodStatusOptions}
tooltip="Exercise period to add payments"
/>
</Col>
</Row>
Expand All @@ -209,7 +211,7 @@ export const PeriodForm: React.FunctionComponent<React.PropsWithChildren<IPeriod
Add Base Rent
<TooltipIcon
toolTipId="base-rent-tooltip"
toolTip="Fixed Amount of Rent per Payment Period, excluding Operating Expenses."
toolTip="Fixed Amount of Rent per Payment Period, excluding Operating Expenses"
/>
</>
}
Expand All @@ -228,7 +230,7 @@ export const PeriodForm: React.FunctionComponent<React.PropsWithChildren<IPeriod
Add Additional Rent
<TooltipIcon
toolTipId="additional-rent-tooltip"
toolTip="Operating Expenses and Taxes Payable by the Tenant."
toolTip="Operating Expenses and Taxes Payable by the Tenant"
/>
</>
}
Expand All @@ -247,7 +249,7 @@ export const PeriodForm: React.FunctionComponent<React.PropsWithChildren<IPeriod
Add Variable Rent
<TooltipIcon
toolTipId="variable-rent-tooltip"
toolTip="Percentage Rent or Other Amount payable by Tenant."
toolTip="Percentage Rent or Other Amount payable by Tenant"
/>
</>
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ export const getActualsColumns = ({
{isReceivable ? 'Received payment ($)' : 'Sent payment ($)'}
<TooltipIcon
toolTipId="actualReceivedPaymentTooltip"
toolTip="Actual payment amount, not including GST. This calculation can be overridden by editing the payment row."
toolTip="Actual payment amount, not including GST. This calculation can be overridden by editing the payment row"
/>
</>
),
Expand All @@ -133,7 +133,7 @@ export const getActualsColumns = ({
GST ($)
<TooltipIcon
toolTipId="actualGstTooltip"
toolTip="GST is calculated as (expected amount) x GST rate (5%). This calculation can be overridden by editing the payment row."
toolTip="GST is calculated as (expected amount) x GST rate (5%). This calculation can be overridden by editing the payment row"
/>
</>
),
Expand All @@ -159,7 +159,7 @@ export const getActualsColumns = ({
Total ($)
<TooltipIcon
toolTipId="receivedTotalTooltip"
toolTip="Actual payment amount, including GST if applicable."
toolTip="Actual payment amount, including GST if applicable"
/>
</>
),
Expand All @@ -180,7 +180,7 @@ export const getActualsColumns = ({
Payment status
<TooltipIcon
toolTipId="paymentStatusTooltip"
toolTip="Variance between expected and actual payment."
toolTip="Variance between expected and actual payment"
/>
</>
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export const getLeasePeriodColumns = ({
Expected payment ($)
<TooltipIcon
toolTipId="expectedPaymentTooltip"
toolTip="This is the amount agreed to be paid per interval, ie: the amount of a monthly payment if the lease is paid monthly."
toolTip="This is the amount agreed to be paid per interval, ie: the amount of a monthly payment if the lease is paid monthly"
/>
</>
),
Expand All @@ -99,7 +99,7 @@ export const getLeasePeriodColumns = ({
GST ($)
<TooltipIcon
toolTipId="gstAmountTooltip"
toolTip="GST is calculated as (expected amount) x GST rate (5%)."
toolTip="GST is calculated as (expected amount) x GST rate (5%)"
/>
</>
),
Expand All @@ -114,7 +114,7 @@ export const getLeasePeriodColumns = ({
Expected total ($)
<TooltipIcon
toolTipId="expectedTotalTooltip"
toolTip="This is the expected payment amount plus GST if applicable."
toolTip="This is the expected payment amount plus GST if applicable"
/>
</>
),
Expand All @@ -129,7 +129,7 @@ export const getLeasePeriodColumns = ({
Expected period ($)
<TooltipIcon
toolTipId="expectedPeriodTooltip"
toolTip="This is the full payment amount expected in the duration of the period."
toolTip="This is the full payment amount expected in the duration of the period"
/>
</>
),
Expand All @@ -142,7 +142,7 @@ export const getLeasePeriodColumns = ({
Header: () => (
<>
Actual total ($)
<TooltipIcon toolTipId="actualTotalTooltip" toolTip="Amount paid this period." />
<TooltipIcon toolTipId="actualTotalTooltip" toolTip="Amount paid this period" />
</>
),
id: 'actualTotal',
Expand All @@ -154,7 +154,7 @@ export const getLeasePeriodColumns = ({
Header: () => (
<>
Exercised?
<TooltipIcon toolTipId="exercisedTooltip" toolTip="Exercised period to add payments." />
<TooltipIcon toolTipId="exercisedTooltip" toolTip="Exercise period to add payments" />
</>
),
align: 'left',
Expand Down Expand Up @@ -227,7 +227,7 @@ const paymentActions = (
original.statusTypeCode?.id === LeasePeriodStatusTypes.EXERCISED) && (
<TooltipIcon
toolTipId={`no-delete-tooltip-period-${original.id}`}
toolTip="An exercised period cannot be deleted. To delete this period ensure that there are no payments recorded for it, and the period has not been exercised."
toolTip="An exercised period cannot be deleted. To delete this period ensure that there are no payments recorded for it, and the period has not been exercised"
/>
)}
</StyledIcons>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ const UpdateAcquisitionOwnersSubForm: React.FC = () => {
{owner.isOrganization === 'true' && (
<SectionField
label="Registration number"
tooltip="The number used for tax purposes, (like GST)."
tooltip="The number used for tax purposes, (like GST)"
>
<Input
field={`owners[${index}].registrationNumber`}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ export const AgreementView: React.FunctionComponent<IAgreementViewProps> = ({
<SectionField
labelWidth="6"
label="Deposit due no later than"
tooltip="Generally, if applicable, this is number of days from the execution of the agreement."
tooltip="Generally, if applicable, this is number of days from the execution of the agreement"
>
{agreement.noLaterThanDays ? (
<span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ const AcquisitionAgreementForm: React.FunctionComponent<
<SectionField
labelWidth="5"
label="Deposit due no later than"
tooltip="Generally, if applicable, this is number of days from the execution of the agreement."
tooltip="Generally, if applicable, this is number of days from the execution of the agreement"
>
<StyledDiv>
<Input field="noLaterThanDays" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ export const CompensationRequisitionDetailView: React.FunctionComponent<
<TooltipIcon
toolTipId="selected-properties"
innerClassName="ml-4 mb-1"
toolTip="Select the properties that will be displayed on the generated document."
toolTip="Select the properties that will be displayed on the generated document"
/>
</div>
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ const UpdateCompensationRequisitionForm: React.FC<CompensationRequisitionFormPro
<TooltipIcon
toolTipId="select-properties"
innerClassName="ml-4 mb-1"
toolTip="Select the properties that will be displayed on the generated document."
toolTip="Select the properties that will be displayed on the generated document"
/>
</div>
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ export const ExpropriationForm1: React.FC<IExpropriationForm1Props> = ({
<SectionField
label="Impacted properties"
required
tooltip="For the selected properties - corresponding property and interest details will be captured on the form."
tooltip="For the selected properties - corresponding property and interest details will be captured on the form"
>
<FormItem field="impactedProperties">
<FilePropertiesTable
Expand Down
Loading
Loading