refactor: remove totals nesting on governorlimits interface

Make it easier to access and makes more sense.

Author: lukecotter

log-viewer/modules/__tests__/ApexLogParser.test.ts

@@ -1162,9 +1162,9 @@ describe('Governor Limits Parsing', () => {
     const apexLog = parse(log);
 
     expect(apexLog.governorLimits).toBeDefined();
-    expect([...apexLog.governorLimits.limitsByNamespace.keys()]).toEqual(['default', 'myNS']);
+    expect([...apexLog.governorLimits.byNamespace.keys()]).toEqual(['default', 'myNS']);
 
-    expect(apexLog.governorLimits.limitsByNamespace.get('default')).toMatchObject({
+    expect(apexLog.governorLimits.byNamespace.get('default')).toMatchObject({
       soqlQueries: { used: 17, limit: 100 },
       queryRows: { used: 121, limit: 50000 },
       soslQueries: { used: 3, limit: 20 },
@@ -1180,7 +1180,7 @@ describe('Governor Limits Parsing', () => {
       mobileApexPushCalls: { used: 1, limit: 10 },
     });
 
-    expect(apexLog.governorLimits.limitsByNamespace.get('myNS')).toMatchObject({
+    expect(apexLog.governorLimits.byNamespace.get('myNS')).toMatchObject({
       soqlQueries: { used: 2, limit: 100 },
       queryRows: { used: 10, limit: 50000 },
       soslQueries: { used: 1, limit: 20 },
@@ -1196,7 +1196,7 @@ describe('Governor Limits Parsing', () => {
       mobileApexPushCalls: { used: 0, limit: 10 },
     });
 
-    expect(apexLog.governorLimits.totals).toMatchObject({
+    expect(apexLog.governorLimits).toMatchObject({
       soqlQueries: { used: 19, limit: 100 },
       queryRows: { used: 131, limit: 50000 },
       soslQueries: { used: 4, limit: 20 },
@@ -1241,8 +1241,8 @@ describe('Governor Limits Parsing', () => {
       queueableJobsAddedToQueue: { used: 0, limit: 0 },
       mobileApexPushCalls: { used: 0, limit: 0 },
     };
-    expect(apexLog.governorLimits.limitsByNamespace.get('default')).toMatchObject(expected);
-    expect(apexLog.governorLimits.totals).toMatchObject(expected);
+    expect(apexLog.governorLimits.byNamespace.get('default')).toMatchObject(expected);
+    expect(apexLog.governorLimits).toMatchObject(expected);
   });
 });
 

log-viewer/modules/components/calltree-view/CalltreeView.ts

@@ -567,7 +567,7 @@ export class CalltreeView extends LitElement {
       const namespaceFilterCache = new Map<string, boolean>();
 
       const excludedTypes = new Set<LogEventType>(['SOQL_EXECUTE_BEGIN', 'DML_BEGIN']);
-      const governorLimits = rootMethod.governorLimits.totals;
+      const governorLimits = rootMethod.governorLimits;
 
       let childIndent;
       this.calltreeTable = new Tabulator(callTreeTableContainer, {

log-viewer/modules/parsers/ApexLogParser.ts

@@ -43,22 +43,20 @@ export class ApexLogParser {
   discontinuity = false;
   namespaces = new Set<string>();
   governorLimits: GovernorLimits = {
-    totals: {
-      soqlQueries: { used: 0, limit: 0 },
-      soslQueries: { used: 0, limit: 0 },
-      queryRows: { used: 0, limit: 0 },
-      dmlStatements: { used: 0, limit: 0 },
-      publishImmediateDml: { used: 0, limit: 0 },
-      dmlRows: { used: 0, limit: 0 },
-      cpuTime: { used: 0, limit: 0 },
-      heapSize: { used: 0, limit: 0 },
-      callouts: { used: 0, limit: 0 },
-      emailInvocations: { used: 0, limit: 0 },
-      futureCalls: { used: 0, limit: 0 },
-      queueableJobsAddedToQueue: { used: 0, limit: 0 },
-      mobileApexPushCalls: { used: 0, limit: 0 },
-    },
-    limitsByNamespace: new Map<string, Limits>(),
+    soqlQueries: { used: 0, limit: 0 },
+    soslQueries: { used: 0, limit: 0 },
+    queryRows: { used: 0, limit: 0 },
+    dmlStatements: { used: 0, limit: 0 },
+    publishImmediateDml: { used: 0, limit: 0 },
+    dmlRows: { used: 0, limit: 0 },
+    cpuTime: { used: 0, limit: 0 },
+    heapSize: { used: 0, limit: 0 },
+    callouts: { used: 0, limit: 0 },
+    emailInvocations: { used: 0, limit: 0 },
+    futureCalls: { used: 0, limit: 0 },
+    queueableJobsAddedToQueue: { used: 0, limit: 0 },
+    mobileApexPushCalls: { used: 0, limit: 0 },
+    byNamespace: new Map<string, Limits>(),
   };
 
   /**
@@ -82,9 +80,9 @@ export class ApexLogParser {
   }
 
   private addGovernorLimits(apexLog: ApexLog) {
-    const totalLimits = apexLog.governorLimits.totals;
+    const totalLimits = apexLog.governorLimits;
     if (totalLimits) {
-      for (const limitsForNs of apexLog.governorLimits.limitsByNamespace.values()) {
+      for (const limitsForNs of apexLog.governorLimits.byNamespace.values()) {
         for (const [key, value] of Object.entries(limitsForNs) as Array<
           [keyof Limits, Limits[keyof Limits]]
         >) {
@@ -537,9 +535,8 @@ export interface Limits {
   mobileApexPushCalls: { used: number; limit: number };
 }
 
-export interface GovernorLimits {
-  totals: Limits;
-  limitsByNamespace: Map<string, Limits>;
+export interface GovernorLimits extends Limits {
+  byNamespace: Map<string, Limits>;
 }
 /**
  * All log lines extend this base class.
@@ -879,22 +876,20 @@ export class ApexLog extends Method {
   public parsingErrors: string[] = [];
 
   public governorLimits: GovernorLimits = {
-    totals: {
-      soqlQueries: { used: 0, limit: 0 },
-      soslQueries: { used: 0, limit: 0 },
-      queryRows: { used: 0, limit: 0 },
-      dmlStatements: { used: 0, limit: 0 },
-      publishImmediateDml: { used: 0, limit: 0 },
-      dmlRows: { used: 0, limit: 0 },
-      cpuTime: { used: 0, limit: 0 },
-      heapSize: { used: 0, limit: 0 },
-      callouts: { used: 0, limit: 0 },
-      emailInvocations: { used: 0, limit: 0 },
-      futureCalls: { used: 0, limit: 0 },
-      queueableJobsAddedToQueue: { used: 0, limit: 0 },
-      mobileApexPushCalls: { used: 0, limit: 0 },
-    },
-    limitsByNamespace: new Map<string, Limits>(),
+    soqlQueries: { used: 0, limit: 0 },
+    soslQueries: { used: 0, limit: 0 },
+    queryRows: { used: 0, limit: 0 },
+    dmlStatements: { used: 0, limit: 0 },
+    publishImmediateDml: { used: 0, limit: 0 },
+    dmlRows: { used: 0, limit: 0 },
+    cpuTime: { used: 0, limit: 0 },
+    heapSize: { used: 0, limit: 0 },
+    callouts: { used: 0, limit: 0 },
+    emailInvocations: { used: 0, limit: 0 },
+    futureCalls: { used: 0, limit: 0 },
+    queueableJobsAddedToQueue: { used: 0, limit: 0 },
+    mobileApexPushCalls: { used: 0, limit: 0 },
+    byNamespace: new Map<string, Limits>(),
   };
 
   /**
@@ -1653,7 +1648,7 @@ class LimitUsageForNSLine extends LogLine {
       }
     }
 
-    parser.governorLimits.limitsByNamespace.set(this.namespace, limits);
+    parser.governorLimits.byNamespace.set(this.namespace, limits);
   }
 }
 

log-viewer/modules/timeline/Timeline.ts

@@ -676,7 +676,7 @@ function findTimelineTooltip(
         rows.push({ label: 'total:', value: val });
       }
 
-      const govLimits = timelineRoot.governorLimits.totals;
+      const govLimits = timelineRoot.governorLimits;
       if (target.dmlCount.total) {
         rows.push({
           label: 'DML:',