fix: prevent enrollment date setting with no program in TrackedEntity layer

src/components/edit/trackedEntity/PeriodTypeSelect.js

@@ -1,15 +1,14 @@
 import i18n from '@dhis2/d2-i18n'
 import PropTypes from 'prop-types'
 import React from 'react'
-import { connect } from 'react-redux'
-import { setPeriodType } from '../../../actions/layerEdit.js'
+import { LAST_UPDATED_DATES } from '../../../constants/periods.js'
 import { Radio, RadioGroup } from '../../core/index.js'
 import styles from './styles/PeriodTypeSelect.module.css'
 
 const PeriodTypeSelect = ({
     program,
-    periodType = 'lastUpdated',
-    setPeriodType,
+    periodType = LAST_UPDATED_DATES,
+    onChange,
 }) => {
     const label = i18n.t(
         'Select period when tracked entities were last updated'
@@ -19,7 +18,7 @@ const PeriodTypeSelect = ({
         <RadioGroup
             name="type"
             value={periodType}
-            onChange={(type) => setPeriodType({ value: type })}
+            onChange={(type) => onChange({ value: type })}
         >
             <Radio value="lastUpdated" label={label} />
             <Radio
@@ -35,15 +34,9 @@ const PeriodTypeSelect = ({
 }
 
 PeriodTypeSelect.propTypes = {
-    setPeriodType: PropTypes.func.isRequired,
+    onChange: PropTypes.func.isRequired,
     periodType: PropTypes.string,
     program: PropTypes.object,
 }
 
-export default connect(
-    ({ layerEdit }) => ({
-        program: layerEdit.program,
-        periodType: layerEdit.periodType,
-    }),
-    { setPeriodType }
-)(PeriodTypeSelect)
+export default PeriodTypeSelect

src/components/edit/trackedEntity/TrackedEntityDialog.js

@@ -11,6 +11,7 @@ import {
     setFollowUpStatus,
     setTrackedEntityRelationshipType,
     setTrackedEntityRelationshipOutsideProgram,
+    setPeriodType,
     setStartDate,
     setEndDate,
     setOrgUnits,
@@ -31,6 +32,7 @@ import {
     MIN_RADIUS,
     MAX_RADIUS,
 } from '../../../constants/layers.js'
+import { LAST_UPDATED_DATES } from '../../../constants/periods.js'
 import { getOrgUnitsFromRows } from '../../../util/analytics.js'
 import { getDefaultDatesInCalendar } from '../../../util/date.js'
 import { getStartEndDateError } from '../../../util/time.js'
@@ -58,6 +60,7 @@ class TrackedEntityDialog extends Component {
         setEventPointRadius: PropTypes.func.isRequired,
         setFollowUpStatus: PropTypes.func.isRequired,
         setOrgUnits: PropTypes.func.isRequired,
+        setPeriodType: PropTypes.func.isRequired,
         setProgram: PropTypes.func.isRequired,
         setProgramStatus: PropTypes.func.isRequired,
         setRelatedPointColor: PropTypes.func.isRequired,
@@ -73,6 +76,7 @@ class TrackedEntityDialog extends Component {
         eventPointRadius: PropTypes.number,
         followUp: PropTypes.bool,
         orgUnits: PropTypes.object,
+        periodType: PropTypes.string,
         periodsSettings: PropTypes.object,
         program: PropTypes.object,
         programStatus: PropTypes.string,
@@ -130,8 +134,14 @@ class TrackedEntityDialog extends Component {
     }
 
     componentDidUpdate(prev) {
-        const { validateLayer, onLayerValidation, startDate, endDate } =
-            this.props
+        const {
+            validateLayer,
+            onLayerValidation,
+            startDate,
+            endDate,
+            program,
+            setPeriodType,
+        } = this.props
         const { periodError } = this.state
 
         if (validateLayer && validateLayer !== prev.validateLayer) {
@@ -144,13 +154,18 @@ class TrackedEntityDialog extends Component {
         ) {
             this.setErrorState('periodError', null, 'period')
         }
+
+        if (!program && prev.program !== program) {
+            setPeriodType(LAST_UPDATED_DATES)
+        }
     }
 
     render() {
         const {
             eventPointColor,
             eventPointRadius,
             followUp,
+            periodType,
             program,
             programStatus,
             trackedEntityType,
@@ -163,6 +178,7 @@ class TrackedEntityDialog extends Component {
 
         const {
             setTrackedEntityType,
+            setPeriodType,
             setProgram,
             setProgramStatus,
             setFollowUpStatus,
@@ -284,7 +300,11 @@ class TrackedEntityDialog extends Component {
                         ))}
                     {tab === 'period' && (
                         <div className={styles.flexRowFlow}>
-                            <PeriodTypeSelect />
+                            <PeriodTypeSelect
+                                program={program}
+                                periodType={periodType}
+                                onChange={setPeriodType}
+                            />
                             <StartEndDate
                                 onSelectStartDate={setStartDate}
                                 onSelectEndDate={setEndDate}
@@ -436,6 +456,7 @@ export default connect(
         setFollowUpStatus,
         setTrackedEntityRelationshipType,
         setTrackedEntityRelationshipOutsideProgram,
+        setPeriodType,
         setStartDate,
         setEndDate,
         setOrgUnits,

src/constants/periods.js

@@ -36,6 +36,7 @@ export const PREDEFINED_PERIODS = 'PREDEFINED_PERIODS'
 export const RELATIVE_PERIODS = 'RELATIVE_PERIODS'
 export const FIXED_PERIODS = 'FIXED_PERIODS'
 export const START_END_DATES = 'START_END_DATES'
+export const LAST_UPDATED_DATES = 'lastUpdated'
 
 export const periodTypes = (includeRelativePeriods) => [
     ...(includeRelativePeriods