@esri/hub-common 9.45.0 → 9.45.1

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.
@@ -35,6 +35,9 @@ export class Collection {
35
35
  get sortDirection() {
36
36
  return this._collection.sortDirection || "asc";
37
37
  }
38
+ get targetEntity() {
39
+ return this._collection.targetEntity;
40
+ }
38
41
  async search(query, options = {}) {
39
42
  var _a;
40
43
  let qry;
@@ -1 +1 @@
1
- {"version":3,"file":"Collection.js","sourceRoot":"","sources":["../../../src/search/Collection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAkB,MAAM,IAAI,CAAC;AAUpD;;GAEG;AACH,0BAA0B;AAC1B,MAAM,OAAO,UAAU;IAGrB,YAAoB,UAA0B,EAAE,OAAwB;QACtE,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;QAC9B,IAAI,OAAO,EAAE;YACX,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;SACzB;IACH,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,MAAM,CACxB,UAA0B,EAC1B,OAAwB;QAExB,kDAAkD;QAClD,gEAAgE;QAChE,MAAM,GAAG,GAAG,IAAI,UAAU,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAChD,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;IAED,UAAU;IAEV,IAAW,KAAK;QACd,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;IAChC,CAAC;IACD,IAAW,GAAG;QACZ,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC;IAC9B,CAAC;IACD,IAAW,OAAO;QAChB,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC;IAClC,CAAC;IACD,IAAW,KAAK;QACd,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;IAChC,CAAC;IACD,IAAW,SAAS;QAClB,OAAO,IAAI,CAAC,WAAW,CAAC,SAAS,IAAI,OAAO,CAAC;IAC/C,CAAC;IACD,IAAW,aAAa;QACtB,OAAO,IAAI,CAAC,WAAW,CAAC,aAAa,IAAI,KAAK,CAAC;IACjD,CAAC;IAEM,KAAK,CAAC,MAAM,CACjB,KAAsB,EACtB,UAA6B,EAAE;;QAE/B,IAAI,GAAW,CAAC;QAChB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,iCAAiC;YACjC,GAAG,GAAG;gBACJ,YAAY,EAAE,OAAA,IAAI,CAAC,WAAW,CAAC,KAAK,0CAAE,YAAY,KAAI,MAAM;gBAC5D,OAAO,EAAE;oBACP;wBACE,UAAU,EAAE;4BACV;gCACE,IAAI,EAAE,KAAK;6BACZ;yBACF;qBACF;iBACF;aACF,CAAC;SACH;aAAM;YACL,GAAG,GAAG,KAAK,CAAC;SACb;QAED,yCAAyC;QACzC,GAAG,CAAC,OAAO,GAAG,CAAC,GAAG,GAAG,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAEtD,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC;QACzD,4CAA4C;QAC5C,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,CAAC;QACxD,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC,aAAa,CAAC;QAC5D,2CAA2C;QAC3C,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC;QAElD,wCAAwC;QACxC,OAAO,cAAc,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACtC,CAAC;CACF"}
1
+ {"version":3,"file":"Collection.js","sourceRoot":"","sources":["../../../src/search/Collection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAkB,MAAM,IAAI,CAAC;AAWpD;;GAEG;AACH,0BAA0B;AAC1B,MAAM,OAAO,UAAU;IAGrB,YAAoB,UAA0B,EAAE,OAAwB;QACtE,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;QAC9B,IAAI,OAAO,EAAE;YACX,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;SACzB;IACH,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,MAAM,CACxB,UAA0B,EAC1B,OAAwB;QAExB,kDAAkD;QAClD,gEAAgE;QAChE,MAAM,GAAG,GAAG,IAAI,UAAU,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAChD,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;IAED,UAAU;IAEV,IAAW,KAAK;QACd,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;IAChC,CAAC;IACD,IAAW,GAAG;QACZ,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC;IAC9B,CAAC;IACD,IAAW,OAAO;QAChB,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC;IAClC,CAAC;IACD,IAAW,KAAK;QACd,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;IAChC,CAAC;IACD,IAAW,SAAS;QAClB,OAAO,IAAI,CAAC,WAAW,CAAC,SAAS,IAAI,OAAO,CAAC;IAC/C,CAAC;IACD,IAAW,aAAa;QACtB,OAAO,IAAI,CAAC,WAAW,CAAC,aAAa,IAAI,KAAK,CAAC;IACjD,CAAC;IACD,IAAW,YAAY;QACrB,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC;IACvC,CAAC;IAEM,KAAK,CAAC,MAAM,CACjB,KAAsB,EACtB,UAA6B,EAAE;;QAE/B,IAAI,GAAW,CAAC;QAChB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,iCAAiC;YACjC,GAAG,GAAG;gBACJ,YAAY,EAAE,OAAA,IAAI,CAAC,WAAW,CAAC,KAAK,0CAAE,YAAY,KAAI,MAAM;gBAC5D,OAAO,EAAE;oBACP;wBACE,UAAU,EAAE;4BACV;gCACE,IAAI,EAAE,KAAK;6BACZ;yBACF;qBACF;iBACF;aACF,CAAC;SACH;aAAM;YACL,GAAG,GAAG,KAAK,CAAC;SACb;QAED,yCAAyC;QACzC,GAAG,CAAC,OAAO,GAAG,CAAC,GAAG,GAAG,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAEtD,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC;QACzD,4CAA4C;QAC5C,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,CAAC;QACxD,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC,aAAa,CAAC;QAC5D,2CAA2C;QAC3C,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC;QAElD,wCAAwC;QACxC,OAAO,cAAc,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACtC,CAAC;CACF"}
@@ -4,29 +4,30 @@ import { getProp } from "..";
4
4
  * @param original
5
5
  */
6
6
  export function convertCatalog(original) {
7
- const filterGroup = {
8
- filterType: "item",
9
- operation: "OR",
10
- filters: [],
11
- };
12
- const groups = getProp(original, "groups");
13
- if (Array.isArray(groups) && groups.length) {
14
- filterGroup.filters.push({
15
- filterType: "item",
16
- group: groups,
17
- });
18
- }
19
- else if (typeof groups === "string") {
20
- filterGroup.filters.push({
21
- filterType: "item",
22
- group: [groups],
23
- });
24
- }
25
7
  const catalog = {
8
+ schemaVersion: 1,
26
9
  title: "Default Catalog",
27
- scope: [filterGroup],
10
+ scopes: {
11
+ item: {
12
+ targetEntity: "item",
13
+ filters: [],
14
+ },
15
+ },
28
16
  collections: [],
29
17
  };
18
+ const rawGroups = getProp(original, "groups");
19
+ let groups = [];
20
+ if (Array.isArray(rawGroups) && rawGroups.length) {
21
+ groups = rawGroups;
22
+ }
23
+ else if (typeof rawGroups === "string") {
24
+ groups = [rawGroups];
25
+ }
26
+ if (groups.length) {
27
+ catalog.scopes.item.filters.push({
28
+ predicates: [{ group: groups }],
29
+ });
30
+ }
30
31
  return catalog;
31
32
  }
32
33
  //# sourceMappingURL=convertCatalog.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"convertCatalog.js","sourceRoot":"","sources":["../../../src/search/convertCatalog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAG7B;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAC,QAAa;IAC1C,MAAM,WAAW,GAAyB;QACxC,UAAU,EAAE,MAAM;QAClB,SAAS,EAAE,IAAI;QACf,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAE3C,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE;QAC1C,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC;YACvB,UAAU,EAAE,MAAM;YAClB,KAAK,EAAE,MAAM;SACd,CAAC,CAAC;KACJ;SAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;QACrC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC;YACvB,UAAU,EAAE,MAAM;YAClB,KAAK,EAAE,CAAC,MAAM,CAAC;SAChB,CAAC,CAAC;KACJ;IAED,MAAM,OAAO,GAAa;QACxB,KAAK,EAAE,iBAAiB;QACxB,KAAK,EAAE,CAAC,WAAW,CAAC;QACpB,WAAW,EAAE,EAAE;KAChB,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC"}
1
+ {"version":3,"file":"convertCatalog.js","sourceRoot":"","sources":["../../../src/search/convertCatalog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAG7B;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAC,QAAa;IAC1C,MAAM,OAAO,GAAgB;QAC3B,aAAa,EAAE,CAAC;QAChB,KAAK,EAAE,iBAAiB;QACxB,MAAM,EAAE;YACN,IAAI,EAAE;gBACJ,YAAY,EAAE,MAAM;gBACpB,OAAO,EAAE,EAAE;aACZ;SACF;QACD,WAAW,EAAE,EAAE;KAChB,CAAC;IAEF,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAC9C,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,MAAM,EAAE;QAChD,MAAM,GAAG,SAAS,CAAC;KACpB;SAAM,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;QACxC,MAAM,GAAG,CAAC,SAAS,CAAC,CAAC;KACtB;IAED,IAAI,MAAM,CAAC,MAAM,EAAE;QACjB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;YAC/B,UAAU,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;SAChC,CAAC,CAAC;KACJ;IAED,OAAO,OAAO,CAAC;AACjB,CAAC"}
@@ -63,6 +63,13 @@ var Collection = /** @class */ (function () {
63
63
  enumerable: false,
64
64
  configurable: true
65
65
  });
66
+ Object.defineProperty(Collection.prototype, "targetEntity", {
67
+ get: function () {
68
+ return this._collection.targetEntity;
69
+ },
70
+ enumerable: false,
71
+ configurable: true
72
+ });
66
73
  Collection.prototype.search = function (query, options) {
67
74
  var _a;
68
75
  if (options === void 0) { options = {}; }
@@ -1 +1 @@
1
- {"version":3,"file":"Collection.js","sourceRoot":"","sources":["../../../src/search/Collection.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAkB,MAAM,IAAI,CAAC;AAUpD;;GAEG;AACH,0BAA0B;AAC1B;IAGE,oBAAoB,UAA0B,EAAE,OAAwB;QACtE,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;QAC9B,IAAI,OAAO,EAAE;YACX,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;SACzB;IACH,CAAC;IAEmB,iBAAM,GAA1B,UACE,UAA0B,EAC1B,OAAwB;;;;gBAIlB,GAAG,GAAG,IAAI,UAAU,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;gBAChD,sBAAO,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,EAAC;;;KAC7B;IAID,sBAAW,6BAAK;QAFhB,UAAU;aAEV;YACE,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;QAChC,CAAC;;;OAAA;IACD,sBAAW,2BAAG;aAAd;YACE,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC;QAC9B,CAAC;;;OAAA;IACD,sBAAW,+BAAO;aAAlB;YACE,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC;QAClC,CAAC;;;OAAA;IACD,sBAAW,6BAAK;aAAhB;YACE,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;QAChC,CAAC;;;OAAA;IACD,sBAAW,iCAAS;aAApB;YACE,OAAO,IAAI,CAAC,WAAW,CAAC,SAAS,IAAI,OAAO,CAAC;QAC/C,CAAC;;;OAAA;IACD,sBAAW,qCAAa;aAAxB;YACE,OAAO,IAAI,CAAC,WAAW,CAAC,aAAa,IAAI,KAAK,CAAC;QACjD,CAAC;;;OAAA;IAEY,2BAAM,GAAnB,UACE,KAAsB,EACtB,OAA+B;;QAA/B,wBAAA,EAAA,YAA+B;;;;gBAG/B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;oBAC7B,iCAAiC;oBACjC,GAAG,GAAG;wBACJ,YAAY,EAAE,OAAA,IAAI,CAAC,WAAW,CAAC,KAAK,0CAAE,YAAY,KAAI,MAAM;wBAC5D,OAAO,EAAE;4BACP;gCACE,UAAU,EAAE;oCACV;wCACE,IAAI,EAAE,KAAK;qCACZ;iCACF;6BACF;yBACF;qBACF,CAAC;iBACH;qBAAM;oBACL,GAAG,GAAG,KAAK,CAAC;iBACb;gBAED,yCAAyC;gBACzC,GAAG,CAAC,OAAO,kBAAO,GAAG,CAAC,OAAO,EAAK,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;gBAEtD,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC;gBACzD,4CAA4C;gBAC5C,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,CAAC;gBACxD,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC,aAAa,CAAC;gBAC5D,2CAA2C;gBAC3C,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC;gBAElD,wCAAwC;gBACxC,sBAAO,cAAc,CAAC,GAAG,EAAE,OAAO,CAAC,EAAC;;;KACrC;IACH,iBAAC;AAAD,CAAC,AA7ED,IA6EC"}
1
+ {"version":3,"file":"Collection.js","sourceRoot":"","sources":["../../../src/search/Collection.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAkB,MAAM,IAAI,CAAC;AAWpD;;GAEG;AACH,0BAA0B;AAC1B;IAGE,oBAAoB,UAA0B,EAAE,OAAwB;QACtE,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;QAC9B,IAAI,OAAO,EAAE;YACX,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;SACzB;IACH,CAAC;IAEmB,iBAAM,GAA1B,UACE,UAA0B,EAC1B,OAAwB;;;;gBAIlB,GAAG,GAAG,IAAI,UAAU,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;gBAChD,sBAAO,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,EAAC;;;KAC7B;IAID,sBAAW,6BAAK;QAFhB,UAAU;aAEV;YACE,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;QAChC,CAAC;;;OAAA;IACD,sBAAW,2BAAG;aAAd;YACE,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC;QAC9B,CAAC;;;OAAA;IACD,sBAAW,+BAAO;aAAlB;YACE,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC;QAClC,CAAC;;;OAAA;IACD,sBAAW,6BAAK;aAAhB;YACE,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;QAChC,CAAC;;;OAAA;IACD,sBAAW,iCAAS;aAApB;YACE,OAAO,IAAI,CAAC,WAAW,CAAC,SAAS,IAAI,OAAO,CAAC;QAC/C,CAAC;;;OAAA;IACD,sBAAW,qCAAa;aAAxB;YACE,OAAO,IAAI,CAAC,WAAW,CAAC,aAAa,IAAI,KAAK,CAAC;QACjD,CAAC;;;OAAA;IACD,sBAAW,oCAAY;aAAvB;YACE,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC;QACvC,CAAC;;;OAAA;IAEY,2BAAM,GAAnB,UACE,KAAsB,EACtB,OAA+B;;QAA/B,wBAAA,EAAA,YAA+B;;;;gBAG/B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;oBAC7B,iCAAiC;oBACjC,GAAG,GAAG;wBACJ,YAAY,EAAE,OAAA,IAAI,CAAC,WAAW,CAAC,KAAK,0CAAE,YAAY,KAAI,MAAM;wBAC5D,OAAO,EAAE;4BACP;gCACE,UAAU,EAAE;oCACV;wCACE,IAAI,EAAE,KAAK;qCACZ;iCACF;6BACF;yBACF;qBACF,CAAC;iBACH;qBAAM;oBACL,GAAG,GAAG,KAAK,CAAC;iBACb;gBAED,yCAAyC;gBACzC,GAAG,CAAC,OAAO,kBAAO,GAAG,CAAC,OAAO,EAAK,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;gBAEtD,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC;gBACzD,4CAA4C;gBAC5C,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,CAAC;gBACxD,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC,aAAa,CAAC;gBAC5D,2CAA2C;gBAC3C,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC;gBAElD,wCAAwC;gBACxC,sBAAO,cAAc,CAAC,GAAG,EAAE,OAAO,CAAC,EAAC;;;KACrC;IACH,iBAAC;AAAD,CAAC,AAhFD,IAgFC"}
@@ -4,29 +4,30 @@ import { getProp } from "..";
4
4
  * @param original
5
5
  */
6
6
  export function convertCatalog(original) {
7
- var filterGroup = {
8
- filterType: "item",
9
- operation: "OR",
10
- filters: [],
11
- };
12
- var groups = getProp(original, "groups");
13
- if (Array.isArray(groups) && groups.length) {
14
- filterGroup.filters.push({
15
- filterType: "item",
16
- group: groups,
17
- });
18
- }
19
- else if (typeof groups === "string") {
20
- filterGroup.filters.push({
21
- filterType: "item",
22
- group: [groups],
23
- });
24
- }
25
7
  var catalog = {
8
+ schemaVersion: 1,
26
9
  title: "Default Catalog",
27
- scope: [filterGroup],
10
+ scopes: {
11
+ item: {
12
+ targetEntity: "item",
13
+ filters: [],
14
+ },
15
+ },
28
16
  collections: [],
29
17
  };
18
+ var rawGroups = getProp(original, "groups");
19
+ var groups = [];
20
+ if (Array.isArray(rawGroups) && rawGroups.length) {
21
+ groups = rawGroups;
22
+ }
23
+ else if (typeof rawGroups === "string") {
24
+ groups = [rawGroups];
25
+ }
26
+ if (groups.length) {
27
+ catalog.scopes.item.filters.push({
28
+ predicates: [{ group: groups }],
29
+ });
30
+ }
30
31
  return catalog;
31
32
  }
32
33
  //# sourceMappingURL=convertCatalog.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"convertCatalog.js","sourceRoot":"","sources":["../../../src/search/convertCatalog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAG7B;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAC,QAAa;IAC1C,IAAM,WAAW,GAAyB;QACxC,UAAU,EAAE,MAAM;QAClB,SAAS,EAAE,IAAI;QACf,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,IAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAE3C,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE;QAC1C,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC;YACvB,UAAU,EAAE,MAAM;YAClB,KAAK,EAAE,MAAM;SACd,CAAC,CAAC;KACJ;SAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;QACrC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC;YACvB,UAAU,EAAE,MAAM;YAClB,KAAK,EAAE,CAAC,MAAM,CAAC;SAChB,CAAC,CAAC;KACJ;IAED,IAAM,OAAO,GAAa;QACxB,KAAK,EAAE,iBAAiB;QACxB,KAAK,EAAE,CAAC,WAAW,CAAC;QACpB,WAAW,EAAE,EAAE;KAChB,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC"}
1
+ {"version":3,"file":"convertCatalog.js","sourceRoot":"","sources":["../../../src/search/convertCatalog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAG7B;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAC,QAAa;IAC1C,IAAM,OAAO,GAAgB;QAC3B,aAAa,EAAE,CAAC;QAChB,KAAK,EAAE,iBAAiB;QACxB,MAAM,EAAE;YACN,IAAI,EAAE;gBACJ,YAAY,EAAE,MAAM;gBACpB,OAAO,EAAE,EAAE;aACZ;SACF;QACD,WAAW,EAAE,EAAE;KAChB,CAAC;IAEF,IAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAC9C,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,MAAM,EAAE;QAChD,MAAM,GAAG,SAAS,CAAC;KACpB;SAAM,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;QACxC,MAAM,GAAG,CAAC,SAAS,CAAC,CAAC;KACtB;IAED,IAAI,MAAM,CAAC,MAAM,EAAE;QACjB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;YAC/B,UAAU,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;SAChC,CAAC,CAAC;KACJ;IAED,OAAO,OAAO,CAAC;AACjB,CAAC"}
@@ -38,6 +38,9 @@ class Collection {
38
38
  get sortDirection() {
39
39
  return this._collection.sortDirection || "asc";
40
40
  }
41
+ get targetEntity() {
42
+ return this._collection.targetEntity;
43
+ }
41
44
  async search(query, options = {}) {
42
45
  var _a;
43
46
  let qry;
@@ -1 +1 @@
1
- {"version":3,"file":"Collection.js","sourceRoot":"","sources":["../../../src/search/Collection.ts"],"names":[],"mappings":";;;AAAA,0BAAoD;AAUpD;;GAEG;AACH,0BAA0B;AAC1B,MAAa,UAAU;IAGrB,YAAoB,UAA0B,EAAE,OAAwB;QACtE,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;QAC9B,IAAI,OAAO,EAAE;YACX,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;SACzB;IACH,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,MAAM,CACxB,UAA0B,EAC1B,OAAwB;QAExB,kDAAkD;QAClD,gEAAgE;QAChE,MAAM,GAAG,GAAG,IAAI,UAAU,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAChD,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;IAED,UAAU;IAEV,IAAW,KAAK;QACd,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;IAChC,CAAC;IACD,IAAW,GAAG;QACZ,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC;IAC9B,CAAC;IACD,IAAW,OAAO;QAChB,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC;IAClC,CAAC;IACD,IAAW,KAAK;QACd,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;IAChC,CAAC;IACD,IAAW,SAAS;QAClB,OAAO,IAAI,CAAC,WAAW,CAAC,SAAS,IAAI,OAAO,CAAC;IAC/C,CAAC;IACD,IAAW,aAAa;QACtB,OAAO,IAAI,CAAC,WAAW,CAAC,aAAa,IAAI,KAAK,CAAC;IACjD,CAAC;IAEM,KAAK,CAAC,MAAM,CACjB,KAAsB,EACtB,UAA6B,EAAE;;QAE/B,IAAI,GAAW,CAAC;QAChB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,iCAAiC;YACjC,GAAG,GAAG;gBACJ,YAAY,EAAE,OAAA,IAAI,CAAC,WAAW,CAAC,KAAK,0CAAE,YAAY,KAAI,MAAM;gBAC5D,OAAO,EAAE;oBACP;wBACE,UAAU,EAAE;4BACV;gCACE,IAAI,EAAE,KAAK;6BACZ;yBACF;qBACF;iBACF;aACF,CAAC;SACH;aAAM;YACL,GAAG,GAAG,KAAK,CAAC;SACb;QAED,yCAAyC;QACzC,GAAG,CAAC,OAAO,GAAG,CAAC,GAAG,GAAG,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAEtD,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC;QACzD,4CAA4C;QAC5C,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,CAAC;QACxD,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC,aAAa,CAAC;QAC5D,2CAA2C;QAC3C,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC;QAElD,wCAAwC;QACxC,OAAO,kBAAc,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACtC,CAAC;CACF;AA7ED,gCA6EC"}
1
+ {"version":3,"file":"Collection.js","sourceRoot":"","sources":["../../../src/search/Collection.ts"],"names":[],"mappings":";;;AAAA,0BAAoD;AAWpD;;GAEG;AACH,0BAA0B;AAC1B,MAAa,UAAU;IAGrB,YAAoB,UAA0B,EAAE,OAAwB;QACtE,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;QAC9B,IAAI,OAAO,EAAE;YACX,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;SACzB;IACH,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,MAAM,CACxB,UAA0B,EAC1B,OAAwB;QAExB,kDAAkD;QAClD,gEAAgE;QAChE,MAAM,GAAG,GAAG,IAAI,UAAU,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAChD,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;IAED,UAAU;IAEV,IAAW,KAAK;QACd,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;IAChC,CAAC;IACD,IAAW,GAAG;QACZ,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC;IAC9B,CAAC;IACD,IAAW,OAAO;QAChB,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC;IAClC,CAAC;IACD,IAAW,KAAK;QACd,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;IAChC,CAAC;IACD,IAAW,SAAS;QAClB,OAAO,IAAI,CAAC,WAAW,CAAC,SAAS,IAAI,OAAO,CAAC;IAC/C,CAAC;IACD,IAAW,aAAa;QACtB,OAAO,IAAI,CAAC,WAAW,CAAC,aAAa,IAAI,KAAK,CAAC;IACjD,CAAC;IACD,IAAW,YAAY;QACrB,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC;IACvC,CAAC;IAEM,KAAK,CAAC,MAAM,CACjB,KAAsB,EACtB,UAA6B,EAAE;;QAE/B,IAAI,GAAW,CAAC;QAChB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,iCAAiC;YACjC,GAAG,GAAG;gBACJ,YAAY,EAAE,OAAA,IAAI,CAAC,WAAW,CAAC,KAAK,0CAAE,YAAY,KAAI,MAAM;gBAC5D,OAAO,EAAE;oBACP;wBACE,UAAU,EAAE;4BACV;gCACE,IAAI,EAAE,KAAK;6BACZ;yBACF;qBACF;iBACF;aACF,CAAC;SACH;aAAM;YACL,GAAG,GAAG,KAAK,CAAC;SACb;QAED,yCAAyC;QACzC,GAAG,CAAC,OAAO,GAAG,CAAC,GAAG,GAAG,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAEtD,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC;QACzD,4CAA4C;QAC5C,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,CAAC;QACxD,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC,aAAa,CAAC;QAC5D,2CAA2C;QAC3C,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC;QAElD,wCAAwC;QACxC,OAAO,kBAAc,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACtC,CAAC;CACF;AAhFD,gCAgFC"}
@@ -7,29 +7,30 @@ const __1 = require("..");
7
7
  * @param original
8
8
  */
9
9
  function convertCatalog(original) {
10
- const filterGroup = {
11
- filterType: "item",
12
- operation: "OR",
13
- filters: [],
14
- };
15
- const groups = __1.getProp(original, "groups");
16
- if (Array.isArray(groups) && groups.length) {
17
- filterGroup.filters.push({
18
- filterType: "item",
19
- group: groups,
20
- });
21
- }
22
- else if (typeof groups === "string") {
23
- filterGroup.filters.push({
24
- filterType: "item",
25
- group: [groups],
26
- });
27
- }
28
10
  const catalog = {
11
+ schemaVersion: 1,
29
12
  title: "Default Catalog",
30
- scope: [filterGroup],
13
+ scopes: {
14
+ item: {
15
+ targetEntity: "item",
16
+ filters: [],
17
+ },
18
+ },
31
19
  collections: [],
32
20
  };
21
+ const rawGroups = __1.getProp(original, "groups");
22
+ let groups = [];
23
+ if (Array.isArray(rawGroups) && rawGroups.length) {
24
+ groups = rawGroups;
25
+ }
26
+ else if (typeof rawGroups === "string") {
27
+ groups = [rawGroups];
28
+ }
29
+ if (groups.length) {
30
+ catalog.scopes.item.filters.push({
31
+ predicates: [{ group: groups }],
32
+ });
33
+ }
33
34
  return catalog;
34
35
  }
35
36
  exports.convertCatalog = convertCatalog;
@@ -1 +1 @@
1
- {"version":3,"file":"convertCatalog.js","sourceRoot":"","sources":["../../../src/search/convertCatalog.ts"],"names":[],"mappings":";;;AAAA,0BAA6B;AAG7B;;;GAGG;AACH,SAAgB,cAAc,CAAC,QAAa;IAC1C,MAAM,WAAW,GAAyB;QACxC,UAAU,EAAE,MAAM;QAClB,SAAS,EAAE,IAAI;QACf,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,MAAM,MAAM,GAAG,WAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAE3C,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE;QAC1C,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC;YACvB,UAAU,EAAE,MAAM;YAClB,KAAK,EAAE,MAAM;SACd,CAAC,CAAC;KACJ;SAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;QACrC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC;YACvB,UAAU,EAAE,MAAM;YAClB,KAAK,EAAE,CAAC,MAAM,CAAC;SAChB,CAAC,CAAC;KACJ;IAED,MAAM,OAAO,GAAa;QACxB,KAAK,EAAE,iBAAiB;QACxB,KAAK,EAAE,CAAC,WAAW,CAAC;QACpB,WAAW,EAAE,EAAE;KAChB,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC;AA5BD,wCA4BC"}
1
+ {"version":3,"file":"convertCatalog.js","sourceRoot":"","sources":["../../../src/search/convertCatalog.ts"],"names":[],"mappings":";;;AAAA,0BAA6B;AAG7B;;;GAGG;AACH,SAAgB,cAAc,CAAC,QAAa;IAC1C,MAAM,OAAO,GAAgB;QAC3B,aAAa,EAAE,CAAC;QAChB,KAAK,EAAE,iBAAiB;QACxB,MAAM,EAAE;YACN,IAAI,EAAE;gBACJ,YAAY,EAAE,MAAM;gBACpB,OAAO,EAAE,EAAE;aACZ;SACF;QACD,WAAW,EAAE,EAAE;KAChB,CAAC;IAEF,MAAM,SAAS,GAAG,WAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAC9C,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,MAAM,EAAE;QAChD,MAAM,GAAG,SAAS,CAAC;KACpB;SAAM,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;QACxC,MAAM,GAAG,CAAC,SAAS,CAAC,CAAC;KACtB;IAED,IAAI,MAAM,CAAC,MAAM,EAAE;QACjB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;YAC/B,UAAU,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;SAChC,CAAC,CAAC;KACJ;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AA5BD,wCA4BC"}
@@ -1,5 +1,5 @@
1
1
  import { IArcGISContext } from "..";
2
- import { IHubCollection, IHubSearchOptions, IHubSearchResponse, IHubSearchResult, IQuery } from "./types";
2
+ import { EntityType, IHubCollection, IHubSearchOptions, IHubSearchResponse, IHubSearchResult, IQuery } from "./types";
3
3
  /**
4
4
  * Implements Collection behavior
5
5
  */
@@ -14,5 +14,6 @@ export declare class Collection implements IHubCollection {
14
14
  get scope(): IQuery;
15
15
  get sortField(): string;
16
16
  get sortDirection(): "asc" | "desc";
17
+ get targetEntity(): EntityType;
17
18
  search(query: string | IQuery, options?: IHubSearchOptions): Promise<IHubSearchResponse<IHubSearchResult>>;
18
19
  }
@@ -1,6 +1,6 @@
1
- import { ICatalog } from "./types";
1
+ import { IHubCatalog } from "./types";
2
2
  /**
3
3
  * Convert the original site catalog structure into a formal ICatalog
4
4
  * @param original
5
5
  */
6
- export declare function convertCatalog(original: any): ICatalog;
6
+ export declare function convertCatalog(original: any): IHubCatalog;
@@ -11,8 +11,12 @@ export interface IHubCatalog {
11
11
  * Collections within the Catalog
12
12
  */
13
13
  collections?: IHubCollection[];
14
+ /**
15
+ * Schema Version
16
+ */
17
+ schemaVersion: number;
14
18
  }
15
- export interface ICatalogScope extends Record<EntityType, IQuery> {
19
+ export interface ICatalogScope extends Partial<Record<EntityType, IQuery>> {
16
20
  }
17
21
  export interface IHubCollection {
18
22
  /**
@@ -39,6 +43,11 @@ export interface IHubCollection {
39
43
  * Default sort direction for the Collection
40
44
  */
41
45
  sortDirection?: "asc" | "desc";
46
+ /**
47
+ * What entity is this query targeting. This is used internally to
48
+ * ensure we query the correct API
49
+ */
50
+ targetEntity: EntityType;
42
51
  }
43
52
  export declare type EntityType = "item" | "group" | "user" | "groupMember" | "event";
44
53
  export interface IQuery {
@@ -1,5 +1,5 @@
1
1
  /* @preserve
2
- * @esri/hub-common - v9.44.1 - Tue Jun 28 2022 15:39:40 GMT+0000 (Coordinated Universal Time)
2
+ * @esri/hub-common - v9.45.0 - Tue Jun 28 2022 18:49:00 GMT+0000 (Coordinated Universal Time)
3
3
  * Copyright (c) 2022 Environmental Systems Research Institute, Inc.
4
4
  * Apache-2.0
5
5
  */
@@ -14948,29 +14948,30 @@
14948
14948
  * @param original
14949
14949
  */
14950
14950
  function convertCatalog(original) {
14951
- var filterGroup = {
14952
- filterType: "item",
14953
- operation: "OR",
14954
- filters: [],
14955
- };
14956
- var groups = getProp(original, "groups");
14957
- if (Array.isArray(groups) && groups.length) {
14958
- filterGroup.filters.push({
14959
- filterType: "item",
14960
- group: groups,
14961
- });
14962
- }
14963
- else if (typeof groups === "string") {
14964
- filterGroup.filters.push({
14965
- filterType: "item",
14966
- group: [groups],
14967
- });
14968
- }
14969
14951
  var catalog = {
14952
+ schemaVersion: 1,
14970
14953
  title: "Default Catalog",
14971
- scope: [filterGroup],
14954
+ scopes: {
14955
+ item: {
14956
+ targetEntity: "item",
14957
+ filters: [],
14958
+ },
14959
+ },
14972
14960
  collections: [],
14973
14961
  };
14962
+ var rawGroups = getProp(original, "groups");
14963
+ var groups = [];
14964
+ if (Array.isArray(rawGroups) && rawGroups.length) {
14965
+ groups = rawGroups;
14966
+ }
14967
+ else if (typeof rawGroups === "string") {
14968
+ groups = [rawGroups];
14969
+ }
14970
+ if (groups.length) {
14971
+ catalog.scopes.item.filters.push({
14972
+ predicates: [{ group: groups }],
14973
+ });
14974
+ }
14974
14975
  return catalog;
14975
14976
  }
14976
14977