@memberjunction/core 1.8.1 → 2.1.0

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 (63) hide show
  1. package/dist/generic/applicationInfo.d.ts +4 -1
  2. package/dist/generic/applicationInfo.d.ts.map +1 -1
  3. package/dist/generic/applicationInfo.js +3 -0
  4. package/dist/generic/applicationInfo.js.map +1 -1
  5. package/dist/generic/baseEngine.d.ts +72 -2
  6. package/dist/generic/baseEngine.d.ts.map +1 -1
  7. package/dist/generic/baseEngine.js +174 -2
  8. package/dist/generic/baseEngine.js.map +1 -1
  9. package/dist/generic/baseEntity.d.ts +18 -8
  10. package/dist/generic/baseEntity.d.ts.map +1 -1
  11. package/dist/generic/baseEntity.js +60 -16
  12. package/dist/generic/baseEntity.js.map +1 -1
  13. package/dist/generic/baseInfo.d.ts +2 -1
  14. package/dist/generic/baseInfo.d.ts.map +1 -1
  15. package/dist/generic/baseInfo.js +9 -6
  16. package/dist/generic/baseInfo.js.map +1 -1
  17. package/dist/generic/compositeKey.d.ts +1 -0
  18. package/dist/generic/compositeKey.d.ts.map +1 -1
  19. package/dist/generic/compositeKey.js +3 -0
  20. package/dist/generic/compositeKey.js.map +1 -1
  21. package/dist/generic/entityInfo.d.ts +45 -24
  22. package/dist/generic/entityInfo.d.ts.map +1 -1
  23. package/dist/generic/entityInfo.js +46 -20
  24. package/dist/generic/entityInfo.js.map +1 -1
  25. package/dist/generic/explorerNavigationItem.d.ts +20 -0
  26. package/dist/generic/explorerNavigationItem.d.ts.map +1 -0
  27. package/dist/generic/explorerNavigationItem.js +29 -0
  28. package/dist/generic/explorerNavigationItem.js.map +1 -0
  29. package/dist/generic/interfaces.d.ts +22 -15
  30. package/dist/generic/interfaces.d.ts.map +1 -1
  31. package/dist/generic/interfaces.js +5 -0
  32. package/dist/generic/interfaces.js.map +1 -1
  33. package/dist/generic/libraryInfo.d.ts +1 -0
  34. package/dist/generic/libraryInfo.d.ts.map +1 -1
  35. package/dist/generic/libraryInfo.js +1 -0
  36. package/dist/generic/libraryInfo.js.map +1 -1
  37. package/dist/generic/metadata.d.ts +16 -7
  38. package/dist/generic/metadata.d.ts.map +1 -1
  39. package/dist/generic/metadata.js +18 -2
  40. package/dist/generic/metadata.js.map +1 -1
  41. package/dist/generic/providerBase.d.ts +10 -2
  42. package/dist/generic/providerBase.d.ts.map +1 -1
  43. package/dist/generic/providerBase.js +51 -8
  44. package/dist/generic/providerBase.js.map +1 -1
  45. package/dist/generic/queryInfo.d.ts +7 -5
  46. package/dist/generic/queryInfo.d.ts.map +1 -1
  47. package/dist/generic/queryInfo.js +2 -0
  48. package/dist/generic/queryInfo.js.map +1 -1
  49. package/dist/generic/runQuery.d.ts +1 -1
  50. package/dist/generic/runReport.d.ts +1 -1
  51. package/dist/generic/securityInfo.d.ts +15 -8
  52. package/dist/generic/securityInfo.d.ts.map +1 -1
  53. package/dist/generic/securityInfo.js +16 -9
  54. package/dist/generic/securityInfo.js.map +1 -1
  55. package/dist/views/runView.d.ts +14 -2
  56. package/dist/views/runView.d.ts.map +1 -1
  57. package/dist/views/runView.js +42 -8
  58. package/dist/views/runView.js.map +1 -1
  59. package/dist/views/viewInfo.d.ts +1 -0
  60. package/dist/views/viewInfo.d.ts.map +1 -1
  61. package/dist/views/viewInfo.js +1 -0
  62. package/dist/views/viewInfo.js.map +1 -1
  63. package/package.json +2 -2
@@ -25,23 +25,57 @@ class RunView {
25
25
  throw new Error(`Entity ${params.EntityName} not found in metadata`);
26
26
  params.Fields = entity.Fields.map(f => f.Name); // just override whatever was passed in with all the fields - or if nothing was passed in, we set it. For loading the entity object, we need ALL the fields.
27
27
  }
28
- // NOW, run the view
28
+ // Run the view
29
29
  const result = await RunView.Provider.RunView(params, contextUser);
30
- // FINALLY, if needed, transform the result set into BaseEntity-derived objects
31
- if (params.ResultType === 'entity_object' &&
32
- result &&
33
- result.Success) {
30
+ // Transform the result set into BaseEntity-derived objects, if needed
31
+ await this.TransformSimpleObjectToEntityObject(params, result, contextUser);
32
+ return result;
33
+ }
34
+ /**
35
+ * Runs multiple views based on the provided parameters, see documentation for RunViewParams for more information
36
+ * @param params
37
+ * @param contextUser
38
+ * @returns
39
+ */
40
+ async RunViews(params, contextUser) {
41
+ if (params && params.length > 0) {
42
+ const md = new metadata_1.Metadata();
43
+ for (const param of params) {
44
+ // FIRST, if the resultType is entity_object, we need to run the view with ALL fields in the entity
45
+ // so that we can get the data to populate the entity object with.
46
+ if (param.ResultType === 'entity_object') {
47
+ // we need to get the entity definition and then get all the fields for it
48
+ const entity = md.Entities.find(e => e.Name.trim().toLowerCase() === param.EntityName.trim().toLowerCase());
49
+ if (!entity) {
50
+ throw new Error(`Entity ${param.EntityName} not found in metadata`);
51
+ }
52
+ param.Fields = entity.Fields.map(f => f.Name); // just override whatever was passed in with all the fields - or if nothing was passed in, we set it. For loading the entity object, we need ALL the fields.
53
+ }
54
+ }
55
+ // NOW, run the view
56
+ const results = await RunView.Provider.RunViews(params, contextUser);
57
+ for (const [index, result] of results.entries()) {
58
+ await this.TransformSimpleObjectToEntityObject(params[index], result, contextUser);
59
+ }
60
+ return results;
61
+ }
62
+ else {
63
+ return [];
64
+ }
65
+ }
66
+ async TransformSimpleObjectToEntityObject(param, result, contextUser) {
67
+ // only if needed (e.g. ResultType==='entity_object'), transform the result set into BaseEntity-derived objects
68
+ if (param.ResultType === 'entity_object' && result && result.Success) {
34
69
  // we need to transform each of the items in the result set into a BaseEntity-derived object
35
70
  const md = new metadata_1.Metadata();
36
71
  const newItems = [];
37
72
  for (const item of result.Results) {
38
- const entity = await md.GetEntityObject(params.EntityName, contextUser);
73
+ const entity = await md.GetEntityObject(param.EntityName, contextUser);
39
74
  entity.LoadFromData(item);
40
75
  newItems.push(entity);
41
76
  }
42
77
  result.Results = newItems;
43
78
  }
44
- return result;
45
79
  }
46
80
  static get Provider() {
47
81
  const g = global_1.MJGlobal.Instance.GetGlobalObjectStore();
@@ -77,7 +111,7 @@ class RunView {
77
111
  const rv = new RunView();
78
112
  const result = await rv.RunView({
79
113
  EntityName: "User Views",
80
- ExtraFilter: params.ViewID ? `ID = ${params.ViewID}` : `Name = '${params.ViewName}'`,
114
+ ExtraFilter: params.ViewID ? `ID = '${params.ViewID}'` : `Name = '${params.ViewName}'`,
81
115
  ResultType: 'entity_object'
82
116
  });
83
117
  if (result && result.Success && result.Results.length > 0) {
@@ -1 +1 @@
1
- {"version":3,"file":"runView.js","sourceRoot":"","sources":["../../src/views/runView.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"runView.js","sourceRoot":"","sources":["../../src/views/runView.ts"],"names":[],"mappings":"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"}
@@ -30,6 +30,7 @@ export declare class ViewGridState {
30
30
  filter?: any;
31
31
  }
32
32
  export declare class ViewInfo extends BaseInfo {
33
+ ID: string;
33
34
  UserID: number;
34
35
  EntityID: number;
35
36
  Name: string;
@@ -1 +1 @@
1
- {"version":3,"file":"viewInfo.d.ts","sourceRoot":"","sources":["../../src/views/viewInfo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAC9C,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAG1D,qBAAa,cAAe,SAAQ,QAAQ;IACxC,EAAE,EAAE,MAAM,CAAO;IACjB,IAAI,EAAE,MAAM,CAAO;IACnB,WAAW,EAAE,MAAM,CAAO;IAC1B,MAAM,EAAE,OAAO,CAAO;IACtB,KAAK,CAAC,EAAE,MAAM,CAAO;IACrB,UAAU,CAAC,EAAE,MAAM,CAAO;IAE1B,WAAW,EAAE,eAAe,CAAO;gBAEtB,QAAQ,GAAE,GAAU;CAIpC;AAGD,eAAO,MAAM,mBAAmB;;;CAGtB,CAAC;AAEX,MAAM,MAAM,mBAAmB,GAAG,OAAO,mBAAmB,CAAC,MAAM,OAAO,mBAAmB,CAAC,CAAC;AAG/F,qBAAa,cAAe,SAAQ,QAAQ;IACxC,aAAa,EAAE,mBAAmB,CAAO;IAEzC,KAAK,EAAE,MAAM,CAAO;IACpB,QAAQ,EAAE,MAAM,CAAO;IACvB,KAAK,EAAE,MAAM,CAAO;IAEpB,OAAO,EAAE,cAAc,EAAE,CAAK;gBAEjB,QAAQ,GAAE,GAAU;CAUpC;AAED,qBAAa,aAAa;IACtB,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,cAAc,CAAC,EAAE,GAAG,CAAC;IACrB,MAAM,CAAC,EAAE,GAAG,CAAC;CAChB;AAED,qBAAa,QAAS,SAAQ,QAAQ;IAClC,MAAM,EAAE,MAAM,CAAO;IACrB,QAAQ,EAAE,MAAM,CAAO;IACvB,IAAI,EAAE,MAAM,CAAO;IACnB,WAAW,EAAE,MAAM,CAAO;IAC1B,UAAU,EAAE,MAAM,CAAO;IACzB,QAAQ,EAAE,OAAO,CAAO;IACxB,SAAS,EAAE,OAAO,CAAO;IACzB,SAAS,EAAE,MAAM,CAAO;IACxB,WAAW,EAAE,MAAM,CAAO;IAC1B,iBAAiB,EAAE,MAAM,CAAO;IAChC,WAAW,EAAE,MAAM,CAAO;IAC1B,iBAAiB,EAAE,MAAM,CAAO;IAChC,cAAc,EAAE,IAAI,CAAO;IAC3B,cAAc,EAAE,IAAI,CAAO;IAC3B,QAAQ,EAAE,MAAM,CAAO;IACvB,QAAQ,EAAE,MAAM,CAAO;IACvB,MAAM,EAAE,MAAM,CAAO;IACrB,cAAc,EAAE,MAAM,CAAO;IAE7B,OAAO,CAAC,OAAO,CAAuB;IACtC,IAAW,MAAM,IAAI,cAAc,EAAE,CAEpC;IAED,OAAO,CAAC,QAAQ,CAAuB;IACvC,IAAW,OAAO,IAAI,cAAc,EAAE,CAErC;IAED,OAAO,CAAC,WAAW,CAAmB;IACtC,IAAW,UAAU,IAAI,UAAU,CAElC;IAEM,YAAY,CAAC,EAAE,EAAE,iBAAiB,EAAE,QAAQ,EAAE,GAAG;gBAyC3C,EAAE,EAAE,iBAAiB,EAAE,QAAQ,GAAE,GAAU;CAI3D"}
1
+ {"version":3,"file":"viewInfo.d.ts","sourceRoot":"","sources":["../../src/views/viewInfo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAC9C,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAG1D,qBAAa,cAAe,SAAQ,QAAQ;IACxC,EAAE,EAAE,MAAM,CAAO;IACjB,IAAI,EAAE,MAAM,CAAO;IACnB,WAAW,EAAE,MAAM,CAAO;IAC1B,MAAM,EAAE,OAAO,CAAO;IACtB,KAAK,CAAC,EAAE,MAAM,CAAO;IACrB,UAAU,CAAC,EAAE,MAAM,CAAO;IAE1B,WAAW,EAAE,eAAe,CAAO;gBAEtB,QAAQ,GAAE,GAAU;CAIpC;AAGD,eAAO,MAAM,mBAAmB;;;CAGtB,CAAC;AAEX,MAAM,MAAM,mBAAmB,GAAG,OAAO,mBAAmB,CAAC,MAAM,OAAO,mBAAmB,CAAC,CAAC;AAG/F,qBAAa,cAAe,SAAQ,QAAQ;IACxC,aAAa,EAAE,mBAAmB,CAAO;IAEzC,KAAK,EAAE,MAAM,CAAO;IACpB,QAAQ,EAAE,MAAM,CAAO;IACvB,KAAK,EAAE,MAAM,CAAO;IAEpB,OAAO,EAAE,cAAc,EAAE,CAAK;gBAEjB,QAAQ,GAAE,GAAU;CAUpC;AAED,qBAAa,aAAa;IACtB,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,cAAc,CAAC,EAAE,GAAG,CAAC;IACrB,MAAM,CAAC,EAAE,GAAG,CAAC;CAChB;AAED,qBAAa,QAAS,SAAQ,QAAQ;IAClC,EAAE,EAAE,MAAM,CAAO;IACjB,MAAM,EAAE,MAAM,CAAO;IACrB,QAAQ,EAAE,MAAM,CAAO;IACvB,IAAI,EAAE,MAAM,CAAO;IACnB,WAAW,EAAE,MAAM,CAAO;IAC1B,UAAU,EAAE,MAAM,CAAO;IACzB,QAAQ,EAAE,OAAO,CAAO;IACxB,SAAS,EAAE,OAAO,CAAO;IACzB,SAAS,EAAE,MAAM,CAAO;IACxB,WAAW,EAAE,MAAM,CAAO;IAC1B,iBAAiB,EAAE,MAAM,CAAO;IAChC,WAAW,EAAE,MAAM,CAAO;IAC1B,iBAAiB,EAAE,MAAM,CAAO;IAChC,cAAc,EAAE,IAAI,CAAO;IAC3B,cAAc,EAAE,IAAI,CAAO;IAC3B,QAAQ,EAAE,MAAM,CAAO;IACvB,QAAQ,EAAE,MAAM,CAAO;IACvB,MAAM,EAAE,MAAM,CAAO;IACrB,cAAc,EAAE,MAAM,CAAO;IAE7B,OAAO,CAAC,OAAO,CAAuB;IACtC,IAAW,MAAM,IAAI,cAAc,EAAE,CAEpC;IAED,OAAO,CAAC,QAAQ,CAAuB;IACvC,IAAW,OAAO,IAAI,cAAc,EAAE,CAErC;IAED,OAAO,CAAC,WAAW,CAAmB;IACtC,IAAW,UAAU,IAAI,UAAU,CAElC;IAEM,YAAY,CAAC,EAAE,EAAE,iBAAiB,EAAE,QAAQ,EAAE,GAAG;gBAyC3C,EAAE,EAAE,iBAAiB,EAAE,QAAQ,GAAE,GAAU;CAI3D"}
@@ -93,6 +93,7 @@ class ViewInfo extends baseInfo_1.BaseInfo {
93
93
  }
94
94
  constructor(md, initData = null) {
95
95
  super();
96
+ this.ID = null;
96
97
  this.UserID = null;
97
98
  this.EntityID = null;
98
99
  this.Name = null;
@@ -1 +1 @@
1
- {"version":3,"file":"viewInfo.js","sourceRoot":"","sources":["../../src/views/viewInfo.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"viewInfo.js","sourceRoot":"","sources":["../../src/views/viewInfo.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@memberjunction/core",
3
- "version": "1.8.1",
3
+ "version": "2.1.0",
4
4
  "description": "MemberJunction: Core Library including Metadata, Application, Entity Retrieval and Manipulation, and Utilities",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -19,7 +19,7 @@
19
19
  "typescript": "^5.4.5"
20
20
  },
21
21
  "dependencies": {
22
- "@memberjunction/global": "1.8.1",
22
+ "@memberjunction/global": "2.1.0",
23
23
  "rxjs": "^7.8.1"
24
24
  }
25
25
  }