@iapps/ng-dhis2-ui 1.2.140 → 1.2.153

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

@@ -3838,37 +3838,273 @@ const DropdownMenu$1 = (props) => {
             } }))));
 };
 
-// Copyright 2025 UDSM DHIS2 Lab. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
+/* eslint-disable @typescript-eslint/no-explicit-any */
+// // Copyright 2025 UDSM DHIS2 Lab. All rights reserved.
+// // Use of this source code is governed by a BSD-style
+// // license that can be found in the LICENSE file.
+// import {
+//   ActionOptionOrientation,
+//   DropdownMenuOption,
+//   LineListActionOption,
+// } from '../../models';
+// import { DropdownMenu } from '../dropdown-menu';
+// import React from 'react';
+// import { ButtonStrip, Button, colors } from '@dhis2/ui';
+// import { TableRow } from '../../models/line-list.models';
+// import { LineListRowActionFilterConfig } from '@iapps/d2-web-sdk';
+// export const DataTableActions = (props: {
+//   data: TableRow;
+//   actionOptions: LineListActionOption[];
+//   rowActionFilterConfig: LineListRowActionFilterConfig;
+//   actionOptionOrientation: ActionOptionOrientation;
+//   onClick: (dropdownOption: LineListActionOption) => void;
+// }) => {
+//   const {
+//     data,
+//     actionOptions,
+//     rowActionFilterConfig,
+//     actionOptionOrientation,
+//     onClick,
+//   } = props;
+//   console.log(
+//     'REACHED HERE AND IMPROVE THE FOLLOWING::: ',
+//     // JSON.stringify(data),
+//     rowActionFilterConfig
+//   );
+//   switch (actionOptionOrientation) {
+//     case 'BUTTON':
+//       return (
+//         <ButtonStrip>
+//           {actionOptions.map((option) => (
+//             <Button
+//               key={option.label}
+//               onClick={() => onClick(option)}
+//               icon={option.icon ? <option.icon /> : <></>}
+//               small
+//               destructive={option.destructive}
+//             >
+//               {!option.iconOnly ? option.label : ''}
+//             </Button>
+//           ))}
+//         </ButtonStrip>
+//       );
+//     case 'DROPDOWN':
+//       return (
+//         <DropdownMenu
+//           dropdownOptions={actionOptions}
+//           onClick={(option) => {
+//             onClick(option);
+//           }}
+//         />
+//       );
+//     case 'LINK':
+//       return (
+//         <div
+//           style={{
+//             display: 'flex',
+//             gap: 16,
+//             alignItems: 'center',
+//           }}
+//         >
+//           {actionOptions.map((option) => (
+//             <a
+//               style={{
+//                 cursor: 'pointer',
+//                 textDecoration: 'underline',
+//                 fontSize: 14,
+//                 display: 'flex',
+//                 alignItems: 'center',
+//                 gap: 4,
+//                 color: option.destructive ? colors.red700 : colors.grey900,
+//               }}
+//               key={option.label}
+//               onClick={(event: any) => {
+//                 event.stopPropagation();
+//                 onClick(option);
+//               }}
+//             >
+//               {option.icon ? <option.icon /> : <></>}
+//               {!option.iconOnly ? <span>{option.label}</span> : <></>}
+//             </a>
+//           ))}
+//         </div>
+//       );
+//     default:
+//       return <></>;
+//   }
+// };
+const extractTeiPayloadFromRow = (row) => row?.responseData?.value ?? null;
+/** Operator matcher (fast + predictable) */
+const matchesOperator = (actual, op, expected) => {
+    const actualStr = actual == null ? '' : String(actual);
+    const expectedList = Array.isArray(expected)
+        ? expected.map(String)
+        : expected != null
+            ? [String(expected)]
+            : [];
+    switch (op) {
+        case 'EXISTS':
+            return actual != null;
+        case 'NOT_EXISTS':
+            return actual == null;
+        case 'HAS_VALUE':
+            return actualStr.trim().length > 0;
+        case 'NO_VALUE':
+            return actualStr.trim().length === 0;
+        case 'EQ':
+            return actualStr === (expectedList[0] ?? '');
+        case 'NEQ':
+            return actualStr !== (expectedList[0] ?? '');
+        case 'IN':
+            return expectedList.includes(actualStr);
+        case 'NOT_IN':
+            return !expectedList.includes(actualStr);
+        default:
+            return false;
+    }
+};
+/**
+ * Extract facts needed for rule evaluation from the TEI payload.
+ * This is O(enrollments + events + attributes) and uses plain objects for speed.
+ */
+const buildTeiFacts = (teiPayload) => {
+    const enrolledProgramIds = new Set();
+    const eventCountByStageId = Object.create(null);
+    const attributeValueById = Object.create(null);
+    const attributeValueByCode = Object.create(null);
+    const enrollments = teiPayload.enrollments ?? [];
+    for (const enrollment of enrollments) {
+        if (enrollment?.program)
+            enrolledProgramIds.add(enrollment.program);
+        const events = enrollment?.events ?? [];
+        for (const ev of events) {
+            const stageId = ev?.programStage;
+            if (!stageId)
+                continue;
+            eventCountByStageId[stageId] = (eventCountByStageId[stageId] ?? 0) + 1;
+        }
+    }
+    const attributes = teiPayload.attributes ?? [];
+    for (const attr of attributes) {
+        const attrId = attr?.attribute;
+        const attrCode = attr?.code;
+        const value = attr?.value;
+        if (attrId)
+            attributeValueById[attrId] = value;
+        if (attrCode)
+            attributeValueByCode[attrCode] = value;
+    }
+    return {
+        enrolledProgramIds,
+        eventCountByStageId,
+        attributeValueById,
+        attributeValueByCode,
+    };
+};
+const doesRuleMatchFacts = (rule, facts) => {
+    // Enrollment condition
+    if (rule.enrollment) {
+        const hasEnrollment = facts.enrolledProgramIds.has(rule.enrollment.programId);
+        if (hasEnrollment !== rule.enrollment.mustExist)
+            return false;
+    }
+    // Stage event existence condition
+    if (rule.stageEvent) {
+        const count = facts.eventCountByStageId[rule.stageEvent.programStageId] ?? 0;
+        const hasStageEvent = count > 0;
+        if (hasStageEvent !== rule.stageEvent.mustExist)
+            return false;
+    }
+    // Attribute condition (support by id OR code)
+    if (rule.attribute) {
+        const value = rule.attribute.attributeId
+            ? facts.attributeValueById[rule.attribute.attributeId]
+            : undefined;
+        if (!matchesOperator(value, rule.attribute.op, rule.attribute.value))
+            return false;
+    }
+    return true;
+};
+const compileFilterConfig = (config) => {
+    if (!config?.enabled)
+        return null;
+    // Sort once, not per row render
+    const rulesSorted = [...(config.rules ?? [])].sort((a, b) => (b.priority ?? 0) - (a.priority ?? 0));
+    return {
+        enabled: true,
+        fallback: config.fallback ?? 'NO_FILTER',
+        combine: config.combine ?? 'APPLY_ALL',
+        rulesSorted,
+    };
+};
+const computeAllowedActionIdsForRow = (baseActionIds, compiled, facts) => {
+    const matchedRules = [];
+    for (const rule of compiled.rulesSorted) {
+        if (doesRuleMatchFacts(rule, facts)) {
+            matchedRules.push(rule);
+            if (compiled.combine === 'FIRST_MATCH')
+                break;
+        }
+    }
+    // If nothing matched: return base or empty depending on fallback
+    if (matchedRules.length === 0) {
+        return compiled.fallback === 'NO_FILTER' ? baseActionIds : [];
+    }
+    let allowed = new Set(baseActionIds);
+    for (const rule of matchedRules) {
+        if (rule.effect === 'HIDE') {
+            for (const actionId of rule.actions)
+                allowed.delete(actionId);
+        }
+        else {
+            // SHOW_ONLY
+            allowed = new Set(rule.actions.filter((id) => allowed.has(id)));
+        }
+    }
+    return Array.from(allowed);
+};
 const DataTableActions = (props) => {
-    const { data, actionOptions, actionOptionOrientation, onClick } = props;
-    switch (actionOptionOrientation) {
+    const { data: row, actionOptions, rowActionFilterConfig, actionOptionOrientation: orientation, onClick: onActionClick, } = props;
+    const compiledConfig = useMemo(() => compileFilterConfig(rowActionFilterConfig), [rowActionFilterConfig]);
+    const visibleActions = useMemo(() => {
+        const base = actionOptions ?? [];
+        // No config => show base
+        if (!compiledConfig)
+            return base;
+        // Extract embedded TEI payload (already available in row)
+        const teiPayload = extractTeiPayloadFromRow(row);
+        // If no payload => do not filter (your requirement)
+        if (!teiPayload)
+            return base;
+        // Prefer stable action id; fallback to label as legacy
+        const baseActionIds = base.map((a) => a.id ?? a.label);
+        const facts = buildTeiFacts(teiPayload);
+        const allowedIds = computeAllowedActionIdsForRow(baseActionIds, compiledConfig, facts);
+        // If allowedIds equals baseActionIds, this filter is basically no-op,
+        // but we keep a cheap Set to filter objects correctly.
+        const allowedSet = new Set(allowedIds);
+        return base.filter((a) => allowedSet.has(a.id ?? a.label));
+    }, [actionOptions, row, compiledConfig]);
+    switch (orientation) {
         case 'BUTTON':
-            return (React__default.createElement(ButtonStrip$1, null, actionOptions.map((option) => (React__default.createElement(Button$1, { key: option.label, onClick: () => onClick(option), icon: option.icon ? React__default.createElement(option.icon, null) : React__default.createElement(React__default.Fragment, null), small: true, destructive: option.destructive }, !option.iconOnly ? option.label : '')))));
+            return (React__default.createElement(ButtonStrip$1, null, visibleActions.map((action) => (React__default.createElement(Button$1, { key: action.id ?? action.label, onClick: () => onActionClick(action), icon: action.icon ? React__default.createElement(action.icon, null) : React__default.createElement(React__default.Fragment, null), small: true, destructive: action.destructive }, !action.iconOnly ? action.label : '')))));
         case 'DROPDOWN':
-            return (React__default.createElement(DropdownMenu$1, { dropdownOptions: actionOptions, onClick: (option) => {
-                    onClick(option);
-                } }));
+            return (React__default.createElement(DropdownMenu$1, { dropdownOptions: visibleActions, onClick: (action) => onActionClick(action) }));
         case 'LINK':
-            return (React__default.createElement("div", { style: {
-                    display: 'flex',
-                    gap: 16,
-                    alignItems: 'center',
-                } }, actionOptions.map((option) => (React__default.createElement("a", { style: {
+            return (React__default.createElement("div", { style: { display: 'flex', gap: 16, alignItems: 'center' } }, visibleActions.map((action) => (React__default.createElement("a", { key: action.id ?? action.label, style: {
                     cursor: 'pointer',
                     textDecoration: 'underline',
                     fontSize: 14,
                     display: 'flex',
                     alignItems: 'center',
                     gap: 4,
-                    color: option.destructive ? colors$1.red700 : colors$1.grey900,
-                }, key: option.label, onClick: (event) => {
+                    color: action.destructive ? colors$1.red700 : colors$1.grey900,
+                }, onClick: (event) => {
                     event.stopPropagation();
-                    onClick(option);
+                    onActionClick(action);
                 } },
-                option.icon ? React__default.createElement(option.icon, null) : React__default.createElement(React__default.Fragment, null),
-                !option.iconOnly ? React__default.createElement("span", null, option.label) : React__default.createElement(React__default.Fragment, null))))));
+                action.icon ? React__default.createElement(action.icon, null) : React__default.createElement(React__default.Fragment, null),
+                !action.iconOnly ? React__default.createElement("span", null, action.label) : React__default.createElement(React__default.Fragment, null))))));
         default:
             return React__default.createElement(React__default.Fragment, null);
     }
@@ -3900,7 +4136,7 @@ const TableCell = ({ cell, getTextColorFromBackGround, }) => {
         React__default.createElement("div", { className: "text-sm text-gray-800" }, cell?.value || '-')));
 };
 
-const TableRow = ({ row, columns, getTextColorFromBackGround, actionOptions, actionOptionOrientation, actionSelected, isChecked, onToggle, selectable, showActionButtons, }) => {
+const TableRow = ({ row, columns, getTextColorFromBackGround, actionOptions, rowActionFilterConfig, actionOptionOrientation, actionSelected, isChecked, onToggle, selectable, showActionButtons, }) => {
     const handleCheckBoxChange = () => {
         onToggle(row);
     };
@@ -3909,7 +4145,7 @@ const TableRow = ({ row, columns, getTextColorFromBackGround, actionOptions, act
             React__default.createElement(Checkbox, { onChange: handleCheckBoxChange, checked: isChecked }))),
         columns.map((col) => {
             if (col.key === 'actions') {
-                return (React__default.createElement(DataTableCell, { key: col.key }, actionOptions && showActionButtons && (React__default.createElement(DataTableActions, { actionOptions: actionOptions, data: row, actionOptionOrientation: actionOptionOrientation, onClick: (option) => {
+                return (React__default.createElement(DataTableCell, { key: col.key }, actionOptions && showActionButtons && (React__default.createElement(DataTableActions, { actionOptions: actionOptions, rowActionFilterConfig: rowActionFilterConfig, data: row, actionOptionOrientation: actionOptionOrientation, onClick: (option) => {
                         const data = row['responseData']?.['value'];
                         if (option.onClick)
                             option.onClick(data);
@@ -3961,13 +4197,13 @@ const TableRow = ({ row, columns, getTextColorFromBackGround, actionOptions, act
 //     )}
 //   </DHISTableBody>
 // );
-const TableBody = ({ data, columns, getTextColorFromBackGround, actionOptions, actionOptionOrientation, actionSelected, selectedRows, onRowToggle, selectable, showActionButtons, error, }) => (React__default.createElement(TableBody$1, null, error ? (React__default.createElement(DataTableRow, null,
+const TableBody = ({ data, columns, getTextColorFromBackGround, actionOptions, rowActionFilterConfig, actionOptionOrientation, actionSelected, selectedRows, onRowToggle, selectable, showActionButtons, error, }) => (React__default.createElement(TableBody$1, null, error ? (React__default.createElement(DataTableRow, null,
     React__default.createElement(DataTableCell, { colSpan: columns.length.toString(), style: {
             textAlign: 'center',
             fontWeight: 'bold',
             color: 'red',
             padding: '20px',
-        } }, error))) : data.length > 0 ? (data.map((row) => (React__default.createElement(TableRow, { key: row.index.value, row: row, columns: columns, getTextColorFromBackGround: getTextColorFromBackGround, actionOptions: actionOptions, actionOptionOrientation: actionOptionOrientation, actionSelected: actionSelected, isChecked: selectedRows.some((r) => r.index?.value === row.index?.value), onToggle: onRowToggle, selectable: selectable, showActionButtons: showActionButtons })))) : (React__default.createElement(DataTableRow, null,
+        } }, error))) : data.length > 0 ? (data.map((row) => (React__default.createElement(TableRow, { key: row.index.value, row: row, columns: columns, getTextColorFromBackGround: getTextColorFromBackGround, actionOptions: actionOptions, rowActionFilterConfig: rowActionFilterConfig, actionOptionOrientation: actionOptionOrientation, actionSelected: actionSelected, isChecked: selectedRows.some((r) => r.index?.value === row.index?.value), onToggle: onRowToggle, selectable: selectable, showActionButtons: showActionButtons })))) : (React__default.createElement(DataTableRow, null,
     React__default.createElement(DataTableCell, { colSpan: columns.length.toString(), style: {
             textAlign: 'center',
             fontWeight: 'bold',
@@ -4024,7 +4260,7 @@ const TableFooter = ({ pager, setPager, columns }) => {
 //       </DataTable>
 //     );
 //   };
-const LineListTable = ({ columns, data, pager, setPager, getTextColorFromBackGround, actionOptions, actionOptionOrientation, actionSelected, selectable, rowsSelected, showActionButtons, error }) => {
+const LineListTable = ({ columns, data, pager, setPager, getTextColorFromBackGround, actionOptions, rowActionFilterConfig, actionOptionOrientation, actionSelected, selectable, rowsSelected, showActionButtons, error }) => {
     const [selectedRows, setSelectedRows] = useState([]);
     const handleRowToggle = (row) => {
         const exists = selectedRows.find((r) => r.index?.value === row.index?.value);
@@ -4041,7 +4277,7 @@ const LineListTable = ({ columns, data, pager, setPager, getTextColorFromBackGro
     };
     return (React__default.createElement(DataTable, null,
         React__default.createElement(TableHeader, { columns: columns, allSelected: selectedRows.length === data.length && data.length > 0, onSelectAll: handleSelectAll, selectable: selectable, showActionButtons: showActionButtons }),
-        React__default.createElement(TableBody, { data: data, columns: columns, getTextColorFromBackGround: getTextColorFromBackGround, actionOptions: actionOptions, actionOptionOrientation: actionOptionOrientation, actionSelected: actionSelected, selectedRows: selectedRows, onRowToggle: handleRowToggle, selectable: selectable, showActionButtons: showActionButtons, error: error }),
+        React__default.createElement(TableBody, { data: data, columns: columns, getTextColorFromBackGround: getTextColorFromBackGround, actionOptions: actionOptions, rowActionFilterConfig: rowActionFilterConfig, actionOptionOrientation: actionOptionOrientation, actionSelected: actionSelected, selectedRows: selectedRows, onRowToggle: handleRowToggle, selectable: selectable, showActionButtons: showActionButtons, error: error }),
         React__default.createElement(TableFooter, { columns: columns, pager: pager, setPager: setPager })));
 };
 
@@ -4397,6 +4633,7 @@ class LineListTableComponent extends ReactWrapperModule {
         super(...arguments);
         this.actionOptionOrientation = 'DROPDOWN';
         this.dataQueryFilters = [];
+        this.hydrateForActionFiltering = true;
         this.isButtonLoading = false;
         this.filterRootOrgUnit = false;
         this.showFilters = false;
@@ -4432,6 +4669,7 @@ class LineListTableComponent extends ReactWrapperModule {
             const [attributeFiltersState, setAttributeFiltersState] = useState(this.attributeFilters);
             const [dataQueryFiltersState, setDataQueryFiltersState] = useState(this.dataQueryFilters);
             const [tempDataQueryFiltersState, setTempDataQueryFiltersState] = useState(this.dataQueryFilters);
+            const [rowActionFilterConfig, setRowActionFilterConfig] = useState(this.lineListRowActionFilterConfig);
             const [startDateState, setStartDateState] = useState(this.startDate);
             const [tempStartDateState, setTempStartDateState] = useState(this.startDate);
             const [endDateState, setEndDateState] = useState(this.endDate);
@@ -4926,6 +5164,7 @@ class LineListTableComponent extends ReactWrapperModule {
                     setPager: setPager,
                     getTextColorFromBackGround: getTextColorFromBackGround,
                     actionOptions: this.actionOptions,
+                    rowActionFilterConfig: this.lineListRowActionFilterConfig,
                     actionOptionOrientation: this.actionOptionOrientation,
                     actionSelected: this.actionSelected,
                     selectable: selectable,
@@ -4981,7 +5220,7 @@ class LineListTableComponent extends ReactWrapperModule {
         this.render();
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.3", ngImport: i0, type: LineListTableComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "20.1.3", type: LineListTableComponent, isStandalone: false, selector: "ng-dhis2-ui-line-list", inputs: { triggerToken: "triggerToken", programId: "programId", orgUnit: "orgUnit", programStageId: "programStageId", actionOptions: "actionOptions", actionOptionOrientation: "actionOptionOrientation", attributeFilters: "attributeFilters", useOuModeWithOlderDHIS2Instance: "useOuModeWithOlderDHIS2Instance", startDate: "startDate", endDate: "endDate", dataQueryFilters: "dataQueryFilters", ouMode: "ouMode", isButtonLoading: "isButtonLoading", buttonFilter: "buttonFilter", filterRootOrgUnit: "filterRootOrgUnit", showFilters: "showFilters", isOptionSetNameVisible: "isOptionSetNameVisible", allowRowsSelection: "allowRowsSelection", enrollmentStatus: "enrollmentStatus", filterableColumnIds: "filterableColumnIds", triggerRefetch: "triggerRefetch", eventStatus: "eventStatus", showActionButtons: "showActionButtons", showEnrollmentDates: "showEnrollmentDates", showDownloadButton: "showDownloadButton", searcheableDataElements: "searcheableDataElements" }, outputs: { actionSelected: "actionSelected", rowsSelected: "rowsSelected" }, usesInheritance: true, usesOnChanges: true, ngImport: i0, template: '<ng-content></ng-content>', isInline: true, styles: ["@charset \"UTF-8\";::ng-deep .custom-input{display:flex!important;gap:4px!important;align-items:center!important;border:1px solid #9fadba!important;border-radius:4px!important;margin:0;padding:0 0 0 8px;background-color:#fff!important}::ng-deep .custom-input div{margin:0!important}::ng-deep .custom-input label{font-size:12px;padding-right:0}::ng-deep .custom-input input{border:none!important;font-size:12px!important;display:flex;align-items:center;padding-left:4px;height:40px;outline:none!important;box-shadow:none!important}::ng-deep .custom-input input:focus{border:none!important;box-shadow:none!important}::ng-deep .custom-input [data-test=calendar-clear-button]{background-color:#f2f2f2!important;color:#870808!important;border-radius:6px!important;padding:4px 10px!important;font-size:0!important}::ng-deep .custom-input [data-test=calendar-clear-button]:before{content:\"\\2715\";font-size:14px;color:#870808}::ng-deep .custom-input [data-test=calendar-clear-button]:hover{background-color:#ddd}::ng-deep .calendar-input-wrapper{position:relative}::ng-deep .calendar-input-wrapper .custom-input{position:relative;width:100%;display:flex;align-items:center}::ng-deep .calendar-input-wrapper [data-test=calendar-clear-button]{right:8px;bottom:14px;margin:auto;display:flex;align-items:center;justify-content:center;width:16px;height:16px;font-size:0!important;background-color:#a0adba!important;border-radius:50%;padding:2px;cursor:pointer}::ng-deep .calendar-input-wrapper [data-test=calendar-clear-button]:before{content:\"\\2715\";font-size:10px;color:#f0f0f0}::ng-deep .calendar-input-wrapper input{padding-right:40px!important;height:40px;line-height:40px;box-sizing:border-box}::ng-deep .custom-input label{color:gray!important;opacity:1}::ng-deep .table-top-toolbar{background-color:var(--colors-grey100)!important;color:var(--colors-grey900)!important}::ng-deep .custom-select-input{display:flex!important;gap:4px!important;align-items:center!important;border:1px solid #9fadba!important;border-radius:4px!important;margin:0;padding:0 0 0 8px;background-color:#fff!important}::ng-deep .custom-select-input div{margin:0!important}::ng-deep .custom-select-input [data-test=dhis2-uiwidgets-singleselectfield-label]{font-size:12px;color:gray!important}::ng-deep .custom-select-input [data-test=dhis2-uicore-select-input]{border:none!important;font-size:12px!important;display:flex;align-items:center;padding-left:4px;height:40px;outline:none!important;box-shadow:none!important}::ng-deep .custom-select-input [data-test=dhis2-uicore-select-input]:focus-within{box-shadow:none!important}::ng-deep .custom-select-input input:focus{border:none!important;box-shadow:none!important}\n"] }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "20.1.3", type: LineListTableComponent, isStandalone: false, selector: "ng-dhis2-ui-line-list", inputs: { triggerToken: "triggerToken", programId: "programId", orgUnit: "orgUnit", programStageId: "programStageId", actionOptions: "actionOptions", actionOptionOrientation: "actionOptionOrientation", attributeFilters: "attributeFilters", useOuModeWithOlderDHIS2Instance: "useOuModeWithOlderDHIS2Instance", startDate: "startDate", endDate: "endDate", dataQueryFilters: "dataQueryFilters", lineListRowActionFilterConfig: "lineListRowActionFilterConfig", hydrateForActionFiltering: "hydrateForActionFiltering", ouMode: "ouMode", isButtonLoading: "isButtonLoading", buttonFilter: "buttonFilter", filterRootOrgUnit: "filterRootOrgUnit", showFilters: "showFilters", isOptionSetNameVisible: "isOptionSetNameVisible", allowRowsSelection: "allowRowsSelection", enrollmentStatus: "enrollmentStatus", filterableColumnIds: "filterableColumnIds", triggerRefetch: "triggerRefetch", eventStatus: "eventStatus", showActionButtons: "showActionButtons", showEnrollmentDates: "showEnrollmentDates", showDownloadButton: "showDownloadButton", searcheableDataElements: "searcheableDataElements" }, outputs: { actionSelected: "actionSelected", rowsSelected: "rowsSelected" }, usesInheritance: true, usesOnChanges: true, ngImport: i0, template: '<ng-content></ng-content>', isInline: true, styles: ["@charset \"UTF-8\";::ng-deep .custom-input{display:flex!important;gap:4px!important;align-items:center!important;border:1px solid #9fadba!important;border-radius:4px!important;margin:0;padding:0 0 0 8px;background-color:#fff!important}::ng-deep .custom-input div{margin:0!important}::ng-deep .custom-input label{font-size:12px;padding-right:0}::ng-deep .custom-input input{border:none!important;font-size:12px!important;display:flex;align-items:center;padding-left:4px;height:40px;outline:none!important;box-shadow:none!important}::ng-deep .custom-input input:focus{border:none!important;box-shadow:none!important}::ng-deep .custom-input [data-test=calendar-clear-button]{background-color:#f2f2f2!important;color:#870808!important;border-radius:6px!important;padding:4px 10px!important;font-size:0!important}::ng-deep .custom-input [data-test=calendar-clear-button]:before{content:\"\\2715\";font-size:14px;color:#870808}::ng-deep .custom-input [data-test=calendar-clear-button]:hover{background-color:#ddd}::ng-deep .calendar-input-wrapper{position:relative}::ng-deep .calendar-input-wrapper .custom-input{position:relative;width:100%;display:flex;align-items:center}::ng-deep .calendar-input-wrapper [data-test=calendar-clear-button]{right:8px;bottom:14px;margin:auto;display:flex;align-items:center;justify-content:center;width:16px;height:16px;font-size:0!important;background-color:#a0adba!important;border-radius:50%;padding:2px;cursor:pointer}::ng-deep .calendar-input-wrapper [data-test=calendar-clear-button]:before{content:\"\\2715\";font-size:10px;color:#f0f0f0}::ng-deep .calendar-input-wrapper input{padding-right:40px!important;height:40px;line-height:40px;box-sizing:border-box}::ng-deep .custom-input label{color:gray!important;opacity:1}::ng-deep .table-top-toolbar{background-color:var(--colors-grey100)!important;color:var(--colors-grey900)!important}::ng-deep .custom-select-input{display:flex!important;gap:4px!important;align-items:center!important;border:1px solid #9fadba!important;border-radius:4px!important;margin:0;padding:0 0 0 8px;background-color:#fff!important}::ng-deep .custom-select-input div{margin:0!important}::ng-deep .custom-select-input [data-test=dhis2-uiwidgets-singleselectfield-label]{font-size:12px;color:gray!important}::ng-deep .custom-select-input [data-test=dhis2-uicore-select-input]{border:none!important;font-size:12px!important;display:flex;align-items:center;padding-left:4px;height:40px;outline:none!important;box-shadow:none!important}::ng-deep .custom-select-input [data-test=dhis2-uicore-select-input]:focus-within{box-shadow:none!important}::ng-deep .custom-select-input input:focus{border:none!important;box-shadow:none!important}\n"] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.3", ngImport: i0, type: LineListTableComponent, decorators: [{
             type: Component,
@@ -5008,6 +5247,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.3", ngImpor
                 type: Input
             }], dataQueryFilters: [{
                 type: Input
+            }], lineListRowActionFilterConfig: [{
+                type: Input
+            }], hydrateForActionFiltering: [{
+                type: Input
             }], ouMode: [{
                 type: Input
             }], isButtonLoading: [{
@@ -5843,8 +6086,8 @@ Only proceed if you are certain this is intentional and acceptable according to
         ? `Location outside allowed area (not permitted)`
         : `Location outside allowed area (review required)`;
     // Optional debug logs (keep outside JSX)
-    console.log('rawAllowedArea:', rawAllowedArea);
-    console.log('safeAllowedAreaGeoJson:', safeAllowedAreaGeoJson);
+    // console.log('rawAllowedArea:', rawAllowedArea);
+    // console.log('safeAllowedAreaGeoJson:', safeAllowedAreaGeoJson);
     return (React__default.createElement(React__default.Fragment, null,
         React__default.createElement(Field, { label: label, name: name, required: required, error: Boolean(combinedErrorMessage), validationText: combinedErrorMessage ?? undefined },
             React__default.createElement("div", { style: {
@@ -7667,7 +7910,7 @@ class FieldCascadeUtil {
         if (!childPath || !parentLeaf)
             return false;
         const token = `${separator}${parentLeaf}`;
-        return (childPath.endsWith(token) || childPath.includes(token + separator));
+        return childPath.endsWith(token) || childPath.includes(token + separator);
     }
     /**
      * Safe property getter for "unknown object shapes" (keeps TS happy).
@@ -7692,6 +7935,87 @@ class FieldCascadeUtil {
         }
         return FieldCascadeUtil.normalizePath(raw, merged.optionPathSeparator);
     }
+    // static matchesChildToParent(
+    //   childPathRaw: string,
+    //   parentEffectiveRaw: string,
+    //   mode: ParentMatchMode,
+    //   separator = '/'
+    // ): boolean {
+    //   const childPath = FieldCascadeUtil.normalizePath(childPathRaw, separator);
+    //   console.log("STABILITY::: ", JSON.stringify(childPath));
+    //   const parentEffective = FieldCascadeUtil.normalizePath(
+    //     parentEffectiveRaw,
+    //     separator
+    //   );
+    //   if (!childPath || !parentEffective) return false;
+    //   switch (mode) {
+    //     // case ParentMatchMode.PREFIX: {
+    //     //   // Allow exact node match and boundary-safe prefix
+    //     //   if (childPath === parentEffective) return true;
+    //     //   const prefix = parentEffective.endsWith(separator)
+    //     //     ? parentEffective
+    //     //     : parentEffective + separator;
+    //     //   return childPath.startsWith(prefix);
+    //     // }
+    //     default: {
+    //       const leaf = FieldCascadeUtil.getPathLeaf(parentEffective, separator);
+    //       return FieldCascadeUtil.containsLeafToken(childPath, leaf, separator);
+    //     }
+    //   }
+    // }
+    /**
+     * Segment-safe "contains" match:
+     * checks if parent segments appear contiguously anywhere in child segments
+     */
+    static containsPathSegments(childPath, parentPath, separator = '/') {
+        const childSegs = FieldCascadeUtil.splitSegments(childPath, separator);
+        const parentSegs = FieldCascadeUtil.splitSegments(parentPath, separator);
+        if (parentSegs.length === 0 || childSegs.length === 0)
+            return false;
+        if (parentSegs.length > childSegs.length)
+            return false;
+        // sliding window
+        for (let start = 0; start <= childSegs.length - parentSegs.length; start++) {
+            let ok = true;
+            for (let j = 0; j < parentSegs.length; j++) {
+                if (childSegs[start + j] !== parentSegs[j]) {
+                    ok = false;
+                    break;
+                }
+            }
+            if (ok)
+                return true;
+        }
+        return false;
+    }
+    /** Split normalized path into non-empty segments */
+    static splitSegments(path, separator = '/') {
+        const p = FieldCascadeUtil.normalizePath(path, separator);
+        if (!p)
+            return [];
+        return p
+            .split(separator)
+            .map((s) => s.trim())
+            .filter(Boolean);
+    }
+    /**
+     * Segment-safe "prefix" match:
+     * - exact match OR child starts with parent + separator boundary
+     */
+    static startsWithPathSegments(childPath, parentPath, separator = '/') {
+        const childSegs = FieldCascadeUtil.splitSegments(childPath, separator);
+        const parentSegs = FieldCascadeUtil.splitSegments(parentPath, separator);
+        if (parentSegs.length === 0 || childSegs.length === 0)
+            return false;
+        if (parentSegs.length > childSegs.length)
+            return false;
+        for (let i = 0; i < parentSegs.length; i++) {
+            if (childSegs[i] !== parentSegs[i])
+                return false;
+        }
+        return true;
+    }
+    /** Your requested method: no includes/contains; all segment-safe */
     static matchesChildToParent(childPathRaw, parentEffectiveRaw, mode, separator = '/') {
         const childPath = FieldCascadeUtil.normalizePath(childPathRaw, separator);
         const parentEffective = FieldCascadeUtil.normalizePath(parentEffectiveRaw, separator);
@@ -7699,15 +8023,24 @@ class FieldCascadeUtil {
             return false;
         switch (mode) {
             case ParentMatchMode.PREFIX: {
-                // Allow exact node match and boundary-safe prefix
-                if (childPath === parentEffective)
-                    return true;
-                const prefix = parentEffective.endsWith(separator)
-                    ? parentEffective
-                    : parentEffective + separator;
-                return childPath.startsWith(prefix);
+                // exact node match or boundary-safe prefix (segment-based)
+                return FieldCascadeUtil.startsWithPathSegments(childPath, parentEffective, separator);
+            }
+            case ParentMatchMode.CONTAINS: {
+                // boundary-safe contains (segment-based)
+                // const nana = FieldCascadeUtil.containsPathSegments(
+                //   childPath,
+                //   parentEffective,
+                //   separator
+                // );
+                // console.log("MAMA::: ", childPath);
+                // console.log("MAMA 1111::: ", parentEffective);
+                // console.log("MAMA 2222::: ", separator);
+                // console.log("MAMA 2222::: ", separator);
+                return FieldCascadeUtil.containsPathSegments(childPath, parentEffective, separator);
             }
             default: {
+                // your existing behavior: match by leaf token, but segment-safe
                 const leaf = FieldCascadeUtil.getPathLeaf(parentEffective, separator);
                 return FieldCascadeUtil.containsLeafToken(childPath, leaf, separator);
             }
@@ -7723,12 +8056,12 @@ class FieldCascadeUtil {
         if (!parentEffective)
             return true;
         if (merged.parentValueType === ParentValueType.CODE) {
-            return (FieldCascadeUtil.getPathLeaf(parentEffective, merged.optionPathSeparator)
-                .length === 0);
+            return (FieldCascadeUtil.getPathLeaf(parentEffective, merged.optionPathSeparator).length === 0);
         }
         return false;
     }
     static filterChildOptionsByParentPath(childOptions, cascade, parentValue) {
+        console.log('MERGE::: ', cascade);
         if (!cascade || cascade.kind !== CascadeKind.OPTIONS_PATH) {
             return (childOptions ?? []);
         }
@@ -7748,6 +8081,10 @@ class FieldCascadeUtil {
             const childPath = FieldCascadeUtil.getChildOptionPath(opt, pathField, sep);
             if (!childPath)
                 continue;
+            // console.log('CHILDPATH::: ', childPath);
+            // console.log('PARENTEFFECTIVE::: ', parentEffective);
+            // console.log('MODE::: ', mode);
+            // console.log('SEP::: ', sep);
             if (FieldCascadeUtil.matchesChildToParent(childPath, parentEffective, mode, sep)) {
                 out.push(opt);
             }
@@ -8593,6 +8930,9 @@ class BaseFormFieldComponent extends ReactWrapperModule {
                     setDisabled(baseDisabled || cascadeDisable);
                     // filter options
                     const nextOptions = FieldCascadeUtil.filterChildOptionsByParentPath(field.options ?? [], cascade, parentStr);
+                    // console.log("NOEW PARENT STR::: ", JSON.stringify(parentStr));
+                    // console.log("NOEW FIELD OPTIONS::: ", JSON.stringify(field.options));
+                    // console.log("NOEW PARENT CASCADE::: ", JSON.stringify(cascade));
                     setFilteredOptions(nextOptions);
                     // clear invalid child on parent change if configured
                     if (merged.clearOnParentChange && reason === 'parentChange') {
@@ -11379,78 +11719,84 @@ class ProgramEntryFormFieldUtil {
         });
     }
     // #getGeometryField(): IFormField<string> | null {
-    //   const rawFeatureType = this.program?.featureType ?? '';
-    //   console.log(
-    //     'REACHED HERE AND FEATURE TYPE ACTIVATED::: ',
-    //     JSON.stringify(rawFeatureType)
-    //   );
-    //   const featureType = rawFeatureType.toUpperCase() as
+    //   if (this.config?.hideGeometryField) return null;
+    //   const effectiveFeatureTypeRaw = this.#resolveEffectiveFeatureType();
+    //   const normalizedFeatureType = effectiveFeatureTypeRaw.toUpperCase() as
     //     | 'NONE'
     //     | 'POINT'
     //     | 'POLYGON'
     //     | 'MULTI_POLYGON'
     //     | '';
-    //   const isGeometryProgram =
-    //     featureType === 'POINT' ||
-    //     featureType === 'POLYGON' ||
-    //     featureType === 'MULTI_POLYGON';
-    //   if (!isGeometryProgram) {
-    //     if (this.config?.hideGeometryField) {
-    //       return null;
-    //     }
-    //     return null;
-    //   }
-    //   const sharedOptions = {
-    //     required: true,
-    //     disabled: this.config?.disableRegistrationUnit ?? false,
-    //     isGeometryField: true as const,
-    //   };
-    //   const label =
-    //     featureType === 'POINT' ? 'Location (coordinates)' : 'Boundary (polygon)';
+    //   const supportsGeometry =
+    //     normalizedFeatureType === 'POINT' ||
+    //     normalizedFeatureType === 'POLYGON' ||
+    //     normalizedFeatureType === 'MULTI_POLYGON';
+    //   if (!supportsGeometry) return null;
+    //   const geometryFieldLabel =
+    //     normalizedFeatureType === 'POINT'
+    //       ? 'Location (coordinates)'
+    //       : 'Boundary (polygon)';
     //   return new FormField<string>({
     //     id: 'geometry',
     //     key: 'geometry',
-    //     label,
     //     code: 'geometry',
+    //     label: geometryFieldLabel,
     //     controlType: 'coordinate',
-    //     ...sharedOptions,
+    //     required: true,
+    //     disabled: this.config?.disableGeometryField ?? false,
+    //     isGeometryField: true,
     //   });
     // }
     #getGeometryField() {
-        if (this.config?.hideGeometryField)
+        // Hide by default unless explicitly enabled
+        if (this.config?.hideGeometryField !== false)
             return null;
-        const effectiveFeatureTypeRaw = this.#resolveEffectiveFeatureType();
-        const normalizedFeatureType = effectiveFeatureTypeRaw.toUpperCase();
-        const supportsGeometry = normalizedFeatureType === 'POINT' ||
-            normalizedFeatureType === 'POLYGON' ||
-            normalizedFeatureType === 'MULTI_POLYGON';
+        const featureType = this.#resolveEffectiveFeatureType().toUpperCase();
+        const supportsGeometry = featureType === 'POINT' ||
+            featureType === 'POLYGON' ||
+            featureType === 'MULTI_POLYGON';
         if (!supportsGeometry)
             return null;
-        const geometryFieldLabel = normalizedFeatureType === 'POINT'
-            ? 'Location (coordinates)'
-            : 'Boundary (polygon)';
+        const label = featureType === 'POINT' ? 'Location (coordinates)' : 'Boundary (polygon)';
         return new FormField({
             id: 'geometry',
             key: 'geometry',
             code: 'geometry',
-            label: geometryFieldLabel,
+            label,
             controlType: 'coordinate',
             required: true,
-            disabled: this.config?.disableRegistrationUnit ?? false,
+            disabled: this.config?.disableGeometryField ?? false,
             isGeometryField: true,
         });
     }
+    // #resolveEffectiveFeatureType(): string {
+    //   const programMeta = this.program;
+    //   const configuredProgramStageId = this.config?.programStage;
+    //   if (configuredProgramStageId && programMeta?.programStages?.length) {
+    //     const configuredStage = programMeta.programStages.find(
+    //       (stage: ProgramStage) => stage?.id === configuredProgramStageId
+    //     );
+    //     const stageFeatureTypeRaw = configuredStage?.featureType ?? '';
+    //     if (stageFeatureTypeRaw) return String(stageFeatureTypeRaw);
+    //   }
+    //   const programFeatureTypeRaw = (programMeta as Program)?.featureType ?? '';
+    //   return String(programFeatureTypeRaw);
+    // }
     #resolveEffectiveFeatureType() {
         const programMeta = this.program;
-        const configuredProgramStageId = this.config?.programStage;
-        if (configuredProgramStageId && programMeta?.programStages?.length) {
-            const configuredStage = programMeta.programStages.find((stage) => stage?.id === configuredProgramStageId);
-            const stageFeatureTypeRaw = configuredStage?.featureType ?? '';
-            if (stageFeatureTypeRaw)
-                return String(stageFeatureTypeRaw);
-        }
-        const programFeatureTypeRaw = programMeta?.featureType ?? '';
-        return String(programFeatureTypeRaw);
+        if (!programMeta)
+            return '';
+        const configuredStageId = this.config?.programStage;
+        if (configuredStageId && Array.isArray(programMeta.programStages)) {
+            const stage = programMeta.programStages.find((s) => s?.id === configuredStageId);
+            const stageFeatureType = String(stage?.featureType ?? '').trim();
+            if (stageFeatureType) {
+                return stageFeatureType;
+            }
+        }
+        // 2) Fallback to program (enrollment-level) featureType
+        const programFeatureType = String(programMeta?.featureType ?? '').trim();
+        return programFeatureType;
     }
     #getEnrollmentDateField() {
         if (this.config.hideEnrollmentDate || this.config.programStage) {