@webiny/api-headless-cms 0.0.0-unstable.990c3ab1b6 → 0.0.0-unstable.d16f688daf
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/context.js +15 -0
- package/context.js.map +1 -1
- package/crud/contentEntry/afterDelete.js +5 -0
- package/crud/contentEntry/afterDelete.js.map +1 -1
- package/crud/contentEntry/beforeCreate.js +3 -0
- package/crud/contentEntry/beforeCreate.js.map +1 -1
- package/crud/contentEntry/beforeUpdate.js +3 -0
- package/crud/contentEntry/beforeUpdate.js.map +1 -1
- package/crud/contentEntry/entryDataValidation.js +40 -1
- package/crud/contentEntry/entryDataValidation.js.map +1 -1
- package/crud/contentEntry/markLockedFields.js +30 -4
- package/crud/contentEntry/markLockedFields.js.map +1 -1
- package/crud/contentEntry/referenceFieldsMapping.js +68 -10
- package/crud/contentEntry/referenceFieldsMapping.js.map +1 -1
- package/crud/contentEntry/searchableFields.d.ts +9 -0
- package/crud/contentEntry/searchableFields.js +83 -0
- package/crud/contentEntry/searchableFields.js.map +1 -0
- package/crud/contentEntry.crud.js +190 -50
- package/crud/contentEntry.crud.js.map +1 -1
- package/crud/contentModel/afterCreate.js +2 -0
- package/crud/contentModel/afterCreate.js.map +1 -1
- package/crud/contentModel/afterCreateFrom.js +2 -0
- package/crud/contentModel/afterCreateFrom.js.map +1 -1
- package/crud/contentModel/afterDelete.js +2 -0
- package/crud/contentModel/afterDelete.js.map +1 -1
- package/crud/contentModel/afterUpdate.js +2 -0
- package/crud/contentModel/afterUpdate.js.map +1 -1
- package/crud/contentModel/beforeCreate.js +32 -4
- package/crud/contentModel/beforeCreate.js.map +1 -1
- package/crud/contentModel/beforeDelete.js +10 -0
- package/crud/contentModel/beforeDelete.js.map +1 -1
- package/crud/contentModel/beforeUpdate.js +5 -0
- package/crud/contentModel/beforeUpdate.js.map +1 -1
- package/crud/contentModel/contentModelManagerFactory.js +7 -0
- package/crud/contentModel/contentModelManagerFactory.js.map +1 -1
- package/crud/contentModel/createFieldModels.js +6 -0
- package/crud/contentModel/createFieldModels.js.map +1 -1
- package/crud/contentModel/createFieldStorageId.js +7 -1
- package/crud/contentModel/createFieldStorageId.js.map +1 -1
- package/crud/contentModel/fieldIdValidation.js +5 -0
- package/crud/contentModel/fieldIdValidation.js.map +1 -1
- package/crud/contentModel/idValidation.js +5 -0
- package/crud/contentModel/idValidation.js.map +1 -1
- package/crud/contentModel/models.js +20 -1
- package/crud/contentModel/models.js.map +1 -1
- package/crud/contentModel/systemFields.js.map +1 -1
- package/crud/contentModel/validateLayout.js +8 -0
- package/crud/contentModel/validateLayout.js.map +1 -1
- package/crud/contentModel/validateModel.js +8 -0
- package/crud/contentModel/validateModel.js.map +1 -1
- package/crud/contentModel/validateModelFields.js +97 -33
- package/crud/contentModel/validateModelFields.js.map +1 -1
- package/crud/contentModel.crud.js +251 -121
- package/crud/contentModel.crud.js.map +1 -1
- package/crud/contentModelGroup/beforeCreate.js +12 -0
- package/crud/contentModelGroup/beforeCreate.js.map +1 -1
- package/crud/contentModelGroup/beforeDelete.js +8 -0
- package/crud/contentModelGroup/beforeDelete.js.map +1 -1
- package/crud/contentModelGroup/beforeUpdate.js +5 -0
- package/crud/contentModelGroup/beforeUpdate.js.map +1 -1
- package/crud/contentModelGroup.crud.js +74 -7
- package/crud/contentModelGroup.crud.js.map +1 -1
- package/crud/index.js +16 -0
- package/crud/index.js.map +1 -1
- package/crud/settings.crud.js +12 -0
- package/crud/settings.crud.js.map +1 -1
- package/crud/system.crud.js +37 -2
- package/crud/system.crud.js.map +1 -1
- package/fieldConverters/CmsModelDefaultFieldConverterPlugin.js +13 -0
- package/fieldConverters/CmsModelDefaultFieldConverterPlugin.js.map +1 -1
- package/fieldConverters/CmsModelDynamicZoneFieldConverterPlugin.d.ts +11 -0
- package/fieldConverters/CmsModelDynamicZoneFieldConverterPlugin.js +239 -0
- package/fieldConverters/CmsModelDynamicZoneFieldConverterPlugin.js.map +1 -0
- package/fieldConverters/CmsModelObjectFieldConverterPlugin.js +53 -0
- package/fieldConverters/CmsModelObjectFieldConverterPlugin.js.map +1 -1
- package/fieldConverters/index.d.ts +2 -1
- package/fieldConverters/index.js +7 -1
- package/fieldConverters/index.js.map +1 -1
- package/graphql/buildSchemaPlugins.js +9 -5
- package/graphql/buildSchemaPlugins.js.map +1 -1
- package/graphql/graphQLHandlerFactory.js +86 -17
- package/graphql/graphQLHandlerFactory.js.map +1 -1
- package/graphql/index.d.ts +1 -1
- package/graphql/index.js +8 -1
- package/graphql/index.js.map +1 -1
- package/graphql/schema/baseContentSchema.js +10 -2
- package/graphql/schema/baseContentSchema.js.map +1 -1
- package/graphql/schema/contentEntries.js +42 -2
- package/graphql/schema/contentEntries.js.map +1 -1
- package/graphql/schema/contentModelGroups.js +19 -2
- package/graphql/schema/contentModelGroups.js.map +1 -1
- package/graphql/schema/contentModels.js +41 -6
- package/graphql/schema/contentModels.js.map +1 -1
- package/graphql/schema/createFieldResolvers.d.ts +1 -1
- package/graphql/schema/createFieldResolvers.js +30 -8
- package/graphql/schema/createFieldResolvers.js.map +1 -1
- package/graphql/schema/createManageResolvers.js +26 -0
- package/graphql/schema/createManageResolvers.js.map +1 -1
- package/graphql/schema/createManageSDL.js +19 -5
- package/graphql/schema/createManageSDL.js.map +1 -1
- package/graphql/schema/createPreviewResolvers.js +10 -0
- package/graphql/schema/createPreviewResolvers.js.map +1 -1
- package/graphql/schema/createReadResolvers.js +10 -0
- package/graphql/schema/createReadResolvers.js.map +1 -1
- package/graphql/schema/createReadSDL.js +15 -3
- package/graphql/schema/createReadSDL.js.map +1 -1
- package/graphql/schema/resolvers/commonFieldResolvers.js +2 -0
- package/graphql/schema/resolvers/commonFieldResolvers.js.map +1 -1
- package/graphql/schema/resolvers/manage/resolveCreate.js +3 -0
- package/graphql/schema/resolvers/manage/resolveCreate.js.map +1 -1
- package/graphql/schema/resolvers/manage/resolveCreateFrom.js +3 -0
- package/graphql/schema/resolvers/manage/resolveCreateFrom.js.map +1 -1
- package/graphql/schema/resolvers/manage/resolveDelete.js +6 -0
- package/graphql/schema/resolvers/manage/resolveDelete.js.map +1 -1
- package/graphql/schema/resolvers/manage/resolveGet.js +16 -0
- package/graphql/schema/resolvers/manage/resolveGet.js.map +1 -1
- package/graphql/schema/resolvers/manage/resolveGetByIds.js +3 -0
- package/graphql/schema/resolvers/manage/resolveGetByIds.js.map +1 -1
- package/graphql/schema/resolvers/manage/resolveGetRevisions.js +3 -0
- package/graphql/schema/resolvers/manage/resolveGetRevisions.js.map +1 -1
- package/graphql/schema/resolvers/manage/resolveList.js +3 -0
- package/graphql/schema/resolvers/manage/resolveList.js.map +1 -1
- package/graphql/schema/resolvers/manage/resolvePublish.js +3 -0
- package/graphql/schema/resolvers/manage/resolvePublish.js.map +1 -1
- package/graphql/schema/resolvers/manage/resolveRepublish.js +3 -0
- package/graphql/schema/resolvers/manage/resolveRepublish.js.map +1 -1
- package/graphql/schema/resolvers/manage/resolveUnpublish.js +3 -0
- package/graphql/schema/resolvers/manage/resolveUnpublish.js.map +1 -1
- package/graphql/schema/resolvers/manage/resolveUpdate.js +3 -0
- package/graphql/schema/resolvers/manage/resolveUpdate.js.map +1 -1
- package/graphql/schema/resolvers/preview/resolveGet.js +8 -0
- package/graphql/schema/resolvers/preview/resolveGet.js.map +1 -1
- package/graphql/schema/resolvers/preview/resolveList.js +3 -0
- package/graphql/schema/resolvers/preview/resolveList.js.map +1 -1
- package/graphql/schema/resolvers/read/resolveGet.js +8 -0
- package/graphql/schema/resolvers/read/resolveGet.js.map +1 -1
- package/graphql/schema/resolvers/read/resolveList.js +3 -0
- package/graphql/schema/resolvers/read/resolveList.js.map +1 -1
- package/graphql/schema/schemaPlugins.js +19 -5
- package/graphql/schema/schemaPlugins.js.map +1 -1
- package/graphql/system.js +14 -1
- package/graphql/system.js.map +1 -1
- package/graphqlFields/boolean.js +12 -0
- package/graphqlFields/boolean.js.map +1 -1
- package/graphqlFields/datetime.js +17 -0
- package/graphqlFields/datetime.js.map +1 -1
- package/graphqlFields/dynamicZone/dynamicZoneField.d.ts +2 -0
- package/graphqlFields/dynamicZone/dynamicZoneField.js +234 -0
- package/graphqlFields/dynamicZone/dynamicZoneField.js.map +1 -0
- package/graphqlFields/dynamicZone/dynamicZoneStorage.d.ts +3 -0
- package/graphqlFields/dynamicZone/dynamicZoneStorage.js +79 -0
- package/graphqlFields/dynamicZone/dynamicZoneStorage.js.map +1 -0
- package/graphqlFields/dynamicZone/index.d.ts +2 -0
- package/graphqlFields/dynamicZone/index.js +21 -0
- package/graphqlFields/dynamicZone/index.js.map +1 -0
- package/graphqlFields/file.js +8 -0
- package/graphqlFields/file.js.map +1 -1
- package/graphqlFields/helpers.js +10 -0
- package/graphqlFields/helpers.js.map +1 -1
- package/graphqlFields/index.d.ts +1 -1
- package/graphqlFields/index.js +14 -1
- package/graphqlFields/index.js.map +1 -1
- package/graphqlFields/longText.js +10 -0
- package/graphqlFields/longText.js.map +1 -1
- package/graphqlFields/number.js +16 -0
- package/graphqlFields/number.js.map +1 -1
- package/graphqlFields/object.js +148 -68
- package/graphqlFields/object.js.map +1 -1
- package/graphqlFields/ref.js +77 -61
- package/graphqlFields/ref.js.map +1 -1
- package/graphqlFields/richText.js +9 -0
- package/graphqlFields/richText.js.map +1 -1
- package/graphqlFields/text.js +11 -0
- package/graphqlFields/text.js.map +1 -1
- package/index.d.ts +2 -2
- package/index.js +22 -1
- package/index.js.map +1 -1
- package/modelManager/DefaultCmsModelManager.js +16 -0
- package/modelManager/DefaultCmsModelManager.js.map +1 -1
- package/modelManager/index.js +4 -0
- package/modelManager/index.js.map +1 -1
- package/package.json +25 -24
- package/parameters/context.js +4 -0
- package/parameters/context.js.map +1 -1
- package/parameters/header.js +11 -0
- package/parameters/header.js.map +1 -1
- package/parameters/index.js +8 -0
- package/parameters/index.js.map +1 -1
- package/parameters/manual.js +8 -1
- package/parameters/manual.js.map +1 -1
- package/parameters/path.js +11 -0
- package/parameters/path.js.map +1 -1
- package/plugins/CmsGroupPlugin.js +8 -0
- package/plugins/CmsGroupPlugin.js.map +1 -1
- package/plugins/CmsModelFieldConverterPlugin.d.ts +2 -2
- package/plugins/CmsModelFieldConverterPlugin.js +5 -0
- package/plugins/CmsModelFieldConverterPlugin.js.map +1 -1
- package/plugins/CmsModelPlugin.js +38 -2
- package/plugins/CmsModelPlugin.js.map +1 -1
- package/plugins/CmsParametersPlugin.js +7 -0
- package/plugins/CmsParametersPlugin.js.map +1 -1
- package/plugins/StorageTransformPlugin.d.ts +11 -11
- package/plugins/StorageTransformPlugin.js +9 -0
- package/plugins/StorageTransformPlugin.js.map +1 -1
- package/plugins/index.js +10 -0
- package/plugins/index.js.map +1 -1
- package/storage/default.js +3 -0
- package/storage/default.js.map +1 -1
- package/storage/object.js +23 -2
- package/storage/object.js.map +1 -1
- package/types.d.ts +185 -42
- package/types.js +112 -7
- package/types.js.map +1 -1
- package/upgrades/5.33.0/index.js +26 -3
- package/upgrades/5.33.0/index.js.map +1 -1
- package/upgrades/index.js +3 -0
- package/upgrades/index.js.map +1 -1
- package/utils/access.js +25 -11
- package/utils/access.js.map +1 -1
- package/utils/converters/Converter.js +13 -0
- package/utils/converters/Converter.js.map +1 -1
- package/utils/converters/ConverterCollection.js +38 -11
- package/utils/converters/ConverterCollection.js.map +1 -1
- package/utils/converters/valueKeyStorageConverter.js +26 -0
- package/utils/converters/valueKeyStorageConverter.js.map +1 -1
- package/utils/createTypeFromFields.d.ts +15 -0
- package/utils/createTypeFromFields.js +75 -0
- package/utils/createTypeFromFields.js.map +1 -0
- package/utils/createTypeName.js +11 -1
- package/utils/createTypeName.js.map +1 -1
- package/utils/entryStorage.js +38 -19
- package/utils/entryStorage.js.map +1 -1
- package/utils/filterAsync.js +5 -0
- package/utils/filterAsync.js.map +1 -1
- package/utils/filterModelFields.js +9 -3
- package/utils/filterModelFields.js.map +1 -1
- package/utils/getBaseFieldType.d.ts +4 -0
- package/utils/getBaseFieldType.js +12 -0
- package/utils/getBaseFieldType.js.map +1 -0
- package/utils/getEntryTitle.js +9 -0
- package/utils/getEntryTitle.js.map +1 -1
- package/utils/getSchemaFromFieldPlugins.js +6 -2
- package/utils/getSchemaFromFieldPlugins.js.map +1 -1
- package/utils/ownership.js +8 -0
- package/utils/ownership.js.map +1 -1
- package/utils/permissions.js +23 -8
- package/utils/permissions.js.map +1 -1
- package/utils/pluralizedTypeName.js +6 -0
- package/utils/pluralizedTypeName.js.map +1 -1
- package/utils/renderFields.js +11 -1
- package/utils/renderFields.js.map +1 -1
- package/utils/renderGetFilterFields.js +19 -3
- package/utils/renderGetFilterFields.js.map +1 -1
- package/utils/renderInputFields.js +11 -1
- package/utils/renderInputFields.js.map +1 -1
- package/utils/renderListFilterFields.js +13 -2
- package/utils/renderListFilterFields.js.map +1 -1
- package/utils/renderSortEnum.js +10 -1
- package/utils/renderSortEnum.js.map +1 -1
- package/utils/toSlug.js +4 -0
- package/utils/toSlug.js.map +1 -1
- package/validators/dateGte.js +7 -0
- package/validators/dateGte.js.map +1 -1
- package/validators/dateLte.js +7 -0
- package/validators/dateLte.js.map +1 -1
- package/validators/dynamicZone.d.ts +2 -0
- package/validators/dynamicZone.js +24 -0
- package/validators/dynamicZone.js.map +1 -0
- package/validators/gte.js +8 -0
- package/validators/gte.js.map +1 -1
- package/validators/in.js +8 -0
- package/validators/in.js.map +1 -1
- package/validators/index.js +18 -1
- package/validators/index.js.map +1 -1
- package/validators/lte.js +8 -0
- package/validators/lte.js.map +1 -1
- package/validators/maxLength.js +8 -0
- package/validators/maxLength.js.map +1 -1
- package/validators/minLength.js +8 -0
- package/validators/minLength.js.map +1 -1
- package/validators/pattern.js +9 -0
- package/validators/pattern.js.map +1 -1
- package/validators/patternPlugins/email.js +2 -0
- package/validators/patternPlugins/email.js.map +1 -1
- package/validators/patternPlugins/index.js +8 -0
- package/validators/patternPlugins/index.js.map +1 -1
- package/validators/patternPlugins/lowerCase.js +2 -0
- package/validators/patternPlugins/lowerCase.js.map +1 -1
- package/validators/patternPlugins/lowerCaseSpace.js +2 -0
- package/validators/patternPlugins/lowerCaseSpace.js.map +1 -1
- package/validators/patternPlugins/upperCase.js +2 -0
- package/validators/patternPlugins/upperCase.js.map +1 -1
- package/validators/patternPlugins/upperCaseSpace.js +2 -0
- package/validators/patternPlugins/upperCaseSpace.js.map +1 -1
- package/validators/patternPlugins/url.js +2 -0
- package/validators/patternPlugins/url.js.map +1 -1
- package/validators/required.js +5 -0
- package/validators/required.js.map +1 -1
- package/validators/timeGte.js +8 -0
- package/validators/timeGte.js.map +1 -1
- package/validators/timeLte.js +8 -0
- package/validators/timeLte.js.map +1 -1
- package/validators/unique.js +7 -0
- package/validators/unique.js.map +1 -1
- package/graphql/schema/resolvers/manage/resolveRequestChanges.d.ts +0 -7
- package/graphql/schema/resolvers/manage/resolveRequestChanges.js +0 -21
- package/graphql/schema/resolvers/manage/resolveRequestChanges.js.map +0 -1
- package/graphql/schema/resolvers/manage/resolveRequestReview.d.ts +0 -7
- package/graphql/schema/resolvers/manage/resolveRequestReview.js +0 -21
- package/graphql/schema/resolvers/manage/resolveRequestReview.js.map +0 -1
|
@@ -1,70 +1,69 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
|
|
4
|
+
|
|
4
5
|
Object.defineProperty(exports, "__esModule", {
|
|
5
6
|
value: true
|
|
6
7
|
});
|
|
7
8
|
exports.createModelsCrud = void 0;
|
|
9
|
+
|
|
8
10
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
|
11
|
+
|
|
9
12
|
var _dataloader = _interopRequireDefault(require("dataloader"));
|
|
13
|
+
|
|
10
14
|
var _handlerGraphql = require("@webiny/handler-graphql");
|
|
15
|
+
|
|
11
16
|
var _contentModelManagerFactory = require("./contentModel/contentModelManagerFactory");
|
|
17
|
+
|
|
12
18
|
var _models = require("./contentModel/models");
|
|
19
|
+
|
|
13
20
|
var _createFieldModels = require("./contentModel/createFieldModels");
|
|
21
|
+
|
|
14
22
|
var _error = _interopRequireDefault(require("@webiny/error"));
|
|
23
|
+
|
|
15
24
|
var _pubsub = require("@webiny/pubsub");
|
|
25
|
+
|
|
16
26
|
var _beforeCreate = require("./contentModel/beforeCreate");
|
|
27
|
+
|
|
17
28
|
var _beforeUpdate = require("./contentModel/beforeUpdate");
|
|
29
|
+
|
|
18
30
|
var _beforeDelete = require("./contentModel/beforeDelete");
|
|
31
|
+
|
|
19
32
|
var _afterCreate = require("./contentModel/afterCreate");
|
|
33
|
+
|
|
20
34
|
var _afterUpdate = require("./contentModel/afterUpdate");
|
|
35
|
+
|
|
21
36
|
var _afterDelete = require("./contentModel/afterDelete");
|
|
37
|
+
|
|
22
38
|
var _afterCreateFrom = require("./contentModel/afterCreateFrom");
|
|
39
|
+
|
|
23
40
|
var _CmsModelPlugin = require("../plugins/CmsModelPlugin");
|
|
41
|
+
|
|
24
42
|
var _permissions = require("../utils/permissions");
|
|
43
|
+
|
|
25
44
|
var _filterAsync = require("../utils/filterAsync");
|
|
45
|
+
|
|
26
46
|
var _ownership = require("../utils/ownership");
|
|
47
|
+
|
|
27
48
|
var _access = require("../utils/access");
|
|
49
|
+
|
|
28
50
|
var _validateModelFields = require("./contentModel/validateModelFields");
|
|
29
|
-
|
|
51
|
+
|
|
30
52
|
/**
|
|
31
|
-
*
|
|
32
|
-
* Required because of the 5.33.0 upgrade.
|
|
33
|
-
* Until the upgrade is done, API will break because there is no storageId assigned.
|
|
53
|
+
* Given a model, return an array of tags ensuring the `type` tag is set.
|
|
34
54
|
*/
|
|
35
|
-
const
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
if (!field.storageId) {
|
|
43
|
-
field.storageId = field.fieldId;
|
|
44
|
-
}
|
|
45
|
-
return field;
|
|
46
|
-
});
|
|
47
|
-
};
|
|
48
|
-
const attachStorageIdToModelFields = model => {
|
|
49
|
-
if (!model.webinyVersion) {
|
|
50
|
-
return model.fields;
|
|
51
|
-
}
|
|
52
|
-
const version = _semver.default.coerce(model.webinyVersion);
|
|
53
|
-
if (!version) {
|
|
54
|
-
return model.fields;
|
|
55
|
-
}
|
|
56
|
-
/**
|
|
57
|
-
* Unfortunately we need to check for beta and next.
|
|
58
|
-
* TODO remove after 5.33.0
|
|
59
|
-
*/
|
|
60
|
-
if (model.webinyVersion.match(/beta|next/)) {
|
|
61
|
-
return attachStorageIdToFields(model.fields);
|
|
62
|
-
}
|
|
63
|
-
if (_semver.default.compare(version, featureVersion) >= 0) {
|
|
64
|
-
return model.fields;
|
|
55
|
+
const ensureTypeTag = model => {
|
|
56
|
+
// Let's make sure we have a `type` tag assigned.
|
|
57
|
+
// If `type` tag is not set, set it to a default one (`model`).
|
|
58
|
+
const tags = model.tags || [];
|
|
59
|
+
|
|
60
|
+
if (!tags.some(tag => tag.startsWith("type:"))) {
|
|
61
|
+
tags.push("type:model");
|
|
65
62
|
}
|
|
66
|
-
|
|
63
|
+
|
|
64
|
+
return tags;
|
|
67
65
|
};
|
|
66
|
+
|
|
68
67
|
const createModelsCrud = params => {
|
|
69
68
|
const {
|
|
70
69
|
getTenant,
|
|
@@ -83,29 +82,34 @@ const createModelsCrud = params => {
|
|
|
83
82
|
});
|
|
84
83
|
return [models.map(model => {
|
|
85
84
|
return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, model), {}, {
|
|
86
|
-
|
|
85
|
+
tags: ensureTypeTag(model),
|
|
87
86
|
tenant: model.tenant || getTenant().id,
|
|
88
87
|
locale: model.locale || getLocale().code
|
|
89
88
|
});
|
|
90
89
|
})];
|
|
91
90
|
})
|
|
92
91
|
};
|
|
92
|
+
|
|
93
93
|
const clearModelsCache = () => {
|
|
94
94
|
for (const loader of Object.values(loaders)) {
|
|
95
95
|
loader.clearAll();
|
|
96
96
|
}
|
|
97
97
|
};
|
|
98
|
+
|
|
98
99
|
const managers = new Map();
|
|
100
|
+
|
|
99
101
|
const updateManager = async (context, model) => {
|
|
100
102
|
const manager = await (0, _contentModelManagerFactory.contentModelManagerFactory)(context, model);
|
|
101
103
|
managers.set(model.modelId, manager);
|
|
102
104
|
return manager;
|
|
103
105
|
};
|
|
106
|
+
|
|
104
107
|
const checkModelPermissions = check => {
|
|
105
108
|
return (0, _permissions.checkPermissions)(context, "cms.contentModel", {
|
|
106
109
|
rwd: check
|
|
107
110
|
});
|
|
108
111
|
};
|
|
112
|
+
|
|
109
113
|
const getModelsAsPlugins = () => {
|
|
110
114
|
const tenant = getTenant().id;
|
|
111
115
|
const locale = getLocale().code;
|
|
@@ -113,19 +117,23 @@ const createModelsCrud = params => {
|
|
|
113
117
|
/**
|
|
114
118
|
* We need to filter out models that are not for this tenant or locale.
|
|
115
119
|
* If it does not have tenant or locale define, it is for every locale and tenant
|
|
116
|
-
|
|
120
|
+
*/
|
|
121
|
+
.filter(plugin => {
|
|
117
122
|
const {
|
|
118
|
-
tenant:
|
|
119
|
-
locale:
|
|
123
|
+
tenant: modelTenant,
|
|
124
|
+
locale: modelLocale
|
|
120
125
|
} = plugin.contentModel;
|
|
121
|
-
|
|
126
|
+
|
|
127
|
+
if (modelTenant && modelTenant !== tenant) {
|
|
122
128
|
return false;
|
|
123
|
-
} else if (
|
|
129
|
+
} else if (modelLocale && modelLocale !== locale) {
|
|
124
130
|
return false;
|
|
125
131
|
}
|
|
132
|
+
|
|
126
133
|
return true;
|
|
127
134
|
}).map(plugin => {
|
|
128
135
|
return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, plugin.contentModel), {}, {
|
|
136
|
+
tags: ensureTypeTag(plugin.contentModel),
|
|
129
137
|
tenant,
|
|
130
138
|
locale,
|
|
131
139
|
webinyVersion: context.WEBINY_VERSION
|
|
@@ -134,37 +142,47 @@ const createModelsCrud = params => {
|
|
|
134
142
|
/**
|
|
135
143
|
* Only point where we can truly validate the user model is in the runtime.
|
|
136
144
|
*/
|
|
145
|
+
|
|
137
146
|
for (const model of models) {
|
|
138
147
|
(0, _validateModelFields.validateModelFields)({
|
|
139
148
|
model,
|
|
140
149
|
plugins: context.plugins
|
|
141
150
|
});
|
|
142
151
|
}
|
|
152
|
+
|
|
143
153
|
return models;
|
|
144
154
|
};
|
|
155
|
+
|
|
145
156
|
const modelsGet = async modelId => {
|
|
146
157
|
const pluginModel = getModelsAsPlugins().find(model => model.modelId === modelId);
|
|
158
|
+
|
|
147
159
|
if (pluginModel) {
|
|
148
160
|
return pluginModel;
|
|
149
161
|
}
|
|
162
|
+
|
|
150
163
|
const model = await storageOperations.models.get({
|
|
151
164
|
tenant: getTenant().id,
|
|
152
165
|
locale: getLocale().code,
|
|
153
166
|
modelId
|
|
154
167
|
});
|
|
168
|
+
|
|
155
169
|
if (!model) {
|
|
156
170
|
throw new _handlerGraphql.NotFoundError(`Content model "${modelId}" was not found!`);
|
|
157
171
|
}
|
|
172
|
+
|
|
158
173
|
return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, model), {}, {
|
|
174
|
+
tags: ensureTypeTag(model),
|
|
159
175
|
tenant: model.tenant || getTenant().id,
|
|
160
176
|
locale: model.locale || getLocale().code
|
|
161
177
|
});
|
|
162
178
|
};
|
|
179
|
+
|
|
163
180
|
const modelsList = async () => {
|
|
164
181
|
const databaseModels = await loaders.listModels.load("listModels");
|
|
165
182
|
const pluginsModels = getModelsAsPlugins();
|
|
166
183
|
return databaseModels.concat(pluginsModels);
|
|
167
184
|
};
|
|
185
|
+
|
|
168
186
|
const listModels = async () => {
|
|
169
187
|
const permission = await checkModelPermissions("r");
|
|
170
188
|
const models = await modelsList();
|
|
@@ -172,9 +190,11 @@ const createModelsCrud = params => {
|
|
|
172
190
|
if (!(0, _ownership.validateOwnership)(context, permission, model)) {
|
|
173
191
|
return false;
|
|
174
192
|
}
|
|
193
|
+
|
|
175
194
|
return (0, _access.validateModelAccess)(context, model);
|
|
176
195
|
});
|
|
177
196
|
};
|
|
197
|
+
|
|
178
198
|
const getModel = async modelId => {
|
|
179
199
|
const permission = await checkModelPermissions("r");
|
|
180
200
|
const model = await modelsGet(modelId);
|
|
@@ -182,35 +202,61 @@ const createModelsCrud = params => {
|
|
|
182
202
|
await (0, _access.checkModelAccess)(context, model);
|
|
183
203
|
return model;
|
|
184
204
|
};
|
|
205
|
+
|
|
185
206
|
const getModelManager = async target => {
|
|
186
207
|
const modelId = typeof target === "string" ? target : target.modelId;
|
|
208
|
+
|
|
187
209
|
if (managers.has(modelId)) {
|
|
188
210
|
return managers.get(modelId);
|
|
189
211
|
}
|
|
212
|
+
|
|
190
213
|
const models = await modelsList();
|
|
191
214
|
const model = models.find(m => m.modelId === modelId);
|
|
215
|
+
|
|
192
216
|
if (!model) {
|
|
193
217
|
throw new _handlerGraphql.NotFoundError(`There is no content model "${modelId}".`);
|
|
194
218
|
}
|
|
219
|
+
|
|
195
220
|
return await updateManager(context, model);
|
|
196
221
|
};
|
|
222
|
+
/**
|
|
223
|
+
* Create
|
|
224
|
+
*/
|
|
225
|
+
|
|
197
226
|
|
|
198
|
-
// create
|
|
199
227
|
const onModelBeforeCreate = (0, _pubsub.createTopic)("cms.onModelBeforeCreate");
|
|
200
228
|
const onModelAfterCreate = (0, _pubsub.createTopic)("cms.onModelAfterCreate");
|
|
201
|
-
|
|
229
|
+
const onModelCreateError = (0, _pubsub.createTopic)("cms.onModelCreateError");
|
|
230
|
+
/**
|
|
231
|
+
* Create from / clone
|
|
232
|
+
*/
|
|
233
|
+
|
|
202
234
|
const onModelBeforeCreateFrom = (0, _pubsub.createTopic)("cms.onModelBeforeCreateFrom");
|
|
203
235
|
const onModelAfterCreateFrom = (0, _pubsub.createTopic)("cms.onModelAfterCreateFrom");
|
|
204
|
-
|
|
236
|
+
const onModelCreateFromError = (0, _pubsub.createTopic)("cms.onModelCreateFromError");
|
|
237
|
+
/**
|
|
238
|
+
* Update
|
|
239
|
+
*/
|
|
240
|
+
|
|
205
241
|
const onModelBeforeUpdate = (0, _pubsub.createTopic)("cms.onModelBeforeUpdate");
|
|
206
242
|
const onModelAfterUpdate = (0, _pubsub.createTopic)("cms.onModelAfterUpdate");
|
|
207
|
-
|
|
243
|
+
const onModelUpdateError = (0, _pubsub.createTopic)("cms.onModelUpdateError");
|
|
244
|
+
/**
|
|
245
|
+
* Delete
|
|
246
|
+
*/
|
|
247
|
+
|
|
208
248
|
const onModelBeforeDelete = (0, _pubsub.createTopic)("cms.onModelBeforeDelete");
|
|
209
249
|
const onModelAfterDelete = (0, _pubsub.createTopic)("cms.onModelAfterDelete");
|
|
250
|
+
const onModelDeleteError = (0, _pubsub.createTopic)("cms.onModelDeleteError");
|
|
251
|
+
/**
|
|
252
|
+
* Initialize
|
|
253
|
+
*/
|
|
254
|
+
|
|
210
255
|
const onModelInitialize = (0, _pubsub.createTopic)("cms.onModelInitialize");
|
|
211
256
|
/**
|
|
212
257
|
* We need to assign some default behaviors.
|
|
213
258
|
*/
|
|
259
|
+
|
|
214
260
|
(0, _beforeCreate.assignModelBeforeCreate)({
|
|
215
261
|
onModelBeforeCreate,
|
|
216
262
|
onModelBeforeCreateFrom,
|
|
@@ -255,21 +301,27 @@ const createModelsCrud = params => {
|
|
|
255
301
|
onAfterModelUpdate: onModelAfterUpdate,
|
|
256
302
|
onBeforeModelDelete: onModelBeforeDelete,
|
|
257
303
|
onAfterModelDelete: onModelAfterDelete,
|
|
304
|
+
|
|
258
305
|
/**
|
|
259
306
|
* Released in 5.34.0
|
|
260
307
|
*/
|
|
261
308
|
onModelBeforeCreate,
|
|
262
309
|
onModelAfterCreate,
|
|
310
|
+
onModelCreateError,
|
|
263
311
|
onModelBeforeCreateFrom,
|
|
264
312
|
onModelAfterCreateFrom,
|
|
313
|
+
onModelCreateFromError,
|
|
265
314
|
onModelBeforeUpdate,
|
|
266
315
|
onModelAfterUpdate,
|
|
316
|
+
onModelUpdateError,
|
|
267
317
|
onModelBeforeDelete,
|
|
268
318
|
onModelAfterDelete,
|
|
319
|
+
onModelDeleteError,
|
|
269
320
|
onModelInitialize,
|
|
270
321
|
clearModelsCache,
|
|
271
322
|
getModel,
|
|
272
323
|
listModels,
|
|
324
|
+
|
|
273
325
|
async createModel(inputData) {
|
|
274
326
|
await checkModelPermissions("w");
|
|
275
327
|
const createdData = new _models.CreateContentModelModel().populate(inputData);
|
|
@@ -278,9 +330,11 @@ const createModelsCrud = params => {
|
|
|
278
330
|
context.security.disableAuthorization();
|
|
279
331
|
const group = await context.cms.getGroup(input.group);
|
|
280
332
|
context.security.enableAuthorization();
|
|
333
|
+
|
|
281
334
|
if (!group) {
|
|
282
335
|
throw new _handlerGraphql.NotFoundError(`There is no group "${input.group}".`);
|
|
283
336
|
}
|
|
337
|
+
|
|
284
338
|
const fields = await (0, _createFieldModels.createFieldModels)(input.fields);
|
|
285
339
|
const identity = getIdentity();
|
|
286
340
|
const model = {
|
|
@@ -304,23 +358,36 @@ const createModelsCrud = params => {
|
|
|
304
358
|
fields,
|
|
305
359
|
lockedFields: [],
|
|
306
360
|
layout: input.layout || [],
|
|
361
|
+
tags: [...(input.tags || [])],
|
|
307
362
|
webinyVersion: context.WEBINY_VERSION
|
|
308
363
|
};
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
model
|
|
321
|
-
|
|
322
|
-
|
|
364
|
+
model.tags = ensureTypeTag(model);
|
|
365
|
+
|
|
366
|
+
try {
|
|
367
|
+
await onModelBeforeCreate.publish({
|
|
368
|
+
input,
|
|
369
|
+
model
|
|
370
|
+
});
|
|
371
|
+
const createdModel = await storageOperations.models.create({
|
|
372
|
+
model
|
|
373
|
+
});
|
|
374
|
+
loaders.listModels.clearAll();
|
|
375
|
+
await updateManager(context, model);
|
|
376
|
+
await onModelAfterCreate.publish({
|
|
377
|
+
input,
|
|
378
|
+
model: createdModel
|
|
379
|
+
});
|
|
380
|
+
return createdModel;
|
|
381
|
+
} catch (ex) {
|
|
382
|
+
await onModelCreateError.publish({
|
|
383
|
+
input,
|
|
384
|
+
model,
|
|
385
|
+
error: ex
|
|
386
|
+
});
|
|
387
|
+
throw ex;
|
|
388
|
+
}
|
|
323
389
|
},
|
|
390
|
+
|
|
324
391
|
/**
|
|
325
392
|
* Method does not check for permissions or ownership.
|
|
326
393
|
* @internal
|
|
@@ -335,28 +402,41 @@ const createModelsCrud = params => {
|
|
|
335
402
|
locale: initialModel.locale || getLocale().code,
|
|
336
403
|
webinyVersion: context.WEBINY_VERSION
|
|
337
404
|
});
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
405
|
+
|
|
406
|
+
try {
|
|
407
|
+
await onModelBeforeUpdate.publish({
|
|
408
|
+
input: {},
|
|
409
|
+
original,
|
|
410
|
+
model
|
|
411
|
+
});
|
|
412
|
+
const resultModel = await storageOperations.models.update({
|
|
413
|
+
model
|
|
414
|
+
});
|
|
415
|
+
await updateManager(context, resultModel);
|
|
416
|
+
loaders.listModels.clearAll();
|
|
417
|
+
await onModelAfterUpdate.publish({
|
|
418
|
+
input: {},
|
|
419
|
+
original,
|
|
420
|
+
model: resultModel
|
|
421
|
+
});
|
|
422
|
+
return resultModel;
|
|
423
|
+
} catch (ex) {
|
|
424
|
+
await onModelUpdateError.publish({
|
|
425
|
+
input: {},
|
|
426
|
+
original,
|
|
427
|
+
model,
|
|
428
|
+
error: ex
|
|
429
|
+
});
|
|
430
|
+
throw ex;
|
|
431
|
+
}
|
|
354
432
|
},
|
|
433
|
+
|
|
355
434
|
async createModelFrom(modelId, data) {
|
|
356
435
|
await checkModelPermissions("w");
|
|
357
436
|
/**
|
|
358
437
|
* Get a model record; this will also perform ownership validation.
|
|
359
438
|
*/
|
|
439
|
+
|
|
360
440
|
const original = await getModel(modelId);
|
|
361
441
|
const createdData = new _models.CreateContentModelModelFrom().populate({
|
|
362
442
|
name: data.name,
|
|
@@ -368,20 +448,25 @@ const createModelsCrud = params => {
|
|
|
368
448
|
await createdData.validate();
|
|
369
449
|
const input = await createdData.toJSON();
|
|
370
450
|
const locale = await context.i18n.getLocale(input.locale || original.locale);
|
|
451
|
+
|
|
371
452
|
if (!locale) {
|
|
372
453
|
throw new _handlerGraphql.NotFoundError(`There is no locale "${input.locale}".`);
|
|
373
454
|
}
|
|
374
455
|
/**
|
|
375
456
|
* Use storage operations directly because we cannot get group from different locale via context methods.
|
|
376
457
|
*/
|
|
458
|
+
|
|
459
|
+
|
|
377
460
|
const group = await context.cms.storageOperations.groups.get({
|
|
378
461
|
id: input.group,
|
|
379
462
|
tenant: original.tenant,
|
|
380
463
|
locale: locale.code
|
|
381
464
|
});
|
|
465
|
+
|
|
382
466
|
if (!group) {
|
|
383
467
|
throw new _handlerGraphql.NotFoundError(`There is no group "${input.group}".`);
|
|
384
468
|
}
|
|
469
|
+
|
|
385
470
|
const identity = getIdentity();
|
|
386
471
|
const model = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, original), {}, {
|
|
387
472
|
locale: locale.code,
|
|
@@ -402,55 +487,72 @@ const createModelsCrud = params => {
|
|
|
402
487
|
lockedFields: [],
|
|
403
488
|
webinyVersion: context.WEBINY_VERSION
|
|
404
489
|
});
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
|
|
490
|
+
|
|
491
|
+
try {
|
|
492
|
+
await onModelBeforeCreateFrom.publish({
|
|
493
|
+
input,
|
|
494
|
+
model,
|
|
495
|
+
original
|
|
496
|
+
});
|
|
497
|
+
const createdModel = await storageOperations.models.create({
|
|
498
|
+
model
|
|
499
|
+
});
|
|
500
|
+
loaders.listModels.clearAll();
|
|
501
|
+
await updateManager(context, model);
|
|
502
|
+
await onModelAfterCreateFrom.publish({
|
|
503
|
+
input,
|
|
504
|
+
original,
|
|
505
|
+
model: createdModel
|
|
506
|
+
});
|
|
507
|
+
return createdModel;
|
|
508
|
+
} catch (ex) {
|
|
509
|
+
await onModelCreateFromError.publish({
|
|
510
|
+
input,
|
|
511
|
+
original,
|
|
512
|
+
model,
|
|
513
|
+
error: ex
|
|
514
|
+
});
|
|
515
|
+
throw ex;
|
|
516
|
+
}
|
|
421
517
|
},
|
|
518
|
+
|
|
422
519
|
async updateModel(modelId, inputData) {
|
|
423
|
-
await checkModelPermissions("w");
|
|
520
|
+
await checkModelPermissions("w"); // Get a model record; this will also perform ownership validation.
|
|
424
521
|
|
|
425
|
-
// Get a model record; this will also perform ownership validation.
|
|
426
522
|
const original = await getModel(modelId);
|
|
427
523
|
const updatedData = new _models.UpdateContentModelModel().populate(inputData);
|
|
428
524
|
await updatedData.validate();
|
|
429
525
|
const input = await updatedData.toJSON({
|
|
430
526
|
onlyDirty: true
|
|
431
527
|
});
|
|
528
|
+
|
|
432
529
|
if (Object.keys(input).length === 0) {
|
|
433
530
|
/**
|
|
434
531
|
* We need to return the original if nothing is to be updated.
|
|
435
532
|
*/
|
|
436
533
|
return original;
|
|
437
534
|
}
|
|
535
|
+
|
|
438
536
|
let group = {
|
|
439
537
|
id: original.group.id,
|
|
440
538
|
name: original.group.name
|
|
441
539
|
};
|
|
540
|
+
|
|
442
541
|
if (input.group) {
|
|
443
542
|
context.security.disableAuthorization();
|
|
444
543
|
const groupData = await context.cms.getGroup(input.group);
|
|
445
544
|
context.security.enableAuthorization();
|
|
545
|
+
|
|
446
546
|
if (!groupData) {
|
|
447
547
|
throw new _handlerGraphql.NotFoundError(`There is no group "${input.group}".`);
|
|
448
548
|
}
|
|
549
|
+
|
|
449
550
|
group = {
|
|
450
551
|
id: groupData.id,
|
|
451
552
|
name: groupData.name
|
|
452
553
|
};
|
|
453
554
|
}
|
|
555
|
+
|
|
454
556
|
const fields = await (0, _createFieldModels.createFieldModels)(inputData.fields);
|
|
455
557
|
const model = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, original), input), {}, {
|
|
456
558
|
group,
|
|
@@ -460,44 +562,69 @@ const createModelsCrud = params => {
|
|
|
460
562
|
fields,
|
|
461
563
|
savedOn: new Date().toISOString()
|
|
462
564
|
});
|
|
463
|
-
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
|
|
470
|
-
|
|
471
|
-
|
|
472
|
-
|
|
473
|
-
|
|
474
|
-
|
|
475
|
-
|
|
476
|
-
|
|
477
|
-
|
|
565
|
+
model.tags = ensureTypeTag(model);
|
|
566
|
+
|
|
567
|
+
try {
|
|
568
|
+
await onModelBeforeUpdate.publish({
|
|
569
|
+
input,
|
|
570
|
+
original,
|
|
571
|
+
model
|
|
572
|
+
});
|
|
573
|
+
const resultModel = await storageOperations.models.update({
|
|
574
|
+
model
|
|
575
|
+
});
|
|
576
|
+
await updateManager(context, resultModel);
|
|
577
|
+
await onModelAfterUpdate.publish({
|
|
578
|
+
input,
|
|
579
|
+
original,
|
|
580
|
+
model: resultModel
|
|
581
|
+
});
|
|
582
|
+
return resultModel;
|
|
583
|
+
} catch (ex) {
|
|
584
|
+
await onModelUpdateError.publish({
|
|
585
|
+
input,
|
|
586
|
+
model,
|
|
587
|
+
original,
|
|
588
|
+
error: ex
|
|
589
|
+
});
|
|
590
|
+
throw ex;
|
|
591
|
+
}
|
|
478
592
|
},
|
|
593
|
+
|
|
479
594
|
async deleteModel(modelId) {
|
|
480
595
|
await checkModelPermissions("d");
|
|
481
596
|
const model = await getModel(modelId);
|
|
482
|
-
|
|
483
|
-
model
|
|
484
|
-
});
|
|
597
|
+
|
|
485
598
|
try {
|
|
486
|
-
await
|
|
599
|
+
await onModelBeforeDelete.publish({
|
|
487
600
|
model
|
|
488
601
|
});
|
|
602
|
+
|
|
603
|
+
try {
|
|
604
|
+
await storageOperations.models.delete({
|
|
605
|
+
model
|
|
606
|
+
});
|
|
607
|
+
} catch (ex) {
|
|
608
|
+
throw new _error.default(ex.message || "Could not delete the content model", ex.code || "CONTENT_MODEL_DELETE_ERROR", {
|
|
609
|
+
error: ex,
|
|
610
|
+
modelId: model.modelId
|
|
611
|
+
});
|
|
612
|
+
}
|
|
613
|
+
|
|
614
|
+
await onModelAfterDelete.publish({
|
|
615
|
+
model
|
|
616
|
+
});
|
|
617
|
+
managers.delete(model.modelId);
|
|
489
618
|
} catch (ex) {
|
|
490
|
-
|
|
491
|
-
|
|
492
|
-
|
|
619
|
+
await onModelDeleteError.publish({
|
|
620
|
+
model,
|
|
621
|
+
error: ex
|
|
493
622
|
});
|
|
623
|
+
throw ex;
|
|
494
624
|
}
|
|
495
|
-
await onModelAfterDelete.publish({
|
|
496
|
-
model
|
|
497
|
-
});
|
|
498
|
-
managers.delete(model.modelId);
|
|
499
625
|
},
|
|
500
|
-
|
|
626
|
+
|
|
627
|
+
async initializeModel(modelId, data) {
|
|
501
628
|
/**
|
|
502
629
|
* We require that users have write permissions to initialize models.
|
|
503
630
|
* Maybe introduce another permission for it?
|
|
@@ -505,10 +632,12 @@ const createModelsCrud = params => {
|
|
|
505
632
|
await checkModelPermissions("w");
|
|
506
633
|
const model = await getModel(modelId);
|
|
507
634
|
await onModelInitialize.publish({
|
|
508
|
-
model
|
|
635
|
+
model,
|
|
636
|
+
data
|
|
509
637
|
});
|
|
510
638
|
return true;
|
|
511
639
|
},
|
|
640
|
+
|
|
512
641
|
getModelManager,
|
|
513
642
|
getEntryManager: async model => {
|
|
514
643
|
return getModelManager(model);
|
|
@@ -517,4 +646,5 @@ const createModelsCrud = params => {
|
|
|
517
646
|
getEntryManagers: () => managers
|
|
518
647
|
};
|
|
519
648
|
};
|
|
649
|
+
|
|
520
650
|
exports.createModelsCrud = createModelsCrud;
|