@iapps/d2-web-sdk 1.1.7 → 1.1.9

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"}