@iapps/d2-web-sdk 1.1.8 → 1.1.12

package/src/lib/modules/tracker/helpers/form.helper.js

@@ -1,13 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseCoordinates = parseCoordinates;
+function isGeoJsonPointLike(candidate) {
+    return (!!candidate &&
+        typeof candidate === 'object' &&
+        candidate.type === 'Point' &&
+        Array.isArray(candidate.coordinates));
+}
 /**
  * Parses a coordinate value into a [longitude, latitude] pair of strings.
  *
- * Supported string inputs:
- *  - "[39.319364,-6.069623]"   // JSON-style
+ * Supported inputs:
+ *  - "[39.319364,-6.069623]"   // JSON-style string
  *  - "39.319364,-6.069623"     // comma-separated
  *  - "39.319364 -6.069623"     // space-separated
+ *  - { type: "Point", coordinates: [39.192299, -6.164641] } // GeoJSON Point
  *
  * Returns:
  *  - ["39.319364", "-6.069623"] when valid (lon, lat as strings)
@@ -17,48 +24,54 @@ exports.parseCoordinates = parseCoordinates;
  *  - Follows GeoJSON convention: [longitude, latitude]
  *  - Valid ranges: lon ∈ [-180, 180], lat ∈ [-90, 90]
  */
-function parseCoordinates(value) {
-    if (!value)
-        return null;
-    const trimmed = value.trim();
-    if (!trimmed)
+function parseCoordinates(input) {
+    if (input == null)
         return null;
-    const validateAndNormalizePair = (parts) => {
-        if (parts.length !== 2)
+    const normalizeLonLatPair = (coordinateParts) => {
+        if (!coordinateParts || coordinateParts.length !== 2)
             return null;
-        const lonText = parts[0].trim();
-        const latText = parts[1].trim();
-        if (!lonText || !latText)
+        const longitudeText = String(coordinateParts[0]).trim();
+        const latitudeText = String(coordinateParts[1]).trim();
+        if (!longitudeText || !latitudeText)
             return null;
-        const lonNum = Number(lonText);
-        const latNum = Number(latText);
-        if (!Number.isFinite(lonNum) || !Number.isFinite(latNum)) {
+        const longitude = Number(longitudeText);
+        const latitude = Number(latitudeText);
+        if (!Number.isFinite(longitude) || !Number.isFinite(latitude))
             return null;
-        }
-        const isLonValid = lonNum >= -180 && lonNum <= 180;
-        const isLatValid = latNum >= -90 && latNum <= 90;
-        if (!isLonValid || !isLatValid) {
+        const isLongitudeValid = longitude >= -180 && longitude <= 180;
+        const isLatitudeValid = latitude >= -90 && latitude <= 90;
+        if (!isLongitudeValid || !isLatitudeValid)
             return null;
-        }
-        return [lonText, latText];
+        return [longitudeText, latitudeText];
     };
-    if (trimmed.startsWith('[') && trimmed.endsWith(']')) {
-        const inner = trimmed.slice(1, -1);
-        const parts = inner.split(',');
-        const result = validateAndNormalizePair(parts);
-        if (result)
-            return result;
+    // GeoJSON Point support
+    if (isGeoJsonPointLike(input)) {
+        const geoJsonCoordinates = input.coordinates;
+        return normalizeLonLatPair(geoJsonCoordinates);
+    }
+    // String-based input handling
+    if (typeof input !== 'string')
+        return null;
+    const trimmedInput = input.trim();
+    if (!trimmedInput)
+        return null;
+    // "[lon,lat]" format
+    if (trimmedInput.startsWith('[') && trimmedInput.endsWith(']')) {
+        const bracketContent = trimmedInput.slice(1, -1);
+        const commaSeparatedValues = bracketContent
+            .split(',')
+            .map((value) => value.trim());
+        return normalizeLonLatPair(commaSeparatedValues);
     }
-    if (trimmed.includes(',')) {
-        const parts = trimmed.split(',');
-        const result = validateAndNormalizePair(parts);
-        if (result)
-            return result;
+    // "lon,lat" format
+    if (trimmedInput.includes(',')) {
+        const commaSeparatedValues = trimmedInput
+            .split(',')
+            .map((value) => value.trim());
+        return normalizeLonLatPair(commaSeparatedValues);
     }
-    const spaceParts = trimmed.split(/\s+/);
-    const result = validateAndNormalizePair(spaceParts);
-    if (result)
-        return result;
-    return null;
+    // "lon lat" format
+    const spaceSeparatedValues = trimmedInput.split(/\s+/);
+    return normalizeLonLatPair(spaceSeparatedValues);
 }
 //# sourceMappingURL=form.helper.js.map

package/src/lib/modules/tracker/helpers/form.helper.js.map

@@ -1 +1 @@
-{"version":3,"file":"form.helper.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/helpers/form.helper.ts"],"names":[],"mappings":";;AAgBA,4CAiDC;AAjED;;;;;;;;;;;;;;;GAeG;AACH,SAAgB,gBAAgB,CAAC,KAAqB;IAClD,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IAExB,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC7B,IAAI,CAAC,OAAO;QAAE,OAAO,IAAI,CAAC;IAE1B,MAAM,wBAAwB,GAAG,CAAC,KAAe,EAAmB,EAAE;QAClE,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAEpC,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAChC,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAEhC,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO;YAAE,OAAO,IAAI,CAAC;QAEtC,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;QAC/B,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;QAE/B,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YACvD,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,GAAG,IAAI,MAAM,IAAI,GAAG,CAAC;QACnD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,EAAE,IAAI,MAAM,IAAI,EAAE,CAAC;QAEjD,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC9B,CAAC,CAAC;IAEF,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACnD,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACnC,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,MAAM,GAAG,wBAAwB,CAAC,KAAK,CAAC,CAAC;QAC/C,IAAI,MAAM;YAAE,OAAO,MAAM,CAAC;IAC9B,CAAC;IAED,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACxB,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACjC,MAAM,MAAM,GAAG,wBAAwB,CAAC,KAAK,CAAC,CAAC;QAC/C,IAAI,MAAM;YAAE,OAAO,MAAM,CAAC;IAC9B,CAAC;IAED,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACxC,MAAM,MAAM,GAAG,wBAAwB,CAAC,UAAU,CAAC,CAAC;IACpD,IAAI,MAAM;QAAE,OAAO,MAAM,CAAC;IAE1B,OAAO,IAAI,CAAC;AAChB,CAAC"}
+{"version":3,"file":"form.helper.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/helpers/form.helper.ts"],"names":[],"mappings":";;AA+BA,4CA4DC;AAtFD,SAAS,kBAAkB,CAAC,SAAkB;IAC1C,OAAO,CACH,CAAC,CAAC,SAAS;QACX,OAAO,SAAS,KAAK,QAAQ;QAC5B,SAAiB,CAAC,IAAI,KAAK,OAAO;QACnC,KAAK,CAAC,OAAO,CAAE,SAAiB,CAAC,WAAW,CAAC,CAChD,CAAC;AACN,CAAC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,SAAgB,gBAAgB,CAAC,KAAsB;IACnD,IAAI,KAAK,IAAI,IAAI;QAAE,OAAO,IAAI,CAAC;IAE/B,MAAM,mBAAmB,GAAG,CACxB,eAAuC,EACxB,EAAE;QACjB,IAAI,CAAC,eAAe,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAElE,MAAM,aAAa,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QACxD,MAAM,YAAY,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAEvD,IAAI,CAAC,aAAa,IAAI,CAAC,YAAY;YAAE,OAAO,IAAI,CAAC;QAEjD,MAAM,SAAS,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;QACxC,MAAM,QAAQ,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;QAEtC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAAE,OAAO,IAAI,CAAC;QAE3E,MAAM,gBAAgB,GAAG,SAAS,IAAI,CAAC,GAAG,IAAI,SAAS,IAAI,GAAG,CAAC;QAC/D,MAAM,eAAe,GAAG,QAAQ,IAAI,CAAC,EAAE,IAAI,QAAQ,IAAI,EAAE,CAAC;QAE1D,IAAI,CAAC,gBAAgB,IAAI,CAAC,eAAe;YAAE,OAAO,IAAI,CAAC;QAEvD,OAAO,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;IACzC,CAAC,CAAC;IAEF,wBAAwB;IACxB,IAAI,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC;QAC5B,MAAM,kBAAkB,GAAG,KAAK,CAAC,WAAW,CAAC;QAC7C,OAAO,mBAAmB,CAAC,kBAAkB,CAAC,CAAC;IACnD,CAAC;IAED,8BAA8B;IAC9B,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC;IAE3C,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAClC,IAAI,CAAC,YAAY;QAAE,OAAO,IAAI,CAAC;IAE/B,qBAAqB;IACrB,IAAI,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC7D,MAAM,cAAc,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACjD,MAAM,oBAAoB,GAAG,cAAc;aACtC,KAAK,CAAC,GAAG,CAAC;aACV,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;QAElC,OAAO,mBAAmB,CAAC,oBAAoB,CAAC,CAAC;IACrD,CAAC;IAED,mBAAmB;IACnB,IAAI,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC7B,MAAM,oBAAoB,GAAG,YAAY;aACpC,KAAK,CAAC,GAAG,CAAC;aACV,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;QAElC,OAAO,mBAAmB,CAAC,oBAAoB,CAAC,CAAC;IACrD,CAAC;IAED,mBAAmB;IACnB,MAAM,oBAAoB,GAAG,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACvD,OAAO,mBAAmB,CAAC,oBAAoB,CAAC,CAAC;AACrD,CAAC"}

package/src/lib/shared/models/pager.model.d.ts

@@ -8,5 +8,10 @@ export declare class Pager {
     index?: number;
     pageOffset?: number;
     constructor(pager?: Partial<Pager>);
+    /**
+     * Backward + forward compatible:
+     * - legacy: skipPaging=true/false
+     * - updated: paging=false/true + page/pageSize
+     */
     getPagingQueryParams(): string;
 }

package/src/lib/shared/models/pager.model.js

@@ -1,30 +1,70 @@
 "use strict";
+// export class Pager {
+//   pageSize: number;
+//   pageCount?: number;
+//   page: number;
+//   paging: boolean;
+//   total?: number;
+//   index?: number;
+//   pageOffset?: number;
 var _Pager_instances, _Pager_getIndex, _Pager_getOffset;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Pager = void 0;
 const tslib_1 = require("tslib");
+//   constructor(pager?: Partial<Pager>) {
+//     this.pageSize = pager?.pageSize || 50;
+//     this.page = pager?.page || 1;
+//     this.paging = pager?.paging ?? true;
+//     this.total = pager?.total;
+//     this.index = this.#getIndex();
+//     this.pageCount = pager?.pageCount;
+//     this.pageOffset = this.#getOffset();
+//   }
+//   #getIndex(): number {
+//     return this.page, this.pageSize * (this.page - 1);
+//   }
+//   #getOffset(): number {
+//     return (this.page - 1) * this.pageSize;
+//   }
+//   getPagingQueryParams(): string {
+//     if (!this.paging) {
+//       return 'skipPaging=true&paging=false';
+//     }
+//     return `page=${this.page || 1}&pageSize=${
+//       this.pageSize || 50
+//     }&skipPaging=false&totalPages=true`;
+//   }
+// }
 class Pager {
     constructor(pager) {
-        var _a;
+        var _a, _b, _c;
         _Pager_instances.add(this);
-        this.pageSize = (pager === null || pager === void 0 ? void 0 : pager.pageSize) || 50;
-        this.page = (pager === null || pager === void 0 ? void 0 : pager.page) || 1;
-        this.paging = (_a = pager === null || pager === void 0 ? void 0 : pager.paging) !== null && _a !== void 0 ? _a : true;
+        this.pageSize = (_a = pager === null || pager === void 0 ? void 0 : pager.pageSize) !== null && _a !== void 0 ? _a : 50;
+        this.page = (_b = pager === null || pager === void 0 ? void 0 : pager.page) !== null && _b !== void 0 ? _b : 1;
+        this.paging = (_c = pager === null || pager === void 0 ? void 0 : pager.paging) !== null && _c !== void 0 ? _c : true;
         this.total = pager === null || pager === void 0 ? void 0 : pager.total;
-        this.index = tslib_1.__classPrivateFieldGet(this, _Pager_instances, "m", _Pager_getIndex).call(this);
         this.pageCount = pager === null || pager === void 0 ? void 0 : pager.pageCount;
+        this.index = tslib_1.__classPrivateFieldGet(this, _Pager_instances, "m", _Pager_getIndex).call(this);
         this.pageOffset = tslib_1.__classPrivateFieldGet(this, _Pager_instances, "m", _Pager_getOffset).call(this);
     }
+    /**
+     * Backward + forward compatible:
+     * - legacy: skipPaging=true/false
+     * - updated: paging=false/true + page/pageSize
+     */
     getPagingQueryParams() {
+        var _a, _b;
         if (!this.paging) {
-            return 'skipPaging=true';
+            return 'paging=false&skipPaging=true';
         }
-        return `page=${this.page || 1}&pageSize=${this.pageSize || 50}&skipPaging=false&totalPages=true`;
+        const page = (_a = this.page) !== null && _a !== void 0 ? _a : 1;
+        const pageSize = (_b = this.pageSize) !== null && _b !== void 0 ? _b : 50;
+        return `paging=true&page=${page}&pageSize=${pageSize}&skipPaging=false&totalPages=true`;
     }
 }
 exports.Pager = Pager;
 _Pager_instances = new WeakSet(), _Pager_getIndex = function _Pager_getIndex() {
-    return this.page, this.pageSize * (this.page - 1);
+    return this.pageSize * (this.page - 1);
 }, _Pager_getOffset = function _Pager_getOffset() {
     return (this.page - 1) * this.pageSize;
 };

package/src/lib/shared/models/pager.model.js.map

@@ -1 +1 @@
-{"version":3,"file":"pager.model.js","sourceRoot":"","sources":["../../../../../../../packages/dhis2-web-sdk/src/lib/shared/models/pager.model.ts"],"names":[],"mappings":";;;;;AAAA,MAAa,KAAK;IAShB,YAAY,KAAsB;;;QAChC,IAAI,CAAC,QAAQ,GAAG,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,KAAI,EAAE,CAAC;QACtC,IAAI,CAAC,IAAI,GAAG,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,KAAI,CAAC,CAAC;QAC7B,IAAI,CAAC,MAAM,GAAG,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,mCAAI,IAAI,CAAC;QACpC,IAAI,CAAC,KAAK,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,KAAK,CAAC;QAC1B,IAAI,CAAC,KAAK,GAAG,+BAAA,IAAI,yCAAU,MAAd,IAAI,CAAY,CAAC;QAC9B,IAAI,CAAC,SAAS,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,SAAS,CAAC;QAClC,IAAI,CAAC,UAAU,GAAG,+BAAA,IAAI,0CAAW,MAAf,IAAI,CAAa,CAAC;IACtC,CAAC;IAUD,oBAAoB;QAElB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,OAAO,iBAAiB,CAAC;QAC3B,CAAC;QAED,OAAO,QAAQ,IAAI,CAAC,IAAI,IAAI,CAAC,aAC3B,IAAI,CAAC,QAAQ,IAAI,EACnB,mCAAmC,CAAC;IACtC,CAAC;CACF;AArCD,sBAqCC;;IAjBG,OAAO,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,GAAG,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC;AACpD,CAAC;IAGC,OAAO,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC;AACzC,CAAC"}
+{"version":3,"file":"pager.model.js","sourceRoot":"","sources":["../../../../../../../packages/dhis2-web-sdk/src/lib/shared/models/pager.model.ts"],"names":[],"mappings":";AAAA,uBAAuB;AACvB,sBAAsB;AACtB,wBAAwB;AACxB,kBAAkB;AAClB,qBAAqB;AACrB,oBAAoB;AACpB,oBAAoB;AACpB,yBAAyB;;;;;AAEzB,0CAA0C;AAC1C,6CAA6C;AAC7C,oCAAoC;AACpC,2CAA2C;AAC3C,iCAAiC;AACjC,qCAAqC;AACrC,yCAAyC;AACzC,2CAA2C;AAC3C,MAAM;AAEN,0BAA0B;AAC1B,yDAAyD;AACzD,MAAM;AAEN,2BAA2B;AAC3B,8CAA8C;AAC9C,MAAM;AAEN,qCAAqC;AAErC,0BAA0B;AAC1B,+CAA+C;AAC/C,QAAQ;AAER,iDAAiD;AACjD,4BAA4B;AAC5B,2CAA2C;AAC3C,MAAM;AACN,IAAI;AAEJ,MAAa,KAAK;IAShB,YAAY,KAAsB;;;QAChC,IAAI,CAAC,QAAQ,GAAG,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,mCAAI,EAAE,CAAC;QACtC,IAAI,CAAC,IAAI,GAAG,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,mCAAI,CAAC,CAAC;QAC7B,IAAI,CAAC,MAAM,GAAG,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,mCAAI,IAAI,CAAC;QAEpC,IAAI,CAAC,KAAK,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,KAAK,CAAC;QAC1B,IAAI,CAAC,SAAS,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,SAAS,CAAC;QAElC,IAAI,CAAC,KAAK,GAAG,+BAAA,IAAI,yCAAU,MAAd,IAAI,CAAY,CAAC;QAC9B,IAAI,CAAC,UAAU,GAAG,+BAAA,IAAI,0CAAW,MAAf,IAAI,CAAa,CAAC;IACtC,CAAC;IAUD;;;;OAIG;IACH,oBAAoB;;QAClB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,OAAO,8BAA8B,CAAC;QACxC,CAAC;QAED,MAAM,IAAI,GAAG,MAAA,IAAI,CAAC,IAAI,mCAAI,CAAC,CAAC;QAC5B,MAAM,QAAQ,GAAG,MAAA,IAAI,CAAC,QAAQ,mCAAI,EAAE,CAAC;QAErC,OAAO,oBAAoB,IAAI,aAAa,QAAQ,mCAAmC,CAAC;IAC1F,CAAC;CACF;AA5CD,sBA4CC;;IAtBG,OAAO,IAAI,CAAC,QAAQ,GAAG,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC;AACzC,CAAC;IAGC,OAAO,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC;AACzC,CAAC"}