@iapps/d2-web-sdk 1.1.8 → 1.1.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (13) hide show
  1. package/package.json +1 -1
  2. package/src/lib/modules/engine/program-rule/program-rule.engine.d.ts +33 -5
  3. package/src/lib/modules/engine/program-rule/program-rule.engine.js +183 -47
  4. package/src/lib/modules/engine/program-rule/program-rule.engine.js.map +1 -1
  5. package/src/lib/modules/engine/program-rule/utils/d2-functions.util.d.ts +6 -2
  6. package/src/lib/modules/engine/program-rule/utils/d2-functions.util.js +750 -293
  7. package/src/lib/modules/engine/program-rule/utils/d2-functions.util.js.map +1 -1
  8. package/src/lib/modules/engine/program-rule/utils/run-d2-expression.util.d.ts +12 -4
  9. package/src/lib/modules/engine/program-rule/utils/run-d2-expression.util.js +363 -67
  10. package/src/lib/modules/engine/program-rule/utils/run-d2-expression.util.js.map +1 -1
  11. package/src/lib/shared/models/pager.model.d.ts +5 -0
  12. package/src/lib/shared/models/pager.model.js +48 -8
  13. package/src/lib/shared/models/pager.model.js.map +1 -1
package/src/lib/shared/models/pager.model.js CHANGED
@@ -1,30 +1,70 @@
1
1
  "use strict";
2
+ // export class Pager {
3
+ // pageSize: number;
4
+ // pageCount?: number;
5
+ // page: number;
6
+ // paging: boolean;
7
+ // total?: number;
8
+ // index?: number;
9
+ // pageOffset?: number;
2
10
  var _Pager_instances, _Pager_getIndex, _Pager_getOffset;
3
11
  Object.defineProperty(exports, "__esModule", { value: true });
4
12
  exports.Pager = void 0;
5
13
  const tslib_1 = require("tslib");
14
+ // constructor(pager?: Partial<Pager>) {
15
+ // this.pageSize = pager?.pageSize || 50;
16
+ // this.page = pager?.page || 1;
17
+ // this.paging = pager?.paging ?? true;
18
+ // this.total = pager?.total;
19
+ // this.index = this.#getIndex();
20
+ // this.pageCount = pager?.pageCount;
21
+ // this.pageOffset = this.#getOffset();
22
+ // }
23
+ // #getIndex(): number {
24
+ // return this.page, this.pageSize * (this.page - 1);
25
+ // }
26
+ // #getOffset(): number {
27
+ // return (this.page - 1) * this.pageSize;
28
+ // }
29
+ // getPagingQueryParams(): string {
30
+ // if (!this.paging) {
31
+ // return 'skipPaging=true&paging=false';
32
+ // }
33
+ // return `page=${this.page || 1}&pageSize=${
34
+ // this.pageSize || 50
35
+ // }&skipPaging=false&totalPages=true`;
36
+ // }
37
+ // }
6
38
  class Pager {
7
39
  constructor(pager) {
8
- var _a;
40
+ var _a, _b, _c;
9
41
  _Pager_instances.add(this);
10
- this.pageSize = (pager === null || pager === void 0 ? void 0 : pager.pageSize) || 50;
11
- this.page = (pager === null || pager === void 0 ? void 0 : pager.page) || 1;
12
- this.paging = (_a = pager === null || pager === void 0 ? void 0 : pager.paging) !== null && _a !== void 0 ? _a : true;
42
+ this.pageSize = (_a = pager === null || pager === void 0 ? void 0 : pager.pageSize) !== null && _a !== void 0 ? _a : 50;
43
+ this.page = (_b = pager === null || pager === void 0 ? void 0 : pager.page) !== null && _b !== void 0 ? _b : 1;
44
+ this.paging = (_c = pager === null || pager === void 0 ? void 0 : pager.paging) !== null && _c !== void 0 ? _c : true;
13
45
  this.total = pager === null || pager === void 0 ? void 0 : pager.total;
14
- this.index = tslib_1.__classPrivateFieldGet(this, _Pager_instances, "m", _Pager_getIndex).call(this);
15
46
  this.pageCount = pager === null || pager === void 0 ? void 0 : pager.pageCount;
47
+ this.index = tslib_1.__classPrivateFieldGet(this, _Pager_instances, "m", _Pager_getIndex).call(this);
16
48
  this.pageOffset = tslib_1.__classPrivateFieldGet(this, _Pager_instances, "m", _Pager_getOffset).call(this);
17
49
  }
50
+ /**
51
+ * Backward + forward compatible:
52
+ * - legacy: skipPaging=true/false
53
+ * - updated: paging=false/true + page/pageSize
54
+ */
18
55
  getPagingQueryParams() {
56
+ var _a, _b;
19
57
  if (!this.paging) {
20
- return 'skipPaging=true';
58
+ return 'paging=false&skipPaging=true';
21
59
  }
22
- return `page=${this.page || 1}&pageSize=${this.pageSize || 50}&skipPaging=false&totalPages=true`;
60
+ const page = (_a = this.page) !== null && _a !== void 0 ? _a : 1;
61
+ const pageSize = (_b = this.pageSize) !== null && _b !== void 0 ? _b : 50;
62
+ return `paging=true&page=${page}&pageSize=${pageSize}&skipPaging=false&totalPages=true`;
23
63
  }
24
64
  }
25
65
  exports.Pager = Pager;
26
66
  _Pager_instances = new WeakSet(), _Pager_getIndex = function _Pager_getIndex() {
27
- return this.page, this.pageSize * (this.page - 1);
67
+ return this.pageSize * (this.page - 1);
28
68
  }, _Pager_getOffset = function _Pager_getOffset() {
29
69
  return (this.page - 1) * this.pageSize;
30
70
  };
package/src/lib/shared/models/pager.model.js.map CHANGED
@@ -1 +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"}
1
+ {"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"}