@solidstarters/solid-core 1.2.36 → 1.2.38
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/controllers/view-metadata.controller.d.ts +1 -0
- package/dist/controllers/view-metadata.controller.d.ts.map +1 -1
- package/dist/seeders/module-metadata-seeder.service.d.ts.map +1 -1
- package/dist/seeders/module-metadata-seeder.service.js +6 -2
- package/dist/seeders/module-metadata-seeder.service.js.map +1 -1
- package/dist/services/crud-helper.service.d.ts +1 -1
- package/dist/services/crud-helper.service.d.ts.map +1 -1
- package/dist/services/crud-helper.service.js.map +1 -1
- package/dist/services/crud.service.d.ts +3 -0
- package/dist/services/crud.service.d.ts.map +1 -1
- package/dist/services/crud.service.js +45 -4
- package/dist/services/crud.service.js.map +1 -1
- package/dist/services/solid-introspect.service.d.ts +4 -0
- package/dist/services/solid-introspect.service.d.ts.map +1 -1
- package/dist/services/solid-introspect.service.js +8 -0
- package/dist/services/solid-introspect.service.js.map +1 -1
- package/dist/services/view-metadata.service.d.ts +4 -1
- package/dist/services/view-metadata.service.d.ts.map +1 -1
- package/dist/services/view-metadata.service.js +47 -16
- package/dist/services/view-metadata.service.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/seeders/module-metadata-seeder.service.ts +6 -2
- package/src/services/crud-helper.service.ts +1 -1
- package/src/services/crud.service.ts +64 -12
- package/src/services/solid-introspect.service.ts +20 -6
- package/src/services/view-metadata.service.ts +63 -14
|
@@ -29,8 +29,9 @@ const view_metadata_entity_1 = require("../entities/view-metadata.entity");
|
|
|
29
29
|
const field_metadata_entity_1 = require("../entities/field-metadata.entity");
|
|
30
30
|
const model_metadata_entity_1 = require("../entities/model-metadata.entity");
|
|
31
31
|
const action_metadata_service_1 = require("./action-metadata.service");
|
|
32
|
+
const solid_introspect_service_1 = require("./solid-introspect.service");
|
|
32
33
|
let ViewMetadataService = class ViewMetadataService extends crud_service_1.CRUDService {
|
|
33
|
-
constructor(modelMetadataService, moduleMetadataService, mediaStorageProviderService, configService, fileService, mediaService, discoveryService, crudHelperService, actionMetadataService, entityManager, repo, fieldMetadataRepo, modelMetadataRepo) {
|
|
34
|
+
constructor(modelMetadataService, moduleMetadataService, mediaStorageProviderService, configService, fileService, mediaService, discoveryService, crudHelperService, actionMetadataService, introspectService, entityManager, repo, fieldMetadataRepo, modelMetadataRepo) {
|
|
34
35
|
super(modelMetadataService, moduleMetadataService, mediaStorageProviderService, configService, fileService, mediaService, discoveryService, crudHelperService, entityManager, repo, 'viewMetadata', 'app-builder');
|
|
35
36
|
this.modelMetadataService = modelMetadataService;
|
|
36
37
|
this.moduleMetadataService = moduleMetadataService;
|
|
@@ -41,6 +42,7 @@ let ViewMetadataService = class ViewMetadataService extends crud_service_1.CRUDS
|
|
|
41
42
|
this.discoveryService = discoveryService;
|
|
42
43
|
this.crudHelperService = crudHelperService;
|
|
43
44
|
this.actionMetadataService = actionMetadataService;
|
|
45
|
+
this.introspectService = introspectService;
|
|
44
46
|
this.entityManager = entityManager;
|
|
45
47
|
this.repo = repo;
|
|
46
48
|
this.fieldMetadataRepo = fieldMetadataRepo;
|
|
@@ -61,16 +63,22 @@ let ViewMetadataService = class ViewMetadataService extends crud_service_1.CRUDS
|
|
|
61
63
|
module: true,
|
|
62
64
|
}
|
|
63
65
|
});
|
|
64
|
-
if (entity) {
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
66
|
+
if (!entity) {
|
|
67
|
+
throw new common_1.BadRequestException(`Unable to identify view for module: ${moduleName}, model: ${modelName} and viewType: ${viewType}`);
|
|
68
|
+
}
|
|
69
|
+
entity.layout = JSON.parse(entity.layout);
|
|
70
|
+
if (entity?.layout?.attrs?.createAction) {
|
|
71
|
+
const actionName = entity.layout.attrs.createAction;
|
|
72
|
+
entity.layout.attrs.createAction = await this.actionMetadataService.findOneByUserKey(actionName);
|
|
73
|
+
}
|
|
74
|
+
if (entity?.layout?.attrs?.editAction) {
|
|
75
|
+
const actionName = entity.layout.attrs.editAction;
|
|
76
|
+
entity.layout.attrs.editAction = await this.actionMetadataService.findOneByUserKey(actionName);
|
|
77
|
+
}
|
|
78
|
+
let workflowFieldName = null;
|
|
79
|
+
let workflowField = null;
|
|
80
|
+
if (viewType === 'form') {
|
|
81
|
+
workflowFieldName = entity.layout?.attrs?.workflowField;
|
|
74
82
|
}
|
|
75
83
|
const fields = await this.fieldMetadataRepo.find({
|
|
76
84
|
where: {
|
|
@@ -82,6 +90,9 @@ let ViewMetadataService = class ViewMetadataService extends crud_service_1.CRUDS
|
|
|
82
90
|
const fieldsMap = new Map();
|
|
83
91
|
for (let i = 0; i < fields.length; i++) {
|
|
84
92
|
const field = fields[i];
|
|
93
|
+
if (workflowFieldName && field.name === workflowFieldName) {
|
|
94
|
+
workflowField = field;
|
|
95
|
+
}
|
|
85
96
|
if (field.type === 'relation') {
|
|
86
97
|
const relationModel = await this.modelMetadataRepo.find({
|
|
87
98
|
where: {
|
|
@@ -99,10 +110,29 @@ let ViewMetadataService = class ViewMetadataService extends crud_service_1.CRUDS
|
|
|
99
110
|
fieldsMap.set(field.name, field);
|
|
100
111
|
}
|
|
101
112
|
}
|
|
102
|
-
|
|
113
|
+
let solidFormViewWorkflowData = [];
|
|
114
|
+
if (viewType === 'form' && workflowField) {
|
|
115
|
+
if (workflowField.type === 'selectionStatic') {
|
|
116
|
+
solidFormViewWorkflowData = workflowField.selectionStaticValues.map(item => {
|
|
117
|
+
const [label, value] = item.split(":");
|
|
118
|
+
return { label, value };
|
|
119
|
+
});
|
|
120
|
+
}
|
|
121
|
+
if (workflowField.type === 'relation' && workflowField.relationType === 'many-to-one') {
|
|
122
|
+
const comodelCrudService = this.introspectService.getCRUDService(workflowField.relationCoModelSingularName);
|
|
123
|
+
const data = await comodelCrudService.find({ limit: 100, offset: 0, });
|
|
124
|
+
const records = data.records ?? [];
|
|
125
|
+
const workflowFieldMetadata = fieldsMap.get(workflowFieldName);
|
|
126
|
+
const workflowFielUserkey = workflowFieldMetadata['relationModel']['userKeyField']['name'];
|
|
127
|
+
solidFormViewWorkflowData = records.map(item => ({ 'label': item[workflowFielUserkey], 'value': item['id'] }));
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
const r = {
|
|
103
131
|
'solidView': entity,
|
|
104
132
|
'solidFieldsMetadata': Object.fromEntries(fieldsMap),
|
|
133
|
+
'solidFormViewWorkflowData': solidFormViewWorkflowData
|
|
105
134
|
};
|
|
135
|
+
return r;
|
|
106
136
|
}
|
|
107
137
|
async findOneByUserKey(name, relations = {}) {
|
|
108
138
|
const entity = await this.repo.findOne({
|
|
@@ -137,10 +167,10 @@ let ViewMetadataService = class ViewMetadataService extends crud_service_1.CRUDS
|
|
|
137
167
|
exports.ViewMetadataService = ViewMetadataService;
|
|
138
168
|
exports.ViewMetadataService = ViewMetadataService = __decorate([
|
|
139
169
|
(0, common_1.Injectable)(),
|
|
140
|
-
__param(
|
|
141
|
-
__param(
|
|
142
|
-
__param(
|
|
143
|
-
__param(
|
|
170
|
+
__param(10, (0, typeorm_1.InjectEntityManager)()),
|
|
171
|
+
__param(11, (0, typeorm_1.InjectRepository)(view_metadata_entity_1.ViewMetadata, 'default')),
|
|
172
|
+
__param(12, (0, typeorm_1.InjectRepository)(field_metadata_entity_1.FieldMetadata)),
|
|
173
|
+
__param(13, (0, typeorm_1.InjectRepository)(model_metadata_entity_1.ModelMetadata)),
|
|
144
174
|
__metadata("design:paramtypes", [model_metadata_service_1.ModelMetadataService,
|
|
145
175
|
module_metadata_service_1.ModuleMetadataService,
|
|
146
176
|
media_storage_provider_metadata_service_1.MediaStorageProviderMetadataService,
|
|
@@ -150,6 +180,7 @@ exports.ViewMetadataService = ViewMetadataService = __decorate([
|
|
|
150
180
|
core_1.DiscoveryService,
|
|
151
181
|
crud_helper_service_1.CrudHelperService,
|
|
152
182
|
action_metadata_service_1.ActionMetadataService,
|
|
183
|
+
solid_introspect_service_1.SolidIntrospectService,
|
|
153
184
|
typeorm_2.EntityManager,
|
|
154
185
|
typeorm_2.Repository,
|
|
155
186
|
typeorm_2.Repository,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"view-metadata.service.js","sourceRoot":"","sources":["../../src/services/view-metadata.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"view-metadata.service.js","sourceRoot":"","sources":["../../src/services/view-metadata.service.ts"],"names":[],"mappings":"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"}
|