fix: rename component and small refactor

dhis2 · Jan 23, 2025 · 0533965 · 0533965
1 parent 5e3d37b
commit 0533965
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/i18n/en.pot b/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2025-01-23T07:34:31.973Z\n"
-"PO-Revision-Date: 2025-01-23T07:34:31.973Z\n"
+"POT-Creation-Date: 2025-01-23T14:59:11.968Z\n"
+"PO-Revision-Date: 2025-01-23T14:59:11.968Z\n"
 
 msgid "schemas"
 msgstr "schemas"
@@ -1298,9 +1298,6 @@ msgstr "Advanced options"
 msgid "These options are used for advanced data set configurations."
 msgstr "These options are used for advanced data set configurations."
 
-msgid "Value should be bigger than 0"
-msgstr "Value should be bigger than 0"
-
 msgid "Configure data elements"
 msgstr "Configure data elements"
 
@@ -1337,6 +1334,9 @@ msgstr "Close data entry a certain number of days after period end (expiry days)
 msgid "Set up the basic information for this data set."
 msgstr "Set up the basic information for this data set."
 
+msgid "Value should be bigger than 0"
+msgstr "Value should be bigger than 0"
+
 msgid "Validation and limitations"
 msgstr "Validation and limitations"
 

diff --git a/src/pages/dataSetsWip/form/PeriodsFormContents.tsx b/src/pages/dataSetsWip/form/PeriodsFormContents.tsx
@@ -8,7 +8,7 @@ import {
 } from '../../../components'
 import { SectionedFormSection } from '../../../components/sectionedForm'
 import { DEFAULT_CATEGORY_COMBO } from '../../../lib'
-import { CheckboxControlledNumberInput } from './CheckboxControlledNumberInput'
+import { ToggledNumberInput } from './ToggledNumberInput'
 import { PeriodTypeField } from './PeriodTypeField'
 
 export const PeriodsContents = ({ name }: { name: string }) => {
@@ -27,15 +27,15 @@ export const PeriodsContents = ({ name }: { name: string }) => {
                 <PeriodTypeField />
             </StandardFormField>
             <StandardFormField>
-                <CheckboxControlledNumberInput
+                <ToggledNumberInput
                     name="openFuturePeriods"
                     label={i18n.t('Allow data entry for future periods')}
                     uncheckedValue={0}
                     min={'1'}
                 />
             </StandardFormField>
             <StandardFormField>
-                <CheckboxControlledNumberInput
+                <ToggledNumberInput
                     name="expiryDays"
                     label={i18n.t(
                         'Close data entry a certain number of days after period end (expiry days)'
@@ -45,7 +45,7 @@ export const PeriodsContents = ({ name }: { name: string }) => {
             </StandardFormField>
             {formValues?.categoryCombo.id !== DEFAULT_CATEGORY_COMBO.id && (
                 <StandardFormField>
-                    <CheckboxControlledNumberInput
+                    <ToggledNumberInput
                         name="openPeriodsAfterCoEndDate"
                         label={i18n.t(
                             `Close data entry after ${formValues?.categoryCombo.displayName.toLowerCase()} category option end date (if category option exist and has end date)`

diff --git a/...ip/form/CheckboxControlledNumberInput.tsx → ...s/dataSetsWip/form/ToggledNumberInput.tsx b/...ip/form/CheckboxControlledNumberInput.tsx → ...s/dataSetsWip/form/ToggledNumberInput.tsx
@@ -13,7 +13,7 @@ export type HiddenInputFieldProps = InputFieldRestProps & {
     uncheckedValue: number
 }
 
-export function CheckboxControlledNumberInput({
+export function ToggledNumberInput({
     name,
     label,
     uncheckedValue,
@@ -41,11 +41,10 @@ export function CheckboxControlledNumberInput({
     useEffect(() => {
         if (isChecked) {
             input.onChange(undefined)
-            input.onBlur()
         } else {
             input.onChange(uncheckedValue.toString())
-            input.onBlur()
         }
+        input.onBlur()
     }, [isChecked])
 
     return (