@lilaquadrat/studio 2.2.6 → 2.3.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/lib/interfaces.d.ts +3 -1
- package/lib/interfaces.js.map +1 -1
- package/lib/models.d.ts +2 -1
- package/lib/models.js +3 -1
- package/lib/models.js.map +1 -1
- package/lib/services.d.ts +2 -1
- package/lib/services.js +3 -1
- package/lib/services.js.map +1 -1
- package/lib/src/Immutable.class.d.ts +2 -10
- package/lib/src/Immutable.class.js +10 -16
- package/lib/src/Immutable.class.js.map +1 -1
- package/lib/src/classes/ControllerBase.class.js +2 -1
- package/lib/src/classes/ControllerBase.class.js.map +1 -1
- package/lib/src/classes/modelv2.class.d.ts +2 -4
- package/lib/src/classes/modelv2.class.js +4 -4
- package/lib/src/classes/modelv2.class.js.map +1 -1
- package/lib/src/interfaces/ChildData.interface.d.ts +7 -0
- package/lib/src/interfaces/ChildData.interface.js +3 -0
- package/lib/src/interfaces/ChildData.interface.js.map +1 -0
- package/lib/src/interfaces/ContentPrepared.interface.d.ts +1 -0
- package/lib/src/interfaces/ModuleGeneric.interface.d.ts +2 -0
- package/lib/src/models/editor.model.d.ts +2 -1
- package/lib/src/models/editor.model.js.map +1 -1
- package/lib/src/models/permissions.model.js +23 -16
- package/lib/src/models/permissions.model.js.map +1 -1
- package/lib/src/models/publish-method.model.d.ts +25 -0
- package/lib/src/models/publish-method.model.js +109 -0
- package/lib/src/models/publish-method.model.js.map +1 -0
- package/lib/src/models/publish.model copy.d.ts +23 -0
- package/lib/src/models/publish.model copy.js +180 -0
- package/lib/src/models/publish.model copy.js.map +1 -0
- package/lib/src/prepareContent.js +16 -0
- package/lib/src/prepareContent.js.map +1 -1
- package/lib/src/services/publish.service.js +5 -4
- package/lib/src/services/publish.service.js.map +1 -1
- package/lib/src/services/publishMethod.service.d.ts +10 -0
- package/lib/src/services/publishMethod.service.js +27 -0
- package/lib/src/services/publishMethod.service.js.map +1 -0
- package/lib/src/services/universal.service.js +4 -2
- package/lib/src/services/universal.service.js.map +1 -1
- package/package.json +1 -1
package/lib/interfaces.d.ts
CHANGED
|
@@ -24,6 +24,7 @@ import ShareClientOptions from './src/interfaces/ShareClientOptions.interface';
|
|
|
24
24
|
import Contract from './src/interfaces/Contract.interface';
|
|
25
25
|
import { Company } from './src/models/company.model';
|
|
26
26
|
import { Publish } from './src/models/publish.model';
|
|
27
|
+
import { PublishMethod, PublishMethodFtp, PublishMethodWebhook } from './src/models/publish-method.model';
|
|
27
28
|
import { Secret } from './src/models/secrets.model';
|
|
28
29
|
import { UniversalInterface } from './src/services/universal.service';
|
|
29
30
|
import EditorLegacy from './src/interfaces/EditorLegacy.interface';
|
|
@@ -34,4 +35,5 @@ import Content from './src/interfaces/Content.interface';
|
|
|
34
35
|
import ContentWithPositions from './src/interfaces/ContentPrepared.interface';
|
|
35
36
|
import StudioIframeMessage from './src/interfaces/StudioIframeMessage.interface';
|
|
36
37
|
import EditorActiveModule from './src/interfaces/EditorActiveModule.interface';
|
|
37
|
-
|
|
38
|
+
import ChildData from './src/interfaces/ChildData.interface';
|
|
39
|
+
export { BasicDataInterface, Scope, SingleScope, ScopeObject, HttpStatusCode, AppPermissions, DatabaseQuery, DatabaseQueryOptions, DatabaseQuerySites, HistoryReason, ListOfModels, ShareClientInterface, ShareClientOptions, Settings, Project, Me, History, Editor, EditorBase, Media, MediaInfo, MediaViewInfo, MediaStats, VersionInfo, ProjectScope, CompanyScope, UniversalScope, Permissions, ModuleGeneric, IModelv2, Company, Partner, Contract, Action, Publish, PublishMethod, PublishMethodFtp, PublishMethodWebhook, UniversalInterface, EditorLegacy, PublishResult, DataObject, CallResponse, Secret, Content, ContentWithPositions, StudioIframeMessage, EditorActiveModule, ChildData };
|
package/lib/interfaces.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../interfaces.ts"],"names":[],"mappings":";;;;;;AASA,+FAAkE;
|
|
1
|
+
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../interfaces.ts"],"names":[],"mappings":";;;;;;AASA,+FAAkE;AAqChE,yBArCK,6BAAc,CAqCL;AA3BhB,sEAAyG;AAgDvG,6FAhDO,gCAAY,OAgDP;AADZ,6FA/CqB,gCAAY,OA+CrB;AAEZ,+FAjDgD,kCAAc,OAiDhD"}
|
package/lib/models.d.ts
CHANGED
|
@@ -9,5 +9,6 @@ import settingsModel from './src/models/settings.model';
|
|
|
9
9
|
import mediaModel from './src/models/media.model';
|
|
10
10
|
import idModel from './src/models/id.model';
|
|
11
11
|
import publishModel from './src/models/publish.model';
|
|
12
|
+
import publishMethodModel from './src/models/publish-method.model';
|
|
12
13
|
import secretsModel from './src/models/secrets.model';
|
|
13
|
-
export { companyModel as CompanyModel, meModel as MeModel, editorModel as EditorModel, editorBaseModel as EditorBaseModel, historyModel as HistoryModel, permissionsModel as PermissionsModel, projectModel as ProjectModel, settingsModel as SettingsModel, mediaModel as MediaModel, idModel as IdModel, publishModel as PublishModel, secretsModel as SecretsModel };
|
|
14
|
+
export { companyModel as CompanyModel, meModel as MeModel, editorModel as EditorModel, editorBaseModel as EditorBaseModel, historyModel as HistoryModel, permissionsModel as PermissionsModel, projectModel as ProjectModel, settingsModel as SettingsModel, mediaModel as MediaModel, idModel as IdModel, publishModel as PublishModel, publishMethodModel as PublishMethodModel, secretsModel as SecretsModel };
|
package/lib/models.js
CHANGED
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.SecretsModel = exports.PublishModel = exports.IdModel = exports.MediaModel = exports.SettingsModel = exports.ProjectModel = exports.PermissionsModel = exports.HistoryModel = exports.EditorBaseModel = exports.EditorModel = exports.MeModel = exports.CompanyModel = void 0;
|
|
6
|
+
exports.SecretsModel = exports.PublishMethodModel = exports.PublishModel = exports.IdModel = exports.MediaModel = exports.SettingsModel = exports.ProjectModel = exports.PermissionsModel = exports.HistoryModel = exports.EditorBaseModel = exports.EditorModel = exports.MeModel = exports.CompanyModel = void 0;
|
|
7
7
|
const company_model_1 = __importDefault(require("./src/models/company.model"));
|
|
8
8
|
exports.CompanyModel = company_model_1.default;
|
|
9
9
|
const me_model_1 = __importDefault(require("./src/models/me.model"));
|
|
@@ -26,6 +26,8 @@ const id_model_1 = __importDefault(require("./src/models/id.model"));
|
|
|
26
26
|
exports.IdModel = id_model_1.default;
|
|
27
27
|
const publish_model_1 = __importDefault(require("./src/models/publish.model"));
|
|
28
28
|
exports.PublishModel = publish_model_1.default;
|
|
29
|
+
const publish_method_model_1 = __importDefault(require("./src/models/publish-method.model"));
|
|
30
|
+
exports.PublishMethodModel = publish_method_model_1.default;
|
|
29
31
|
const secrets_model_1 = __importDefault(require("./src/models/secrets.model"));
|
|
30
32
|
exports.SecretsModel = secrets_model_1.default;
|
|
31
33
|
//# sourceMappingURL=models.js.map
|
package/lib/models.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"models.js","sourceRoot":"","sources":["../models.ts"],"names":[],"mappings":";;;;;;AAAA,+EAAsD;
|
|
1
|
+
{"version":3,"file":"models.js","sourceRoot":"","sources":["../models.ts"],"names":[],"mappings":";;;;;;AAAA,+EAAsD;AAepC,uBAfX,uBAAY,CAeW;AAd9B,qEAA4C;AAe/B,kBAfN,kBAAO,CAeM;AAdpB,6EAAoD;AAenC,sBAfV,sBAAW,CAeU;AAd5B,qFAA4D;AAevC,0BAfd,0BAAe,CAec;AAdpC,+EAAsD;AAepC,uBAfX,uBAAY,CAeW;AAd9B,uFAA8D;AAexC,2BAff,2BAAgB,CAee;AAdtC,+EAAsD;AAepC,uBAfX,uBAAY,CAeW;AAd9B,iFAAwD;AAerC,wBAfZ,wBAAa,CAeY;AAdhC,2EAAkD;AAelC,qBAfT,qBAAU,CAeS;AAd1B,qEAA4C;AAe/B,kBAfN,kBAAO,CAeM;AAdpB,+EAAsD;AAepC,uBAfX,uBAAY,CAeW;AAd9B,6FAAmE;AAe3C,6BAfjB,8BAAkB,CAeiB;AAd1C,+EAAsD;AAepC,uBAfX,uBAAY,CAeW"}
|
package/lib/services.d.ts
CHANGED
|
@@ -5,5 +5,6 @@ import handleFileService from './src/services/handleFile.service';
|
|
|
5
5
|
import idService from './src/services/id.service';
|
|
6
6
|
import universalService from './src/services/universal.service';
|
|
7
7
|
import publishService from './src/services/publish.service';
|
|
8
|
+
import publishMethodService from './src/services/publishMethod.service';
|
|
8
9
|
import secretService from './src/services/secret.service';
|
|
9
|
-
export { editorService as EditorService, editorBaseService as EditorBaseService, historyService as HistoryService, handleFileService as HandleFileService, idService as IdService, universalService as UniversalService, publishService as PublishService, secretService as SecretService };
|
|
10
|
+
export { editorService as EditorService, editorBaseService as EditorBaseService, historyService as HistoryService, handleFileService as HandleFileService, idService as IdService, universalService as UniversalService, publishService as PublishService, secretService as SecretService, publishMethodService as PublishMethodService };
|
package/lib/services.js
CHANGED
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.SecretService = exports.PublishService = exports.UniversalService = exports.IdService = exports.HandleFileService = exports.HistoryService = exports.EditorBaseService = exports.EditorService = void 0;
|
|
6
|
+
exports.PublishMethodService = exports.SecretService = exports.PublishService = exports.UniversalService = exports.IdService = exports.HandleFileService = exports.HistoryService = exports.EditorBaseService = exports.EditorService = void 0;
|
|
7
7
|
const editor_service_1 = __importDefault(require("./src/services/editor.service"));
|
|
8
8
|
exports.EditorService = editor_service_1.default;
|
|
9
9
|
const editorBase_service_1 = __importDefault(require("./src/services/editorBase.service"));
|
|
@@ -18,6 +18,8 @@ const universal_service_1 = __importDefault(require("./src/services/universal.se
|
|
|
18
18
|
exports.UniversalService = universal_service_1.default;
|
|
19
19
|
const publish_service_1 = __importDefault(require("./src/services/publish.service"));
|
|
20
20
|
exports.PublishService = publish_service_1.default;
|
|
21
|
+
const publishMethod_service_1 = __importDefault(require("./src/services/publishMethod.service"));
|
|
22
|
+
exports.PublishMethodService = publishMethod_service_1.default;
|
|
21
23
|
const secret_service_1 = __importDefault(require("./src/services/secret.service"));
|
|
22
24
|
exports.SecretService = secret_service_1.default;
|
|
23
25
|
//# sourceMappingURL=services.js.map
|
package/lib/services.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"services.js","sourceRoot":"","sources":["../services.ts"],"names":[],"mappings":";;;;;;AAAA,mFAA0D;
|
|
1
|
+
{"version":3,"file":"services.js","sourceRoot":"","sources":["../services.ts"],"names":[],"mappings":";;;;;;AAAA,mFAA0D;AAWvC,wBAXZ,wBAAa,CAWY;AAVhC,2FAAkE;AAW3C,4BAXhB,4BAAiB,CAWgB;AAVxC,qFAA4D;AAWxC,yBAXb,yBAAc,CAWa;AAVlC,2FAAkE;AAW3C,4BAXhB,4BAAiB,CAWgB;AAVxC,2EAAkD;AAWnC,oBAXR,oBAAS,CAWQ;AAVxB,yFAAgE;AAW1C,2BAXf,2BAAgB,CAWe;AAVtC,qFAA4D;AAWxC,yBAXb,yBAAc,CAWa;AAVlC,iGAAwE;AAY9C,+BAZnB,+BAAoB,CAYmB;AAX9C,mFAA0D;AAUvC,wBAVZ,wBAAa,CAUY"}
|
|
@@ -11,16 +11,8 @@ export default abstract class Immutable<T extends BasicDataInterface> {
|
|
|
11
11
|
immutable(_idOrFilterQuery: T['_id'] | Filter<T> | string, data: T | Partial<T>, user: string, reason: HistoryReason, app: string, additionalHistoryData?: Record<string, string | number>, bulk?: UnorderedBulkOperation | OrderedBulkOperation, partial?: string): Promise<import("mongodb").UpdateResult>;
|
|
12
12
|
/**
|
|
13
13
|
* creates or updates data
|
|
14
|
-
* @param _idOrFilterQuery
|
|
15
|
-
* @param data
|
|
16
|
-
* @param user
|
|
17
|
-
* @param reason
|
|
18
|
-
* @param app
|
|
19
|
-
* @param additionalHistoryData
|
|
20
|
-
* @param bulk
|
|
21
|
-
* @returns
|
|
22
14
|
*/
|
|
23
|
-
immutableUpsert(_idOrFilterQuery: T['_id'] | Filter<T>, data: T, user: string, reason: HistoryReason, app: string, additionalHistoryData?: Record<string, string | number>, bulk?: UnorderedBulkOperation | OrderedBulkOperation): Promise<import("mongodb").UpdateResult | CreateResult<T>>;
|
|
15
|
+
immutableUpsert(_idOrFilterQuery: T['_id'] | Filter<T>, data: T, user: string, reason: HistoryReason, app: string, additionalHistoryData?: Record<string, string | number>, bulk?: UnorderedBulkOperation | OrderedBulkOperation, partial?: string): Promise<import("mongodb").UpdateResult | CreateResult<T>>;
|
|
24
16
|
/**
|
|
25
17
|
* add a new history entry
|
|
26
18
|
* @param _id
|
|
@@ -35,7 +27,7 @@ export default abstract class Immutable<T extends BasicDataInterface> {
|
|
|
35
27
|
/**
|
|
36
28
|
* create new data
|
|
37
29
|
*/
|
|
38
|
-
create(data: T, user: string, source: string, additionalHistoryData?: Record<string, string | number>, bulk?: UnorderedBulkOperation | OrderedBulkOperation): Promise<CreateResult<T>>;
|
|
30
|
+
create(data: T, user: string, source: string, additionalHistoryData?: Record<string, string | number>, bulk?: UnorderedBulkOperation | OrderedBulkOperation, partial?: string): Promise<CreateResult<T>>;
|
|
39
31
|
/**
|
|
40
32
|
* add a new history entry with delete and remove the main document
|
|
41
33
|
*
|
|
@@ -14,6 +14,7 @@ class Immutable {
|
|
|
14
14
|
* **IMPORTANT** dont query fields that would be changed on update, that will mess up the history
|
|
15
15
|
*/
|
|
16
16
|
async immutable(_idOrFilterQuery, data, user, reason, app, additionalHistoryData, bulk, partial) {
|
|
17
|
+
var _a;
|
|
17
18
|
let filterQuery;
|
|
18
19
|
const validationType = partial || 'change';
|
|
19
20
|
!mongodb_1.ObjectId.isValid(_idOrFilterQuery)
|
|
@@ -26,7 +27,7 @@ class Immutable {
|
|
|
26
27
|
if (Object.keys(data).length) {
|
|
27
28
|
basicUpdateQuery.$set = data;
|
|
28
29
|
}
|
|
29
|
-
if (!partial) {
|
|
30
|
+
if (!partial || ((_a = this.model.compiledOptions[validationType]) === null || _a === void 0 ? void 0 : _a.unsetWithinPartial)) {
|
|
30
31
|
const unset = this.model.getUnsetObject(data);
|
|
31
32
|
if (Object.keys(unset).length) {
|
|
32
33
|
basicUpdateQuery.$unset = unset;
|
|
@@ -60,16 +61,8 @@ class Immutable {
|
|
|
60
61
|
}
|
|
61
62
|
/**
|
|
62
63
|
* creates or updates data
|
|
63
|
-
* @param _idOrFilterQuery
|
|
64
|
-
* @param data
|
|
65
|
-
* @param user
|
|
66
|
-
* @param reason
|
|
67
|
-
* @param app
|
|
68
|
-
* @param additionalHistoryData
|
|
69
|
-
* @param bulk
|
|
70
|
-
* @returns
|
|
71
64
|
*/
|
|
72
|
-
async immutableUpsert(_idOrFilterQuery, data, user, reason, app, additionalHistoryData, bulk) {
|
|
65
|
+
async immutableUpsert(_idOrFilterQuery, data, user, reason, app, additionalHistoryData, bulk, partial) {
|
|
73
66
|
var _a, _b;
|
|
74
67
|
let filterQuery;
|
|
75
68
|
!mongodb_1.ObjectId.isValid(_idOrFilterQuery)
|
|
@@ -83,9 +76,9 @@ class Immutable {
|
|
|
83
76
|
delete data[single];
|
|
84
77
|
});
|
|
85
78
|
}
|
|
86
|
-
return this.immutable(_idOrFilterQuery, data, user, reason, app, additionalHistoryData, bulk);
|
|
79
|
+
return this.immutable(_idOrFilterQuery, data, user, reason, app, additionalHistoryData, bulk, partial);
|
|
87
80
|
}
|
|
88
|
-
return this.create(data, user, app, additionalHistoryData, bulk);
|
|
81
|
+
return this.create(data, user, app, additionalHistoryData, bulk, partial);
|
|
89
82
|
}
|
|
90
83
|
/**
|
|
91
84
|
* add a new history entry
|
|
@@ -106,14 +99,16 @@ class Immutable {
|
|
|
106
99
|
/**
|
|
107
100
|
* create new data
|
|
108
101
|
*/
|
|
109
|
-
async create(data, user, source, additionalHistoryData, bulk) {
|
|
102
|
+
async create(data, user, source, additionalHistoryData, bulk, partial) {
|
|
110
103
|
var _a, _b;
|
|
111
104
|
let type = 'create';
|
|
105
|
+
const validationType = partial || 'create';
|
|
112
106
|
let inheritedVersion = 0;
|
|
113
107
|
if (!this.model)
|
|
114
108
|
throw new Error('model not set in the main class');
|
|
115
|
-
if (!this.model.validate(data,
|
|
116
|
-
throw new Immutable_error_1.default('VALIDATION_FAILED', this.model.compiledTypes.
|
|
109
|
+
if (!this.model.validate(data, validationType)) {
|
|
110
|
+
throw new Immutable_error_1.default('VALIDATION_FAILED', this.model.compiledTypes[validationType].errors);
|
|
111
|
+
}
|
|
117
112
|
if ((_a = this.model.historyMatch) === null || _a === void 0 ? void 0 : _a.length) {
|
|
118
113
|
const query = {};
|
|
119
114
|
this.model.historyMatch.forEach((key) => {
|
|
@@ -139,7 +134,6 @@ class Immutable {
|
|
|
139
134
|
if (this.model.uniqueId && !data.id) {
|
|
140
135
|
data.id = await id_service_1.IdService.getUnique(data.company, data.project, data.app, data.model);
|
|
141
136
|
}
|
|
142
|
-
console.log(data);
|
|
143
137
|
const inserted = await this.model.db.insertOne(data);
|
|
144
138
|
await this.history(inserted.insertedId, user, type, source, additionalHistoryData, bulk);
|
|
145
139
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Immutable.class.js","sourceRoot":"","sources":["../../src/Immutable.class.ts"],"names":[],"mappings":";;;;;AAAA,qCAEiB;AAEjB,sCAAyC;AACzC,uFAA8D;AAC9D,iFAAwD;AAExD,sDAAkD;AAGlD,MAA8B,SAAS;IAIrC;;;MAGE;IACF,KAAK,CAAC,SAAS,CACb,gBAA+C,EAC/C,IAAoB,EACpB,IAAY,EACZ,MAAqB,EACrB,GAAW,EACX,qBAAqD,EACrD,IAAoD,EACpD,OAAgB
|
|
1
|
+
{"version":3,"file":"Immutable.class.js","sourceRoot":"","sources":["../../src/Immutable.class.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ class ControllerBase {
|
|
|
13
13
|
* @type {string}
|
|
14
14
|
* @memberof ControllerBase
|
|
15
15
|
*/
|
|
16
|
-
this.selectDefault = {
|
|
16
|
+
this.selectDefault = {};
|
|
17
17
|
/**
|
|
18
18
|
* defines which keys are used for regex search
|
|
19
19
|
* if more then one entry, it will be an $or
|
|
@@ -215,6 +215,7 @@ class ControllerBase {
|
|
|
215
215
|
}
|
|
216
216
|
delete realQuery.search;
|
|
217
217
|
}
|
|
218
|
+
console.log(realQuery);
|
|
218
219
|
return realQuery;
|
|
219
220
|
}
|
|
220
221
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ControllerBase.class.js","sourceRoot":"","sources":["../../../src/classes/ControllerBase.class.ts"],"names":[],"mappings":";;AAAA,qCAA2C;AAI3C,iDAE0B;AAC1B,qCAAoC;AAIpC,MAA8B,cAAc;IAA5C;QAEE,WAAM,GAAG,OAAO,CAAC;QAEjB,WAAM,GAAW,IAAA,gBAAM,EAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;QAY/C;;;;;aAKK;QACL,kBAAa,GAAQ,
|
|
1
|
+
{"version":3,"file":"ControllerBase.class.js","sourceRoot":"","sources":["../../../src/classes/ControllerBase.class.ts"],"names":[],"mappings":";;AAAA,qCAA2C;AAI3C,iDAE0B;AAC1B,qCAAoC;AAIpC,MAA8B,cAAc;IAA5C;QAEE,WAAM,GAAG,OAAO,CAAC;QAEjB,WAAM,GAAW,IAAA,gBAAM,EAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;QAY/C;;;;;aAKK;QACL,kBAAa,GAAQ,EAAG,CAAC;QAEzB;;;;;;;;;;;;;aAaK;QACL,WAAM,GAAa,EAAE,CAAC;IA+XxB,CAAC;IA7XC,WAAW,CAAC,MAA8B;QAExC,MAAM,WAAW,GAA2B,EAAE,CAAC;QAE/C,IAAI,MAAM,CAAC,MAAM,EAAE;YAEjB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,GAAW,EAAE,EAAE;gBAEjD,WAAW,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC;YAEhD,CAAC,CAAC,CAAC;SAEJ;aAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;YAErC,IAAI,MAAM,CAAC,IAAI,KAAK,KAAK,EAAE;gBAEzB,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;gBACtD,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC;aAErD;iBAAM;gBAEL,WAAW,CAAC,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC;aAEpC;SAEF;QAED,OAAO,WAAW,CAAC;IAErB,CAAC;IAED,WAAW,CAAC,KAAwC,EAAE,GAAa;QAEjE,IAAI,QAAQ,GAAqC,EAAE,CAAC;QAEpD,IAAI,KAAK,CAAC,WAAW,CAAC,IAAI,KAAK,kBAAkB,EAAE;YAEjD,MAAM,UAAU,GAAG,KAAyB,CAAC;YAE7C,KAAyB,CAAC;YAC1B,IAAI,UAAU,CAAC,IAAI,KAAK,KAAK,EAAE;gBAE7B,MAAM,UAAU,GAAG,KAAY,CAAC;gBAEhC,QAAQ,GAAG;oBACT,OAAO,EAAE,yBAAyB;oBAClC,GAAG,EAAE,UAAU,CAAC,UAAU;iBAC3B,CAAC;aAEH;YAED,IAAI,UAAU,CAAC,IAAI,KAAK,KAAK,EAAE;gBAE7B,QAAQ,GAAG;oBACT,OAAO,EAAE,4BAA4B;oBACrC,MAAM,EAAE,KAAK,CAAC,OAAO;iBACtB,CAAC;aAEH;SAEF;aAAM;YAEL,MAAM,UAAU,GAAG,KAAuB,CAAC;YAE3C,QAAQ,GAAG;gBACT,OAAO,EAAE,UAAU,CAAC,OAAO;gBAC3B,MAAM,EAAE,UAAU,CAAC,MAAM,IAAI,IAAI;aAClC,CAAC;SAEH;QAED,aAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACpB,GAAG,CAAC,MAAM,CAAC,2BAAc,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAExD,CAAC;IAED,QAAQ,CAAC,GAAQ,EAAE,IAAS,EAAE,KAAc;QAE1C,KAAK,IAAI,KAAK,KAAK,CAAC;YAClB,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;YAC3B,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IAE7C,CAAC;IAED,MAAM,CAAC,aAAa,CAAI,IAAqB,EAAE,IAAY,EAAE,KAAa,EAAE,YAAoB,EAAE;QAEhG,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,KAAK,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,cAAc,CAAC,YAAY,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE,IAAI,CAAC,GAAa,EAAE,IAAI,CAAC,KAAe,CAAC;YAC9H,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAC;IAEJ,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,IAAY,EAAE,KAAa,EAAE,SAAkB;QAE7D,MAAM,SAAS,GAAW,cAAc,CAAC,YAAY,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAExE,OAAO;YACL,IAAI,EAAE,IAAI,GAAG,SAAS,IAAI,CAAC;YAC3B,KAAK,EAAE,SAAS;SACjB,CAAC;IAEJ,CAAC;IAED,MAAM,CAAC,YAAY,CAAC,KAAa,EAAE,SAAkB;QAEnD,IAAI,SAAiB,CAAC;QAEtB,IAAI,SAAS,EAAE;YAEb,SAAS,GAAG,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC;SAEnD;aAAM;YAEL,SAAS,GAAG,KAAK,CAAC;SAEnB;QAED,OAAO,SAAS,CAAC;IAEnB,CAAC;IAED,OAAO,CAAC,IAAa,EAAE,KAAe;QAEpC,MAAM,UAAU,GAAG,EAAE,CAAC;QAEtB,IAAI,IAAI,IAAI,KAAK,EAAE;YAEjB,UAAU,CAAC,IAAI,CAAC,GAAG,KAAK,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1C,OAAO,UAAU,CAAC;SAEnB;QAED,OAAO,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;IAEpB,CAAC;IAED;;;;;;;;;SASK;IACL,MAAM,CAAC,QAAQ,CAAC,IAAY,EAAE,KAAa,EAAE,KAAa,EAAE,OAAe;QAEzE,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,CAAC;QAE1B,IAAI,KAAK,KAAK,CAAC,EAAE;YAEf,OAAO;gBACL,KAAK,EAAE,CAAC;gBACR,OAAO,EAAE,CAAC;gBACV,IAAI,EAAE,CAAC;gBACP,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;aACd,CAAC;SAEH;QAED,OAAO;YACL,KAAK,EAAE,CAAC;YACR,OAAO,EAAE,IAAI,IAAI,CAAC;YAClB,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1C,KAAK,EAAE;gBACL,CAAC,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC;gBAC3B,QAAQ,GAAG,KAAK,GAAG,OAAO,IAAI,OAAO;aACtC;SACF,CAAC;IAEJ,CAAC;IAED,IAAI;IAEJ,CAAC;IAED;;;;;;;;;SASK;IACL,UAAU,CAAI,KAAwB,EAAE,OAAgB,EAAE,OAA0B,EAAE,OAA8B;QAElH,MAAM,SAAS,qBAA6B,KAAK,CAAE,CAAC;QACpD,MAAM,OAAO,GAAa,EAAE,CAAC;QAE7B,IAAI,IAAc,CAAC;QACnB,IAAI,QAAQ,GAAG,KAAK,CAAC;QACrB,IAAI,UAAU,GAAG,KAAK,CAAC;QACvB,IAAI,QAAQ,GAAG,KAAK,CAAC;QAErB,IAAI,OAAO;YAAE,SAAS,CAAC,OAAO,GAAG,OAAO,CAAC;QACzC,IAAI,OAAO;YAAE,SAAS,CAAC,OAAO,GAAG,OAAO,CAAC;QACzC,IAAI,OAAO,KAAK,KAAK;YAAE,SAAS,CAAC,OAAO,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QAE9D,IAAI,OAAO,EAAE;YAEX,IAAI,OAAO,CAAC,QAAQ;gBAAE,QAAQ,GAAG,IAAI,CAAC;YACtC,IAAI,OAAO,CAAC,UAAU;gBAAE,UAAU,GAAG,IAAI,CAAC;YAC1C,IAAI,OAAO,CAAC,QAAQ;gBAAE,QAAQ,GAAG,IAAI,CAAC;SAEvC;QAED,IAAI,CAAC,QAAQ,EAAE;YAEb,OAAO,SAAS,CAAC,IAAI,CAAC;YACtB,OAAO,SAAS,CAAC,KAAK,CAAC;SAExB;QAED,IAAI,KAAK,CAAC,OAAO,EAAE;YAEjB,SAAS,CAAC,OAAO,GAAG,CAAC,KAAK,CAAC,OAAO,KAAK,MAAM,CAAC,CAAC;SAEhD;QAED,IAAI,KAAK,CAAC,MAAM,EAAE;YAEhB,SAAS,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC;SAE9C;QAED,IAAI,KAAK,CAAC,SAAS,EAAE;YAEnB,SAAS,CAAC,SAAS,GAAG,CAAC,KAAK,CAAC,SAAS,KAAK,MAAM,CAAC,CAAC;SAEpD;QAED;;cAEM;QACN,IAAI,KAAK,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE;YAE3B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;gBAE9B,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aAErB;iBAAM;gBAEL,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;aAEnB;YAED,SAAS,CAAC,IAAI,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;SAEhC;QAED,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,UAAU,EAAE;YAE/B,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;gBAE1B,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAc,EAAE,EAAE;oBAErC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;gBAE3F,CAAC,CAAC,CAAC;gBAEH,SAAS,CAAC,GAAG,GAAG,OAAO,CAAC;aAEzB;iBAAM;gBAEL,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC;aAE1F;YAED,OAAO,SAAS,CAAC,MAAM,CAAC;SAEzB;QAED,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACvB,OAAO,SAA8B,CAAC;IAExC,CAAC;IAED;;;;;;;;;;;;SAYK;IACL,IAAI,CACF,KAAwB,EACxB,MAA8B,EAC9B,IAAY,EACZ,KAAa,EACb,KAAiB,EACjB,IAAa,EACb,KAAc;QAGd,IAAI,UAAmC,CAAC;QACxC,IAAI,GAAW,CAAC;QAEhB,MAAM,aAAa,GAAG,cAAc,CAAC,gBAAgB,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;QAEhF,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC;QAEhC,IAAI,MAAM,EAAE;YAEV,UAAU,mCAAQ,MAAM,GAAK,UAAU,CAAE,CAAC;SAE3C;QAED,OAAO,KAAK,CAAC,EAAE,CAAC,cAAc,CAAC,KAAkB,CAAC;aAC/C,IAAI,CAAC,CAAC,KAAa,EAAE,EAAE;YAEtB,GAAG,GAAG,KAAK,CAAC;YAEZ,OAAO,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC;iBACpD,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC;iBAC1B,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC;iBACxB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC;iBACxB,OAAO,EAAE,CAAC;QAEf,CAAC,CAAC;aACD,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAEzD,CAAC;IAED,MAAM,CAAC,gBAAgB,CACrB,IAAY,EACZ,KAAa,EACb,IAAa,EACb,KAAc;QAGd,IAAI,QAAQ,GAAW,CAAC,CAAC;QACzB,IAAI,QAAQ,GAAS,EAAE,CAAC;QACxB,IAAI,OAAe,CAAC;QAEpB;;cAEM;QACN,IAAI,IAAI;YAAE,QAAQ,GAAG,IAAI,GAAG,CAAC,CAAC;QAE9B,MAAM,SAAS,GAAG,cAAc,CAAC,QAAQ,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QAElE,IAAI,IAAI,IAAI,KAAK,EAAE;YAEjB,IAAI,IAAI,KAAK,SAAS,EAAE;gBAEtB,OAAO,GAAG,iBAAiB,CAAC;aAE7B;iBAAM,IAAI,IAAI,KAAK,SAAS,EAAE;gBAE7B,OAAO,GAAG,iBAAiB,CAAC;aAE7B;;gBAAM,OAAO,GAAG,IAAI,CAAC;YAEtB,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,KAAsB,CAAC;SAE7C;aAAM;YAEL,QAAQ,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;SAEvB;QAED,uBACE,IAAI,EAAE,QAAQ,IAAK,SAAS,EAC5B;IAEJ,CAAC;CAIF;AAraD,iCAqaC"}
|
|
@@ -7,6 +7,7 @@ export default class Modelv2<T> {
|
|
|
7
7
|
ajv: Ajv;
|
|
8
8
|
compiled: ValidateFunction<T>;
|
|
9
9
|
compiledTypes: Record<IModelv2['SchemaType'], ValidateFunction<T>>;
|
|
10
|
+
compiledOptions: Record<IModelv2['SchemaType'], Record<string, unknown>>;
|
|
10
11
|
mongo: mongo.Db;
|
|
11
12
|
collection: string;
|
|
12
13
|
indexes: IndexDescription[];
|
|
@@ -44,10 +45,7 @@ export default class Modelv2<T> {
|
|
|
44
45
|
* @param noIndexes disables the creation of indexes
|
|
45
46
|
*/
|
|
46
47
|
setMongoConnection(mongoClient: MongoClient, mongoClass?: MongoClass, noIndexes?: boolean): Promise<unknown>;
|
|
47
|
-
|
|
48
|
-
* allowAtomic removes the required array to make atomic updates possible with validation single properties
|
|
49
|
-
*/
|
|
50
|
-
setSchema(schema: Schema, type?: IModelv2['SchemaType']): void;
|
|
48
|
+
setSchema(schema: Schema, type?: IModelv2['SchemaType'], options?: Record<string, unknown>): void;
|
|
51
49
|
addIndex(index: IndexDescription & CreateIndexesOptions, version: number): void;
|
|
52
50
|
handleIndexes(indexes: (IndexDescription & CreateIndexesOptions)[]): Promise<true | string[]>;
|
|
53
51
|
validate(data: T | Partial<T>, type?: IModelv2['SchemaType']): boolean;
|
|
@@ -8,6 +8,7 @@ const models_class_1 = __importDefault(require("./models.class"));
|
|
|
8
8
|
class Modelv2 {
|
|
9
9
|
constructor(name, collection, modelsInjected, dynamic) {
|
|
10
10
|
this.compiledTypes = {};
|
|
11
|
+
this.compiledOptions = {};
|
|
11
12
|
this.indexes = [];
|
|
12
13
|
this.collection = collection;
|
|
13
14
|
this.name = name;
|
|
@@ -36,13 +37,12 @@ class Modelv2 {
|
|
|
36
37
|
}
|
|
37
38
|
return !noIndexes ? this.handleIndexes(this.indexes) : new Promise((resolve) => resolve(true));
|
|
38
39
|
}
|
|
39
|
-
|
|
40
|
-
* allowAtomic removes the required array to make atomic updates possible with validation single properties
|
|
41
|
-
*/
|
|
42
|
-
setSchema(schema, type) {
|
|
40
|
+
setSchema(schema, type, options) {
|
|
43
41
|
this.compiled = this.ajv.compile(schema);
|
|
44
42
|
if (type) {
|
|
45
43
|
this.compiledTypes[type] = this.compiled;
|
|
44
|
+
if (options)
|
|
45
|
+
this.compiledOptions[type] = options;
|
|
46
46
|
}
|
|
47
47
|
if (type === 'collection') {
|
|
48
48
|
const validationSchema = JSON.parse(JSON.stringify(schema));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modelv2.class.js","sourceRoot":"","sources":["../../../src/classes/modelv2.class.ts"],"names":[],"mappings":";;;;;AAOA,uDAA+B;AAC/B,kEAAgD;AAGhD,MAAqB,OAAO;
|
|
1
|
+
{"version":3,"file":"modelv2.class.js","sourceRoot":"","sources":["../../../src/classes/modelv2.class.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ChildData.interface.js","sourceRoot":"","sources":["../../../src/interfaces/ChildData.interface.ts"],"names":[],"mappings":""}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import ChildData from './ChildData.interface';
|
|
1
2
|
export default interface ModuleGeneric {
|
|
2
3
|
[key: string]: any;
|
|
3
4
|
id?: string;
|
|
@@ -7,4 +8,5 @@ export default interface ModuleGeneric {
|
|
|
7
8
|
position?: string;
|
|
8
9
|
layout?: 'first' | 'last' | '';
|
|
9
10
|
source?: string;
|
|
11
|
+
childData?: ChildData;
|
|
10
12
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { BasicDataInterface, ModuleGeneric } from '../../interfaces';
|
|
1
|
+
import { BasicDataInterface, ChildData, ModuleGeneric } from '../../interfaces';
|
|
2
2
|
import Modelv2 from '../classes/modelv2.class';
|
|
3
3
|
declare const model: Modelv2<Editor>;
|
|
4
4
|
export interface Editor extends BasicDataInterface {
|
|
@@ -23,5 +23,6 @@ export interface Editor extends BasicDataInterface {
|
|
|
23
23
|
filename?: string[];
|
|
24
24
|
mode?: string;
|
|
25
25
|
};
|
|
26
|
+
childData?: ChildData;
|
|
26
27
|
}
|
|
27
28
|
export default model;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editor.model.js","sourceRoot":"","sources":["../../../src/models/editor.model.ts"],"names":[],"mappings":";;;;;AACA,6EAA+C;AAE/C,MAAM,KAAK,GAAG,IAAI,uBAAO,CAAS,QAAQ,EAAE,QAAQ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"editor.model.js","sourceRoot":"","sources":["../../../src/models/editor.model.ts"],"names":[],"mappings":"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"}
|
|
@@ -55,17 +55,17 @@ model.addIndex({
|
|
|
55
55
|
// );
|
|
56
56
|
const CompanyScope = {
|
|
57
57
|
project: [
|
|
58
|
-
'edit',
|
|
59
|
-
'remove',
|
|
60
58
|
'read',
|
|
61
59
|
'create',
|
|
60
|
+
'edit',
|
|
61
|
+
'remove',
|
|
62
62
|
'history',
|
|
63
63
|
],
|
|
64
64
|
app: [
|
|
65
|
-
'edit',
|
|
66
|
-
'remove',
|
|
67
65
|
'read',
|
|
68
66
|
'create',
|
|
67
|
+
'edit',
|
|
68
|
+
'remove',
|
|
69
69
|
'toggle',
|
|
70
70
|
'history',
|
|
71
71
|
],
|
|
@@ -75,15 +75,15 @@ const CompanyScope = {
|
|
|
75
75
|
'history',
|
|
76
76
|
],
|
|
77
77
|
permissions: [
|
|
78
|
-
'edit',
|
|
79
|
-
'remove',
|
|
80
78
|
'read',
|
|
81
79
|
'create',
|
|
80
|
+
'edit',
|
|
81
|
+
'remove',
|
|
82
82
|
'history',
|
|
83
83
|
],
|
|
84
84
|
company: [
|
|
85
|
-
'create',
|
|
86
85
|
'list',
|
|
86
|
+
'create',
|
|
87
87
|
'history',
|
|
88
88
|
],
|
|
89
89
|
partner: [
|
|
@@ -99,17 +99,17 @@ const CompanyScope = {
|
|
|
99
99
|
exports.CompanyScope = CompanyScope;
|
|
100
100
|
const ProjectScope = {
|
|
101
101
|
editor: [
|
|
102
|
-
'edit',
|
|
103
|
-
'remove',
|
|
104
102
|
'read',
|
|
105
103
|
'create',
|
|
104
|
+
'edit',
|
|
105
|
+
'remove',
|
|
106
106
|
'history',
|
|
107
107
|
],
|
|
108
108
|
media: [
|
|
109
|
-
'edit',
|
|
110
|
-
'remove',
|
|
111
109
|
'read',
|
|
112
110
|
'create',
|
|
111
|
+
'edit',
|
|
112
|
+
'remove',
|
|
113
113
|
'history',
|
|
114
114
|
],
|
|
115
115
|
settings: [
|
|
@@ -118,10 +118,10 @@ const ProjectScope = {
|
|
|
118
118
|
'history',
|
|
119
119
|
],
|
|
120
120
|
permissions: [
|
|
121
|
-
'edit',
|
|
122
|
-
'remove',
|
|
123
121
|
'read',
|
|
124
122
|
'create',
|
|
123
|
+
'edit',
|
|
124
|
+
'remove',
|
|
125
125
|
'history',
|
|
126
126
|
],
|
|
127
127
|
publish: [
|
|
@@ -131,6 +131,13 @@ const ProjectScope = {
|
|
|
131
131
|
'secret',
|
|
132
132
|
'refreshSecret',
|
|
133
133
|
],
|
|
134
|
+
publishMethods: [
|
|
135
|
+
'read',
|
|
136
|
+
'create',
|
|
137
|
+
'edit',
|
|
138
|
+
'remove',
|
|
139
|
+
'history',
|
|
140
|
+
],
|
|
134
141
|
hosting: [
|
|
135
142
|
'domains',
|
|
136
143
|
'toggle',
|
|
@@ -150,13 +157,13 @@ const ProjectScope = {
|
|
|
150
157
|
};
|
|
151
158
|
exports.ProjectScope = ProjectScope;
|
|
152
159
|
const UniversalScope = [
|
|
160
|
+
'read',
|
|
161
|
+
'list',
|
|
153
162
|
'create',
|
|
154
163
|
'edit',
|
|
155
|
-
'history',
|
|
156
|
-
'list',
|
|
157
|
-
'read',
|
|
158
164
|
'remove',
|
|
159
165
|
'settings',
|
|
166
|
+
'history',
|
|
160
167
|
];
|
|
161
168
|
exports.UniversalScope = UniversalScope;
|
|
162
169
|
exports.default = model;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permissions.model.js","sourceRoot":"","sources":["../../../src/models/permissions.model.ts"],"names":[],"mappings":";;;;;;AAGA,6EAA+C;AAY/C,MAAM,KAAK,GAAG,IAAI,uBAAO,CAAc,aAAa,EAAE,aAAa,CAAC,CAAC;AAErE,KAAK,CAAC,SAAS,CACb;IACE,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QACxB,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QACvB,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC3B,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC3B,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE;KACpD;IACD,QAAQ,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC;IAC9B,oBAAoB,EAAE,KAAK;CAC5B,EACD,QAAQ,CACT,CAAC;AAEF,KAAK,CAAC,SAAS,CACb;IACE,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QACxB,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QACvB,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC3B,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC3B,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE;KACpD;IACD,QAAQ,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC;IAC9B,oBAAoB,EAAE,KAAK;CAC5B,EACD,QAAQ,CACT,CAAC;AAEF,KAAK,CAAC,QAAQ,CACZ;IACE,GAAG,EAAE;QACH,IAAI,EAAE,CAAC;QACP,OAAO,EAAE,CAAC;QACV,OAAO,EAAE,CAAC;KACX;IACD,gBAAgB;IAChB,gBAAgB;IAChB,IAAI,EAAE,aAAa;CACpB,EACD,CAAC,CACF,CAAC;AAEF,kBAAkB;AAClB,MAAM;AACN,aAAa;AACb,gBAAgB;AAChB,oBAAoB;AACpB,oBAAoB;AACpB,SAAS;AACT,oBAAoB;AACpB,oBAAoB;AACpB,0BAA0B;AAC1B,OAAO;AACP,OAAO;AACP,KAAK;AAEL,MAAM,YAAY,GAAgB;IAChC,OAAO,EAAE;QACP,MAAM;QACN,QAAQ;QACR,MAAM;QACN,QAAQ;QACR,SAAS;KACV;IACD,GAAG,EAAE;QACH,MAAM;QACN,QAAQ;QACR,MAAM;QACN,QAAQ;QACR,QAAQ;QACR,SAAS;KACV;IACD,QAAQ,EAAE;QACR,MAAM;QACN,MAAM;QACN,SAAS;KACV;IACD,WAAW,EAAE;QACX,MAAM;QACN,QAAQ;QACR,MAAM;QACN,QAAQ;QACR,SAAS;KACV;IACD,OAAO,EAAE;QACP,QAAQ;QACR,
|
|
1
|
+
{"version":3,"file":"permissions.model.js","sourceRoot":"","sources":["../../../src/models/permissions.model.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import Modelv2 from '../classes/modelv2.class';
|
|
2
|
+
import { BasicDataInterface } from '../../interfaces';
|
|
3
|
+
export interface PublishMethod extends BasicDataInterface {
|
|
4
|
+
type: 'ftp' | 'webhook';
|
|
5
|
+
active: boolean;
|
|
6
|
+
label: string;
|
|
7
|
+
availableForApps: string[];
|
|
8
|
+
[key: string]: any;
|
|
9
|
+
}
|
|
10
|
+
export interface PublishMethodFtp extends PublishMethod {
|
|
11
|
+
type: 'ftp';
|
|
12
|
+
username: string;
|
|
13
|
+
password: string;
|
|
14
|
+
host: string;
|
|
15
|
+
port: number;
|
|
16
|
+
mode: 'active' | 'passive';
|
|
17
|
+
}
|
|
18
|
+
export interface PublishMethodWebhook extends PublishMethod {
|
|
19
|
+
type: 'webhook';
|
|
20
|
+
url: string;
|
|
21
|
+
label: string;
|
|
22
|
+
availableForApps: string[];
|
|
23
|
+
}
|
|
24
|
+
declare const model: Modelv2<PublishMethod>;
|
|
25
|
+
export default model;
|
|
@@ -0,0 +1,109 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const modelv2_class_1 = __importDefault(require("../classes/modelv2.class"));
|
|
7
|
+
const model = new modelv2_class_1.default('publishMethod', 'publishMethods');
|
|
8
|
+
model.addIndex({
|
|
9
|
+
key: {
|
|
10
|
+
project: 1,
|
|
11
|
+
company: 1,
|
|
12
|
+
type: 1,
|
|
13
|
+
},
|
|
14
|
+
name: 'project_company_type',
|
|
15
|
+
}, 1);
|
|
16
|
+
model.setSchema({
|
|
17
|
+
type: 'object',
|
|
18
|
+
properties: {
|
|
19
|
+
company: { type: 'string' },
|
|
20
|
+
project: { type: 'string' },
|
|
21
|
+
label: { type: 'string', maxLength: 50 },
|
|
22
|
+
host: { type: 'string', minLength: 5, maxLength: 100 },
|
|
23
|
+
username: { type: 'string', maxLength: 5 },
|
|
24
|
+
password: { type: 'string', maxLength: 50 },
|
|
25
|
+
port: { type: 'number' },
|
|
26
|
+
mode: { type: 'string', maxLength: 10 },
|
|
27
|
+
type: { enum: ['ftp'] },
|
|
28
|
+
active: { type: 'boolean' },
|
|
29
|
+
availableForApps: {
|
|
30
|
+
type: 'array',
|
|
31
|
+
contains: {
|
|
32
|
+
type: 'string',
|
|
33
|
+
maxLength: 20,
|
|
34
|
+
},
|
|
35
|
+
maxItems: 10,
|
|
36
|
+
},
|
|
37
|
+
},
|
|
38
|
+
required: ['type', 'active', 'host'],
|
|
39
|
+
additionalProperties: false,
|
|
40
|
+
}, 'createFtp');
|
|
41
|
+
model.setSchema({
|
|
42
|
+
type: 'object',
|
|
43
|
+
properties: {
|
|
44
|
+
company: { type: 'string' },
|
|
45
|
+
project: { type: 'string' },
|
|
46
|
+
label: { type: 'string', maxLength: 50 },
|
|
47
|
+
host: { type: 'string', minLength: 5, maxLength: 100 },
|
|
48
|
+
username: { type: 'string', maxLength: 50 },
|
|
49
|
+
password: { type: 'string', maxLength: 50 },
|
|
50
|
+
port: { type: 'number' },
|
|
51
|
+
mode: { type: 'string', maxLength: 10 },
|
|
52
|
+
type: { enum: ['ftp'] },
|
|
53
|
+
active: { type: 'boolean' },
|
|
54
|
+
availableForApps: {
|
|
55
|
+
type: 'array',
|
|
56
|
+
contains: {
|
|
57
|
+
type: 'string',
|
|
58
|
+
maxLength: 20,
|
|
59
|
+
},
|
|
60
|
+
maxItems: 10,
|
|
61
|
+
},
|
|
62
|
+
},
|
|
63
|
+
required: ['type', 'active', 'host'],
|
|
64
|
+
additionalProperties: false,
|
|
65
|
+
}, 'changeFtp');
|
|
66
|
+
model.setSchema({
|
|
67
|
+
type: 'object',
|
|
68
|
+
properties: {
|
|
69
|
+
company: { type: 'string' },
|
|
70
|
+
project: { type: 'string' },
|
|
71
|
+
label: { type: 'string', maxLength: 50 },
|
|
72
|
+
url: { type: 'string', minLength: 5, maxLength: 200 },
|
|
73
|
+
active: { type: 'boolean' },
|
|
74
|
+
type: { enum: ['webhook'] },
|
|
75
|
+
availableForApps: {
|
|
76
|
+
type: 'array',
|
|
77
|
+
contains: {
|
|
78
|
+
type: 'string',
|
|
79
|
+
maxLength: 20,
|
|
80
|
+
},
|
|
81
|
+
maxItems: 10,
|
|
82
|
+
},
|
|
83
|
+
},
|
|
84
|
+
required: ['type', 'active', 'url'],
|
|
85
|
+
additionalProperties: false,
|
|
86
|
+
}, 'createWebhook');
|
|
87
|
+
model.setSchema({
|
|
88
|
+
type: 'object',
|
|
89
|
+
properties: {
|
|
90
|
+
company: { type: 'string' },
|
|
91
|
+
project: { type: 'string' },
|
|
92
|
+
label: { type: 'string', maxLength: 50 },
|
|
93
|
+
url: { type: 'string', minLength: 5, maxLength: 200 },
|
|
94
|
+
active: { type: 'boolean' },
|
|
95
|
+
type: { enum: ['webhook'] },
|
|
96
|
+
availableForApps: {
|
|
97
|
+
type: 'array',
|
|
98
|
+
contains: {
|
|
99
|
+
type: 'string',
|
|
100
|
+
maxLength: 20,
|
|
101
|
+
},
|
|
102
|
+
maxItems: 10,
|
|
103
|
+
},
|
|
104
|
+
},
|
|
105
|
+
required: ['type', 'active', 'url'],
|
|
106
|
+
additionalProperties: false,
|
|
107
|
+
}, 'changeWebhook');
|
|
108
|
+
exports.default = model;
|
|
109
|
+
//# sourceMappingURL=publish-method.model.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"publish-method.model.js","sourceRoot":"","sources":["../../../src/models/publish-method.model.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { ObjectId } from 'mongodb';
|
|
2
|
+
import Modelv2 from '../classes/modelv2.class';
|
|
3
|
+
import { BasicDataInterface } from '../../interfaces';
|
|
4
|
+
import PublishResult from '../interfaces/PublishResult.interface';
|
|
5
|
+
import PublishResultStatistics from '../interfaces/PublishResultStatistics.interface';
|
|
6
|
+
export interface Publish extends BasicDataInterface {
|
|
7
|
+
referenceId?: ObjectId;
|
|
8
|
+
method: 'ftp' | 'webhook' | 'internal';
|
|
9
|
+
pre?: 'all' | 'sync';
|
|
10
|
+
state: 'new' | 'planned' | 'inQueue' | 'inProgress' | 'failed' | 'success' | 'partialSuccess' | 'noAction' | 'canceled';
|
|
11
|
+
type: 'editor' | 'universal';
|
|
12
|
+
planned?: Date;
|
|
13
|
+
result?: PublishResult[];
|
|
14
|
+
statistics?: PublishResultStatistics;
|
|
15
|
+
appPublish?: string;
|
|
16
|
+
modelPublish?: string;
|
|
17
|
+
publishData?: {
|
|
18
|
+
id: number | string;
|
|
19
|
+
name?: string;
|
|
20
|
+
};
|
|
21
|
+
}
|
|
22
|
+
declare const model: Modelv2<Publish>;
|
|
23
|
+
export default model;
|
|
@@ -0,0 +1,180 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const modelv2_class_1 = __importDefault(require("../classes/modelv2.class"));
|
|
7
|
+
const model = new modelv2_class_1.default('publish', 'publish');
|
|
8
|
+
model.addIndex({
|
|
9
|
+
key: {
|
|
10
|
+
project: 1,
|
|
11
|
+
company: 1,
|
|
12
|
+
app: 1,
|
|
13
|
+
model: 1,
|
|
14
|
+
},
|
|
15
|
+
name: 'project_company_app_model',
|
|
16
|
+
}, 1);
|
|
17
|
+
model.setSchema({
|
|
18
|
+
type: 'object',
|
|
19
|
+
properties: {
|
|
20
|
+
referenceId: { type: 'object' },
|
|
21
|
+
company: { type: 'string' },
|
|
22
|
+
project: { type: 'string' },
|
|
23
|
+
pre: {
|
|
24
|
+
type: 'string',
|
|
25
|
+
enum: ['all', 'sync'],
|
|
26
|
+
},
|
|
27
|
+
method: { type: 'string' },
|
|
28
|
+
state: {
|
|
29
|
+
type: 'string',
|
|
30
|
+
enum: [
|
|
31
|
+
'new',
|
|
32
|
+
'planned',
|
|
33
|
+
'inQueue',
|
|
34
|
+
'inProgress',
|
|
35
|
+
'failed',
|
|
36
|
+
'success',
|
|
37
|
+
'partialSuccess',
|
|
38
|
+
'noAction',
|
|
39
|
+
'canceled',
|
|
40
|
+
],
|
|
41
|
+
},
|
|
42
|
+
type: {
|
|
43
|
+
type: 'string',
|
|
44
|
+
enum: ['editor', 'universal'],
|
|
45
|
+
},
|
|
46
|
+
planned: {
|
|
47
|
+
type: 'object',
|
|
48
|
+
},
|
|
49
|
+
appPublish: { type: 'string' },
|
|
50
|
+
modelPublish: { type: 'string' },
|
|
51
|
+
},
|
|
52
|
+
required: ['referenceId', 'company', 'project', 'method', 'type', 'state'],
|
|
53
|
+
additionalProperties: false,
|
|
54
|
+
}, 'create');
|
|
55
|
+
model.setSchema({
|
|
56
|
+
type: 'object',
|
|
57
|
+
properties: {
|
|
58
|
+
referenceId: { type: 'object' },
|
|
59
|
+
company: { type: 'string' },
|
|
60
|
+
project: { type: 'string' },
|
|
61
|
+
pre: {
|
|
62
|
+
type: 'string',
|
|
63
|
+
enum: ['all', 'sync'],
|
|
64
|
+
},
|
|
65
|
+
method: { type: 'string' },
|
|
66
|
+
state: {
|
|
67
|
+
type: 'string',
|
|
68
|
+
enum: [
|
|
69
|
+
'new',
|
|
70
|
+
'planned',
|
|
71
|
+
'inQueue',
|
|
72
|
+
'inProgress',
|
|
73
|
+
'failed',
|
|
74
|
+
'success',
|
|
75
|
+
'partialSuccess',
|
|
76
|
+
'noAction',
|
|
77
|
+
'canceled',
|
|
78
|
+
],
|
|
79
|
+
},
|
|
80
|
+
type: {
|
|
81
|
+
type: 'string',
|
|
82
|
+
enum: ['editor', 'universal'],
|
|
83
|
+
},
|
|
84
|
+
planned: {
|
|
85
|
+
type: 'object',
|
|
86
|
+
},
|
|
87
|
+
appPublish: { type: 'string' },
|
|
88
|
+
modelPublish: { type: 'string' },
|
|
89
|
+
result: {
|
|
90
|
+
type: 'array',
|
|
91
|
+
contains: {
|
|
92
|
+
type: 'object',
|
|
93
|
+
properties: {
|
|
94
|
+
referenceId: {
|
|
95
|
+
type: 'object',
|
|
96
|
+
},
|
|
97
|
+
state: {
|
|
98
|
+
type: 'string',
|
|
99
|
+
enum: ['error', 'success'],
|
|
100
|
+
},
|
|
101
|
+
error: {
|
|
102
|
+
type: 'string',
|
|
103
|
+
},
|
|
104
|
+
message: {
|
|
105
|
+
type: 'string',
|
|
106
|
+
},
|
|
107
|
+
},
|
|
108
|
+
additionalProperties: false,
|
|
109
|
+
},
|
|
110
|
+
},
|
|
111
|
+
},
|
|
112
|
+
required: ['referenceId', 'company', 'project', 'method', 'type', 'state'],
|
|
113
|
+
additionalProperties: false,
|
|
114
|
+
}, 'change');
|
|
115
|
+
model.setSchema({
|
|
116
|
+
type: 'object',
|
|
117
|
+
properties: {
|
|
118
|
+
state: {
|
|
119
|
+
type: 'string',
|
|
120
|
+
enum: [
|
|
121
|
+
'new',
|
|
122
|
+
'planned',
|
|
123
|
+
'inQueue',
|
|
124
|
+
'inProgress',
|
|
125
|
+
'failed',
|
|
126
|
+
'success',
|
|
127
|
+
'partialSuccess',
|
|
128
|
+
'noAction',
|
|
129
|
+
'canceled',
|
|
130
|
+
],
|
|
131
|
+
},
|
|
132
|
+
},
|
|
133
|
+
required: ['state'],
|
|
134
|
+
additionalProperties: false,
|
|
135
|
+
}, 'stateChange');
|
|
136
|
+
model.setSchema({
|
|
137
|
+
type: 'object',
|
|
138
|
+
properties: {
|
|
139
|
+
state: {
|
|
140
|
+
type: 'string',
|
|
141
|
+
enum: [
|
|
142
|
+
'new',
|
|
143
|
+
'planned',
|
|
144
|
+
'inQueue',
|
|
145
|
+
'inProgress',
|
|
146
|
+
'failed',
|
|
147
|
+
'success',
|
|
148
|
+
'partialSuccess',
|
|
149
|
+
'noAction',
|
|
150
|
+
'canceled',
|
|
151
|
+
],
|
|
152
|
+
},
|
|
153
|
+
result: {
|
|
154
|
+
type: 'array',
|
|
155
|
+
contains: {
|
|
156
|
+
type: 'object',
|
|
157
|
+
properties: {
|
|
158
|
+
referenceId: {
|
|
159
|
+
type: 'object',
|
|
160
|
+
},
|
|
161
|
+
state: {
|
|
162
|
+
type: 'string',
|
|
163
|
+
enum: ['error', 'success'],
|
|
164
|
+
},
|
|
165
|
+
error: {
|
|
166
|
+
type: 'string',
|
|
167
|
+
},
|
|
168
|
+
message: {
|
|
169
|
+
type: 'string',
|
|
170
|
+
},
|
|
171
|
+
},
|
|
172
|
+
additionalProperties: false,
|
|
173
|
+
},
|
|
174
|
+
},
|
|
175
|
+
},
|
|
176
|
+
required: ['state'],
|
|
177
|
+
additionalProperties: false,
|
|
178
|
+
}, 'stateChangeResult');
|
|
179
|
+
exports.default = model;
|
|
180
|
+
//# sourceMappingURL=publish.model%20copy.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"publish.model copy.js","sourceRoot":"","sources":["../../../src/models/publish.model copy.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,11 +17,27 @@ const addNamespace = (modules, namespace = 'lila') => {
|
|
|
17
17
|
addNamespace(single.modules, namespace);
|
|
18
18
|
});
|
|
19
19
|
};
|
|
20
|
+
const distributeChildData = (modules, childData) => {
|
|
21
|
+
modules.forEach((singleModule) => {
|
|
22
|
+
var _a, _b;
|
|
23
|
+
if (!((_a = singleModule.childData) === null || _a === void 0 ? void 0 : _a.index))
|
|
24
|
+
return;
|
|
25
|
+
const newData = {};
|
|
26
|
+
(_b = singleModule.childData.index) === null || _b === void 0 ? void 0 : _b.forEach((single) => {
|
|
27
|
+
newData[single] = childData === null || childData === void 0 ? void 0 : childData.data[single];
|
|
28
|
+
});
|
|
29
|
+
singleModule.childData.data = newData;
|
|
30
|
+
});
|
|
31
|
+
};
|
|
20
32
|
exports.default = (content, layout, namespace = 'lila') => {
|
|
21
33
|
const namespacedContent = (0, hardCopy_1.default)(content);
|
|
22
34
|
if (namespacedContent === null || namespacedContent === void 0 ? void 0 : namespacedContent.modules)
|
|
23
35
|
addNamespace(namespacedContent === null || namespacedContent === void 0 ? void 0 : namespacedContent.modules, namespace);
|
|
36
|
+
if (namespacedContent.modules && content.childData) {
|
|
37
|
+
distributeChildData(namespacedContent.modules, content.childData);
|
|
38
|
+
}
|
|
24
39
|
const combinedContent = {
|
|
40
|
+
id: content.id,
|
|
25
41
|
settings: (namespacedContent === null || namespacedContent === void 0 ? void 0 : namespacedContent.settings) || {},
|
|
26
42
|
top: (namespacedContent === null || namespacedContent === void 0 ? void 0 : namespacedContent.modules) ? (0, filterMergeModules_1.default)(namespacedContent === null || namespacedContent === void 0 ? void 0 : namespacedContent.modules, 'top', layout === null || layout === void 0 ? void 0 : layout.modules) : [],
|
|
27
43
|
content: (namespacedContent === null || namespacedContent === void 0 ? void 0 : namespacedContent.modules) ? (0, filterMergeModules_1.default)(namespacedContent === null || namespacedContent === void 0 ? void 0 : namespacedContent.modules, 'content', layout === null || layout === void 0 ? void 0 : layout.modules) : [],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareContent.js","sourceRoot":"","sources":["../../src/prepareContent.ts"],"names":[],"mappings":";;;;;AAAA,8EAAsD;AACtD,kEAA0C;
|
|
1
|
+
{"version":3,"file":"prepareContent.js","sourceRoot":"","sources":["../../src/prepareContent.ts"],"names":[],"mappings":"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"}
|
|
@@ -171,7 +171,7 @@ class PublishService extends main_1.Immutable {
|
|
|
171
171
|
};
|
|
172
172
|
(0, cleanObject_1.default)(select);
|
|
173
173
|
const all = await this.model.db.countDocuments(select);
|
|
174
|
-
const
|
|
174
|
+
const query = [
|
|
175
175
|
{
|
|
176
176
|
$match: select,
|
|
177
177
|
},
|
|
@@ -179,10 +179,10 @@ class PublishService extends main_1.Immutable {
|
|
|
179
179
|
$sort: sort || { 'history.created': 1 },
|
|
180
180
|
},
|
|
181
181
|
{
|
|
182
|
-
$
|
|
182
|
+
$skip: skip,
|
|
183
183
|
},
|
|
184
184
|
{
|
|
185
|
-
$
|
|
185
|
+
$limit: limit,
|
|
186
186
|
},
|
|
187
187
|
...publishData_aggregation_1.default,
|
|
188
188
|
{
|
|
@@ -192,7 +192,8 @@ class PublishService extends main_1.Immutable {
|
|
|
192
192
|
universalData: 0,
|
|
193
193
|
},
|
|
194
194
|
},
|
|
195
|
-
]
|
|
195
|
+
];
|
|
196
|
+
const aggregation = await this.model.db.aggregate(query).toArray();
|
|
196
197
|
return { data: aggregation, all, count: aggregation.length };
|
|
197
198
|
}
|
|
198
199
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publish.service.js","sourceRoot":"","sources":["../../../src/services/publish.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"publish.service.js","sourceRoot":"","sources":["../../../src/services/publish.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { ObjectId } from 'mongodb';
|
|
2
|
+
import Immutable from '../Immutable.class';
|
|
3
|
+
import { PublishMethod } from '../models/publish-method.model';
|
|
4
|
+
export declare class PublishMethodService extends Immutable<PublishMethod> {
|
|
5
|
+
model: import("../classes/modelv2.class").default<PublishMethod>;
|
|
6
|
+
getValidationType(action: 'create' | 'change', type: 'ftp' | 'webhook'): string;
|
|
7
|
+
single(internalId: ObjectId, company: string, project: string): Promise<import("mongodb").WithId<PublishMethod> | null>;
|
|
8
|
+
}
|
|
9
|
+
declare const _default: PublishMethodService;
|
|
10
|
+
export default _default;
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.PublishMethodService = void 0;
|
|
7
|
+
const Immutable_class_1 = __importDefault(require("../Immutable.class"));
|
|
8
|
+
const publish_method_model_1 = __importDefault(require("../models/publish-method.model"));
|
|
9
|
+
class PublishMethodService extends Immutable_class_1.default {
|
|
10
|
+
constructor() {
|
|
11
|
+
super(...arguments);
|
|
12
|
+
this.model = publish_method_model_1.default;
|
|
13
|
+
}
|
|
14
|
+
getValidationType(action, type) {
|
|
15
|
+
if (!['create', 'change'].includes(action))
|
|
16
|
+
throw new Error('UNSUPPORTED_ACTION');
|
|
17
|
+
if (!['ftp', 'webhook'].includes(type))
|
|
18
|
+
throw new Error('UNSUPPORTED_ACTION');
|
|
19
|
+
return `${action}${type[0].toUpperCase() + type.slice(1)}`;
|
|
20
|
+
}
|
|
21
|
+
single(internalId, company, project) {
|
|
22
|
+
return this.model.db.findOne({ _id: internalId, company, project });
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
exports.PublishMethodService = PublishMethodService;
|
|
26
|
+
exports.default = new PublishMethodService();
|
|
27
|
+
//# sourceMappingURL=publishMethod.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"publishMethod.service.js","sourceRoot":"","sources":["../../../src/services/publishMethod.service.ts"],"names":[],"mappings":";;;;;;AACA,yEAA2C;AAC3C,0FAAmF;AAEnF,MAAa,oBAAqB,SAAQ,yBAAwB;IAAlE;;QAEE,UAAK,GAAG,8BAAkB,CAAC;IAiB7B,CAAC;IAfC,iBAAiB,CAAC,MAA2B,EAAE,IAAuB;QAEpE,IAAI,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;QAClF,IAAI,CAAC,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;QAE9E,OAAO,GAAG,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;IAE7D,CAAC;IAED,MAAM,CAAC,UAAoB,EAAE,OAAe,EAAE,OAAe;QAE3D,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;IAEtE,CAAC;CAEF;AAnBD,oDAmBC;AAED,kBAAe,IAAI,oBAAoB,EAAE,CAAC"}
|
|
@@ -39,9 +39,11 @@ class UniversalService extends main_1.Immutable {
|
|
|
39
39
|
if (site)
|
|
40
40
|
realSite = site - 1;
|
|
41
41
|
const skipLimit = main_1.ControllerBase.getLimit(realSite, limit, this.limit);
|
|
42
|
-
realSelect = { history: 0 };
|
|
43
42
|
if (select) {
|
|
44
|
-
realSelect = Object.assign(
|
|
43
|
+
realSelect = Object.assign({}, select);
|
|
44
|
+
}
|
|
45
|
+
else {
|
|
46
|
+
realSelect = { history: 0 };
|
|
45
47
|
}
|
|
46
48
|
if (sort && order) {
|
|
47
49
|
realSort[`${sort === 'updated' ? 'history.updated' : sort}`] = +order;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"universal.service.js","sourceRoot":"","sources":["../../../src/services/universal.service.ts"],"names":[],"mappings":";;AAIA,qCAAgE;AAUhE,MAAqB,gBAAiB,SAAQ,gBAA6B;IAMzE,YAAY,KAAkC;QAE5C,KAAK,EAAE,CAAC;QANV,UAAK,GAAG,EAAE,CAAC;QAEX,WAAM,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAMtB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IAErB,CAAC;IAED,MAAM,CACJ,EAAmB,EACnB,OAAe,EACf,OAAe,EACf,GAAW,EACX,KAAa;QAGb,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC;YAC3B,EAAE;YACF,OAAO;YACP,OAAO;YACP,GAAG;YACH,KAAK;SACN,CAAC,CAAC;IAEL,CAAC;IAED,UAAU,CACR,EAAmB,EACnB,OAAe,EACf,OAAe,EACf,GAAW,EACX,KAAa;QAGb,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE;aACjB,cAAc,CAAC;YACd,EAAE;YACF,OAAO;YACP,OAAO;YACP,GAAG;YACH,KAAK;SACN,CAAC;aACD,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;IAEhC,CAAC;IAED,IAAI,CACF,KAAyC,EACzC,MAA8B,EAC9B,IAAY,EACZ,KAAa,EACb,KAAkC,EAClC,IAAa,EACb,KAAc;QAGd,IAAI,QAAQ,GAAW,CAAC,CAAC;QACzB,IAAI,UAAoD,CAAC;QACzD,IAAI,QAAQ,GAAS,EAAE,CAAC;QACxB,IAAI,GAAW,CAAC;QAEhB;;WAEG;QACH,IAAI,IAAI;YAAE,QAAQ,GAAG,IAAI,GAAG,CAAC,CAAC;QAE9B,MAAM,SAAS,GAAG,qBAAc,CAAC,QAAQ,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAEvE,
|
|
1
|
+
{"version":3,"file":"universal.service.js","sourceRoot":"","sources":["../../../src/services/universal.service.ts"],"names":[],"mappings":"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"}
|