@iapps/ng-dhis2-ui 1.2.139 → 1.2.146

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

@@ -5843,8 +5843,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 +7667,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 +7692,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 +7780,15 @@ 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)
+                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 +7804,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 +7829,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);
             }
@@ -13073,5 +13158,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.3", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { Boolean$1 as Boolean, BreadcrumbComponent, BreadcrumbModule, ButtonComponent, ButtonModule, CheckBox, D2FormModule, DEFAULT_KEYWORD_TO_LEVEL, DataTableUIComponent, DataTableUIModule, DateField, DateRangeValue, Dropdown, EventFormComponent, EventFormModule, FACILITY_KEYWORDS, FieldConfig, FieldControlTypeUtil, FieldDropdown, FieldType, FieldUtil, FlatFormComponent, FormComponent, FormConfig, FormField, FormFieldComponent, FormFieldGroup, FormFieldTypeUtil, FormMetaData, FormMetadataSection, FormUtil, FormValue, FormValueUtil, GLOBAL_TYPE_RULES, HeaderBarComponent, HeaderBarModule, LOWERCASE_FACILITY_KEYWORDS, LevelMatchMode, LevelSelectorMode, LineListModule, LineListTableComponent, MetadataRule, MetadataRuleAction, ORG_UNIT_LEVEL_TO_KEYWORD, OrgUnitLevel, OrganisationUnitSelectionConfig, OrganisationUnitSelectorComponent, OrganisationUnitSelectorModalComponent, OrganisationUnitSelectorModule, PeriodSelectorComponent, PeriodSelectorModalComponent, PeriodSelectorModule, ProgramEntryFormConfig, ProgramEntryFormMetaData, ProgramEntryFormModule, ProgramEntryFormSection, ReactWrapperModule, RepeatableFormComponent, SectionFormComponent, SelectionFiltersComponent, SelectionFiltersUiModule, TrackerFormComponent, TrackerFormModule, TranslationUtil };
+export { Boolean$1 as Boolean, BreadcrumbComponent, BreadcrumbModule, ButtonComponent, ButtonModule, CascadeKind, CheckBox, D2FormModule, DEFAULT_KEYWORD_TO_LEVEL, DEFAULT_OPTIONS_PATH_CASCADE, DataTableUIComponent, DataTableUIModule, DateField, DateRangeValue, Dropdown, EventFormComponent, EventFormModule, FACILITY_KEYWORDS, FieldConfig, FieldControlTypeUtil, FieldDropdown, FieldType, FieldUtil, FlatFormComponent, FormComponent, FormConfig, FormField, FormFieldComponent, FormFieldGroup, FormFieldTypeUtil, FormMetaData, FormMetadataSection, FormUtil, FormValue, FormValueUtil, GLOBAL_TYPE_RULES, HeaderBarComponent, HeaderBarModule, LOWERCASE_FACILITY_KEYWORDS, LevelMatchMode, LevelSelectorMode, LineListModule, LineListTableComponent, MetadataRule, MetadataRuleAction, ORG_UNIT_LEVEL_TO_KEYWORD, OptionPathField, OrgUnitLevel, OrganisationUnitSelectionConfig, OrganisationUnitSelectorComponent, OrganisationUnitSelectorModalComponent, OrganisationUnitSelectorModule, ParentMatchMode, ParentValueType, PeriodSelectorComponent, PeriodSelectorModalComponent, PeriodSelectorModule, ProgramEntryFormConfig, ProgramEntryFormMetaData, ProgramEntryFormModule, ProgramEntryFormSection, ReactWrapperModule, RepeatableFormComponent, SectionFormComponent, SelectionFiltersComponent, SelectionFiltersUiModule, TrackerFormComponent, TrackerFormModule, TranslationUtil };
 //# sourceMappingURL=iapps-ng-dhis2-ui.mjs.map