@esri/hub-common 14.213.0 → 14.213.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.
@@ -118,6 +118,9 @@ export async function deepContains(identifier, entityType, hierarchy, context) {
118
118
  if (!hierarchy || hierarchy.length === 0) {
119
119
  return Promise.resolve(response);
120
120
  }
121
+ // from this point, we assume containment is true
122
+ // and only change that if one of the checks fails
123
+ response.isContained = true;
121
124
  // get the id and targetEntity from each of the entries
122
125
  // in the hiearchy
123
126
  let checks = hierarchy
@@ -152,7 +155,13 @@ export async function deepContains(identifier, entityType, hierarchy, context) {
152
155
  const check = await catalog.contains(currentIdentifier, {
153
156
  entityType: currentEntityType,
154
157
  });
155
- response.isContained = check.isContained;
158
+ // if a containment check fails, update the response
159
+ // we only update it on failure b/c we don't want a positive
160
+ // response to override a negative one higher up the hierarchy
161
+ if (!check.isContained) {
162
+ response.isContained = check.isContained;
163
+ response.reason = `Entity ${currentIdentifier} not contained in catalog ${catalogInfo.id}`;
164
+ }
156
165
  });
157
166
  const end = new Date().getTime();
158
167
  response.duration = end - start;
@@ -1 +1 @@
1
- {"version":3,"file":"deepContains.js","sourceRoot":"","sources":["../../../../src/core/_internal/deepContains.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"deepContains.js","sourceRoot":"","sources":["../../../../src/core/_internal/deepContains.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,8CAA8C,CAAC;AACrF,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAGxD;;;GAGG;AACH,MAAM,OAAO,GAAkC;IAC7C,WAAW,EAAE,YAAY;IACzB,QAAQ,EAAE,SAAS;IACnB,OAAO,EAAE,SAAS;IAClB,MAAM,EAAE,OAAO;IACf,WAAW,EAAE,YAAY;IACzB,KAAK,EAAE,MAAM;IACb,IAAI,EAAE,SAAS;IACf,OAAO,EAAE,SAAS;IAClB,IAAI,EAAE,SAAS;IACf,QAAQ,EAAE,SAAS;IACnB,KAAK,EAAE,MAAM;CACd,CAAC;AAYF;;;;GAIG;AACH,MAAM,UAAU,SAAS,CAAC,IAAY;IACpC,yCAAyC;IACzC,IAAI,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QAChC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KACtB;IACD,mFAAmF;IACnF,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAElC,MAAM,MAAM,GAAgB;QAC1B,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,EAAE;QACV,KAAK,EAAE,SAAS;KACjB,CAAC;IAEF,wDAAwD;IACxD,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,EAAE;QAC9B,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;QACrB,MAAM,CAAC,MAAM,GAAG,gDAAgD,CAAC;KAClE;IAED,0CAA0C;IAC1C,IAAI,SAAS,CAAC,MAAM,GAAG,EAAE,EAAE;QACzB,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;QACrB,MAAM,CAAC,MAAM,GAAG,4BAA4B,CAAC;KAC9C;IAED,mDAAmD;IACnD,IAAI,MAAM,CAAC,KAAK,EAAE;QAChB,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACxC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE;YAC5C,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE;gBACtC,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;gBACrB,MAAM,CAAC,MAAM,GAAG,kCAAkC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC;aACnE;SACF;KACF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,iBAAiB,CAAC,IAAY;IAC5C,kCAAkC;IAClC,MAAM,UAAU,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;IACnC,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE;QACrB,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;KACpC;IAED,MAAM,KAAK,GAAuB,EAAE,CAAC;IACrC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE;QACnD,MAAM,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAkB,CAAC;QAC3D,MAAM,UAAU,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAC;QAC/C,KAAK,CAAC,IAAI,CAAC;YACT,UAAU;YACV,EAAE,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC;SAC5B,CAAC,CAAC;KACJ;IAED,qEAAqE;IACrE,wCAAwC;IACxC,OAAO,KAAK,CAAC,OAAO,EAAE,CAAC;AACzB,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,UAAkB,EAClB,UAAsB,EACtB,SAA6B,EAC7B,OAAuB;IAEvB,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACzB,MAAM,QAAQ,GAAsB;QAClC,UAAU;QACV,WAAW,EAAE,KAAK;QAClB,WAAW,EAAE,EAAE;QACf,QAAQ,EAAE,CAAC;KACZ,CAAC;IACF,uCAAuC;IACvC,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE;QACxC,OAAO,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;KAClC;IACD,iDAAiD;IACjD,kDAAkD;IAClD,QAAQ,CAAC,WAAW,GAAG,IAAI,CAAC;IAE5B,uDAAuD;IACvD,kBAAkB;IAClB,IAAI,MAAM,GAAG,SAAS;SACnB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACT,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC;IAChD,CAAC,CAAC;SACD,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAChB,2CAA2C;IAC3C,4DAA4D;IAC5D,MAAM,GAAG,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE,GAAG,MAAM,CAAC,CAAC;IAErD,wBAAwB;IACxB,MAAM,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,EAAE,EAAE;QACvD,MAAM,iBAAiB,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;QACzC,MAAM,iBAAiB,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC;QACjD,4BAA4B;QAC5B,IAAI,OAAgB,CAAC;QACrB,IAAI,WAAW,CAAC,OAAO,EAAE;YACvB,kBAAkB;YAClB,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;SAC1D;aAAM;YACL,4CAA4C;YAC5C,OAAO,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;SACvD;QACD,4BAA4B;QAC5B,QAAQ,CAAC,WAAW,CAAC,WAAW,CAAC,EAAE,CAAC,GAAG;YACrC,EAAE,EAAE,WAAW,CAAC,EAAE;YAClB,UAAU,EAAE,WAAW,CAAC,UAAU;YAClC,OAAO,EAAE,OAAO,CAAC,MAAM,EAAE;SAC1B,CAAC;QACF,WAAW;QACX,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,iBAAiB,EAAE;YACtD,UAAU,EAAE,iBAAiB;SAC9B,CAAC,CAAC;QACH,oDAAoD;QACpD,4DAA4D;QAC5D,8DAA8D;QAC9D,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE;YACtB,QAAQ,CAAC,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;YACzC,QAAQ,CAAC,MAAM,GAAG,UAAU,iBAAiB,6BAA6B,WAAW,CAAC,EAAE,EAAE,CAAC;SAC5F;IACH,CAAC,CAAC,CAAC;IACH,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;IACjC,QAAQ,CAAC,QAAQ,GAAG,GAAG,GAAG,KAAK,CAAC;IAChC,OAAO,QAAQ,CAAC;AAClB,CAAC"}
@@ -5,9 +5,9 @@ import { deepContains, pathToCatalogInfo } from "./_internal/deepContains";
5
5
  * Check that a specific entity is contained within a hierarchy of catalogs
6
6
  * @param identifier id or slug of the entity to check
7
7
  * @param hubEntityType Entity type of the identifier
8
- * @param rootCatalog root level catalog to start checking from
9
- * @param context
10
8
  * @param path
9
+ * @param context
10
+ * @param rootCatalog root level catalog to start checking from
11
11
  * @returns
12
12
  */
13
13
  export async function deepCatalogContains(identifier, hubEntityType, path, context, rootCatalog) {
@@ -1,16 +1,16 @@
1
1
  export const HUB_ENTITY_TYPES = [
2
- "site",
3
- "project",
2
+ "content",
3
+ "discussion",
4
+ "event",
5
+ "group",
4
6
  "initiative",
5
7
  "initiativeTemplate",
6
- "page",
7
- "discussion",
8
- "content",
9
8
  "org",
10
- "group",
11
- "template",
9
+ "page",
10
+ "project",
11
+ "site",
12
12
  "survey",
13
- "event",
13
+ "template",
14
14
  "user",
15
15
  ];
16
16
  //# sourceMappingURL=HubEntityType.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"HubEntityType.js","sourceRoot":"","sources":["../../../../src/core/types/HubEntityType.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,MAAM;IACN,SAAS;IACT,YAAY;IACZ,oBAAoB;IACpB,MAAM;IACN,YAAY;IACZ,SAAS;IACT,KAAK;IACL,OAAO;IACP,UAAU;IACV,QAAQ;IACR,OAAO;IACP,MAAM;CACE,CAAC"}
1
+ {"version":3,"file":"HubEntityType.js","sourceRoot":"","sources":["../../../../src/core/types/HubEntityType.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,SAAS;IACT,YAAY;IACZ,OAAO;IACP,OAAO;IACP,YAAY;IACZ,oBAAoB;IACpB,KAAK;IACL,MAAM;IACN,SAAS;IACT,MAAM;IACN,QAAQ;IACR,UAAU;IACV,MAAM;CACE,CAAC"}
@@ -33,8 +33,18 @@ export async function fetchCatalog(identifier, requestOptions) {
33
33
  }
34
34
  else if (isGuid(identifier)) {
35
35
  // get the item's data, and read the catalog out of it
36
+ // TODO: get the entity so the catalog migrations / mappings can be applied
37
+ // however this requires the HubEntityType and context, which we don't have
36
38
  getPrms = getItemData(identifier, requestOptions).then((data) => {
37
- return upgradeCatalogSchema(data.catalog || {});
39
+ // catalogs are moving to an array structure so we need to handle both
40
+ let catalog = {};
41
+ if (data.catalog) {
42
+ catalog = data.catalog;
43
+ }
44
+ if (data.catalogs && data.catalogs.length > 0) {
45
+ catalog = data.catalogs[0];
46
+ }
47
+ return upgradeCatalogSchema(catalog);
38
48
  });
39
49
  }
40
50
  else {
@@ -1 +1 @@
1
- {"version":3,"file":"fetchCatalog.js","sourceRoot":"","sources":["../../../src/search/fetchCatalog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,QAAQ,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAE9D,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,UAAkB,EAClB,cAAkC;IAElC,IAAI,OAAO,CAAC;IACZ,oCAAoC;IACpC,IAAI,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;QACpC,IAAI,GAAG,GAAG,UAAU,CAAC;QAErB,4BAA4B;QAC5B,GAAG,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;QACzB,wDAAwD;QACxD,+DAA+D;QAC/D,oDAAoD;QACpD,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACtB,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;SACzB;QAED,OAAO,GAAG,YAAY,CAAC,GAAG,EAAE,cAAc,CAAC;YACzC,sDAAsD;aACrD,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;aACzD,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;YACb,OAAO,oBAAoB,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;KACN;SAAM,IAAI,MAAM,CAAC,UAAU,CAAC,EAAE;QAC7B,sDAAsD;QACtD,OAAO,GAAG,WAAW,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;YAC9D,OAAO,oBAAoB,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;KACJ;SAAM;QACL,MAAM,IAAI,QAAQ,CAAC,gBAAgB,EAAE,gCAAgC,CAAC,CAAC;KACxE;IAED,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC;IAE9B,OAAO,OAAO,CAAC;AACjB,CAAC"}
1
+ {"version":3,"file":"fetchCatalog.js","sourceRoot":"","sources":["../../../src/search/fetchCatalog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,QAAQ,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAE9D,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAG9D;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,UAAkB,EAClB,cAAkC;IAElC,IAAI,OAAO,CAAC;IACZ,oCAAoC;IACpC,IAAI,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;QACpC,IAAI,GAAG,GAAG,UAAU,CAAC;QAErB,4BAA4B;QAC5B,GAAG,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;QACzB,wDAAwD;QACxD,+DAA+D;QAC/D,oDAAoD;QACpD,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACtB,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;SACzB;QAED,OAAO,GAAG,YAAY,CAAC,GAAG,EAAE,cAAc,CAAC;YACzC,sDAAsD;aACrD,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;aACzD,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;YACb,OAAO,oBAAoB,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;KACN;SAAM,IAAI,MAAM,CAAC,UAAU,CAAC,EAAE;QAC7B,sDAAsD;QAEtD,2EAA2E;QAC3E,2EAA2E;QAC3E,OAAO,GAAG,WAAW,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;YAC9D,sEAAsE;YACtE,IAAI,OAAO,GAAG,EAAE,CAAC;YACjB,IAAI,IAAI,CAAC,OAAO,EAAE;gBAChB,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;aACxB;YACD,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC7C,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;aAC5B;YAED,OAAO,oBAAoB,CAAC,OAAO,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;KACJ;SAAM;QACL,MAAM,IAAI,QAAQ,CAAC,gBAAgB,EAAE,gCAAgC,CAAC,CAAC;KACxE;IAED,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC;IAE9B,OAAO,OAAO,CAAC;AACjB,CAAC"}
@@ -123,6 +123,9 @@ async function deepContains(identifier, entityType, hierarchy, context) {
123
123
  if (!hierarchy || hierarchy.length === 0) {
124
124
  return Promise.resolve(response);
125
125
  }
126
+ // from this point, we assume containment is true
127
+ // and only change that if one of the checks fails
128
+ response.isContained = true;
126
129
  // get the id and targetEntity from each of the entries
127
130
  // in the hiearchy
128
131
  let checks = hierarchy
@@ -157,7 +160,13 @@ async function deepContains(identifier, entityType, hierarchy, context) {
157
160
  const check = await catalog.contains(currentIdentifier, {
158
161
  entityType: currentEntityType,
159
162
  });
160
- response.isContained = check.isContained;
163
+ // if a containment check fails, update the response
164
+ // we only update it on failure b/c we don't want a positive
165
+ // response to override a negative one higher up the hierarchy
166
+ if (!check.isContained) {
167
+ response.isContained = check.isContained;
168
+ response.reason = `Entity ${currentIdentifier} not contained in catalog ${catalogInfo.id}`;
169
+ }
161
170
  });
162
171
  const end = new Date().getTime();
163
172
  response.duration = end - start;
@@ -1 +1 @@
1
- {"version":3,"file":"deepContains.js","sourceRoot":"","sources":["../../../../src/core/_internal/deepContains.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"deepContains.js","sourceRoot":"","sources":["../../../../src/core/_internal/deepContains.ts"],"names":[],"mappings":"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"}
@@ -8,9 +8,9 @@ const deepContains_1 = require("./_internal/deepContains");
8
8
  * Check that a specific entity is contained within a hierarchy of catalogs
9
9
  * @param identifier id or slug of the entity to check
10
10
  * @param hubEntityType Entity type of the identifier
11
- * @param rootCatalog root level catalog to start checking from
12
- * @param context
13
11
  * @param path
12
+ * @param context
13
+ * @param rootCatalog root level catalog to start checking from
14
14
  * @returns
15
15
  */
16
16
  async function deepCatalogContains(identifier, hubEntityType, path, context, rootCatalog) {
@@ -2,18 +2,18 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.HUB_ENTITY_TYPES = void 0;
4
4
  exports.HUB_ENTITY_TYPES = [
5
- "site",
6
- "project",
5
+ "content",
6
+ "discussion",
7
+ "event",
8
+ "group",
7
9
  "initiative",
8
10
  "initiativeTemplate",
9
- "page",
10
- "discussion",
11
- "content",
12
11
  "org",
13
- "group",
14
- "template",
12
+ "page",
13
+ "project",
14
+ "site",
15
15
  "survey",
16
- "event",
16
+ "template",
17
17
  "user",
18
18
  ];
19
19
  //# sourceMappingURL=HubEntityType.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"HubEntityType.js","sourceRoot":"","sources":["../../../../src/core/types/HubEntityType.ts"],"names":[],"mappings":";;;AAAa,QAAA,gBAAgB,GAAG;IAC9B,MAAM;IACN,SAAS;IACT,YAAY;IACZ,oBAAoB;IACpB,MAAM;IACN,YAAY;IACZ,SAAS;IACT,KAAK;IACL,OAAO;IACP,UAAU;IACV,QAAQ;IACR,OAAO;IACP,MAAM;CACE,CAAC"}
1
+ {"version":3,"file":"HubEntityType.js","sourceRoot":"","sources":["../../../../src/core/types/HubEntityType.ts"],"names":[],"mappings":";;;AAAa,QAAA,gBAAgB,GAAG;IAC9B,SAAS;IACT,YAAY;IACZ,OAAO;IACP,OAAO;IACP,YAAY;IACZ,oBAAoB;IACpB,KAAK;IACL,MAAM;IACN,SAAS;IACT,MAAM;IACN,QAAQ;IACR,UAAU;IACV,MAAM;CACE,CAAC"}
@@ -36,8 +36,18 @@ async function fetchCatalog(identifier, requestOptions) {
36
36
  }
37
37
  else if (is_guid_1.isGuid(identifier)) {
38
38
  // get the item's data, and read the catalog out of it
39
+ // TODO: get the entity so the catalog migrations / mappings can be applied
40
+ // however this requires the HubEntityType and context, which we don't have
39
41
  getPrms = arcgis_rest_portal_1.getItemData(identifier, requestOptions).then((data) => {
40
- return upgradeCatalogSchema_1.upgradeCatalogSchema(data.catalog || {});
42
+ // catalogs are moving to an array structure so we need to handle both
43
+ let catalog = {};
44
+ if (data.catalog) {
45
+ catalog = data.catalog;
46
+ }
47
+ if (data.catalogs && data.catalogs.length > 0) {
48
+ catalog = data.catalogs[0];
49
+ }
50
+ return upgradeCatalogSchema_1.upgradeCatalogSchema(catalog);
41
51
  });
42
52
  }
43
53
  else {
@@ -1 +1 @@
1
- {"version":3,"file":"fetchCatalog.js","sourceRoot":"","sources":["../../../src/search/fetchCatalog.ts"],"names":[],"mappings":";;;AAAA,iEAAuD;AACvD,0CAAmC;AACnC,kEAA8D;AAE9D,2DAAuD;AACvD,8CAA0C;AAE1C,iEAA8D;AAE9D;;;;;;GAMG;AACI,KAAK,UAAU,YAAY,CAChC,UAAkB,EAClB,cAAkC;IAElC,IAAI,OAAO,CAAC;IACZ,oCAAoC;IACpC,IAAI,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;QACpC,IAAI,GAAG,GAAG,UAAU,CAAC;QAErB,4BAA4B;QAC5B,GAAG,GAAG,8BAAa,CAAC,GAAG,CAAC,CAAC;QACzB,wDAAwD;QACxD,+DAA+D;QAC/D,oDAAoD;QACpD,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACtB,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;SACzB;QAED,OAAO,GAAG,4BAAY,CAAC,GAAG,EAAE,cAAc,CAAC;YACzC,sDAAsD;aACrD,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,gCAAW,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;aACzD,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;YACb,OAAO,2CAAoB,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;KACN;SAAM,IAAI,gBAAM,CAAC,UAAU,CAAC,EAAE;QAC7B,sDAAsD;QACtD,OAAO,GAAG,gCAAW,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;YAC9D,OAAO,2CAAoB,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;KACJ;SAAM;QACL,MAAM,IAAI,kBAAQ,CAAC,gBAAgB,EAAE,gCAAgC,CAAC,CAAC;KACxE;IAED,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC;IAE9B,OAAO,OAAO,CAAC;AACjB,CAAC;AApCD,oCAoCC"}
1
+ {"version":3,"file":"fetchCatalog.js","sourceRoot":"","sources":["../../../src/search/fetchCatalog.ts"],"names":[],"mappings":";;;AAAA,iEAAuD;AACvD,0CAAmC;AACnC,kEAA8D;AAE9D,2DAAuD;AACvD,8CAA0C;AAE1C,iEAA8D;AAG9D;;;;;;GAMG;AACI,KAAK,UAAU,YAAY,CAChC,UAAkB,EAClB,cAAkC;IAElC,IAAI,OAAO,CAAC;IACZ,oCAAoC;IACpC,IAAI,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;QACpC,IAAI,GAAG,GAAG,UAAU,CAAC;QAErB,4BAA4B;QAC5B,GAAG,GAAG,8BAAa,CAAC,GAAG,CAAC,CAAC;QACzB,wDAAwD;QACxD,+DAA+D;QAC/D,oDAAoD;QACpD,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACtB,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;SACzB;QAED,OAAO,GAAG,4BAAY,CAAC,GAAG,EAAE,cAAc,CAAC;YACzC,sDAAsD;aACrD,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,gCAAW,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;aACzD,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;YACb,OAAO,2CAAoB,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;KACN;SAAM,IAAI,gBAAM,CAAC,UAAU,CAAC,EAAE;QAC7B,sDAAsD;QAEtD,2EAA2E;QAC3E,2EAA2E;QAC3E,OAAO,GAAG,gCAAW,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;YAC9D,sEAAsE;YACtE,IAAI,OAAO,GAAG,EAAE,CAAC;YACjB,IAAI,IAAI,CAAC,OAAO,EAAE;gBAChB,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;aACxB;YACD,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC7C,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;aAC5B;YAED,OAAO,2CAAoB,CAAC,OAAO,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;KACJ;SAAM;QACL,MAAM,IAAI,kBAAQ,CAAC,gBAAgB,EAAE,gCAAgC,CAAC,CAAC;KACxE;IAED,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC;IAE9B,OAAO,OAAO,CAAC;AACjB,CAAC;AAhDD,oCAgDC"}
@@ -6,9 +6,9 @@ import { HubEntityType } from "./types/HubEntityType";
6
6
  * Check that a specific entity is contained within a hierarchy of catalogs
7
7
  * @param identifier id or slug of the entity to check
8
8
  * @param hubEntityType Entity type of the identifier
9
- * @param rootCatalog root level catalog to start checking from
10
- * @param context
11
9
  * @param path
10
+ * @param context
11
+ * @param rootCatalog root level catalog to start checking from
12
12
  * @returns
13
13
  */
14
14
  export declare function deepCatalogContains(identifier: string, hubEntityType: HubEntityType, path: string, context: IArcGISContext, rootCatalog?: IHubCatalog): Promise<IContainsResponse>;
@@ -1,2 +1,2 @@
1
- export declare const HUB_ENTITY_TYPES: readonly ["site", "project", "initiative", "initiativeTemplate", "page", "discussion", "content", "org", "group", "template", "survey", "event", "user"];
1
+ export declare const HUB_ENTITY_TYPES: readonly ["content", "discussion", "event", "group", "initiative", "initiativeTemplate", "org", "page", "project", "site", "survey", "template", "user"];
2
2
  export declare type HubEntityType = (typeof HUB_ENTITY_TYPES)[number];
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@esri/hub-common",
3
- "version": "14.213.0",
3
+ "version": "14.213.1",
4
4
  "description": "Common TypeScript types and utility functions for @esri/hub.js.",
5
5
  "main": "dist/node/index.js",
6
6
  "module": "dist/esm/index.js",