@iapps/ng-dhis2-ui 1.4.0 → 1.4.2

package/fesm2022/iapps-ng-dhis2-ui.mjs

@@ -4181,7 +4181,7 @@ const AppliedFilterLabel = ({ label, value, tooltip, onClear, }) => (React__defa
         React__default.createElement("span", { className: "line-list-filter-value", title: tooltip ?? `${label}: ${value}` }, value),
         React__default.createElement(ClearControl, { label: label, onClick: onClear })))));
 const FilterToolbar = memo(({ orgUnit, dates, filters }) => {
-    const { customOrgUnitRoots, allowMultipleOrgUnits, appliedOrgUnits: appliedOrgUnitsProp, selectedOrgUnits: selectedOrgUnitsProp, setAppliedOrgUnits, setSelectedOrgUnits, orgUnitLabel, handleOrgUnitFilter, appliedOrgUnitMode, selectedOrgUnitMode, defaultOrgUnitMode, setSelectedOrgUnitMode, handleOrgUnitModeReset, } = orgUnit;
+    const { customOrgUnitRoots, allowMultipleOrgUnits, appliedOrgUnits: appliedOrgUnitsProp, selectedOrgUnits: selectedOrgUnitsProp, setAppliedOrgUnits, setSelectedOrgUnits, orgUnitLabel, handleOrgUnitFilter, appliedOrgUnitMode, selectedOrgUnitMode, defaultOrgUnitMode, setSelectedOrgUnitMode, showOrgUnitMode = false, handleOrgUnitModeReset, } = orgUnit;
     const { startDateState, endDateState, tempStartDateState, tempEndDateState, setTempStartDateState, setTempEndDateState, showEnrollmentDates, handleEnrollmentDatesApply, } = dates;
     const { visibleFilters, dateStates, setDateStates, inputValues, setInputValues, prevDateStates, setPrevDateStates, prevInputValues, setPrevInputValues, handleApplyFilter, handleClearFilter, showAllFilters, setShowAllFilters, } = filters;
     const [activeMenu, setActiveMenu] = useState(null);
@@ -4327,8 +4327,9 @@ const FilterToolbar = memo(({ orgUnit, dates, filters }) => {
                                     units.push(unit);
                                 setSelectedOrgUnits(units);
                             }, key: '' }),
-                        React__default.createElement("span", null, "Mode:"),
-                        React__default.createElement(SingleSelectField, { selected: selectedOrgUnitMode, helpText: `Default mode: ${defaultOrgUnitMode}`, onChange: ({ selected }) => setSelectedOrgUnitMode(selected) }, ['DESCENDANTS', 'SELECTED', 'CHILDREN'].map((mode) => (React__default.createElement(SingleSelectOption, { key: mode, label: mode, value: mode })))))),
+                        showOrgUnitMode && (React__default.createElement(React__default.Fragment, null,
+                            React__default.createElement("span", null, "Mode:"),
+                            React__default.createElement(SingleSelectField, { selected: selectedOrgUnitMode, helpText: `Default mode: ${defaultOrgUnitMode}`, onChange: ({ selected }) => setSelectedOrgUnitMode(selected) }, ['DESCENDANTS', 'SELECTED', 'CHILDREN'].map((mode) => (React__default.createElement(SingleSelectOption, { key: mode, label: mode, value: mode })))))))),
                     React__default.createElement("div", { className: "line-list-filter-actions" },
                         React__default.createElement(ButtonStrip$1, null,
                             React__default.createElement(Button$1, { primary: true, disabled: !canUpdateOrgUnits, onClick: () => {
@@ -4399,6 +4400,7 @@ const FilterToolbar = memo(({ orgUnit, dates, filters }) => {
         'allowMultipleOrgUnits',
         'defaultOrgUnitMode',
         'orgUnitLabel',
+        'showOrgUnitMode',
     ]) &&
         same(before['dates'], after['dates'], [
             'startDateState',
@@ -7121,6 +7123,7 @@ class LineListTableComponent extends ReactWrapperModule {
             const defaultOrgUnitMode = this.ouMode;
             const [appliedOrgUnitMode, setAppliedOrgUnitMode] = useState(defaultOrgUnitMode);
             const [selectedOrgUnitMode, setSelectedOrgUnitMode] = useState(defaultOrgUnitMode);
+            const [showOrgUnitMode, setShowOrgUnitMode] = useState(this.showOrgUnitMode);
             const [defaultOrgUnit, setDefaultOrgUnit] = useState(this.orgUnit);
             const [appliedOrgUnits, setAppliedOrgUnits] = useState([]);
             const orgUnitState = appliedOrgUnits.length
@@ -7166,6 +7169,7 @@ class LineListTableComponent extends ReactWrapperModule {
                 setDefaultOrgUnit,
                 setAppliedOrgUnits,
                 setSelectedOrgUnits,
+                setShowOrgUnitMode,
                 setProgramStageIdState,
                 setAttributeFiltersState,
                 setStartDateState,
@@ -7569,6 +7573,7 @@ class LineListTableComponent extends ReactWrapperModule {
                         selectedOrgUnitMode,
                         defaultOrgUnitMode,
                         setSelectedOrgUnitMode,
+                        showOrgUnitMode,
                         handleOrgUnitModeReset,
                     },
                     dates: {
@@ -7703,6 +7708,9 @@ class LineListTableComponent extends ReactWrapperModule {
             if (changes['endDate']) {
                 this.reactStateUpdaters.setEndDateState(this.endDate);
             }
+            if (changes['showOrgUnitMode']) {
+                this.reactStateUpdaters.setShowOrgUnitMode(this.showOrgUnitMode);
+            }
             if (changes['showActionButtons']) {
                 this.reactStateUpdaters.setShowActionButtons(this.showActionButtons);
             }
@@ -15506,7 +15514,10 @@ class ProgramEntryFormModule {
     }
     #updateInstanceWithAutoAssignedValues(autoAssignedValues) {
         const trackedEntityId = this.trackedEntity?.();
-        if (typeof trackedEntityId === 'string' &&
+        if (
+        // Event forms also receive a trackedEntity ID checking the ID alone prevented their auto-assigned fields from being populated since its passed even in creation of the events. 
+        this.config().formType === 'TRACKER' &&
+            typeof trackedEntityId === 'string' &&
             trackedEntityId.trim().length > 0) {
             return;
         }