@optimiser/common 1.0.235 → 1.0.236

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 +127 -116
  2. package/package.json +1 -1
package/dist/lib/utility.js CHANGED
@@ -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, g, group, childObjectSchema, _loop_3, i, _loop_4, i;
210
210
  return __generator(this, function (_a) {
211
211
  switch (_a.label) {
212
212
  case 0:
@@ -277,121 +277,123 @@ function GetPageFieldData(pageName, db, mdb, msp_d, next, callback) {
277
277
  g++;
278
278
  return [3 /*break*/, 1];
279
279
  case 5:
280
- createdByObj = {
281
- Name: "CreatedBy",
282
- DisplayName: "Created By",
283
- ApiName: "CreatedBy",
284
- HideON: "both",
285
- Sequence: 100,
286
- UniqueID: "CreatedBy",
287
- Schema: {
288
- Name: "CreatedBy",
289
- DisplayName: "Created By",
290
- HideON: "both",
291
- ApiName: "CreatedBy",
292
- UIDataType: "lookup",
293
- LookupObject: "User",
294
- LookupFields: [
295
- "FirstName",
296
- "LastName"
297
- ],
298
- ExtraLookupFields: [
299
- "UserStatus",
300
- "IsAppUser"
301
- ]
302
- }
303
- };
304
- modByObj = {
305
- Name: "ModifiedBy",
306
- DisplayName: "Modified By",
307
- ApiName: "ModifiedBy",
308
- HideON: "both",
309
- Sequence: 101,
310
- UniqueID: "ModifiedBy",
311
- Schema: {
312
- Name: "ModifiedBy",
313
- DisplayName: "Modified By",
314
- HideON: "both",
315
- ApiName: "ModifiedBy",
316
- UIDataType: "lookup",
317
- LookupObject: "User",
318
- LookupFields: [
319
- "FirstName",
320
- "LastName"
321
- ],
322
- ExtraLookupFields: [
323
- "UserStatus",
324
- "IsAppUser"
325
- ]
326
- }
327
- };
328
- createdDateObj = {
329
- Name: "CreatedDate",
330
- DisplayName: "Created Date",
331
- UniqueID: "CreatedDate",
332
- Sequence: 102,
333
- HideON: "both",
334
- Schema: {
335
- Name: "CreatedDate",
336
- HideON: "both",
337
- DisplayName: "Created Date",
338
- ApiName: "CreatedDate",
339
- UIDataType: "datetime"
340
- }
341
- };
342
- modDateObj = {
343
- Name: "ModifiedDate",
344
- DisplayName: "Modified Date",
345
- UniqueID: "ModifiedDate",
346
- HideON: "both",
347
- Sequence: 103,
348
- Schema: {
349
- Name: "ModifiedDate",
350
- HideON: "both",
351
- DisplayName: "Modified Date",
352
- ApiName: "ModifiedDate",
353
- UIDataType: "datetime"
354
- }
355
- };
356
- if (pageData.Fields && pageData.Type == "ObjectGrid") {
357
- idObject = {
358
- Name: "_id",
359
- Schema: { Name: "_id", DisplayName: "ID", ApiName: "ID", UIDataType: "objectid" },
360
- Sequence: 0,
361
- UniqueID: "_id",
362
- DisplayName: "ID",
363
- Width: 100
364
- };
365
- pageData.Fields.splice(0, 0, idObject);
366
- //By Kashish : To handle System Info Fields in Grid
367
- if (!pageData.Fields.find(function (x) { return x.Name == 'CreatedBy'; }))
368
- pageData.Fields.push(createdByObj);
369
- if (!pageData.Fields.find(function (x) { return x.Name == 'CreatedDate'; }))
370
- pageData.Fields.push(createdDateObj);
371
- if (!pageData.Fields.find(function (x) { return x.Name == 'ModifiedBy'; }))
372
- pageData.Fields.push(modByObj);
373
- if (!pageData.Fields.find(function (x) { return x.Name == 'ModifiedDate'; }))
374
- pageData.Fields.push(modDateObj);
375
- }
376
- if (pageData.Fields && pageData.Type == "ObjectDetail") {
377
- idObject_1 = {
378
- Name: "_id",
379
- Sequence: 0,
380
- UIDataType: "objectid",
381
- UniqueID: "_id",
382
- DisplayName: "ID",
383
- HideON: "both"
384
- };
385
- pageData.Fields == pageData.Fields.map(function (s) {
386
- if (s.Schema && s.Schema.UIDataType == "collection") {
387
- s.Schema.Fields.splice(0, 0, idObject_1);
388
- //By Kashish : To handle System Info Fields
389
- if (createdByObj && createdDateObj && modByObj && modDateObj) {
390
- s.Schema.Fields.splice(-1, 0, createdByObj.Schema, createdDateObj.Schema, modByObj.Schema, modDateObj.Schema);
391
- }
392
- }
393
- });
394
- }
280
+ // CODE COMMNETED DUE TO _ID & CREATED FIELDS SHOWN ON PRODUCTION - Rohit Kumar (Kashish assisted)
281
+ //By Kashish : To handle System Info Fields in Grid and Detail
282
+ // let createdByObj = {
283
+ // Name: "CreatedBy",
284
+ // DisplayName: "Created By",
285
+ // ApiName: "CreatedBy",
286
+ // HideON: "both",
287
+ // Sequence: 100,
288
+ // UniqueID: "CreatedBy",
289
+ // Schema: {
290
+ // Name: "CreatedBy",
291
+ // DisplayName: "Created By",
292
+ // HideON: "both",
293
+ // ApiName: "CreatedBy",
294
+ // UIDataType: "lookup",
295
+ // LookupObject: "User",
296
+ // LookupFields: [
297
+ // "FirstName",
298
+ // "LastName"
299
+ // ],
300
+ // ExtraLookupFields: [
301
+ // "UserStatus",
302
+ // "IsAppUser"
303
+ // ]
304
+ // }
305
+ // }
306
+ // let modByObj = {
307
+ // Name: "ModifiedBy",
308
+ // DisplayName: "Modified By",
309
+ // ApiName: "ModifiedBy",
310
+ // HideON: "both",
311
+ // Sequence: 101,
312
+ // UniqueID: "ModifiedBy",
313
+ // Schema: {
314
+ // Name: "ModifiedBy",
315
+ // DisplayName: "Modified By",
316
+ // HideON: "both",
317
+ // ApiName: "ModifiedBy",
318
+ // UIDataType: "lookup",
319
+ // LookupObject: "User",
320
+ // LookupFields: [
321
+ // "FirstName",
322
+ // "LastName"
323
+ // ],
324
+ // ExtraLookupFields: [
325
+ // "UserStatus",
326
+ // "IsAppUser"
327
+ // ]
328
+ // }
329
+ // }
330
+ // let createdDateObj = {
331
+ // Name: "CreatedDate",
332
+ // DisplayName: "Created Date",
333
+ // UniqueID: "CreatedDate",
334
+ // Sequence: 102,
335
+ // HideON: "both",
336
+ // Schema: {
337
+ // Name: "CreatedDate",
338
+ // HideON: "both",
339
+ // DisplayName: "Created Date",
340
+ // ApiName: "CreatedDate",
341
+ // UIDataType: "datetime"
342
+ // }
343
+ // };
344
+ // let modDateObj = {
345
+ // Name: "ModifiedDate",
346
+ // DisplayName: "Modified Date",
347
+ // UniqueID: "ModifiedDate",
348
+ // HideON: "both",
349
+ // Sequence: 103,
350
+ // Schema: {
351
+ // Name: "ModifiedDate",
352
+ // HideON: "both",
353
+ // DisplayName: "Modified Date",
354
+ // ApiName: "ModifiedDate",
355
+ // UIDataType: "datetime"
356
+ // }
357
+ // };
358
+ // if (pageData.Fields && pageData.Type == "ObjectGrid") {
359
+ // let idObject = {
360
+ // Name: "_id",
361
+ // Schema: { Name: "_id", DisplayName: "ID", ApiName: "ID", UIDataType: "objectid" },
362
+ // Sequence: 0,
363
+ // UniqueID: "_id",
364
+ // DisplayName: "ID",
365
+ // Width: 100
366
+ // }
367
+ // pageData.Fields.splice(0, 0, idObject);
368
+ // //By Kashish : To handle System Info Fields in Grid
369
+ // if (!pageData.Fields.find((x: any) => x.Name == 'CreatedBy'))
370
+ // pageData.Fields.push(createdByObj);
371
+ // if (!pageData.Fields.find((x: any) => x.Name == 'CreatedDate'))
372
+ // pageData.Fields.push(createdDateObj);
373
+ // if (!pageData.Fields.find((x: any) => x.Name == 'ModifiedBy'))
374
+ // pageData.Fields.push(modByObj);
375
+ // if (!pageData.Fields.find((x: any) => x.Name == 'ModifiedDate'))
376
+ // pageData.Fields.push(modDateObj);
377
+ // }
378
+ // if (pageData.Fields && pageData.Type == "ObjectDetail") {
379
+ // let idObject = {
380
+ // Name: "_id",
381
+ // Sequence: 0,
382
+ // UIDataType: "objectid",
383
+ // UniqueID: "_id",
384
+ // DisplayName: "ID",
385
+ // HideON: "both"
386
+ // }
387
+ // pageData.Fields == pageData.Fields.map((s: any) => {
388
+ // if (s.Schema && s.Schema.UIDataType == "collection") {
389
+ // s.Schema.Fields.splice(0, 0, idObject);
390
+ // //By Kashish : To handle System Info Fields
391
+ // if (createdByObj && createdDateObj && modByObj && modDateObj) {
392
+ // s.Schema.Fields.splice(-1, 0, createdByObj.Schema, createdDateObj.Schema, modByObj.Schema, modDateObj.Schema);
393
+ // }
394
+ // }
395
+ // })
396
+ // }
395
397
  callback(pageData);
396
398
  return [2 /*return*/];
397
399
  }
@@ -3901,6 +3903,15 @@ function CheckPageAuthentication(pageData, msp_d, db, mdb, next) {
3901
3903
  });
3902
3904
  }
3903
3905
  exports.CheckPageAuthentication = CheckPageAuthentication;
3906
+ /*
3907
+ * Created by: Shahzaib as on 08-12-21
3908
+ * This is a common function and used to remove fields from Advanced/Report filter.
3909
+ * @param1: filter condition object from DB
3910
+ * @param2: fields name
3911
+ * @param3: identifier in string, like- Name or UniqueID
3912
+ * Desc: This is a common function and used to remove fields from Advanced/Report filter.
3913
+ * return value: array.
3914
+ */
3904
3915
  function RemoveFieldsFromFilters(condition, fields, identifier) {
3905
3916
  if (condition != undefined && condition.Filters.length > 0) {
3906
3917
  fields.forEach(function (fld) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@optimiser/common",
3
- "version": "1.0.235",
3
+ "version": "1.0.236",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "scripts": {