@esri/hub-common 15.41.1 → 15.41.3

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.
@@ -100,13 +100,8 @@ export const FilterSchema = {
100
100
  },
101
101
  predicates: {
102
102
  type: "array",
103
- // TODO: uncomment this once site catalogs have been migrated
104
- // to the new catalog structure. This is too difficult to work
105
- // around for now, and isn't currently doing much in the UI.
106
- // Eventually, we'll want to use this to render an error message
107
- // if a predicate hasn't been fully configured
108
- // minItems: 1,
109
103
  items: PredicateSchema,
104
+ minItems: 1,
110
105
  },
111
106
  },
112
107
  };
@@ -122,6 +117,7 @@ export const QuerySchema = {
122
117
  filters: {
123
118
  type: "array",
124
119
  items: FilterSchema,
120
+ minItems: 1,
125
121
  },
126
122
  },
127
123
  };
@@ -1 +1 @@
1
- {"version":3,"file":"CatalogSchema.js","sourceRoot":"","sources":["../../../../../src/core/schemas/shared/CatalogSchema.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"CatalogSchema.js","sourceRoot":"","sources":["../../../../../src/core/schemas/shared/CatalogSchema.ts"],"names":[],"mappings":"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"}
@@ -17,7 +17,7 @@ import { defaultSiteCollectionKeys } from "../defaultSiteCollectionKeys";
17
17
  * NOTE: The changes made in this migration will not be persisted to AGO at this time
18
18
  *
19
19
  * @param model site model to migrate
20
- * @returns a migrated model with default `IHubCollectionPersistance` objects added
20
+ * @returns a migrated model with default `IHubCollection` objects added
21
21
  * to the catalog
22
22
  */
23
23
  export function applyDefaultCollectionMigration(model) {
@@ -40,6 +40,9 @@ export function applyDefaultCollectionMigration(model) {
40
40
  collection: key,
41
41
  filters: [],
42
42
  },
43
+ displayConfig: {
44
+ hidden: false,
45
+ },
43
46
  };
44
47
  return map;
45
48
  }, {});
@@ -74,7 +77,7 @@ export function applyDefaultCollectionMigration(model) {
74
77
  const collectionKey = searchCategoryToCollection[searchCategory.key];
75
78
  const collection = baseCollectionMap[collectionKey];
76
79
  collection.label = searchCategory.overrideText || null;
77
- collection.hidden = searchCategory.hidden;
80
+ collection.displayConfig.hidden = !!searchCategory.hidden;
78
81
  return collection;
79
82
  });
80
83
  // the "all" collection always goes first
@@ -1 +1 @@
1
- {"version":3,"file":"applyDefaultCollectionMigration.js","sourceRoot":"","sources":["../../../../src/sites/_internal/applyDefaultCollectionMigration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAI/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,EAAE,yBAAyB,EAAE,MAAM,8BAA8B,CAAC;AAEzE;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,UAAU,+BAA+B,CAAC,KAAa;IAC3D,MAAM,iBAAiB,GAAG,yBAAyB,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QACtE,GAAG,CAAC,GAAG,CAAC,GAAG;YACT,4EAA4E;YAC5E,0EAA0E;YAC1E,4EAA4E;YAC5E,uFAAuF;YACvF,gFAAgF;YAChF,+EAA+E;YAC/E,0EAA0E;YAC1E,qCAAqC;YACrC,KAAK,EAAE,IAAI;YACX,GAAG;YACH,OAAO,EAAE,EAAE;YACX,YAAY,EAAE,MAAM;YACpB,KAAK,EAAE;gBACL,YAAY,EAAE,MAAM;gBACpB,UAAU,EAAE,GAAG;gBACf,OAAO,EAAE,EAAE;aACZ;SACF,CAAC;QACF,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAA+C,CAAC,CAAC;IACpD,MAAM,0BAA0B,GAE5B;QACF,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,SAAS;QAClC,2FAA2F;QAC3F,sFAAsF;QACtF,CAAC,gBAAgB,CAAC,WAAW,CAAC,EAAE,MAAM;QACtC,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,MAAM;QAChC,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE,UAAU;QACxC,CAAC,gBAAgB,CAAC,aAAa,CAAC,EAAE,WAAW;KAC9C,CAAC;IACF,2FAA2F;IAC3F,uDAAuD;IACvD,+FAA+F;IAC/F,sEAAsE;IACtE,MAAM,yBAAyB,GAAU;QACvC,EAAE,GAAG,EAAE,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE;QAC7C,EAAE,GAAG,EAAE,gBAAgB,CAAC,IAAI,EAAE;QAC9B,EAAE,GAAG,EAAE,gBAAgB,CAAC,SAAS,EAAE;QACnC,EAAE,GAAG,EAAE,gBAAgB,CAAC,aAAa,EAAE;KACxC,CAAC;IACF,MAAM,sBAAsB,GAC1B,cAAc,CAAC,KAAK,CAAC,IAAI,EAAE,yBAAyB,EAAE,SAAS,CAAC;QAChE,yBAAyB,CAAC;IAE5B,MAAM,qBAAqB,GAAG,sBAAsB;QAClD,mEAAmE;SAClE,MAAM,CAAC,CAAC,cAAc,EAAE,EAAE,CAAC,cAAc,CAAC,GAAG,KAAK,gBAAgB,CAAC,MAAM,CAAC;QAC3E,6FAA6F;QAC7F,8EAA8E;SAC7E,MAAM,CACL,CAAC,cAAc,EAAE,EAAE,CACjB,CAAC,CAAC,0BAA0B,CAAC,cAAc,CAAC,GAAuB,CAAC,CACvE;SACA,GAAG,CAAC,CAAC,cAAc,EAAE,EAAE;QACtB,MAAM,aAAa,GACjB,0BAA0B,CAAC,cAAc,CAAC,GAAuB,CAAC,CAAC;QACrE,MAAM,UAAU,GAAG,iBAAiB,CAAC,aAAa,CAAC,CAAC;QACpD,UAAU,CAAC,KAAK,GAAG,cAAc,CAAC,YAAY,IAAI,IAAI,CAAC;QACvD,UAAU,CAAC,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC;QAC1C,OAAO,UAAU,CAAC;IACpB,CAAC,CAAC,CAAC;IAEL,yCAAyC;IACzC,qBAAqB,CAAC,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;IACrD,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,GAAG,qBAAqB,CAAC;IAEvD,OAAO,KAAK,CAAC;AACf,CAAC"}
1
+ {"version":3,"file":"applyDefaultCollectionMigration.js","sourceRoot":"","sources":["../../../../src/sites/_internal/applyDefaultCollectionMigration.ts"],"names":[],"mappings":"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"}
@@ -33,9 +33,10 @@ export function reflectCollectionsToSearchCategories(model) {
33
33
  // such as the "all" collection
34
34
  .filter((c) => !!collectionToSearchCategory[c.key])
35
35
  .map((c) => {
36
+ var _a;
36
37
  const searchCategoryKey = collectionToSearchCategory[c.key];
37
38
  const updated = {
38
- hidden: c.hidden,
39
+ hidden: !!((_a = c.displayConfig) === null || _a === void 0 ? void 0 : _a.hidden),
39
40
  key: searchCategoryKey,
40
41
  queryParams: {
41
42
  collection: searchCategoryToQueryParam[searchCategoryKey],
@@ -1 +1 @@
1
- {"version":3,"file":"reflectCollectionsToSearchCategories.js","sourceRoot":"","sources":["../../../../src/sites/_internal/reflectCollectionsToSearchCategories.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAE3C;;;;;;;;GAQG;AACH,MAAM,UAAU,oCAAoC,CAAC,KAAa;IAChE,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;IACjC,MAAM,0BAA0B,GAE5B;QACF,OAAO,EAAE,gBAAgB,CAAC,IAAI;QAC9B,kFAAkF;QAClF,qFAAqF;QACrF,iFAAiF;QACjF,mFAAmF;QACnF,IAAI,EAAE,gBAAgB,CAAC,KAAK;QAC5B,SAAS,EAAE,gBAAgB,CAAC,aAAa;QACzC,QAAQ,EAAE,gBAAgB,CAAC,SAAS;KACrC,CAAC;IAEF,MAAM,0BAA0B,GAC9B;QACE,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,SAAS;QAClC,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,MAAM;QAChC,CAAC,gBAAgB,CAAC,aAAa,CAAC,EAAE,SAAS;QAC3C,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE,UAAU;KACzC,CAAC;IACJ,MAAM,WAAW,GACf,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;IAEjC,MAAM,uBAAuB,GAAG,WAAW;QACzC,6EAA6E;QAC7E,+BAA+B;SAC9B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,GAA0B,CAAC,CAAC;SACzE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACT,MAAM,iBAAiB,GACrB,0BAA0B,CAAC,CAAC,CAAC,GAA0B,CAAC,CAAC;QAC3D,MAAM,OAAO,GAAQ;YACnB,MAAM,EAAE,CAAC,CAAC,MAAM;YAChB,GAAG,EAAE,iBAAiB;YACtB,WAAW,EAAE;gBACX,UAAU,EAAE,0BAA0B,CAAC,iBAAiB,CAAC;aAC1D;SACF,CAAC;QAEF,kEAAkE;QAClE,uEAAuE;QACvE,wEAAwE;QACxE,IAAI,CAAC,CAAC,KAAK,EAAE;YACX,OAAO,CAAC,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC;SAChC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC,CAAC;IAEL,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,GAAG,uBAAuB,CAAC;IAC7D,OAAO,KAAK,CAAC;AACf,CAAC"}
1
+ {"version":3,"file":"reflectCollectionsToSearchCategories.js","sourceRoot":"","sources":["../../../../src/sites/_internal/reflectCollectionsToSearchCategories.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAE3C;;;;;;;;GAQG;AACH,MAAM,UAAU,oCAAoC,CAAC,KAAa;IAChE,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;IACjC,MAAM,0BAA0B,GAE5B;QACF,OAAO,EAAE,gBAAgB,CAAC,IAAI;QAC9B,kFAAkF;QAClF,qFAAqF;QACrF,iFAAiF;QACjF,mFAAmF;QACnF,IAAI,EAAE,gBAAgB,CAAC,KAAK;QAC5B,SAAS,EAAE,gBAAgB,CAAC,aAAa;QACzC,QAAQ,EAAE,gBAAgB,CAAC,SAAS;KACrC,CAAC;IAEF,MAAM,0BAA0B,GAC9B;QACE,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,SAAS;QAClC,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,MAAM;QAChC,CAAC,gBAAgB,CAAC,aAAa,CAAC,EAAE,SAAS;QAC3C,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE,UAAU;KACzC,CAAC;IACJ,MAAM,WAAW,GAAqB,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;IAErE,MAAM,uBAAuB,GAAG,WAAW;QACzC,6EAA6E;QAC7E,+BAA+B;SAC9B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,GAA0B,CAAC,CAAC;SACzE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;;QACT,MAAM,iBAAiB,GACrB,0BAA0B,CAAC,CAAC,CAAC,GAA0B,CAAC,CAAC;QAC3D,MAAM,OAAO,GAAQ;YACnB,MAAM,EAAE,CAAC,QAAC,CAAC,CAAC,aAAa,0CAAE,MAAM,CAAA;YACjC,GAAG,EAAE,iBAAiB;YACtB,WAAW,EAAE;gBACX,UAAU,EAAE,0BAA0B,CAAC,iBAAiB,CAAC;aAC1D;SACF,CAAC;QAEF,kEAAkE;QAClE,uEAAuE;QACvE,wEAAwE;QACxE,IAAI,CAAC,CAAC,KAAK,EAAE;YACX,OAAO,CAAC,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC;SAChC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC,CAAC;IAEL,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,GAAG,uBAAuB,CAAC;IAC7D,OAAO,KAAK,CAAC;AACf,CAAC"}
@@ -103,13 +103,8 @@ exports.FilterSchema = {
103
103
  },
104
104
  predicates: {
105
105
  type: "array",
106
- // TODO: uncomment this once site catalogs have been migrated
107
- // to the new catalog structure. This is too difficult to work
108
- // around for now, and isn't currently doing much in the UI.
109
- // Eventually, we'll want to use this to render an error message
110
- // if a predicate hasn't been fully configured
111
- // minItems: 1,
112
106
  items: exports.PredicateSchema,
107
+ minItems: 1,
113
108
  },
114
109
  },
115
110
  };
@@ -125,6 +120,7 @@ exports.QuerySchema = {
125
120
  filters: {
126
121
  type: "array",
127
122
  items: exports.FilterSchema,
123
+ minItems: 1,
128
124
  },
129
125
  },
130
126
  };
@@ -1 +1 @@
1
- {"version":3,"file":"CatalogSchema.js","sourceRoot":"","sources":["../../../../../src/core/schemas/shared/CatalogSchema.ts"],"names":[],"mappings":";;;AAAA,mEAA+E;AAE/E,mCAAiE;AAEjE;;;GAGG;AACU,QAAA,0BAA0B,GAAyB;IAC9D,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE;QAC3C,MAAM,EAAE;YACN,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE;gBACJ,MAAM;gBACN,MAAM;gBACN,aAAa;gBACb,OAAO;gBACP,KAAK;gBACL,SAAS;gBACT,UAAU;aACX;YACD,OAAO,EAAE,MAAM;SAChB;QACD,YAAY,EAAE;YACZ,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,uBAAe,CAAC;YAClC,OAAO,EAAE,uBAAe,CAAC,EAAE;SAC5B;QACD,aAAa,EAAE;YACb,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;YAC9B,OAAO,EAAE,MAAM;SAChB;QACD,OAAO,EAAE;YACP,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,eAAO,CAAC;YAC1B,OAAO,EAAE,eAAO,CAAC,MAAM;SACxB;QACD,MAAM,EAAE;YACN,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,oBAAY,CAAC;YAC/B,OAAO,EAAE,oBAAY,CAAC,IAAI;SAC3B;QACD,cAAc,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE;QACnD,eAAe,EAAE;YACf,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,CAAC,SAAS,EAAE,gBAAgB,CAAC;YACnC,OAAO,EAAE,gBAAgB;SAC1B;QACD,cAAc,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE;QACtD,IAAI,EAAE;YACJ,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,CAAC,WAAW,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,CAAC;YACnD,OAAO,EAAE,WAAW;SACrB;QACD,OAAO,EAAE;YACP,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACL,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE;oBACV,GAAG,EAAE;wBACH,IAAI,EAAE,QAAQ;wBACd,IAAI,EAAE;4BACJ,UAAU;4BACV,MAAM;4BACN,QAAQ;4BACR,kBAAkB;4BAClB,YAAY;4BACZ,kBAAkB;4BAClB,MAAM;4BACN,YAAY;4BACZ,SAAS;4BACT,UAAU;4BACV,QAAQ;4BACR,YAAY;4BACZ,YAAY;4BACZ,cAAc;4BACd,cAAc;4BACd,YAAY;yBACb;qBACF;oBACD,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;oBAC3B,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;iBAC1B;aACF;SACF;KACF;CACF,CAAC;AAEF,oCAAoC;AACvB,QAAA,eAAe,GAAyB;IACnD,IAAI,EAAE,QAAQ;CACf,CAAC;AAEF,iCAAiC;AACpB,QAAA,YAAY,GAAyB;IAChD,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,SAAS,EAAE;YACT,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC;SACpB;QACD,UAAU,EAAE;YACV,IAAI,EAAE,OAAO;YACb,6DAA6D;YAC7D,8DAA8D;YAC9D,4DAA4D;YAC5D,gEAAgE;YAChE,8CAA8C;YAC9C,eAAe;YACf,KAAK,EAAE,uBAAe;SACvB;KACF;CACF,CAAC;AAEF,gCAAgC;AACnB,QAAA,WAAW,GAAyB;IAC/C,IAAI,EAAE,QAAQ;IACd,QAAQ,EAAE,CAAC,cAAc,CAAC;IAC1B,UAAU,EAAE;QACV,YAAY,EAAE;YACZ,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,CAAC,GAAG,4BAAc,CAAC;SAC1B;QACD,OAAO,EAAE;YACP,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,oBAAY;SACpB;KACF;CACF,CAAC;AAEF,wCAAwC;AAC3B,QAAA,gBAAgB,GAAyB;IACpD,IAAI,EAAE,QAAQ;IACd,QAAQ,EAAE,CAAC,OAAO,CAAC;IACnB,UAAU,EAAE;QACV,KAAK,EAAE;YACL,IAAI,EAAE,QAAQ;SACf;QACD,KAAK,EAAE,mBAAW;QAClB,aAAa,EAAE,kCAA0B;KAC1C;CACF,CAAC;AAEF,qCAAqC;AACxB,QAAA,aAAa,GAAyB;IACjD,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,KAAK,EAAE;YACL,IAAI,EAAE,QAAQ;SACf;QACD,MAAM,EAAE;YACN,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE,4BAAc,CAAC,MAAM,CAC/B,CAAC,GAA4B,EAAE,YAAwB,EAAE,EAAE;gBACzD,GAAG,CAAC,YAAY,CAAC,GAAG,mBAAW,CAAC;gBAChC,OAAO,GAAG,CAAC;YACb,CAAC,EACD,EAA6B,CAC9B;SACF;QACD,WAAW,EAAE;YACX,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,wBAAgB;SACxB;QACD,aAAa,EAAE;YACb,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE,4BAAc,CAAC,MAAM,CAC/B,CAAC,GAA4B,EAAE,YAAwB,EAAE,EAAE;gBACzD,GAAG,CAAC,YAAY,CAAC,GAAG,kCAA0B,CAAC;gBAC/C,OAAO,GAAG,CAAC;YACb,CAAC,EACD,EAA6B,CAC9B;SACF;KACF;CACF,CAAC"}
1
+ {"version":3,"file":"CatalogSchema.js","sourceRoot":"","sources":["../../../../../src/core/schemas/shared/CatalogSchema.ts"],"names":[],"mappings":"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"}
@@ -20,7 +20,7 @@ const defaultSiteCollectionKeys_1 = require("../defaultSiteCollectionKeys");
20
20
  * NOTE: The changes made in this migration will not be persisted to AGO at this time
21
21
  *
22
22
  * @param model site model to migrate
23
- * @returns a migrated model with default `IHubCollectionPersistance` objects added
23
+ * @returns a migrated model with default `IHubCollection` objects added
24
24
  * to the catalog
25
25
  */
26
26
  function applyDefaultCollectionMigration(model) {
@@ -43,6 +43,9 @@ function applyDefaultCollectionMigration(model) {
43
43
  collection: key,
44
44
  filters: [],
45
45
  },
46
+ displayConfig: {
47
+ hidden: false,
48
+ },
46
49
  };
47
50
  return map;
48
51
  }, {});
@@ -77,7 +80,7 @@ function applyDefaultCollectionMigration(model) {
77
80
  const collectionKey = searchCategoryToCollection[searchCategory.key];
78
81
  const collection = baseCollectionMap[collectionKey];
79
82
  collection.label = searchCategory.overrideText || null;
80
- collection.hidden = searchCategory.hidden;
83
+ collection.displayConfig.hidden = !!searchCategory.hidden;
81
84
  return collection;
82
85
  });
83
86
  // the "all" collection always goes first
@@ -1 +1 @@
1
- {"version":3,"file":"applyDefaultCollectionMigration.js","sourceRoot":"","sources":["../../../../src/sites/_internal/applyDefaultCollectionMigration.ts"],"names":[],"mappings":";;;AAAA,2CAA+C;AAI/C,mCAA2C;AAC3C,4EAAyE;AAEzE;;;;;;;;;;;;;;;;;;GAkBG;AACH,SAAgB,+BAA+B,CAAC,KAAa;IAC3D,MAAM,iBAAiB,GAAG,qDAAyB,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QACtE,GAAG,CAAC,GAAG,CAAC,GAAG;YACT,4EAA4E;YAC5E,0EAA0E;YAC1E,4EAA4E;YAC5E,uFAAuF;YACvF,gFAAgF;YAChF,+EAA+E;YAC/E,0EAA0E;YAC1E,qCAAqC;YACrC,KAAK,EAAE,IAAI;YACX,GAAG;YACH,OAAO,EAAE,EAAE;YACX,YAAY,EAAE,MAAM;YACpB,KAAK,EAAE;gBACL,YAAY,EAAE,MAAM;gBACpB,UAAU,EAAE,GAAG;gBACf,OAAO,EAAE,EAAE;aACZ;SACF,CAAC;QACF,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAA+C,CAAC,CAAC;IACpD,MAAM,0BAA0B,GAE5B;QACF,CAAC,wBAAgB,CAAC,IAAI,CAAC,EAAE,SAAS;QAClC,2FAA2F;QAC3F,sFAAsF;QACtF,CAAC,wBAAgB,CAAC,WAAW,CAAC,EAAE,MAAM;QACtC,CAAC,wBAAgB,CAAC,KAAK,CAAC,EAAE,MAAM;QAChC,CAAC,wBAAgB,CAAC,SAAS,CAAC,EAAE,UAAU;QACxC,CAAC,wBAAgB,CAAC,aAAa,CAAC,EAAE,WAAW;KAC9C,CAAC;IACF,2FAA2F;IAC3F,uDAAuD;IACvD,+FAA+F;IAC/F,sEAAsE;IACtE,MAAM,yBAAyB,GAAU;QACvC,EAAE,GAAG,EAAE,wBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE;QAC7C,EAAE,GAAG,EAAE,wBAAgB,CAAC,IAAI,EAAE;QAC9B,EAAE,GAAG,EAAE,wBAAgB,CAAC,SAAS,EAAE;QACnC,EAAE,GAAG,EAAE,wBAAgB,CAAC,aAAa,EAAE;KACxC,CAAC;IACF,MAAM,sBAAsB,GAC1B,wBAAc,CAAC,KAAK,CAAC,IAAI,EAAE,yBAAyB,EAAE,SAAS,CAAC;QAChE,yBAAyB,CAAC;IAE5B,MAAM,qBAAqB,GAAG,sBAAsB;QAClD,mEAAmE;SAClE,MAAM,CAAC,CAAC,cAAc,EAAE,EAAE,CAAC,cAAc,CAAC,GAAG,KAAK,wBAAgB,CAAC,MAAM,CAAC;QAC3E,6FAA6F;QAC7F,8EAA8E;SAC7E,MAAM,CACL,CAAC,cAAc,EAAE,EAAE,CACjB,CAAC,CAAC,0BAA0B,CAAC,cAAc,CAAC,GAAuB,CAAC,CACvE;SACA,GAAG,CAAC,CAAC,cAAc,EAAE,EAAE;QACtB,MAAM,aAAa,GACjB,0BAA0B,CAAC,cAAc,CAAC,GAAuB,CAAC,CAAC;QACrE,MAAM,UAAU,GAAG,iBAAiB,CAAC,aAAa,CAAC,CAAC;QACpD,UAAU,CAAC,KAAK,GAAG,cAAc,CAAC,YAAY,IAAI,IAAI,CAAC;QACvD,UAAU,CAAC,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC;QAC1C,OAAO,UAAU,CAAC;IACpB,CAAC,CAAC,CAAC;IAEL,yCAAyC;IACzC,qBAAqB,CAAC,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;IACrD,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,GAAG,qBAAqB,CAAC;IAEvD,OAAO,KAAK,CAAC;AACf,CAAC;AAvED,0EAuEC"}
1
+ {"version":3,"file":"applyDefaultCollectionMigration.js","sourceRoot":"","sources":["../../../../src/sites/_internal/applyDefaultCollectionMigration.ts"],"names":[],"mappings":";;;AAAA,2CAA+C;AAI/C,mCAA2C;AAC3C,4EAAyE;AAEzE;;;;;;;;;;;;;;;;;;GAkBG;AACH,SAAgB,+BAA+B,CAAC,KAAa;IAC3D,MAAM,iBAAiB,GAAG,qDAAyB,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QACtE,GAAG,CAAC,GAAG,CAAC,GAAG;YACT,4EAA4E;YAC5E,0EAA0E;YAC1E,4EAA4E;YAC5E,uFAAuF;YACvF,gFAAgF;YAChF,+EAA+E;YAC/E,0EAA0E;YAC1E,qCAAqC;YACrC,KAAK,EAAE,IAAI;YACX,GAAG;YACH,OAAO,EAAE,EAAE;YACX,YAAY,EAAE,MAAM;YACpB,KAAK,EAAE;gBACL,YAAY,EAAE,MAAM;gBACpB,UAAU,EAAE,GAAG;gBACf,OAAO,EAAE,EAAE;aACZ;YACD,aAAa,EAAE;gBACb,MAAM,EAAE,KAAK;aACd;SACF,CAAC;QACF,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAoC,CAAC,CAAC;IACzC,MAAM,0BAA0B,GAE5B;QACF,CAAC,wBAAgB,CAAC,IAAI,CAAC,EAAE,SAAS;QAClC,2FAA2F;QAC3F,sFAAsF;QACtF,CAAC,wBAAgB,CAAC,WAAW,CAAC,EAAE,MAAM;QACtC,CAAC,wBAAgB,CAAC,KAAK,CAAC,EAAE,MAAM;QAChC,CAAC,wBAAgB,CAAC,SAAS,CAAC,EAAE,UAAU;QACxC,CAAC,wBAAgB,CAAC,aAAa,CAAC,EAAE,WAAW;KAC9C,CAAC;IACF,2FAA2F;IAC3F,uDAAuD;IACvD,+FAA+F;IAC/F,sEAAsE;IACtE,MAAM,yBAAyB,GAAU;QACvC,EAAE,GAAG,EAAE,wBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE;QAC7C,EAAE,GAAG,EAAE,wBAAgB,CAAC,IAAI,EAAE;QAC9B,EAAE,GAAG,EAAE,wBAAgB,CAAC,SAAS,EAAE;QACnC,EAAE,GAAG,EAAE,wBAAgB,CAAC,aAAa,EAAE;KACxC,CAAC;IACF,MAAM,sBAAsB,GAC1B,wBAAc,CAAC,KAAK,CAAC,IAAI,EAAE,yBAAyB,EAAE,SAAS,CAAC;QAChE,yBAAyB,CAAC;IAE5B,MAAM,qBAAqB,GAAG,sBAAsB;QAClD,mEAAmE;SAClE,MAAM,CAAC,CAAC,cAAc,EAAE,EAAE,CAAC,cAAc,CAAC,GAAG,KAAK,wBAAgB,CAAC,MAAM,CAAC;QAC3E,6FAA6F;QAC7F,8EAA8E;SAC7E,MAAM,CACL,CAAC,cAAc,EAAE,EAAE,CACjB,CAAC,CAAC,0BAA0B,CAAC,cAAc,CAAC,GAAuB,CAAC,CACvE;SACA,GAAG,CAAC,CAAC,cAAc,EAAE,EAAE;QACtB,MAAM,aAAa,GACjB,0BAA0B,CAAC,cAAc,CAAC,GAAuB,CAAC,CAAC;QACrE,MAAM,UAAU,GAAG,iBAAiB,CAAC,aAAa,CAAC,CAAC;QACpD,UAAU,CAAC,KAAK,GAAG,cAAc,CAAC,YAAY,IAAI,IAAI,CAAC;QACvD,UAAU,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC;QAC1D,OAAO,UAAU,CAAC;IACpB,CAAC,CAAC,CAAC;IAEL,yCAAyC;IACzC,qBAAqB,CAAC,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;IACrD,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,GAAG,qBAAqB,CAAC;IAEvD,OAAO,KAAK,CAAC;AACf,CAAC;AA1ED,0EA0EC"}
@@ -36,9 +36,10 @@ function reflectCollectionsToSearchCategories(model) {
36
36
  // such as the "all" collection
37
37
  .filter((c) => !!collectionToSearchCategory[c.key])
38
38
  .map((c) => {
39
+ var _a;
39
40
  const searchCategoryKey = collectionToSearchCategory[c.key];
40
41
  const updated = {
41
- hidden: c.hidden,
42
+ hidden: !!((_a = c.displayConfig) === null || _a === void 0 ? void 0 : _a.hidden),
42
43
  key: searchCategoryKey,
43
44
  queryParams: {
44
45
  collection: searchCategoryToQueryParam[searchCategoryKey],
@@ -1 +1 @@
1
- {"version":3,"file":"reflectCollectionsToSearchCategories.js","sourceRoot":"","sources":["../../../../src/sites/_internal/reflectCollectionsToSearchCategories.ts"],"names":[],"mappings":";;;AAGA,qCAAyC;AACzC,mCAA2C;AAE3C;;;;;;;;GAQG;AACH,SAAgB,oCAAoC,CAAC,KAAa;IAChE,MAAM,KAAK,GAAG,kBAAW,CAAC,KAAK,CAAC,CAAC;IACjC,MAAM,0BAA0B,GAE5B;QACF,OAAO,EAAE,wBAAgB,CAAC,IAAI;QAC9B,kFAAkF;QAClF,qFAAqF;QACrF,iFAAiF;QACjF,mFAAmF;QACnF,IAAI,EAAE,wBAAgB,CAAC,KAAK;QAC5B,SAAS,EAAE,wBAAgB,CAAC,aAAa;QACzC,QAAQ,EAAE,wBAAgB,CAAC,SAAS;KACrC,CAAC;IAEF,MAAM,0BAA0B,GAC9B;QACE,CAAC,wBAAgB,CAAC,IAAI,CAAC,EAAE,SAAS;QAClC,CAAC,wBAAgB,CAAC,KAAK,CAAC,EAAE,MAAM;QAChC,CAAC,wBAAgB,CAAC,aAAa,CAAC,EAAE,SAAS;QAC3C,CAAC,wBAAgB,CAAC,SAAS,CAAC,EAAE,UAAU;KACzC,CAAC;IACJ,MAAM,WAAW,GACf,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;IAEjC,MAAM,uBAAuB,GAAG,WAAW;QACzC,6EAA6E;QAC7E,+BAA+B;SAC9B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,GAA0B,CAAC,CAAC;SACzE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACT,MAAM,iBAAiB,GACrB,0BAA0B,CAAC,CAAC,CAAC,GAA0B,CAAC,CAAC;QAC3D,MAAM,OAAO,GAAQ;YACnB,MAAM,EAAE,CAAC,CAAC,MAAM;YAChB,GAAG,EAAE,iBAAiB;YACtB,WAAW,EAAE;gBACX,UAAU,EAAE,0BAA0B,CAAC,iBAAiB,CAAC;aAC1D;SACF,CAAC;QAEF,kEAAkE;QAClE,uEAAuE;QACvE,wEAAwE;QACxE,IAAI,CAAC,CAAC,KAAK,EAAE;YACX,OAAO,CAAC,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC;SAChC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC,CAAC;IAEL,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,GAAG,uBAAuB,CAAC;IAC7D,OAAO,KAAK,CAAC;AACf,CAAC;AApDD,oFAoDC"}
1
+ {"version":3,"file":"reflectCollectionsToSearchCategories.js","sourceRoot":"","sources":["../../../../src/sites/_internal/reflectCollectionsToSearchCategories.ts"],"names":[],"mappings":";;;AAGA,qCAAyC;AACzC,mCAA2C;AAE3C;;;;;;;;GAQG;AACH,SAAgB,oCAAoC,CAAC,KAAa;IAChE,MAAM,KAAK,GAAG,kBAAW,CAAC,KAAK,CAAC,CAAC;IACjC,MAAM,0BAA0B,GAE5B;QACF,OAAO,EAAE,wBAAgB,CAAC,IAAI;QAC9B,kFAAkF;QAClF,qFAAqF;QACrF,iFAAiF;QACjF,mFAAmF;QACnF,IAAI,EAAE,wBAAgB,CAAC,KAAK;QAC5B,SAAS,EAAE,wBAAgB,CAAC,aAAa;QACzC,QAAQ,EAAE,wBAAgB,CAAC,SAAS;KACrC,CAAC;IAEF,MAAM,0BAA0B,GAC9B;QACE,CAAC,wBAAgB,CAAC,IAAI,CAAC,EAAE,SAAS;QAClC,CAAC,wBAAgB,CAAC,KAAK,CAAC,EAAE,MAAM;QAChC,CAAC,wBAAgB,CAAC,aAAa,CAAC,EAAE,SAAS;QAC3C,CAAC,wBAAgB,CAAC,SAAS,CAAC,EAAE,UAAU;KACzC,CAAC;IACJ,MAAM,WAAW,GAAqB,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;IAErE,MAAM,uBAAuB,GAAG,WAAW;QACzC,6EAA6E;QAC7E,+BAA+B;SAC9B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,GAA0B,CAAC,CAAC;SACzE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;;QACT,MAAM,iBAAiB,GACrB,0BAA0B,CAAC,CAAC,CAAC,GAA0B,CAAC,CAAC;QAC3D,MAAM,OAAO,GAAQ;YACnB,MAAM,EAAE,CAAC,QAAC,CAAC,CAAC,aAAa,0CAAE,MAAM,CAAA;YACjC,GAAG,EAAE,iBAAiB;YACtB,WAAW,EAAE;gBACX,UAAU,EAAE,0BAA0B,CAAC,iBAAiB,CAAC;aAC1D;SACF,CAAC;QAEF,kEAAkE;QAClE,uEAAuE;QACvE,wEAAwE;QACxE,IAAI,CAAC,CAAC,KAAK,EAAE;YACX,OAAO,CAAC,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC;SAChC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC,CAAC;IAEL,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,GAAG,uBAAuB,CAAC;IAC7D,OAAO,KAAK,CAAC;AACf,CAAC;AAnDD,oFAmDC"}
@@ -79,16 +79,6 @@ export interface IHubCollection {
79
79
  }
80
80
  export declare const targetEntities: readonly ["item", "group", "user", "portalUser", "communityUser", "groupMember", "event", "channel", "discussionPost", "eventAttendee", "organization"];
81
81
  export declare type EntityType = (typeof targetEntities)[number];
82
- /**
83
- * @private
84
- *
85
- * This interface wraps IHubCollection and provides additional fields
86
- * for collection configuration. It is the actual interface used when
87
- * when storing an entity's catalog collections.
88
- */
89
- export interface IHubCollectionPersistance extends IHubCollection {
90
- hidden?: boolean;
91
- }
92
82
  /**
93
83
  * IQuery is the fundamental unit used to execute a search. By composing
94
84
  * `Filter`'s and `IPredicate`s, we can express very complex queries
@@ -15,7 +15,7 @@ import { IModel } from "../../hub-types";
15
15
  * NOTE: The changes made in this migration will not be persisted to AGO at this time
16
16
  *
17
17
  * @param model site model to migrate
18
- * @returns a migrated model with default `IHubCollectionPersistance` objects added
18
+ * @returns a migrated model with default `IHubCollection` objects added
19
19
  * to the catalog
20
20
  */
21
21
  export declare function applyDefaultCollectionMigration(model: IModel): IModel;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@esri/hub-common",
3
- "version": "15.41.1",
3
+ "version": "15.41.3",
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",