@steedos/service-metadata-objects 2.1.64 → 2.1.68

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.
@@ -85,6 +85,25 @@ function getOriginalObject(ctx, objectApiName) {
85
85
  });
86
86
  }
87
87
  exports.getOriginalObject = getOriginalObject;
88
+ function listviewDefaultsDeep(object, ...sources) {
89
+ const objectProto = Object.prototype;
90
+ /** Used to check objects for own properties. */
91
+ const hasOwnProperty = objectProto.hasOwnProperty;
92
+ object = Object(object.list_views);
93
+ sources.forEach(({ list_views: source }) => {
94
+ if (source != null) {
95
+ source = Object(source);
96
+ for (const key in source) {
97
+ const value = object[key];
98
+ if (value === undefined ||
99
+ (_.eq(value, objectProto[key]) && !hasOwnProperty.call(object, key))) {
100
+ object[key] = source[key];
101
+ }
102
+ }
103
+ }
104
+ });
105
+ return object;
106
+ }
88
107
  function refreshObject(ctx, objectApiName) {
89
108
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
90
109
  let objectConfig = {};
@@ -141,6 +160,9 @@ function refreshObject(ctx, objectApiName) {
141
160
  });
142
161
  }
143
162
  objectConfig = _.defaultsDeep({}, clone(_objectConfig), baseObjectConfig, objectConfig);
163
+ objectConfig.list_views = listviewDefaultsDeep({ list_views: {} }, ..._.sortBy(objectConfigs, function (o) {
164
+ return o.isMain ? 1 : -1;
165
+ }));
144
166
  _.each(objectConfig.fields, function (field, field_name) {
145
167
  if (objectDatasource != "default" && objectDatasource != "meteor") {
146
168
  if (field.primary) {
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/objects/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/objects/index.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@steedos/service-metadata-objects",
3
- "version": "2.1.64",
3
+ "version": "2.1.68",
4
4
  "description": "",
5
5
  "main": "lib/objects.service.js",
6
6
  "scripts": {
@@ -20,7 +20,7 @@
20
20
  "author": "",
21
21
  "license": "MIT",
22
22
  "dependencies": {
23
- "@steedos/formula": "2.1.64",
23
+ "@steedos/formula": "2.1.68",
24
24
  "dotenv-flow": "^3.1.0",
25
25
  "ioredis": "^4.22.0",
26
26
  "lodash": "^4.17.21",
@@ -42,5 +42,5 @@
42
42
  "publishConfig": {
43
43
  "access": "public"
44
44
  },
45
- "gitHead": "c5b63dd483aa29bd9c179e8d59a73c675b3a0ba1"
45
+ "gitHead": "08258fa4543a8cf425156f057c6016ca3c1deaf9"
46
46
  }
@@ -102,6 +102,26 @@ export async function getOriginalObject(ctx, objectApiName) {
102
102
  return objectConfig;
103
103
  }
104
104
 
105
+ function listviewDefaultsDeep(object, ...sources) {
106
+ const objectProto = Object.prototype
107
+ /** Used to check objects for own properties. */
108
+ const hasOwnProperty = objectProto.hasOwnProperty
109
+ object = Object(object.list_views)
110
+ sources.forEach(({ list_views: source }) => {
111
+ if (source != null) {
112
+ source = Object(source)
113
+ for (const key in source) {
114
+ const value = object[key]
115
+ if (value === undefined ||
116
+ (_.eq(value, objectProto[key]) && !hasOwnProperty.call(object, key))) {
117
+ object[key] = source[key]
118
+ }
119
+ }
120
+ }
121
+ })
122
+ return object
123
+ }
124
+
105
125
  export async function refreshObject(ctx, objectApiName) {
106
126
  let objectConfig: any = {};
107
127
 
@@ -182,6 +202,10 @@ export async function refreshObject(ctx, objectApiName) {
182
202
  objectConfig
183
203
  );
184
204
 
205
+ objectConfig.list_views = listviewDefaultsDeep({ list_views: {} }, ..._.sortBy(objectConfigs, function (o) {
206
+ return o.isMain ? 1 : -1;
207
+ }))
208
+
185
209
  _.each(objectConfig.fields, function(field, field_name) {
186
210
  if (objectDatasource != "default" && objectDatasource != "meteor") {
187
211
  if (field.primary) {