@esri/hub-common 12.39.1 → 12.41.0
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.
- package/dist/esm/initiatives/HubInitiatives.js +4 -1
- package/dist/esm/initiatives/HubInitiatives.js.map +1 -1
- package/dist/esm/initiatives/_internal/applyInitiativeMigrations.js +60 -0
- package/dist/esm/initiatives/_internal/applyInitiativeMigrations.js.map +1 -0
- package/dist/esm/initiatives/_internal/computeProps.js.map +1 -1
- package/dist/esm/initiatives/defaults.js +2 -2
- package/dist/esm/search/Catalog.js +46 -2
- package/dist/esm/search/Catalog.js.map +1 -1
- package/dist/esm/search/_internal/hubSearchItemsHelpers/getBboxQueryParam.js +15 -0
- package/dist/esm/search/_internal/hubSearchItemsHelpers/getBboxQueryParam.js.map +1 -0
- package/dist/esm/search/_internal/hubSearchItemsHelpers/getFilterQueryParam.js +20 -8
- package/dist/esm/search/_internal/hubSearchItemsHelpers/getFilterQueryParam.js.map +1 -1
- package/dist/esm/search/_internal/hubSearchItemsHelpers/getOgcItemQueryParams.js +3 -0
- package/dist/esm/search/_internal/hubSearchItemsHelpers/getOgcItemQueryParams.js.map +1 -1
- package/dist/esm/sites/HubSites.js +5 -2
- package/dist/esm/sites/HubSites.js.map +1 -1
- package/dist/esm/sites/_internal/catalogMigration.js +50 -0
- package/dist/esm/sites/_internal/catalogMigration.js.map +1 -0
- package/dist/esm/sites/_internal/computeProps.js +3 -0
- package/dist/esm/sites/_internal/computeProps.js.map +1 -1
- package/dist/esm/sites/_internal/getPropertyMap.js +6 -1
- package/dist/esm/sites/_internal/getPropertyMap.js.map +1 -1
- package/dist/node/initiatives/HubInitiatives.js +4 -1
- package/dist/node/initiatives/HubInitiatives.js.map +1 -1
- package/dist/node/initiatives/_internal/applyInitiativeMigrations.js +64 -0
- package/dist/node/initiatives/_internal/applyInitiativeMigrations.js.map +1 -0
- package/dist/node/initiatives/_internal/computeProps.js.map +1 -1
- package/dist/node/initiatives/defaults.js +2 -2
- package/dist/node/search/Catalog.js +46 -2
- package/dist/node/search/Catalog.js.map +1 -1
- package/dist/node/search/_internal/hubSearchItemsHelpers/getBboxQueryParam.js +19 -0
- package/dist/node/search/_internal/hubSearchItemsHelpers/getBboxQueryParam.js.map +1 -0
- package/dist/node/search/_internal/hubSearchItemsHelpers/getFilterQueryParam.js +20 -8
- package/dist/node/search/_internal/hubSearchItemsHelpers/getFilterQueryParam.js.map +1 -1
- package/dist/node/search/_internal/hubSearchItemsHelpers/getOgcItemQueryParams.js +3 -0
- package/dist/node/search/_internal/hubSearchItemsHelpers/getOgcItemQueryParams.js.map +1 -1
- package/dist/node/sites/HubSites.js +5 -2
- package/dist/node/sites/HubSites.js.map +1 -1
- package/dist/node/sites/_internal/catalogMigration.js +54 -0
- package/dist/node/sites/_internal/catalogMigration.js.map +1 -0
- package/dist/node/sites/_internal/computeProps.js +3 -0
- package/dist/node/sites/_internal/computeProps.js.map +1 -1
- package/dist/node/sites/_internal/getPropertyMap.js +6 -1
- package/dist/node/sites/_internal/getPropertyMap.js.map +1 -1
- package/dist/types/core/types/HubEntityType.d.ts +1 -1
- package/dist/types/initiatives/_internal/applyInitiativeMigrations.d.ts +9 -0
- package/dist/types/search/Catalog.d.ts +24 -2
- package/dist/types/search/_internal/hubSearchItemsHelpers/getBboxQueryParam.d.ts +11 -0
- package/dist/types/search/_internal/hubSearchItemsHelpers/getOgcItemQueryParams.d.ts +1 -0
- package/dist/types/sites/_internal/catalogMigration.d.ts +9 -0
- package/package.json +1 -1
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.applyInitiativeMigrations = exports.INITIATIVE_SCHEMA_VERSION = void 0;
|
|
4
|
+
const get_prop_1 = require("../../objects/get-prop");
|
|
5
|
+
const util_1 = require("../../util");
|
|
6
|
+
exports.INITIATIVE_SCHEMA_VERSION = 2;
|
|
7
|
+
/**
|
|
8
|
+
* Apply all Initiative model migrations
|
|
9
|
+
* @param model
|
|
10
|
+
* @returns
|
|
11
|
+
*/
|
|
12
|
+
function applyInitiativeMigrations(model, requestOptions) {
|
|
13
|
+
if (get_prop_1.getProp(model, "item.properties.schemaVersion") ===
|
|
14
|
+
exports.INITIATIVE_SCHEMA_VERSION) {
|
|
15
|
+
return Promise.resolve(model);
|
|
16
|
+
}
|
|
17
|
+
else {
|
|
18
|
+
// apply upgrade functions in order...
|
|
19
|
+
model = addDefaultCatalog(model);
|
|
20
|
+
return Promise.resolve(model);
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
exports.applyInitiativeMigrations = applyInitiativeMigrations;
|
|
24
|
+
/**
|
|
25
|
+
* Apply the default catalog to the model
|
|
26
|
+
* @param model
|
|
27
|
+
* @returns
|
|
28
|
+
*/
|
|
29
|
+
function addDefaultCatalog(model) {
|
|
30
|
+
if (get_prop_1.getProp(model, "item.properties.schemaVersion") >= 1.1) {
|
|
31
|
+
return model;
|
|
32
|
+
}
|
|
33
|
+
else {
|
|
34
|
+
const clone = util_1.cloneObject(model);
|
|
35
|
+
// v0 of initiatives did not have a catalog, so we need to add one
|
|
36
|
+
// based on the content group associated with the initiative
|
|
37
|
+
const groupId = get_prop_1.getProp(clone, "item.properties.contentGroupId");
|
|
38
|
+
const group = groupId ? [groupId] : [];
|
|
39
|
+
const catalog = {
|
|
40
|
+
schemaVersion: 1,
|
|
41
|
+
title: "Default Initiative Catalog",
|
|
42
|
+
scopes: {
|
|
43
|
+
item: {
|
|
44
|
+
targetEntity: "item",
|
|
45
|
+
filters: [
|
|
46
|
+
{
|
|
47
|
+
predicates: [
|
|
48
|
+
{
|
|
49
|
+
group,
|
|
50
|
+
},
|
|
51
|
+
],
|
|
52
|
+
},
|
|
53
|
+
],
|
|
54
|
+
},
|
|
55
|
+
},
|
|
56
|
+
collections: [],
|
|
57
|
+
};
|
|
58
|
+
clone.data.catalog = catalog;
|
|
59
|
+
// set the schema version
|
|
60
|
+
clone.item.properties.schemaVersion = 1.1;
|
|
61
|
+
return clone;
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
//# sourceMappingURL=applyInitiativeMigrations.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"applyInitiativeMigrations.js","sourceRoot":"","sources":["../../../../src/initiatives/_internal/applyInitiativeMigrations.ts"],"names":[],"mappings":";;;AACA,qDAAiD;AAGjD,qCAAyC;AAE5B,QAAA,yBAAyB,GAAG,CAAC,CAAC;AAE3C;;;;GAIG;AACH,SAAgB,yBAAyB,CACvC,KAAa,EACb,cAA+B;IAE/B,IACE,kBAAO,CAAC,KAAK,EAAE,+BAA+B,CAAC;QAC/C,iCAAyB,EACzB;QACA,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;KAC/B;SAAM;QACL,sCAAsC;QACtC,KAAK,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAEjC,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;KAC/B;AACH,CAAC;AAfD,8DAeC;AAED;;;;GAIG;AACH,SAAS,iBAAiB,CAAC,KAAa;IACtC,IAAI,kBAAO,CAAC,KAAK,EAAE,+BAA+B,CAAC,IAAI,GAAG,EAAE;QAC1D,OAAO,KAAK,CAAC;KACd;SAAM;QACL,MAAM,KAAK,GAAG,kBAAW,CAAC,KAAK,CAAC,CAAC;QACjC,kEAAkE;QAClE,4DAA4D;QAC5D,MAAM,OAAO,GAAG,kBAAO,CAAC,KAAK,EAAE,gCAAgC,CAAC,CAAC;QACjE,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAEvC,MAAM,OAAO,GAAgB;YAC3B,aAAa,EAAE,CAAC;YAChB,KAAK,EAAE,4BAA4B;YACnC,MAAM,EAAE;gBACN,IAAI,EAAE;oBACJ,YAAY,EAAE,MAAM;oBACpB,OAAO,EAAE;wBACP;4BACE,UAAU,EAAE;gCACV;oCACE,KAAK;iCACN;6BACF;yBACF;qBACF;iBACF;aACF;YACD,WAAW,EAAE,EAAE;SAChB,CAAC;QAEF,KAAK,CAAC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QAE7B,yBAAyB;QACzB,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,GAAG,GAAG,CAAC;QAE1C,OAAO,KAAK,CAAC;KACd;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"computeProps.js","sourceRoot":"","sources":["../../../../src/initiatives/_internal/computeProps.ts"],"names":[],"mappings":";;;AAEA,+CAAsD;AACtD,qDAA+D;AAE/D,uEAA0E;
|
|
1
|
+
{"version":3,"file":"computeProps.js","sourceRoot":"","sources":["../../../../src/initiatives/_internal/computeProps.ts"],"names":[],"mappings":";;;AAEA,+CAAsD;AACtD,qDAA+D;AAE/D,uEAA0E;AAK1E;;;;;;;GAOG;AACH,SAAgB,YAAY,CAC1B,KAAa,EACb,UAAmC,EACnC,cAA+B;;IAE/B,IAAI,KAAa,CAAC;IAClB,IAAI,cAAc,CAAC,cAAc,EAAE;QACjC,MAAM,OAAO,GAAgB,cAAc,CAAC,cAA6B,CAAC;QAC1E,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;KACvB;IACD,gBAAgB;IAChB,UAAU,CAAC,YAAY,GAAG,+BAAmB,CAC3C,KAAK,CAAC,IAAI,EACV,cAAc,EACd,KAAK,CACN,CAAC;IAEF,eAAe;IACf,UAAU,CAAC,WAAW,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACtD,UAAU,CAAC,iBAAiB,GAAG,cAAc,CAAC;IAC9C,UAAU,CAAC,WAAW,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACvD,UAAU,CAAC,iBAAiB,GAAG,eAAe,CAAC;IAE/C,sBAAsB;IACtB,UAAU,CAAC,YAAY,GAAG,wCAAyB,CACjD,OAAA,KAAK,CAAC,IAAI,CAAC,QAAQ,0CAAE,YAAY,KAAI,EAAE,EACvC,uDAA6B,CAC9B,CAAC;IAEF,0DAA0D;IAC1D,OAAO,UAA4B,CAAC;AACtC,CAAC;AA/BD,oCA+BC"}
|
|
@@ -11,7 +11,7 @@ exports.DEFAULT_INITIATIVE = {
|
|
|
11
11
|
typeKeywords: ["Hub Initiative"],
|
|
12
12
|
catalog: { schemaVersion: 0 },
|
|
13
13
|
permissions: [],
|
|
14
|
-
schemaVersion:
|
|
14
|
+
schemaVersion: 2,
|
|
15
15
|
};
|
|
16
16
|
/**
|
|
17
17
|
* Default values for a new HubInitiative Model
|
|
@@ -26,7 +26,7 @@ exports.DEFAULT_INITIATIVE_MODEL = {
|
|
|
26
26
|
typeKeywords: ["Hub Initiative"],
|
|
27
27
|
properties: {
|
|
28
28
|
slug: "",
|
|
29
|
-
schemaVersion:
|
|
29
|
+
schemaVersion: 2,
|
|
30
30
|
},
|
|
31
31
|
},
|
|
32
32
|
data: {},
|
|
@@ -130,6 +130,15 @@ class Catalog {
|
|
|
130
130
|
* @returns
|
|
131
131
|
*/
|
|
132
132
|
getCollection(name) {
|
|
133
|
+
const json = this.getCollectionJson(name);
|
|
134
|
+
return Collection_1.Collection.fromJson(json, this._context);
|
|
135
|
+
}
|
|
136
|
+
/**
|
|
137
|
+
* Get the Collection json by name
|
|
138
|
+
* @param name
|
|
139
|
+
* @returns
|
|
140
|
+
*/
|
|
141
|
+
getCollectionJson(name) {
|
|
133
142
|
const json = this.collections.find((entry) => entry.key === name);
|
|
134
143
|
if (json) {
|
|
135
144
|
// clone it then merge in the associated scope filter
|
|
@@ -138,12 +147,47 @@ class Catalog {
|
|
|
138
147
|
if (catalogScope === null || catalogScope === void 0 ? void 0 : catalogScope.filters) {
|
|
139
148
|
clone.scope.filters = [...clone.scope.filters, ...catalogScope.filters];
|
|
140
149
|
}
|
|
141
|
-
return
|
|
150
|
+
return clone;
|
|
142
151
|
}
|
|
143
152
|
else {
|
|
144
|
-
throw new HubError_1.default("
|
|
153
|
+
throw new HubError_1.default("getCollectionJson", `Collection "${name}" is not present in the Catalog`);
|
|
145
154
|
}
|
|
146
155
|
}
|
|
156
|
+
/**
|
|
157
|
+
* Get a Collection instance, based on a specific entity type and filters
|
|
158
|
+
* This extends from the base scope for the entity type
|
|
159
|
+
* @param type
|
|
160
|
+
* @param filters
|
|
161
|
+
* @returns
|
|
162
|
+
*/
|
|
163
|
+
getCustomCollection(type, filters) {
|
|
164
|
+
// create the collection
|
|
165
|
+
const collection = this.getCustomCollectionJson(type, filters);
|
|
166
|
+
// create instance
|
|
167
|
+
return Collection_1.Collection.fromJson(collection, this._context);
|
|
168
|
+
}
|
|
169
|
+
/**
|
|
170
|
+
* Create a custom collection based on a specific entity type and filters
|
|
171
|
+
* Returned collection extends from the base scope for the entity type
|
|
172
|
+
* @param type
|
|
173
|
+
* @param filters
|
|
174
|
+
* @returns
|
|
175
|
+
*/
|
|
176
|
+
getCustomCollectionJson(type, filters) {
|
|
177
|
+
// get the scope
|
|
178
|
+
const scopeQuery = this.getScope(type);
|
|
179
|
+
// create the collection
|
|
180
|
+
const collection = {
|
|
181
|
+
key: `${type}-custom`,
|
|
182
|
+
label: `${type} Custom`,
|
|
183
|
+
targetEntity: type,
|
|
184
|
+
scope: {
|
|
185
|
+
targetEntity: type,
|
|
186
|
+
filters: [...((scopeQuery === null || scopeQuery === void 0 ? void 0 : scopeQuery.filters) || []), ...filters],
|
|
187
|
+
},
|
|
188
|
+
};
|
|
189
|
+
return collection;
|
|
190
|
+
}
|
|
147
191
|
/**
|
|
148
192
|
* Search for Items
|
|
149
193
|
* Will throw if the Catalog does not have a scope defined for items
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Catalog.js","sourceRoot":"","sources":["../../../src/search/Catalog.ts"],"names":[],"mappings":";;;AACA,kEAA+D;AAC/D,0CAAmC;AACnC,kCAAsC;AACtC,oCAAyC;AACzC,6CAA0C;AAC1C,iDAA8C;AAC9C,2CAAwC;
|
|
1
|
+
{"version":3,"file":"Catalog.js","sourceRoot":"","sources":["../../../src/search/Catalog.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getBboxQueryParam = void 0;
|
|
4
|
+
const getTopLevelPredicate_1 = require("../commonHelpers/getTopLevelPredicate");
|
|
5
|
+
/**
|
|
6
|
+
* @private
|
|
7
|
+
* Extracts the bbox value that the search should be filtered by.
|
|
8
|
+
* Also validates that the bbox predicate is not combined in some
|
|
9
|
+
* invalid way with other predicates.
|
|
10
|
+
*
|
|
11
|
+
* @param query query to extract the bbox predicate from
|
|
12
|
+
* @returns the bbox value to filter by
|
|
13
|
+
*/
|
|
14
|
+
function getBboxQueryParam(query) {
|
|
15
|
+
const bboxPredicate = getTopLevelPredicate_1.getTopLevelPredicate("bbox", query.filters);
|
|
16
|
+
return bboxPredicate === null || bboxPredicate === void 0 ? void 0 : bboxPredicate.bbox;
|
|
17
|
+
}
|
|
18
|
+
exports.getBboxQueryParam = getBboxQueryParam;
|
|
19
|
+
//# sourceMappingURL=getBboxQueryParam.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getBboxQueryParam.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubSearchItemsHelpers/getBboxQueryParam.ts"],"names":[],"mappings":";;;AACA,gFAA6E;AAE7E;;;;;;;;GAQG;AACH,SAAgB,iBAAiB,CAAC,KAAa;IAC7C,MAAM,aAAa,GAAG,2CAAoB,CAAC,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IAClE,OAAO,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,CAAC;AAC7B,CAAC;AAHD,8CAGC"}
|
|
@@ -2,27 +2,26 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.formatPredicate = exports.formatFilterBlock = exports.getFilterQueryParam = void 0;
|
|
4
4
|
function getFilterQueryParam(query) {
|
|
5
|
-
return
|
|
5
|
+
return query.filters
|
|
6
6
|
.map(formatFilterBlock)
|
|
7
|
-
|
|
8
|
-
.
|
|
9
|
-
.join(" AND "));
|
|
7
|
+
.filter(removeEmptyClauses)
|
|
8
|
+
.join(" AND ");
|
|
10
9
|
}
|
|
11
10
|
exports.getFilterQueryParam = getFilterQueryParam;
|
|
12
11
|
function formatFilterBlock(filter) {
|
|
13
12
|
const operation = filter.operation || "OR";
|
|
14
13
|
const formatted = filter.predicates
|
|
15
14
|
.map(formatPredicate)
|
|
16
|
-
|
|
17
|
-
.filter((p) => p !== "()")
|
|
15
|
+
.filter(removeEmptyClauses)
|
|
18
16
|
.join(` ${operation} `);
|
|
19
17
|
return `(${formatted})`;
|
|
20
18
|
}
|
|
21
19
|
exports.formatFilterBlock = formatFilterBlock;
|
|
22
20
|
function formatPredicate(predicate) {
|
|
23
21
|
const formatted = Object.entries(predicate)
|
|
24
|
-
// Remove predicates that use `term` (handled in `getQQueryParam`)
|
|
25
|
-
|
|
22
|
+
// Remove predicates that use `term` (handled in `getQQueryParam`),
|
|
23
|
+
// `bbox` (handled in `getBboxQueryParam) or have undefined entries
|
|
24
|
+
.filter(([field, value]) => field !== "term" && field !== "bbox" && !!value)
|
|
26
25
|
// Create sections for each field
|
|
27
26
|
.reduce((acc, [field, value]) => {
|
|
28
27
|
let section;
|
|
@@ -101,4 +100,17 @@ function maybeAddSingleQuotes(value) {
|
|
|
101
100
|
const whitespaceRegex = /\s/;
|
|
102
101
|
return whitespaceRegex.test(value) ? `'${value}'` : value;
|
|
103
102
|
}
|
|
103
|
+
/**
|
|
104
|
+
* Returns whether a clause is non-empty and should be included in the
|
|
105
|
+
* final serialized string.
|
|
106
|
+
*
|
|
107
|
+
* Empty clauses appear when certain predicates are detected that are invalid
|
|
108
|
+
* in the OGC API's ?filter string (i.e. `term`, `bbox`)
|
|
109
|
+
*
|
|
110
|
+
* @param clause stringified clause to inspect
|
|
111
|
+
* @returns whether the clause should be included in the final serialization
|
|
112
|
+
*/
|
|
113
|
+
function removeEmptyClauses(clause) {
|
|
114
|
+
return clause !== "()";
|
|
115
|
+
}
|
|
104
116
|
//# sourceMappingURL=getFilterQueryParam.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getFilterQueryParam.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubSearchItemsHelpers/getFilterQueryParam.ts"],"names":[],"mappings":";;;AAGA,SAAgB,mBAAmB,CAAC,KAAa;IAC/C,OAAO,
|
|
1
|
+
{"version":3,"file":"getFilterQueryParam.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubSearchItemsHelpers/getFilterQueryParam.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getOgcItemQueryParams = void 0;
|
|
4
4
|
const get_prop_1 = require("../../../objects/get-prop");
|
|
5
|
+
const getBboxQueryParam_1 = require("./getBboxQueryParam");
|
|
5
6
|
const getFilterQueryParam_1 = require("./getFilterQueryParam");
|
|
6
7
|
const getQQueryParam_1 = require("./getQQueryParam");
|
|
7
8
|
const getSortByQueryParam_1 = require("./getSortByQueryParam");
|
|
@@ -22,6 +23,7 @@ function getOgcItemQueryParams(query, options) {
|
|
|
22
23
|
const startindex = options.start;
|
|
23
24
|
const q = getQQueryParam_1.getQQueryParam(query);
|
|
24
25
|
const sortBy = getSortByQueryParam_1.getSortByQueryParam(options);
|
|
26
|
+
const bbox = getBboxQueryParam_1.getBboxQueryParam(query);
|
|
25
27
|
return {
|
|
26
28
|
filter,
|
|
27
29
|
token,
|
|
@@ -29,6 +31,7 @@ function getOgcItemQueryParams(query, options) {
|
|
|
29
31
|
startindex,
|
|
30
32
|
q,
|
|
31
33
|
sortBy,
|
|
34
|
+
bbox,
|
|
32
35
|
};
|
|
33
36
|
}
|
|
34
37
|
exports.getOgcItemQueryParams = getOgcItemQueryParams;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getOgcItemQueryParams.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubSearchItemsHelpers/getOgcItemQueryParams.ts"],"names":[],"mappings":";;;AAAA,wDAAoD;AAGpD,+DAA4D;AAC5D,qDAAkD;AAClD,+DAA4D;
|
|
1
|
+
{"version":3,"file":"getOgcItemQueryParams.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubSearchItemsHelpers/getOgcItemQueryParams.ts"],"names":[],"mappings":";;;AAAA,wDAAoD;AAGpD,2DAAwD;AACxD,+DAA4D;AAC5D,qDAAkD;AAClD,+DAA4D;AAY5D;;;;;;;;GAQG;AACH,SAAgB,qBAAqB,CACnC,KAAa,EACb,OAA0B;IAE1B,MAAM,MAAM,GAAG,yCAAmB,CAAC,KAAK,CAAC,CAAC;IAC1C,MAAM,KAAK,GAAG,kBAAO,CAAC,OAAO,EAAE,qCAAqC,CAAC,CAAC;IACtE,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC;IAC1B,+CAA+C;IAC/C,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC;IACjC,MAAM,CAAC,GAAG,+BAAc,CAAC,KAAK,CAAC,CAAC;IAChC,MAAM,MAAM,GAAG,yCAAmB,CAAC,OAAO,CAAC,CAAC;IAC5C,MAAM,IAAI,GAAG,qCAAiB,CAAC,KAAK,CAAC,CAAC;IAEtC,OAAO;QACL,MAAM;QACN,KAAK;QACL,KAAK;QACL,UAAU;QACV,CAAC;QACD,MAAM;QACN,IAAI;KACL,CAAC;AACJ,CAAC;AAtBD,sDAsBC"}
|
|
@@ -26,6 +26,7 @@ const remove_domains_by_site_id_1 = require("./domains/remove-domains-by-site-id
|
|
|
26
26
|
const utils_1 = require("../utils");
|
|
27
27
|
const objects_1 = require("../objects");
|
|
28
28
|
const get_item_thumbnail_url_1 = require("../resources/get-item-thumbnail-url");
|
|
29
|
+
const catalogMigration_1 = require("./_internal/catalogMigration");
|
|
29
30
|
exports.HUB_SITE_ITEM_TYPE = "Hub Site Application";
|
|
30
31
|
exports.ENTERPRISE_SITE_ITEM_TYPE = "Site Application";
|
|
31
32
|
/**
|
|
@@ -341,10 +342,12 @@ function convertModelToSite(model, requestOptions) {
|
|
|
341
342
|
// Add permissions based on Groups
|
|
342
343
|
// This may get moved to a formal schema migration in the future but for now
|
|
343
344
|
// we can do it here as there is no ux for managing permissions yet.
|
|
344
|
-
|
|
345
|
+
let migrated = applyPermissionMigration_1.applyPermissionMigration(model);
|
|
346
|
+
// Ensure we have a Catalog structure
|
|
347
|
+
migrated = catalogMigration_1.catalogMigration(migrated);
|
|
345
348
|
// convert to site
|
|
346
349
|
const mapper = new PropertyMapper_1.PropertyMapper(getPropertyMap_1.getPropertyMap());
|
|
347
|
-
const site = mapper.modelToObject(
|
|
350
|
+
const site = mapper.modelToObject(migrated, {});
|
|
348
351
|
// compute additional properties
|
|
349
352
|
return computeProps_1.computeProps(model, site, requestOptions);
|
|
350
353
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HubSites.js","sourceRoot":"","sources":["../../../src/sites/HubSites.ts"],"names":[],"mappings":";;;AACA,iEAA+E;AAC/E,sDAAkD;AAClD,qDAAkD;AAClD,qEAAkE;AAClE,2CAAkD;AAElD,wDAA6D;AAC7D,mEAAgE;AAChE,oFAA8E;AAC9E,mFAAgF;AAChF,2DAAwD;AACxD,+DAA4D;AAE5D,0CAA+D;AAC/D,8CAA2C;AAC3C,mFAA6E;AAC7E,2DAAuD;AACvD,gCAAsC;AACtC,qCAA8C;AAC9C,kCAA8C;AAC9C,sCAKmB;AACnB,2EAAwE;AACxE,6DAA0D;AAE1D,mFAA4E;AAE5E,oCAAiC;AACjC,wCAA8C;AAC9C,gFAA0E;
|
|
1
|
+
{"version":3,"file":"HubSites.js","sourceRoot":"","sources":["../../../src/sites/HubSites.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.catalogMigration = void 0;
|
|
4
|
+
const get_prop_1 = require("../../objects/get-prop");
|
|
5
|
+
/**
|
|
6
|
+
* Add the default catalog and collections to the Site model
|
|
7
|
+
* Note: This migration is only applies via `fetchSite(..):IHubSite` and not
|
|
8
|
+
* the older `getSiteById(...):IModel`
|
|
9
|
+
* @param model
|
|
10
|
+
* @returns
|
|
11
|
+
*/
|
|
12
|
+
function catalogMigration(model) {
|
|
13
|
+
if (get_prop_1.getProp(model, "item.properties.schemaVersion") >= 1.7) {
|
|
14
|
+
return model;
|
|
15
|
+
}
|
|
16
|
+
else {
|
|
17
|
+
let siteCatalog = model.data.catalog || {};
|
|
18
|
+
if (!siteCatalog.hasOwnProperty("schemaVersion")) {
|
|
19
|
+
const groups = siteCatalog.groups || [];
|
|
20
|
+
siteCatalog = {
|
|
21
|
+
schemaVersion: 1,
|
|
22
|
+
title: "Default Site Catalog",
|
|
23
|
+
scopes: {
|
|
24
|
+
item: {
|
|
25
|
+
targetEntity: "item",
|
|
26
|
+
filters: [],
|
|
27
|
+
},
|
|
28
|
+
},
|
|
29
|
+
collections: [],
|
|
30
|
+
};
|
|
31
|
+
// groups are used to set the item scope for the whole catalog
|
|
32
|
+
siteCatalog.scopes.item.filters.push({
|
|
33
|
+
predicates: [
|
|
34
|
+
{
|
|
35
|
+
group: [...groups],
|
|
36
|
+
},
|
|
37
|
+
],
|
|
38
|
+
});
|
|
39
|
+
// in order to not break existing code, we need store the
|
|
40
|
+
// new catalog on `data.catalogv2` and leave old catalog on `data.catalog`
|
|
41
|
+
// The property mapper will expose this as `catalog` on the IHubSite
|
|
42
|
+
// and re-map it back to `data.catalogv2` when saving
|
|
43
|
+
// This is only done if the data.catalog does not have `schemaVersion`
|
|
44
|
+
// property. At some point we will deprecate the old catalog
|
|
45
|
+
// remove the mappings, and save the catalog directly to `data.catalog`
|
|
46
|
+
model.data.catalogv2 = siteCatalog;
|
|
47
|
+
}
|
|
48
|
+
// set the schema version
|
|
49
|
+
model.item.properties.schemaVersion = 1.7;
|
|
50
|
+
return model;
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
exports.catalogMigration = catalogMigration;
|
|
54
|
+
//# sourceMappingURL=catalogMigration.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"catalogMigration.js","sourceRoot":"","sources":["../../../../src/sites/_internal/catalogMigration.ts"],"names":[],"mappings":";;;AAAA,qDAAiD;AAIjD;;;;;;GAMG;AACH,SAAgB,gBAAgB,CAAC,KAAa;IAC5C,IAAI,kBAAO,CAAC,KAAK,EAAE,+BAA+B,CAAC,IAAI,GAAG,EAAE;QAC1D,OAAO,KAAK,CAAC;KACd;SAAM;QACL,IAAI,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;QAC3C,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,eAAe,CAAC,EAAE;YAChD,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,IAAI,EAAE,CAAC;YACxC,WAAW,GAAG;gBACZ,aAAa,EAAE,CAAC;gBAChB,KAAK,EAAE,sBAAsB;gBAC7B,MAAM,EAAE;oBACN,IAAI,EAAE;wBACJ,YAAY,EAAE,MAAM;wBACpB,OAAO,EAAE,EAAE;qBACZ;iBACF;gBACD,WAAW,EAAE,EAAE;aACD,CAAC;YAEjB,8DAA8D;YAC9D,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;gBACnC,UAAU,EAAE;oBACV;wBACE,KAAK,EAAE,CAAC,GAAG,MAAM,CAAC;qBACnB;iBACF;aACF,CAAC,CAAC;YACH,yDAAyD;YACzD,0EAA0E;YAC1E,oEAAoE;YACpE,qDAAqD;YACrD,sEAAsE;YACtE,4DAA4D;YAC5D,uEAAuE;YACvE,KAAK,CAAC,IAAI,CAAC,SAAS,GAAG,WAAW,CAAC;SACpC;QACD,yBAAyB;QACzB,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,GAAG,GAAG,CAAC;QAE1C,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAzCD,4CAyCC"}
|
|
@@ -4,6 +4,7 @@ exports.computeProps = void 0;
|
|
|
4
4
|
const resources_1 = require("../../resources");
|
|
5
5
|
const SiteBusinessRules_1 = require("./SiteBusinessRules");
|
|
6
6
|
const capabilities_1 = require("../../capabilities");
|
|
7
|
+
const upgradeCatalogSchema_1 = require("../../search/upgradeCatalogSchema");
|
|
7
8
|
/**
|
|
8
9
|
* Given a model and a site, set various computed properties that can't be directly mapped
|
|
9
10
|
* @private
|
|
@@ -29,6 +30,8 @@ function computeProps(model, site, requestOptions) {
|
|
|
29
30
|
// Handle capabilities
|
|
30
31
|
// NOTE: This does not currently contain the older "capabilities" values!
|
|
31
32
|
site.capabilities = capabilities_1.processEntityCapabilities(((_a = model.data.settings) === null || _a === void 0 ? void 0 : _a.capabilities) || {}, SiteBusinessRules_1.SiteDefaultCapabilities);
|
|
33
|
+
// handle catalog
|
|
34
|
+
site.catalog = upgradeCatalogSchema_1.upgradeCatalogSchema(model.data.catalog || { groups: [] });
|
|
32
35
|
// cast b/c this takes a partial but returns a full site
|
|
33
36
|
return site;
|
|
34
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"computeProps.js","sourceRoot":"","sources":["../../../../src/sites/_internal/computeProps.ts"],"names":[],"mappings":";;;AAEA,+CAAsD;AAGtD,2DAA8D;AAC9D,qDAA+D;
|
|
1
|
+
{"version":3,"file":"computeProps.js","sourceRoot":"","sources":["../../../../src/sites/_internal/computeProps.ts"],"names":[],"mappings":";;;AAEA,+CAAsD;AAGtD,2DAA8D;AAC9D,qDAA+D;AAC/D,4EAAyE;AAEzE;;;;;;;GAOG;AACH,SAAgB,YAAY,CAC1B,KAAa,EACb,IAAuB,EACvB,cAA+B;;IAE/B,IAAI,KAAa,CAAC;IAClB,IAAI,cAAc,CAAC,cAAc,EAAE;QACjC,MAAM,OAAO,GAAgB,cAAc,CAAC,cAA6B,CAAC;QAC1E,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;KACvB;IACD,gBAAgB;IAChB,IAAI,CAAC,YAAY,GAAG,+BAAmB,CAAC,KAAK,CAAC,IAAI,EAAE,cAAc,EAAE,KAAK,CAAC,CAAC;IAE3E,eAAe;IACf,IAAI,CAAC,WAAW,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAChD,IAAI,CAAC,iBAAiB,GAAG,cAAc,CAAC;IACxC,IAAI,CAAC,WAAW,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACjD,IAAI,CAAC,iBAAiB,GAAG,eAAe,CAAC;IAEzC,sBAAsB;IACtB,yEAAyE;IACzE,IAAI,CAAC,YAAY,GAAG,wCAAyB,CAC3C,OAAA,KAAK,CAAC,IAAI,CAAC,QAAQ,0CAAE,YAAY,KAAI,EAAE,EACvC,2CAAuB,CACxB,CAAC;IAEF,iBAAiB;IACjB,IAAI,CAAC,OAAO,GAAG,2CAAoB,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;IAE1E,wDAAwD;IACxD,OAAO,IAAgB,CAAC;AAC1B,CAAC;AA/BD,oCA+BC"}
|
|
@@ -13,7 +13,6 @@ const getBasePropertyMap_1 = require("../../core/_internal/getBasePropertyMap");
|
|
|
13
13
|
function getPropertyMap() {
|
|
14
14
|
const map = getBasePropertyMap_1.getBasePropertyMap();
|
|
15
15
|
// Site specific mappings
|
|
16
|
-
map.push({ objectKey: "catalog", modelKey: "data.catalog" });
|
|
17
16
|
map.push({ objectKey: "feeds", modelKey: "data.feeds" });
|
|
18
17
|
map.push({ objectKey: "permissions", modelKey: "data.permissions" });
|
|
19
18
|
map.push({
|
|
@@ -59,6 +58,12 @@ function getPropertyMap() {
|
|
|
59
58
|
objectKey: "name",
|
|
60
59
|
modelKey: "item.title",
|
|
61
60
|
});
|
|
61
|
+
// Catalog mappings
|
|
62
|
+
// Since v1.x sites use data.catalog, which is really just `{groiups: []}`
|
|
63
|
+
// we can't overtly migrate data.catalog, but we can map the properties
|
|
64
|
+
// so they don't collide
|
|
65
|
+
map.push({ objectKey: "catalog", modelKey: "data.catalogv2" });
|
|
66
|
+
map.push({ objectKey: "legacyCatalog", modelKey: "data.catalog" });
|
|
62
67
|
return map;
|
|
63
68
|
}
|
|
64
69
|
exports.getPropertyMap = getPropertyMap;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPropertyMap.js","sourceRoot":"","sources":["../../../../src/sites/_internal/getPropertyMap.ts"],"names":[],"mappings":";;;AACA,gFAA6E;AAE7E;;;;;;;GAOG;AACH,SAAgB,cAAc;IAC5B,MAAM,GAAG,GAAG,uCAAkB,EAAE,CAAC;IACjC,yBAAyB;IACzB,GAAG,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"getPropertyMap.js","sourceRoot":"","sources":["../../../../src/sites/_internal/getPropertyMap.ts"],"names":[],"mappings":";;;AACA,gFAA6E;AAE7E;;;;;;;GAOG;AACH,SAAgB,cAAc;IAC5B,MAAM,GAAG,GAAG,uCAAkB,EAAE,CAAC;IACjC,yBAAyB;IACzB,GAAG,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,CAAC;IACzD,GAAG,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,aAAa,EAAE,QAAQ,EAAE,kBAAkB,EAAE,CAAC,CAAC;IACrE,GAAG,CAAC,IAAI,CAAC;QACP,SAAS,EAAE,cAAc;QACzB,QAAQ,EAAE,mBAAmB;KAC9B,CAAC,CAAC;IACH,mCAAmC;IACnC,MAAM,UAAU,GAAG;QACjB,OAAO;QACP,OAAO;QACP,WAAW;QACX,iBAAiB;QACjB,gBAAgB;QAChB,UAAU;QACV,eAAe;QACf,KAAK;QACL,WAAW;QACX,YAAY;QACZ,aAAa;QACb,QAAQ;KACT,CAAC;IACF,UAAU,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QAC3B,GAAG,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,eAAe,KAAK,EAAE,EAAE,CAAC,CAAC;IACnE,CAAC,CAAC,CAAC;IACH,2BAA2B;IAC3B,GAAG,CAAC,IAAI,CAAC;QACP,SAAS,EAAE,MAAM;QACjB,QAAQ,EAAE,sBAAsB;KACjC,CAAC,CAAC;IACH,GAAG,CAAC,IAAI,CAAC;QACP,SAAS,EAAE,qBAAqB;QAChC,QAAQ,EAAE,0BAA0B;KACrC,CAAC,CAAC;IACH,GAAG,CAAC,IAAI,CAAC;QACP,SAAS,EAAE,cAAc;QACzB,QAAQ,EAAE,4BAA4B;KACvC,CAAC,CAAC;IACH,GAAG,CAAC,IAAI,CAAC;QACP,SAAS,EAAE,WAAW;QACtB,QAAQ,EAAE,2BAA2B;KACtC,CAAC,CAAC;IACH,GAAG,CAAC,IAAI,CAAC;QACP,SAAS,EAAE,MAAM;QACjB,QAAQ,EAAE,YAAY;KACvB,CAAC,CAAC;IACH,mBAAmB;IACnB,0EAA0E;IAC1E,uEAAuE;IACvE,wBAAwB;IACxB,GAAG,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAC/D,GAAG,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,eAAe,EAAE,QAAQ,EAAE,cAAc,EAAE,CAAC,CAAC;IAEnE,OAAO,GAAG,CAAC;AACb,CAAC;AAxDD,wCAwDC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare type HubEntityType = "site" | "project" | "initiative" | "page" | "discussion" | "content";
|
|
1
|
+
export declare type HubEntityType = "site" | "project" | "initiative" | "page" | "discussion" | "content" | "org";
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { IRequestOptions } from "@esri/arcgis-rest-request";
|
|
2
|
+
import { IModel } from "../../types";
|
|
3
|
+
export declare const INITIATIVE_SCHEMA_VERSION = 2;
|
|
4
|
+
/**
|
|
5
|
+
* Apply all Initiative model migrations
|
|
6
|
+
* @param model
|
|
7
|
+
* @returns
|
|
8
|
+
*/
|
|
9
|
+
export declare function applyInitiativeMigrations(model: IModel, requestOptions: IRequestOptions): Promise<IModel>;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { IArcGISContext } from "../ArcGISContext";
|
|
2
2
|
import { Collection } from "./Collection";
|
|
3
|
-
import { EntityType, ISearchResponseHash, IContainsOptions, IContainsResponse, IHubSearchOptions, IHubSearchResponse, IHubSearchResult, ICatalogScope, IHubCatalog, IQuery } from "./types";
|
|
3
|
+
import { EntityType, ISearchResponseHash, IContainsOptions, IContainsResponse, IHubSearchOptions, IHubSearchResponse, IHubSearchResult, ICatalogScope, IHubCatalog, IQuery, IFilter, IHubCollection } from "./types";
|
|
4
4
|
/**
|
|
5
5
|
* Catalog Class
|
|
6
6
|
*
|
|
@@ -72,7 +72,7 @@ export declare class Catalog implements IHubCatalog {
|
|
|
72
72
|
/**
|
|
73
73
|
* Get the collections array. Returns simple objects not Collection instances
|
|
74
74
|
*/
|
|
75
|
-
get collections():
|
|
75
|
+
get collections(): IHubCollection[];
|
|
76
76
|
/**
|
|
77
77
|
* Get the names of the collections
|
|
78
78
|
*/
|
|
@@ -83,6 +83,28 @@ export declare class Catalog implements IHubCatalog {
|
|
|
83
83
|
* @returns
|
|
84
84
|
*/
|
|
85
85
|
getCollection(name: string): Collection;
|
|
86
|
+
/**
|
|
87
|
+
* Get the Collection json by name
|
|
88
|
+
* @param name
|
|
89
|
+
* @returns
|
|
90
|
+
*/
|
|
91
|
+
getCollectionJson(name: string): IHubCollection;
|
|
92
|
+
/**
|
|
93
|
+
* Get a Collection instance, based on a specific entity type and filters
|
|
94
|
+
* This extends from the base scope for the entity type
|
|
95
|
+
* @param type
|
|
96
|
+
* @param filters
|
|
97
|
+
* @returns
|
|
98
|
+
*/
|
|
99
|
+
getCustomCollection(type: EntityType, filters: IFilter[]): Collection;
|
|
100
|
+
/**
|
|
101
|
+
* Create a custom collection based on a specific entity type and filters
|
|
102
|
+
* Returned collection extends from the base scope for the entity type
|
|
103
|
+
* @param type
|
|
104
|
+
* @param filters
|
|
105
|
+
* @returns
|
|
106
|
+
*/
|
|
107
|
+
getCustomCollectionJson(type: EntityType, filters: IFilter[]): IHubCollection;
|
|
86
108
|
/**
|
|
87
109
|
* Search for Items
|
|
88
110
|
* Will throw if the Catalog does not have a scope defined for items
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { IQuery } from "../../types/IHubCatalog";
|
|
2
|
+
/**
|
|
3
|
+
* @private
|
|
4
|
+
* Extracts the bbox value that the search should be filtered by.
|
|
5
|
+
* Also validates that the bbox predicate is not combined in some
|
|
6
|
+
* invalid way with other predicates.
|
|
7
|
+
*
|
|
8
|
+
* @param query query to extract the bbox predicate from
|
|
9
|
+
* @returns the bbox value to filter by
|
|
10
|
+
*/
|
|
11
|
+
export declare function getBboxQueryParam(query: IQuery): string;
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { IModel } from "../../types";
|
|
2
|
+
/**
|
|
3
|
+
* Add the default catalog and collections to the Site model
|
|
4
|
+
* Note: This migration is only applies via `fetchSite(..):IHubSite` and not
|
|
5
|
+
* the older `getSiteById(...):IModel`
|
|
6
|
+
* @param model
|
|
7
|
+
* @returns
|
|
8
|
+
*/
|
|
9
|
+
export declare function catalogMigration(model: IModel): IModel;
|