@esri/hub-common 18.4.0 → 18.5.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/discussions/api/types.js +1 -0
- package/dist/esm/discussions/api/types.js.map +1 -1
- package/dist/esm/search/upgradeCatalogSchema.js +26 -1
- package/dist/esm/search/upgradeCatalogSchema.js.map +1 -1
- package/dist/esm/sites/_internal/applyCatalogStructureMigration.js +6 -4
- package/dist/esm/sites/_internal/applyCatalogStructureMigration.js.map +1 -1
- package/dist/node/discussions/api/types.js +1 -0
- package/dist/node/discussions/api/types.js.map +1 -1
- package/dist/node/search/upgradeCatalogSchema.js +26 -1
- package/dist/node/search/upgradeCatalogSchema.js.map +1 -1
- package/dist/node/sites/_internal/applyCatalogStructureMigration.js +6 -4
- package/dist/node/sites/_internal/applyCatalogStructureMigration.js.map +1 -1
- package/dist/types/discussions/api/types.d.ts +1 -0
- package/package.json +1 -1
|
@@ -103,6 +103,7 @@ export var DiscussionSource;
|
|
|
103
103
|
export var PostRelation;
|
|
104
104
|
(function (PostRelation) {
|
|
105
105
|
PostRelation["REPLIES"] = "replies";
|
|
106
|
+
PostRelation["REPLY_COUNT"] = "replyCount";
|
|
106
107
|
PostRelation["REACTIONS"] = "reactions";
|
|
107
108
|
PostRelation["PARENT"] = "parent";
|
|
108
109
|
PostRelation["CHANNEL"] = "channel";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/discussions/api/types.ts"],"names":[],"mappings":"AAQA;;;;;GAKG;AACH,MAAM,CAAN,IAAY,SAGX;AAHD,WAAY,SAAS;IACnB,wBAAW,CAAA;IACX,0BAAa,CAAA;AACf,CAAC,EAHW,SAAS,KAAT,SAAS,QAGpB;AAED;;;;;GAKG;AACH,MAAM,CAAN,IAAY,YA0BX;AA1BD,WAAY,YAAY;IACtB,iDAAiC,CAAA;IACjC,qCAAqB,CAAA;IACrB,yCAAyB,CAAA;IACzB,6BAAa,CAAA;IACb,iEAAiD,CAAA;IACjD,6BAAa,CAAA;IACb,qCAAqB,CAAA;IACrB,+BAAe,CAAA;IACf,+BAAe,CAAA;IACf,2CAA2B,CAAA;IAC3B,qCAAqB,CAAA;IACrB,6CAA6B,CAAA;IAC7B,+CAA+B,CAAA;IAC/B,iCAAiB,CAAA;IACjB,2BAAW,CAAA;IACX,qDAAqC,CAAA;IACrC,uCAAuB,CAAA;IACvB,qCAAqB,CAAA;IACrB,uCAAuB,CAAA;IACvB,2CAA2B,CAAA;IAC3B,iCAAiB,CAAA;IACjB,qCAAqB,CAAA;IACrB,2CAA2B,CAAA;IAC3B,mCAAmB,CAAA;IACnB,uCAAuB,CAAA;AACzB,CAAC,EA1BW,YAAY,KAAZ,YAAY,QA0BvB;AAED;;;;;GAKG;AACH,MAAM,CAAN,IAAY,aAIX;AAJD,WAAY,aAAa;IACvB,kCAAiB,CAAA;IACjB,4BAAW,CAAA;IACX,oCAAmB,CAAA;AACrB,CAAC,EAJW,aAAa,KAAb,aAAa,QAIxB;AAcD;;;;;GAKG;AACH,MAAM,CAAN,IAAY,UAOX;AAPD,WAAY,UAAU;IACpB,iCAAmB,CAAA;IACnB,mCAAqB,CAAA;IACrB,mCAAqB,CAAA;IACrB,iCAAmB,CAAA;IACnB,+BAAiB,CAAA;IACjB,iCAAmB,CAAA;AACrB,CAAC,EAPW,UAAU,KAAV,UAAU,QAOrB;AAED;;;;;GAKG;AACH,MAAM,CAAN,IAAY,cAIX;AAJD,WAAY,cAAc;IACxB,iCAAe,CAAA;IACf,qCAAmB,CAAA;IACnB,iCAAe,CAAA;AACjB,CAAC,EAJW,cAAc,KAAd,cAAc,QAIzB;AAED;;;;;GAKG;AACH,MAAM,CAAN,IAAY,gBAIX;AAJD,WAAY,gBAAgB;IAC1B,+BAAW,CAAA;IACX,+BAAW,CAAA;IACX,mCAAe,CAAA;AACjB,CAAC,EAJW,gBAAgB,KAAhB,gBAAgB,QAI3B;AAuBD;;;;;GAKG;AACH,MAAM,CAAN,IAAY,
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/discussions/api/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,9 +14,17 @@ const getAgoEntityOrgIdPredicates = (orgId) => [
|
|
|
14
14
|
const getEventEntityOrgIdPredicates = (orgId) => [
|
|
15
15
|
{ orgId },
|
|
16
16
|
];
|
|
17
|
+
const getGroupEntityOrgIdPredicates = (orgId) => [
|
|
18
|
+
{ orgid: orgId },
|
|
19
|
+
];
|
|
20
|
+
const getUserEntityOrgIdPredicates = (orgId) => [
|
|
21
|
+
{ orgid: orgId },
|
|
22
|
+
];
|
|
17
23
|
const ORG_ID_PREDICATE_FNS_BY_ENTITY_TYPE = {
|
|
18
24
|
item: getAgoEntityOrgIdPredicates,
|
|
19
25
|
event: getEventEntityOrgIdPredicates,
|
|
26
|
+
group: getGroupEntityOrgIdPredicates,
|
|
27
|
+
user: getUserEntityOrgIdPredicates,
|
|
20
28
|
};
|
|
21
29
|
/**
|
|
22
30
|
* Apply schema upgrades to Catalog objects
|
|
@@ -77,12 +85,29 @@ function applyCatalogSchema(original) {
|
|
|
77
85
|
// for org-level home sites (e.g., "my-org.hub.arcgis.com")
|
|
78
86
|
const orgId = getProp(original, "orgId");
|
|
79
87
|
if (orgId) {
|
|
88
|
+
// Org-level sites should ignore any configured groups.
|
|
89
|
+
// They also need 'group' and 'user' scopes within the catalog.
|
|
90
|
+
catalog.scopes.item = {
|
|
91
|
+
targetEntity: "item",
|
|
92
|
+
filters: [],
|
|
93
|
+
};
|
|
94
|
+
catalog.scopes.event = {
|
|
95
|
+
targetEntity: "event",
|
|
96
|
+
filters: [],
|
|
97
|
+
};
|
|
98
|
+
catalog.scopes.group = {
|
|
99
|
+
targetEntity: "group",
|
|
100
|
+
filters: [],
|
|
101
|
+
};
|
|
102
|
+
catalog.scopes.user = {
|
|
103
|
+
targetEntity: "user",
|
|
104
|
+
filters: [],
|
|
105
|
+
};
|
|
80
106
|
// add the org ID predicate to all the scope queries
|
|
81
107
|
catalog.scopes = Object.entries(catalog.scopes).reduce((acc, entry) => {
|
|
82
108
|
const entityType = entry[0];
|
|
83
109
|
const query = entry[1];
|
|
84
110
|
return Object.assign(Object.assign({}, acc), { [entityType]: Object.assign(Object.assign({}, query), { filters: [
|
|
85
|
-
...query.filters,
|
|
86
111
|
{
|
|
87
112
|
operation: "AND",
|
|
88
113
|
predicates: ORG_ID_PREDICATE_FNS_BY_ENTITY_TYPE[entityType](orgId),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgradeCatalogSchema.js","sourceRoot":"","sources":["../../../src/search/upgradeCatalogSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAStC,MAAM,sBAAsB,GAAG,GAAG,CAAC;AAEnC,MAAM,2BAA2B,GAAG,CAAC,KAAa,EAAgB,EAAE,CAAC;IACnE,wDAAwD;IACxD,6DAA6D;IAC7D,+DAA+D;IAC/D,EAAE,KAAK,EAAE,CAAC,KAAK,CAAC,EAAE;IAClB,6DAA6D;IAC7D,+DAA+D;IAC/D,gEAAgE;IAChE,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,EAAE,EAAE;CACvC,CAAC;AAEF,MAAM,6BAA6B,GAAG,CAAC,KAAa,EAAgB,EAAE,CAAC;IACrE,EAAE,KAAK,EAAE;CACV,CAAC;AAEF,MAAM,mCAAmC,GAErC;IACF,IAAI,EAAE,2BAA2B;IACjC,KAAK,EAAE,6BAA6B;
|
|
1
|
+
{"version":3,"file":"upgradeCatalogSchema.js","sourceRoot":"","sources":["../../../src/search/upgradeCatalogSchema.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,22 +14,24 @@ export function applyCatalogStructureMigration(model) {
|
|
|
14
14
|
if (!siteCatalog.schemaVersion) {
|
|
15
15
|
const clonedModel = cloneObject(model);
|
|
16
16
|
clonedModel.data.catalog = upgradeCatalogSchema(siteCatalog);
|
|
17
|
+
const upgradedCatalog = clonedModel.data.catalog;
|
|
17
18
|
// The umbrella site needs a special predicate added to the catalog to ensure
|
|
18
19
|
// that its item scope only includes results shared to open data groups.
|
|
19
20
|
// We also don't want to include the groups from the site model
|
|
20
21
|
if (getProp(clonedModel, "data.values.isUmbrella")) {
|
|
21
|
-
|
|
22
|
+
upgradedCatalog.scopes.item.filters = [
|
|
22
23
|
{
|
|
23
24
|
predicates: [{ openData: true }],
|
|
24
25
|
},
|
|
25
26
|
];
|
|
26
|
-
// The umbrella site doesn't have
|
|
27
|
-
|
|
27
|
+
// The umbrella site doesn't have any other scopes defined, so remove any
|
|
28
|
+
// others that might have been added by the migration
|
|
29
|
+
upgradedCatalog.scopes = { item: upgradedCatalog.scopes.item };
|
|
28
30
|
}
|
|
29
31
|
// applyCatalogSchema sets the catalog to `Default Catalog` but this fn previously
|
|
30
32
|
// set it to `Default Site Catalog`. Overriding title to `Default Site Catalog` here
|
|
31
33
|
// to prevent any potential regressions
|
|
32
|
-
|
|
34
|
+
upgradedCatalog.title = "Default Site Catalog";
|
|
33
35
|
return clonedModel;
|
|
34
36
|
}
|
|
35
37
|
return model;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"applyCatalogStructureMigration.js","sourceRoot":"","sources":["../../../../src/sites/_internal/applyCatalogStructureMigration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAEzE,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAGjD;;;;GAIG;AACH,MAAM,UAAU,8BAA8B,CAAC,KAAa;IAC1D,MAAM,WAAW,GAAG,cAAc,CAAC,KAAK,EAAE,cAAc,EAAE,EAAE,CAG3D,CAAC;IACF,yEAAyE;IACzE,0EAA0E;IAC1E,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE;QAC9B,MAAM,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;QACvC,WAAW,CAAC,IAAI,CAAC,OAAO,GAAG,oBAAoB,CAAC,WAAW,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"applyCatalogStructureMigration.js","sourceRoot":"","sources":["../../../../src/sites/_internal/applyCatalogStructureMigration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAEzE,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAGjD;;;;GAIG;AACH,MAAM,UAAU,8BAA8B,CAAC,KAAa;IAC1D,MAAM,WAAW,GAAG,cAAc,CAAC,KAAK,EAAE,cAAc,EAAE,EAAE,CAG3D,CAAC;IACF,yEAAyE;IACzE,0EAA0E;IAC1E,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE;QAC9B,MAAM,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;QACvC,WAAW,CAAC,IAAI,CAAC,OAAO,GAAG,oBAAoB,CAAC,WAAW,CAAC,CAAC;QAC7D,MAAM,eAAe,GAAG,WAAW,CAAC,IAAI,CAAC,OAAsB,CAAC;QAEhE,6EAA6E;QAC7E,wEAAwE;QACxE,+DAA+D;QAC/D,IAAI,OAAO,CAAC,WAAW,EAAE,wBAAwB,CAAC,EAAE;YAClD,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,GAAG;gBACpC;oBACE,UAAU,EAAE,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;iBACjC;aACF,CAAC;YACF,yEAAyE;YACzE,qDAAqD;YACrD,eAAe,CAAC,MAAM,GAAG,EAAE,IAAI,EAAE,eAAe,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;SAChE;QAED,kFAAkF;QAClF,oFAAoF;QACpF,uCAAuC;QACvC,eAAe,CAAC,KAAK,GAAG,sBAAsB,CAAC;QAC/C,OAAO,WAAW,CAAC;KACpB;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}
|
|
@@ -106,6 +106,7 @@ var DiscussionSource;
|
|
|
106
106
|
var PostRelation;
|
|
107
107
|
(function (PostRelation) {
|
|
108
108
|
PostRelation["REPLIES"] = "replies";
|
|
109
|
+
PostRelation["REPLY_COUNT"] = "replyCount";
|
|
109
110
|
PostRelation["REACTIONS"] = "reactions";
|
|
110
111
|
PostRelation["PARENT"] = "parent";
|
|
111
112
|
PostRelation["CHANNEL"] = "channel";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/discussions/api/types.ts"],"names":[],"mappings":";;;AAQA;;;;;GAKG;AACH,IAAY,SAGX;AAHD,WAAY,SAAS;IACnB,wBAAW,CAAA;IACX,0BAAa,CAAA;AACf,CAAC,EAHW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAGpB;AAED;;;;;GAKG;AACH,IAAY,YA0BX;AA1BD,WAAY,YAAY;IACtB,iDAAiC,CAAA;IACjC,qCAAqB,CAAA;IACrB,yCAAyB,CAAA;IACzB,6BAAa,CAAA;IACb,iEAAiD,CAAA;IACjD,6BAAa,CAAA;IACb,qCAAqB,CAAA;IACrB,+BAAe,CAAA;IACf,+BAAe,CAAA;IACf,2CAA2B,CAAA;IAC3B,qCAAqB,CAAA;IACrB,6CAA6B,CAAA;IAC7B,+CAA+B,CAAA;IAC/B,iCAAiB,CAAA;IACjB,2BAAW,CAAA;IACX,qDAAqC,CAAA;IACrC,uCAAuB,CAAA;IACvB,qCAAqB,CAAA;IACrB,uCAAuB,CAAA;IACvB,2CAA2B,CAAA;IAC3B,iCAAiB,CAAA;IACjB,qCAAqB,CAAA;IACrB,2CAA2B,CAAA;IAC3B,mCAAmB,CAAA;IACnB,uCAAuB,CAAA;AACzB,CAAC,EA1BW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QA0BvB;AAED;;;;;GAKG;AACH,IAAY,aAIX;AAJD,WAAY,aAAa;IACvB,kCAAiB,CAAA;IACjB,4BAAW,CAAA;IACX,oCAAmB,CAAA;AACrB,CAAC,EAJW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAIxB;AAcD;;;;;GAKG;AACH,IAAY,UAOX;AAPD,WAAY,UAAU;IACpB,iCAAmB,CAAA;IACnB,mCAAqB,CAAA;IACrB,mCAAqB,CAAA;IACrB,iCAAmB,CAAA;IACnB,+BAAiB,CAAA;IACjB,iCAAmB,CAAA;AACrB,CAAC,EAPW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAOrB;AAED;;;;;GAKG;AACH,IAAY,cAIX;AAJD,WAAY,cAAc;IACxB,iCAAe,CAAA;IACf,qCAAmB,CAAA;IACnB,iCAAe,CAAA;AACjB,CAAC,EAJW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAIzB;AAED;;;;;GAKG;AACH,IAAY,gBAIX;AAJD,WAAY,gBAAgB;IAC1B,+BAAW,CAAA;IACX,+BAAW,CAAA;IACX,mCAAe,CAAA;AACjB,CAAC,EAJW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAI3B;AAuBD;;;;;GAKG;AACH,IAAY,
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/discussions/api/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,9 +17,17 @@ const getAgoEntityOrgIdPredicates = (orgId) => [
|
|
|
17
17
|
const getEventEntityOrgIdPredicates = (orgId) => [
|
|
18
18
|
{ orgId },
|
|
19
19
|
];
|
|
20
|
+
const getGroupEntityOrgIdPredicates = (orgId) => [
|
|
21
|
+
{ orgid: orgId },
|
|
22
|
+
];
|
|
23
|
+
const getUserEntityOrgIdPredicates = (orgId) => [
|
|
24
|
+
{ orgid: orgId },
|
|
25
|
+
];
|
|
20
26
|
const ORG_ID_PREDICATE_FNS_BY_ENTITY_TYPE = {
|
|
21
27
|
item: getAgoEntityOrgIdPredicates,
|
|
22
28
|
event: getEventEntityOrgIdPredicates,
|
|
29
|
+
group: getGroupEntityOrgIdPredicates,
|
|
30
|
+
user: getUserEntityOrgIdPredicates,
|
|
23
31
|
};
|
|
24
32
|
/**
|
|
25
33
|
* Apply schema upgrades to Catalog objects
|
|
@@ -81,12 +89,29 @@ function applyCatalogSchema(original) {
|
|
|
81
89
|
// for org-level home sites (e.g., "my-org.hub.arcgis.com")
|
|
82
90
|
const orgId = objects_1.getProp(original, "orgId");
|
|
83
91
|
if (orgId) {
|
|
92
|
+
// Org-level sites should ignore any configured groups.
|
|
93
|
+
// They also need 'group' and 'user' scopes within the catalog.
|
|
94
|
+
catalog.scopes.item = {
|
|
95
|
+
targetEntity: "item",
|
|
96
|
+
filters: [],
|
|
97
|
+
};
|
|
98
|
+
catalog.scopes.event = {
|
|
99
|
+
targetEntity: "event",
|
|
100
|
+
filters: [],
|
|
101
|
+
};
|
|
102
|
+
catalog.scopes.group = {
|
|
103
|
+
targetEntity: "group",
|
|
104
|
+
filters: [],
|
|
105
|
+
};
|
|
106
|
+
catalog.scopes.user = {
|
|
107
|
+
targetEntity: "user",
|
|
108
|
+
filters: [],
|
|
109
|
+
};
|
|
84
110
|
// add the org ID predicate to all the scope queries
|
|
85
111
|
catalog.scopes = Object.entries(catalog.scopes).reduce((acc, entry) => {
|
|
86
112
|
const entityType = entry[0];
|
|
87
113
|
const query = entry[1];
|
|
88
114
|
return Object.assign(Object.assign({}, acc), { [entityType]: Object.assign(Object.assign({}, query), { filters: [
|
|
89
|
-
...query.filters,
|
|
90
115
|
{
|
|
91
116
|
operation: "AND",
|
|
92
117
|
predicates: ORG_ID_PREDICATE_FNS_BY_ENTITY_TYPE[entityType](orgId),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgradeCatalogSchema.js","sourceRoot":"","sources":["../../../src/search/upgradeCatalogSchema.ts"],"names":[],"mappings":";;;AAAA,wCAAqC;AACrC,kCAAsC;AAStC,MAAM,sBAAsB,GAAG,GAAG,CAAC;AAEnC,MAAM,2BAA2B,GAAG,CAAC,KAAa,EAAgB,EAAE,CAAC;IACnE,wDAAwD;IACxD,6DAA6D;IAC7D,+DAA+D;IAC/D,EAAE,KAAK,EAAE,CAAC,KAAK,CAAC,EAAE;IAClB,6DAA6D;IAC7D,+DAA+D;IAC/D,gEAAgE;IAChE,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,EAAE,EAAE;CACvC,CAAC;AAEF,MAAM,6BAA6B,GAAG,CAAC,KAAa,EAAgB,EAAE,CAAC;IACrE,EAAE,KAAK,EAAE;CACV,CAAC;AAEF,MAAM,mCAAmC,GAErC;IACF,IAAI,EAAE,2BAA2B;IACjC,KAAK,EAAE,6BAA6B;
|
|
1
|
+
{"version":3,"file":"upgradeCatalogSchema.js","sourceRoot":"","sources":["../../../src/search/upgradeCatalogSchema.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,22 +17,24 @@ function applyCatalogStructureMigration(model) {
|
|
|
17
17
|
if (!siteCatalog.schemaVersion) {
|
|
18
18
|
const clonedModel = util_1.cloneObject(model);
|
|
19
19
|
clonedModel.data.catalog = upgradeCatalogSchema_1.upgradeCatalogSchema(siteCatalog);
|
|
20
|
+
const upgradedCatalog = clonedModel.data.catalog;
|
|
20
21
|
// The umbrella site needs a special predicate added to the catalog to ensure
|
|
21
22
|
// that its item scope only includes results shared to open data groups.
|
|
22
23
|
// We also don't want to include the groups from the site model
|
|
23
24
|
if (get_prop_1.getProp(clonedModel, "data.values.isUmbrella")) {
|
|
24
|
-
|
|
25
|
+
upgradedCatalog.scopes.item.filters = [
|
|
25
26
|
{
|
|
26
27
|
predicates: [{ openData: true }],
|
|
27
28
|
},
|
|
28
29
|
];
|
|
29
|
-
// The umbrella site doesn't have
|
|
30
|
-
|
|
30
|
+
// The umbrella site doesn't have any other scopes defined, so remove any
|
|
31
|
+
// others that might have been added by the migration
|
|
32
|
+
upgradedCatalog.scopes = { item: upgradedCatalog.scopes.item };
|
|
31
33
|
}
|
|
32
34
|
// applyCatalogSchema sets the catalog to `Default Catalog` but this fn previously
|
|
33
35
|
// set it to `Default Site Catalog`. Overriding title to `Default Site Catalog` here
|
|
34
36
|
// to prevent any potential regressions
|
|
35
|
-
|
|
37
|
+
upgradedCatalog.title = "Default Site Catalog";
|
|
36
38
|
return clonedModel;
|
|
37
39
|
}
|
|
38
40
|
return model;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"applyCatalogStructureMigration.js","sourceRoot":"","sources":["../../../../src/sites/_internal/applyCatalogStructureMigration.ts"],"names":[],"mappings":";;;AAAA,qEAAgE;AAChE,4EAAyE;AAEzE,qCAAyC;AACzC,qDAAiD;AAGjD;;;;GAIG;AACH,SAAgB,8BAA8B,CAAC,KAAa;IAC1D,MAAM,WAAW,GAAG,iCAAc,CAAC,KAAK,EAAE,cAAc,EAAE,EAAE,CAG3D,CAAC;IACF,yEAAyE;IACzE,0EAA0E;IAC1E,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE;QAC9B,MAAM,WAAW,GAAG,kBAAW,CAAC,KAAK,CAAC,CAAC;QACvC,WAAW,CAAC,IAAI,CAAC,OAAO,GAAG,2CAAoB,CAAC,WAAW,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"applyCatalogStructureMigration.js","sourceRoot":"","sources":["../../../../src/sites/_internal/applyCatalogStructureMigration.ts"],"names":[],"mappings":";;;AAAA,qEAAgE;AAChE,4EAAyE;AAEzE,qCAAyC;AACzC,qDAAiD;AAGjD;;;;GAIG;AACH,SAAgB,8BAA8B,CAAC,KAAa;IAC1D,MAAM,WAAW,GAAG,iCAAc,CAAC,KAAK,EAAE,cAAc,EAAE,EAAE,CAG3D,CAAC;IACF,yEAAyE;IACzE,0EAA0E;IAC1E,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE;QAC9B,MAAM,WAAW,GAAG,kBAAW,CAAC,KAAK,CAAC,CAAC;QACvC,WAAW,CAAC,IAAI,CAAC,OAAO,GAAG,2CAAoB,CAAC,WAAW,CAAC,CAAC;QAC7D,MAAM,eAAe,GAAG,WAAW,CAAC,IAAI,CAAC,OAAsB,CAAC;QAEhE,6EAA6E;QAC7E,wEAAwE;QACxE,+DAA+D;QAC/D,IAAI,kBAAO,CAAC,WAAW,EAAE,wBAAwB,CAAC,EAAE;YAClD,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,GAAG;gBACpC;oBACE,UAAU,EAAE,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;iBACjC;aACF,CAAC;YACF,yEAAyE;YACzE,qDAAqD;YACrD,eAAe,CAAC,MAAM,GAAG,EAAE,IAAI,EAAE,eAAe,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;SAChE;QAED,kFAAkF;QAClF,oFAAoF;QACpF,uCAAuC;QACvC,eAAe,CAAC,KAAK,GAAG,sBAAsB,CAAC;QAC/C,OAAO,WAAW,CAAC;KACpB;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAjCD,wEAiCC"}
|