@esri/hub-common 18.4.0 → 18.4.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.
- 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/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/package.json +1 -1
|
@@ -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":"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,6BAA6B,GAAG,CAAC,KAAa,EAAgB,EAAE,CAAC;IACrE,EAAE,KAAK,EAAE,KAAK,EAAE;CACjB,CAAC;AAEF,MAAM,4BAA4B,GAAG,CAAC,KAAa,EAAgB,EAAE,CAAC;IACpE,EAAE,KAAK,EAAE,KAAK,EAAE;CACjB,CAAC;AAEF,MAAM,mCAAmC,GAErC;IACF,IAAI,EAAE,2BAA2B;IACjC,KAAK,EAAE,6BAA6B;IACpC,KAAK,EAAE,6BAA6B;IACpC,IAAI,EAAE,4BAA4B;CACnC,CAAC;AAEF;;;;GAIG;AACH,MAAM,UAAU,oBAAoB,CAAC,OAAY;IAC/C,IAAI,OAAO,CAAC,OAAO,EAAE,eAAe,CAAC,KAAK,sBAAsB,EAAE;QAChE,OAAO,OAAO,CAAC;KAChB;SAAM;QACL,IAAI,KAAK,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;QAEjC,4BAA4B;QAC5B,KAAK,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;QAElC,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAED;;;;;GAKG;AACH,SAAS,kBAAkB,CAAC,QAAa;IACvC,IAAI,OAAO,CAAC,QAAQ,EAAE,eAAe,CAAC,GAAG,GAAG,EAAE;QAC5C,OAAO,QAAuB,CAAC;KAChC;SAAM;QACL,MAAM,OAAO,GAAgB;YAC3B,aAAa,EAAE,CAAC;YAChB,KAAK,EAAE,iBAAiB;YACxB,MAAM,EAAE;gBACN,IAAI,EAAE;oBACJ,YAAY,EAAE,MAAM;oBACpB,OAAO,EAAE,EAAE;iBACZ;gBACD,KAAK,EAAE;oBACL,YAAY,EAAE,OAAO;oBACrB,OAAO,EAAE,EAAE;iBACZ;aACF;YACD,WAAW,EAAE,EAAE;SAChB,CAAC;QAEF,gCAAgC;QAChC,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC;QACpD,IAAI,MAAM,GAAa,EAAE,CAAC;QAC1B,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,MAAM,EAAE;YAChD,MAAM,GAAG,SAAS,CAAC;SACpB;aAAM,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;YACxC,MAAM,GAAG,CAAC,SAAS,CAAC,CAAC;SACtB;QAED,IAAI,MAAM,CAAC,MAAM,EAAE;YACjB,wDAAwD;YACxD,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,CACpD,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,iCACX,GAAG,KACN,CAAC,KAAK,CAAC,CAAC,CAAe,CAAC,kCACnB,KAAK,CAAC,CAAC,CAAC,KACX,OAAO,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,OAEhD,EACF,EAAE,CACH,CAAC;SACH;QAED,0DAA0D;QAC1D,2DAA2D;QAC3D,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAW,CAAC;QACnD,IAAI,KAAK,EAAE;YACT,uDAAuD;YACvD,+DAA+D;YAC/D,OAAO,CAAC,MAAM,CAAC,IAAI,GAAG;gBACpB,YAAY,EAAE,MAAM;gBACpB,OAAO,EAAE,EAAE;aACZ,CAAC;YACF,OAAO,CAAC,MAAM,CAAC,KAAK,GAAG;gBACrB,YAAY,EAAE,OAAO;gBACrB,OAAO,EAAE,EAAE;aACZ,CAAC;YACF,OAAO,CAAC,MAAM,CAAC,KAAK,GAAG;gBACrB,YAAY,EAAE,OAAO;gBACrB,OAAO,EAAE,EAAE;aACZ,CAAC;YACF,OAAO,CAAC,MAAM,CAAC,IAAI,GAAG;gBACpB,YAAY,EAAE,MAAM;gBACpB,OAAO,EAAE,EAAE;aACZ,CAAC;YAEF,oDAAoD;YACpD,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,CACpD,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;gBACb,MAAM,UAAU,GAAe,KAAK,CAAC,CAAC,CAAe,CAAC;gBACtD,MAAM,KAAK,GAAW,KAAK,CAAC,CAAC,CAAC,CAAC;gBAC/B,uCACK,GAAG,KACN,CAAC,UAAU,CAAC,kCACP,KAAK,KACR,OAAO,EAAE;4BACP;gCACE,SAAS,EAAE,KAAK;gCAChB,UAAU,EACR,mCAAmC,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC;6BACzD;yBACF,OAEH;YACJ,CAAC,EACD,EAAE,CACH,CAAC;SACH;QAED,OAAO,OAAO,CAAC;KAChB;AACH,CAAC"}
|
|
@@ -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"}
|
|
@@ -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"}
|