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

chore(FE): cleanup date check on sex field #7922

Merged
merged 1 commit into from
Nov 20, 2024
Merged

chore(FE): cleanup date check on sex field #7922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 0 additions & 25 deletions ...nd-design/BuilderAndDesignDrawer/EditFieldDrawer/edit-fieldtype/EditMyInfo/EditMyInfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,34 +45,9 @@ export const EditMyInfo = ({ field }: EditMyInfoProps): JSX.Element => {
},
})

function conditionallyDisplayInfoBox() {
const currentDate = new Date().toLocaleString('en-US', {
timeZone: 'Asia/Singapore',
})
const targetDate = new Date('2024-06-28T00:00:00').toLocaleString('en-US', {
timeZone: 'Asia/Singapore',
})

if (new Date(currentDate) <= new Date(targetDate)) {
return (
<>
<Box pb="1.5rem">
<InlineMessage variant="warning">
To align with MyInfo terminology, the “Gender” field will be
renamed to “Sex” from 28 Jun 2024.
</InlineMessage>
</Box>{' '}
</>
)
} else {
return null
}
}

return (
<CreatePageDrawerContentContainer>
<VStack align="flex-start">
{conditionallyDisplayInfoBox()}
<Text textStyle="subhead-1">Data source</Text>
{extendedField.dataSource.map((dataSource, idx) => (
<HStack key={idx} align="flex-start">
Expand Down
25 changes: 0 additions & 25 deletions ...rAndDesignDrawer/EditFieldDrawer/edit-fieldtype/EditMyInfoChildren/EditMyInfoChildren.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,34 +61,9 @@ export const EditMyInfoChildren = ({
},
})

function conditionallyDisplayInfoBox() {
const currentDate = new Date().toLocaleString('en-US', {
timeZone: 'Asia/Singapore',
})
const targetDate = new Date('2024-06-28T00:00:00').toLocaleString('en-US', {
timeZone: 'Asia/Singapore',
})

if (new Date(currentDate) <= new Date(targetDate)) {
return (
<>
<Box pb="1.5rem">
<InlineMessage variant="warning">
To align with MyInfo terminology, the “Gender” field will be
renamed to “Sex” from 28 Jun 2024.
</InlineMessage>
</Box>{' '}
</>
)
} else {
return null
}
}

return (
<CreatePageDrawerContentContainer>
<VStack align="flex-start">
{conditionallyDisplayInfoBox()}
<Text textStyle="subhead-1">Data source</Text>
{extendedField.dataSource.map((dataSource, idx) => (
<HStack key={idx} align="flex-start">
Expand Down
25 changes: 2 additions & 23 deletions frontend/src/features/admin-form/create/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ export const MYINFO_FIELD_TO_DRAWER_META: {
isSubmitted: true,
},
[MyInfoAttribute.Sex]: {
label: 'Gender',
label: 'Sex',
icon: BiInfinite,
isSubmitted: true,
},
Expand Down Expand Up @@ -346,7 +346,7 @@ export const MYINFO_FIELD_TO_DRAWER_META: {
isSubmitted: true,
},
[MyInfoAttribute.ChildGender]: {
label: 'Gender',
label: 'Sex',
icon: BiDummyIcon,
isSubmitted: true,
},
Expand All @@ -361,24 +361,3 @@ export const MYINFO_FIELD_TO_DRAWER_META: {
isSubmitted: true,
},
}
// TODO: remove after 28 Jun 2024 as this would have fully taken effect
function updateLabelsBasedOnDate() {
const currentDate = new Date().toLocaleString('en-US', {
timeZone: 'Asia/Singapore',
})
const targetDate = new Date('2024-06-28T00:00:00').toLocaleString('en-US', {
timeZone: 'Asia/Singapore',
})
if (new Date(currentDate) >= new Date(targetDate)) {
const sexAttribute = MYINFO_FIELD_TO_DRAWER_META[MyInfoAttribute.Sex]
if (sexAttribute) {
sexAttribute.label = 'Sex'
}
const childGenderAttribute =
MYINFO_FIELD_TO_DRAWER_META[MyInfoAttribute.ChildGender]
if (childGenderAttribute) {
childGenderAttribute.label = 'Sex'
}
}
}
updateLabelsBasedOnDate()
35 changes: 4 additions & 31 deletions shared/constants/field/myinfo/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@ export const types: MyInfoFieldBlock[] = [
},
{
name: MyInfoAttribute.Sex,
value: 'Gender',
value: 'Sex',
category: 'personal',
verified: ['SG', 'PR', 'F'],
source: 'Immigration & Checkpoints Authority / Ministry of Manpower',
description:
'The gender of the form-filler. This field is verified by ICA for Singaporeans/PRs & foreigners on Long-Term Visit Pass, and by MOM for Employment Pass holders.',
'The sex of the form-filler. This field is verified by ICA for Singaporeans/PRs & foreigners on Long-Term Visit Pass, and by MOM for Employment Pass holders.',
fieldType: BasicField.Dropdown,
fieldOptions: ['FEMALE', 'MALE', 'UNKNOWN'],
previewValue: 'MALE',
Expand Down Expand Up @@ -349,11 +349,11 @@ export const types: MyInfoFieldBlock[] = [
},
{
name: MyInfoAttribute.ChildGender,
value: "Child's gender",
value: "Child's sex",
category: 'children',
verified: [],
source: 'Immigration & Checkpoints Authority',
description: 'Gender',
description: 'Sex',
fieldType: BasicField.ShortText,
fieldOptions: ['FEMALE', 'MALE', 'UNKNOWN'],
previewValue: 'MALE',
Expand Down Expand Up @@ -394,30 +394,3 @@ export const types: MyInfoFieldBlock[] = [
]

export const MYINFO_ATTRIBUTE_MAP = keyBy(types, 'name')

// TODO: remove after 28 Jun 2024 as this would have fully taken effect
function updateLabelBasedOnDate() {
const currentDate = new Date().toLocaleString('en-US', {
timeZone: 'Asia/Singapore',
})
const targetDate = new Date('2024-06-28T00:00:00').toLocaleString('en-US', {
timeZone: 'Asia/Singapore',
})
if (new Date(currentDate) >= new Date(targetDate)) {
const sexAttribute = MYINFO_ATTRIBUTE_MAP[MyInfoAttribute.Sex]
if (sexAttribute) {
sexAttribute.description = 'Sex'
sexAttribute.value = 'Sex'
sexAttribute.description =
'The sex of the form-filler. This field is verified by ICA for Singaporeans/PRs & foreigners on Long-Term Visit Pass, and by MOM for Employment Pass holders.'
}
const childGenderAttribute =
MYINFO_ATTRIBUTE_MAP[MyInfoAttribute.ChildGender]
if (childGenderAttribute) {
childGenderAttribute.value = "Child's Sex"
childGenderAttribute.description = 'Sex'
}
}
}

updateLabelBasedOnDate()
Loading