chore: code tidying

Author: chrismclarke

packages/scripts/src/commands/app-data/convert/processors/flowParser/flowParser.ts

@@ -5,7 +5,7 @@ import { arrayToHashmap, groupJsonByKey, IContentsEntry } from "../../utils";
 import BaseProcessor from "../base";
 
 export class FlowParserProcessor extends BaseProcessor<FlowTypes.FlowTypeWithData> {
-  public cacheVersion = 20240220.2;
+  public cacheVersion = 20240315.0;
 
   public parsers: { [flowType in FlowTypes.FlowType]: Parsers.DefaultParser } = {
     data_list: new Parsers.DataListParser(this),

packages/scripts/src/commands/app-data/convert/processors/flowParser/parsers/template.parser.ts

@@ -25,11 +25,7 @@ export class TemplateParser extends DefaultParser {
     // when unique name not specified assume namespacing with template value (flow_name)
     // or the row type for non-templates
     if (!row.name) {
-      if (row.type === "template") {
-        row.name = row.value;
-      } else {
-        row.name = `${row.type}_${rowNumber}`;
-      }
+      row.name = this.generateRowName(row, rowNumber);
     }
     // track path to row when nested
     row._nested_name = nestedPath ? `${nestedPath}.${row.name}` : row.name;
@@ -152,6 +148,18 @@ export class TemplateParser extends DefaultParser {
     });
   }
 
+  /** Automatically generate a row name when not provided by author */
+  private generateRowName(row: FlowTypes.TemplateRow, rowNumber: Number) {
+    switch (row.type) {
+      // template row name assigned to target template name
+      case "template":
+        return row.value;
+      // default use combination of row type and row number
+      default:
+        return `${row.type}_${rowNumber}`;
+    }
+  }
+
   private qualityControlCheck(row: FlowTypes.TemplateRow) {
     const errors: string[] = [];
 

src/app/shared/utils/utils.ts

@@ -2,7 +2,7 @@ import { format } from "date-fns";
 import { diff } from "deep-object-diff";
 import { Observable } from "rxjs";
 import { map, pairwise, filter, share } from "rxjs/operators";
-import * as Sentry from "@sentry/angular";
+import * as Sentry from "@sentry/angular-ivy";
 import { FlowTypes } from "../model";
 import { objectToArray } from "../components/template/utils";
 import marked from "marked";