@optimiser/common 1.0.242 → 1.0.243

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.
Files changed (2) hide show
  1. package/dist/lib/utility.js +69 -43
  2. package/package.json +1 -1
@@ -206,7 +206,7 @@ function GetPageFieldData(pageName, db, mdb, msp_d, next, callback) {
206
206
  else {
207
207
  db.collection("ObjectSchema").findOne({ 'Name': pageData.ObjectName }, function (err, objectData) {
208
208
  return __awaiter(this, void 0, void 0, function () {
209
- var removeFieldsFromFilter, j, filterData, _loop_2, i, g, group, childObjectSchema, _loop_3, i, _loop_4, i, createdByObj, modByObj, createdDateObj, modDateObj, idObject, idObject_1;
209
+ var removeFieldsFromFilter, j, filterData, _loop_2, i, createdByObj, modByObj, createdDateObj, modDateObj, g, group, childObjectSchema, _loop_3, i, _loop_4, i, idObject, idObject_1;
210
210
  return __generator(this, function (_a) {
211
211
  switch (_a.label) {
212
212
  case 0:
@@ -236,47 +236,6 @@ function GetPageFieldData(pageName, db, mdb, msp_d, next, callback) {
236
236
  _loop_2(i);
237
237
  }
238
238
  }
239
- if (!(pageData.Groups != undefined)) return [3 /*break*/, 5];
240
- g = 0;
241
- _a.label = 1;
242
- case 1:
243
- if (!(g < pageData.Groups.length)) return [3 /*break*/, 5];
244
- group = pageData.Groups[g];
245
- if (!group.IsRealLookup) return [3 /*break*/, 3];
246
- return [4 /*yield*/, db.collection('ObjectSchema').findOne({ 'Name': group.ChildObject })];
247
- case 2:
248
- childObjectSchema = _a.sent();
249
- _loop_3 = function (i) {
250
- var fld = group.Fields[i];
251
- var fldSchema = childObjectSchema.Fields.find(function (x) { return x.Name == fld.Name; });
252
- if (fldSchema) {
253
- fld.Schema = fldSchema;
254
- fld.ObjectName = group.ChildObject;
255
- fld.UniqueID = group.Name + '.' + fld.Name;
256
- }
257
- };
258
- for (i = 0; i < group.Fields.length; i++) {
259
- _loop_3(i);
260
- }
261
- return [3 /*break*/, 4];
262
- case 3:
263
- _loop_4 = function (i) {
264
- var fld = group.Fields[i];
265
- var fldSchema = objectData.Fields.find(function (x) { return x.Name == fld.Name; });
266
- if (fldSchema) {
267
- fld.Schema = fldSchema;
268
- fld.ObjectName = pageData.ObjectName;
269
- fld.UniqueID = fld.Name;
270
- }
271
- };
272
- for (i = 0; i < group.Fields.length; i++) {
273
- _loop_4(i);
274
- }
275
- _a.label = 4;
276
- case 4:
277
- g++;
278
- return [3 /*break*/, 1];
279
- case 5:
280
239
  createdByObj = {
281
240
  Name: "CreatedBy",
282
241
  DisplayName: "Created By",
@@ -353,6 +312,73 @@ function GetPageFieldData(pageName, db, mdb, msp_d, next, callback) {
353
312
  UIDataType: "datetime"
354
313
  }
355
314
  };
315
+ if (!(pageData.Groups != undefined)) return [3 /*break*/, 5];
316
+ g = 0;
317
+ _a.label = 1;
318
+ case 1:
319
+ if (!(g < pageData.Groups.length)) return [3 /*break*/, 5];
320
+ group = pageData.Groups[g];
321
+ if (!group.IsRealLookup) return [3 /*break*/, 3];
322
+ return [4 /*yield*/, db.collection('ObjectSchema').findOne({ 'Name': group.ChildObject })];
323
+ case 2:
324
+ childObjectSchema = _a.sent();
325
+ _loop_3 = function (i) {
326
+ var fld = group.Fields[i];
327
+ var fldSchema = childObjectSchema.Fields.find(function (x) { return x.Name == fld.Name; });
328
+ if (fldSchema) {
329
+ fld.Schema = fldSchema;
330
+ fld.ObjectName = group.ChildObject;
331
+ fld.UniqueID = group.Name + '.' + fld.Name;
332
+ if (pageData.Type == "ObjectDetail" && fldSchema.UIDataType == "collection") { // By Kashish - To handle System Fields in Group Collection Field
333
+ if (fld.Schema && fld.Schema.Fields.length > 0) {
334
+ fld.Schema.Fields.splice(0, 0, {
335
+ Name: "_id",
336
+ Sequence: 0,
337
+ UIDataType: "objectid",
338
+ UniqueID: "_id",
339
+ DisplayName: "ID",
340
+ HideON: "both"
341
+ });
342
+ fld.Schema.Fields.splice(fld.Schema.Fields.length, null, createdByObj.Schema, createdDateObj.Schema, modByObj.Schema, modDateObj.Schema);
343
+ }
344
+ }
345
+ }
346
+ };
347
+ for (i = 0; i < group.Fields.length; i++) {
348
+ _loop_3(i);
349
+ }
350
+ return [3 /*break*/, 4];
351
+ case 3:
352
+ _loop_4 = function (i) {
353
+ var fld = group.Fields[i];
354
+ var fldSchema = objectData.Fields.find(function (x) { return x.Name == fld.Name; });
355
+ if (fldSchema) {
356
+ fld.Schema = fldSchema;
357
+ fld.ObjectName = pageData.ObjectName;
358
+ fld.UniqueID = fld.Name;
359
+ if (pageData.Type == "ObjectDetail" && fldSchema.UIDataType == "collection") { // By Kashish - To handle System Fields in Group Collection Field
360
+ if (fld.Schema && fld.Schema.Fields.length > 0) {
361
+ fld.Schema.Fields.splice(0, 0, {
362
+ Name: "_id",
363
+ Sequence: 0,
364
+ UIDataType: "objectid",
365
+ UniqueID: "_id",
366
+ DisplayName: "ID",
367
+ HideON: "both"
368
+ });
369
+ fld.Schema.Fields.splice(fld.Schema.Fields.length, null, createdByObj.Schema, createdDateObj.Schema, modByObj.Schema, modDateObj.Schema);
370
+ }
371
+ }
372
+ }
373
+ };
374
+ for (i = 0; i < group.Fields.length; i++) {
375
+ _loop_4(i);
376
+ }
377
+ _a.label = 4;
378
+ case 4:
379
+ g++;
380
+ return [3 /*break*/, 1];
381
+ case 5:
356
382
  if (pageData.Fields && pageData.Type == "ObjectGrid") {
357
383
  idObject = {
358
384
  Name: "_id",
@@ -387,7 +413,7 @@ function GetPageFieldData(pageName, db, mdb, msp_d, next, callback) {
387
413
  s.Schema.Fields.splice(0, 0, idObject_1);
388
414
  //By Kashish : To handle System Info Fields
389
415
  if (createdByObj && createdDateObj && modByObj && modDateObj) {
390
- s.Schema.Fields.splice(-1, 0, createdByObj.Schema, createdDateObj.Schema, modByObj.Schema, modDateObj.Schema);
416
+ s.Schema.Fields.splice(s.Schema.Fields.length, null, createdByObj.Schema, createdDateObj.Schema, modByObj.Schema, modDateObj.Schema);
391
417
  }
392
418
  }
393
419
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@optimiser/common",
3
- "version": "1.0.242",
3
+ "version": "1.0.243",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "scripts": {