IDEMSInternational · jfmcquade · Nov 12, 2024 · Oct 28, 2024 · Oct 28, 2024 · Oct 28, 2024
diff --git a/.idems_app/deployments/local/sheets/demo.xlsx b/.idems_app/deployments/local/sheets/demo.xlsx
diff --git a/android/app/capacitor.build.gradle b/android/app/capacitor.build.gradle
@@ -19,6 +19,7 @@ dependencies {
     implementation project(':capacitor-filesystem')
     implementation project(':capacitor-local-notifications')
     implementation project(':capacitor-push-notifications')
+    implementation project(':capacitor-screen-orientation')
     implementation project(':capacitor-share')
     implementation project(':capacitor-splash-screen')
     implementation project(':capawesome-capacitor-app-update')

diff --git a/android/app/src/main/assets/capacitor.plugins.json b/android/app/src/main/assets/capacitor.plugins.json
@@ -39,6 +39,10 @@
 		"pkg": "@capacitor/push-notifications",
 		"classpath": "com.capacitorjs.plugins.pushnotifications.PushNotificationsPlugin"
 	},
+	{
+		"pkg": "@capacitor/screen-orientation",
+		"classpath": "com.capacitorjs.plugins.screenorientation.ScreenOrientationPlugin"
+	},
 	{
 		"pkg": "@capacitor/share",
 		"classpath": "com.capacitorjs.plugins.share.SharePlugin"

diff --git a/android/capacitor.settings.gradle b/android/capacitor.settings.gradle
@@ -32,6 +32,9 @@ project(':capacitor-local-notifications').projectDir = new File('../node_modules
 include ':capacitor-push-notifications'
 project(':capacitor-push-notifications').projectDir = new File('../node_modules/@capacitor/push-notifications/android')
 
+include ':capacitor-screen-orientation'
+project(':capacitor-screen-orientation').projectDir = new File('../node_modules/@capacitor/screen-orientation/android')
+
 include ':capacitor-share'
 project(':capacitor-share').projectDir = new File('../node_modules/@capacitor/share/android')
 

diff --git a/cspell.config.yml b/cspell.config.yml
@@ -37,6 +37,7 @@
     "tmpl",
     "venv",
     "viewbox",
+    "youtube",
   ]
 # flagWords - list of words to be always considered incorrect
 # This is useful for offensive words and common spelling errors.

diff --git a/ios/App/Podfile b/ios/App/Podfile
@@ -21,6 +21,7 @@ def capacitor_pods
   pod 'CapacitorFilesystem', :path => '../../node_modules/@capacitor/filesystem'
   pod 'CapacitorLocalNotifications', :path => '../../node_modules/@capacitor/local-notifications'
   pod 'CapacitorPushNotifications', :path => '../../node_modules/@capacitor/push-notifications'
+  pod 'CapacitorScreenOrientation', :path => '../../node_modules/@capacitor/screen-orientation'
   pod 'CapacitorShare', :path => '../../node_modules/@capacitor/share'
   pod 'CapacitorSplashScreen', :path => '../../node_modules/@capacitor/splash-screen'
   pod 'CapawesomeCapacitorAppUpdate', :path => '../../node_modules/@capawesome/capacitor-app-update'

diff --git a/ios/App/Podfile.lock b/ios/App/Podfile.lock
@@ -32,6 +32,8 @@ PODS:
     - Capacitor
   - CapacitorPushNotifications (6.0.2):
     - Capacitor
+  - CapacitorScreenOrientation (6.0.2):
+    - Capacitor
   - CapacitorShare (6.0.2):
     - Capacitor
   - CapacitorSplashScreen (6.0.2):
@@ -162,6 +164,7 @@ DEPENDENCIES:
   - "CapacitorFirebasePerformance (from `../../node_modules/@capacitor-firebase/performance`)"
   - "CapacitorLocalNotifications (from `../../node_modules/@capacitor/local-notifications`)"
   - "CapacitorPushNotifications (from `../../node_modules/@capacitor/push-notifications`)"
+  - "CapacitorScreenOrientation (from `../../node_modules/@capacitor/screen-orientation`)"
   - "CapacitorShare (from `../../node_modules/@capacitor/share`)"
   - "CapacitorSplashScreen (from `../../node_modules/@capacitor/splash-screen`)"
   - "CapawesomeCapacitorAppUpdate (from `../../node_modules/@capawesome/capacitor-app-update`)"
@@ -218,6 +221,8 @@ EXTERNAL SOURCES:
     :path: "../../node_modules/@capacitor/local-notifications"
   CapacitorPushNotifications:
     :path: "../../node_modules/@capacitor/push-notifications"
+  CapacitorScreenOrientation:
+    :path: "../../node_modules/@capacitor/screen-orientation"
   CapacitorShare:
     :path: "../../node_modules/@capacitor/share"
   CapacitorSplashScreen:
@@ -239,6 +244,7 @@ SPEC CHECKSUMS:
   CapacitorFirebasePerformance: c806ce7f8270295465c050210d8e8a4ae2dc282e
   CapacitorLocalNotifications: 6bac9e948b2b8852506c6d74abb2cde140250f86
   CapacitorPushNotifications: ccd797926c030acad3d5498ef452c735c90a2c89
+  CapacitorScreenOrientation: 6039dc2ea4a8596b79316709d5727e8bb7e32845
   CapacitorShare: 591ae4693d85686ceb590db8e8b44aa014ec6490
   CapacitorSplashScreen: 250df9ef8014fac5c7c1fd231f0f8b1d8f0b5624
   CapawesomeCapacitorAppUpdate: 3c05b5c8e42f9c6a88d666093406e9336d9bfdb1
@@ -264,6 +270,6 @@ SPEC CHECKSUMS:
   PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851
   RecaptchaInterop: 7d1a4a01a6b2cb1610a47ef3f85f0c411434cb21
 
-PODFILE CHECKSUM: a6362e50008bd5aea904cdd9ec858da94a7f155c
+PODFILE CHECKSUM: 131ec70809fe3dec63113a003a42e6009560dcef
 
 COCOAPODS: 1.15.2
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "0.16.37",
+  "version": "0.16.38",
   "author": "IDEMS International",
   "license": "See LICENSE",
   "homepage": "https://idems.international/",
@@ -54,6 +54,7 @@
     "@capacitor/ios": "^6.0.0",
     "@capacitor/local-notifications": "^6.0.0",
     "@capacitor/push-notifications": "^6.0.0",
+    "@capacitor/screen-orientation": "^6.0.2",
     "@capacitor/share": "^6.0.0",
     "@capacitor/splash-screen": "^6.0.0",
     "@capawesome/capacitor-app-update": "^6.0.0",

diff --git a/packages/data-models/appConfig.ts b/packages/data-models/appConfig.ts
@@ -14,18 +14,6 @@ import { IAppSkin } from "./skin.model";
  * special use case for relative paths
  ********************************************************************************************/
 
-const DYNAMIC_PREFIXES = [
-  "local",
-  "field",
-  "fields",
-  "global",
-  "data",
-  "campaign",
-  "calc",
-  "item",
-  "raw",
-] as const;
-
 const APP_LANGUAGES = {
   /** Language used during first load. If translations do not exist will default to source strings (gb_en) */
   default: "gb_en",
@@ -216,7 +204,6 @@ const APP_CONFIG = {
   APP_THEMES,
   APP_UPDATES,
   ASSET_PACKS,
-  DYNAMIC_PREFIXES,
   FEEDBACK_MODULE_DEFAULTS,
   NOTIFICATIONS_SYNC_FREQUENCY_MS,
   NOTIFICATION_DEFAULTS,

diff --git a/packages/data-models/flowTypes.ts b/packages/data-models/flowTypes.ts
@@ -1,7 +1,6 @@
 /* eslint @typescript-eslint/sort-type-constituents: "warn"  */
 
 import type { IDataPipeOperation } from "shared";
-import type { IAppConfig } from "./appConfig";
 import type { IAssetEntry } from "./assets.model";
 
 /*********************************************************************************************
@@ -315,7 +314,8 @@ export namespace FlowTypes {
     | "toggle_bar"
     | "update_action_list"
     | "video"
-    | "workshops_accordion";
+    | "workshops_accordion"
+    | "youtube";
 
   export interface TemplateRow extends Row_with_translations {
     type: TemplateRowType;
@@ -340,7 +340,7 @@ export namespace FlowTypes {
     /** Keep a list of dynamic dependencies used within a template, by reference (e.g. {@local.var1 : ["text_1"]}) */
     _dynamicDependencies?: { [reference: string]: string[] };
     _translatedFields?: { [field: string]: any };
-    _evalContext?: { itemContext: TemplateRowItemEvalContext }; // force specific context variables when calculating eval statements (such as loop items)
+    _evalContext?: any; // force specific context variables when calculating eval statements (such as loop items)
     __EMPTY?: any; // empty cells (can be removed after pr 679 merged)
   }
 
@@ -362,7 +362,26 @@ export namespace FlowTypes {
     [key: string]: any;
   };
 
-  type IDynamicPrefix = IAppConfig["DYNAMIC_PREFIXES"][number];
+  const DYNAMIC_PREFIXES_COMPILER = ["gen", "row", "default"] as const;
+
+  const DYNAMIC_PREFIXES_RUNTIME = [
+    "local",
+    "field",
+    "fields",
+    "global",
+    "data",
+    "campaign",
+    "calc",
+    "item",
+    "raw",
+  ] as const;
+
+  export const DYNAMIC_PREFIXES = [
+    ...DYNAMIC_PREFIXES_COMPILER,
+    ...DYNAMIC_PREFIXES_RUNTIME,
+  ] as const;
+
+  export type IDynamicPrefix = (typeof DYNAMIC_PREFIXES)[number];
 
   /** Data passed back from regex match, e.g. expression @local.someField => type:local, fieldName: someField */
   export interface TemplateRowDynamicEvaluator {
@@ -415,9 +434,13 @@ export namespace FlowTypes {
     "process_template",
     "reset_app",
     "save_to_device",
+    "screen_orientation",
     "set_field",
+    /** NOTE - only available from with data_items loop */
     "set_item",
+    /** NOTE - only available from with data_items loop */
     "set_items",
+    "set_data",
     "set_local",
     "share",
     "style",

diff --git a/packages/data-models/functions.ts b/packages/data-models/functions.ts
@@ -90,7 +90,7 @@ export function extractDynamicEvaluators(
           type = "raw";
         }
         // cross-check to ensure lookup matches one of the pre-defined dynamic field types (e.g. not [email protected])
-        if (!appConfigDefault.DYNAMIC_PREFIXES.includes(type)) {
+        if (!FlowTypes.DYNAMIC_PREFIXES.includes(type)) {
           return undefined;
         }
         return { fullExpression, matchedExpression, type, fieldName };

diff --git a/packages/scripts/src/commands/app-data/convert/index.ts b/packages/scripts/src/commands/app-data/convert/index.ts
@@ -60,7 +60,7 @@ export default program
  */
 export class AppDataConverter {
   /** Change version to invalidate all underlying caches */
-  public version = 20231002.0;
+  public version = 20241104.0;
 
   public activeDeployment = ActiveDeployment.get();
 

diff --git a/packages/scripts/src/commands/app-data/convert/utils/app-data-string.utils.ts b/packages/scripts/src/commands/app-data/convert/utils/app-data-string.utils.ts
@@ -97,6 +97,7 @@ export function extractDynamicDependencies(dynamicFields: FlowTypes.TemplateRow[
 }
 
 // Standardise newline characters within a string (i.e. replace "\r\n" (CRLF) with "\n" (LF))
+// also replace any remaining \r with \n (https://github.com/IDEMSInternational/open-app-builder/issues/2499)
 export function standardiseNewlines(str: string) {
-  return str.replace(/\\r\\n/g, "\\n");
+  return str.replace(/\\r\\n/g, "\\n").replace(/\\r/g, "\\n");
 }
diff --git a/packages/scripts/src/tasks/providers/git.ts b/packages/scripts/src/tasks/providers/git.ts
@@ -2,12 +2,14 @@ import chalk from "chalk";
 import fs from "fs-extra";
 import path from "path";
 import semver from "semver";
+import logUpdate from "log-update";
 import simpleGit, { ResetMode } from "simple-git";
 import type { SimpleGit, FileStatusResult } from "simple-git";
 import { Project, SyntaxKind } from "ts-morph";
 import { ActiveDeployment } from "../../commands/deployment/get";
 import { Logger, logOutput, openUrl, promptOptions } from "../../utils";
 import type { IDeploymentConfigJson } from "../../commands/deployment/common";
+import { pad, PATHS } from "shared";
 
 class GitProvider {
   private git: SimpleGit;
@@ -20,8 +22,14 @@ class GitProvider {
 
   /** Access git clone methods directly independent of deployment */
   public async cloneRepo(repoPath: string, localPath: string) {
-    const git = simpleGit();
-    return git.clone(repoPath, localPath);
+    console.log("\n");
+    const git = simpleGit(PATHS.DEPLOYMENTS_PATH, {
+      progress: ({ stage, progress, processed, total }) =>
+        logUpdate(chalk.gray(`${stage} | ${pad(progress, 2)}% | ${processed}/${total}`)),
+    });
+    const res = await git.clone(repoPath, localPath);
+    logUpdate.done();
+    return res;
   }
 
   /** Pull latest content from remote repo into local branch. Attempt to resolve any conflicts */

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -42,6 +42,8 @@ import { FeedbackService } from "./feature/feedback/feedback.service";
 import { ShareService } from "./shared/services/share/share.service";
 import { LocalStorageService } from "./shared/services/local-storage/local-storage.service";
 import { DeploymentService } from "./shared/services/deployment/deployment.service";
+import { ScreenOrientationService } from "./shared/services/screen-orientation/screen-orientation.service";
+import { TemplateMetadataService } from "./shared/components/template/services/template-metadata.service";
 
 @Component({
   selector: "app-root",
@@ -89,6 +91,7 @@ export class AppComponent {
     private tourService: TourService,
     private templateService: TemplateService,
     private templateFieldService: TemplateFieldService,
+    private templateMetadataService: TemplateMetadataService,
     private templateProcessService: TemplateProcessService,
     private appEventService: AppEventService,
     private campaignService: CampaignService,
@@ -111,7 +114,8 @@ export class AppComponent {
     private appUpdateService: AppUpdateService,
     private remoteAssetService: RemoteAssetService,
     private shareService: ShareService,
-    private fileManagerService: FileManagerService
+    private fileManagerService: FileManagerService,
+    private screenOrientationService: ScreenOrientationService
   ) {
     this.initializeApp();
   }
@@ -249,6 +253,8 @@ export class AppComponent {
         this.feedbackService,
         this.shareService,
         this.fileManagerService,
+        this.templateMetadataService,
+        this.screenOrientationService,
       ],
       deferred: [this.analyticsService],
       implicit: [

diff --git a/src/app/feature/template/template.page.html b/src/app/feature/template/template.page.html
@@ -1,17 +1,15 @@
 <ion-content [scrollEvents]="shouldEmitScrollEvents">
-  <plh-template-container
-    *ngIf="templateName"
-    [templatename]="templateName"
-  ></plh-template-container>
-  <div *ngIf="!templateName" class="ion-padding">
+  @if (templateName) {
+  <plh-template-container [templatename]="templateName"></plh-template-container>
+  } @else {
+  <div class="ion-padding">
     <h3>Select a Template</h3>
     <ion-searchbar [(ngModel)]="filterTerm" (ionInput)="search()"></ion-searchbar>
     <ion-list>
-      <ion-item
-        *ngFor="let template of filteredTemplates; trackBy: trackByFn"
-        [routerLink]="template.flow_name"
-        >{{template.flow_name}}</ion-item
-      >
+      @for(template of filteredTemplates; track $index) {
+      <ion-item [routerLink]="template.flow_name">{{template.flow_name}}</ion-item>
+      }
     </ion-list>
   </div>
+  }
 </ion-content>
diff --git a/src/app/feature/template/template.page.ts b/src/app/feature/template/template.page.ts
@@ -18,6 +18,7 @@ export class TemplatePage implements OnInit, OnDestroy {
   filteredTemplates: FlowTypes.FlowTypeBase[] = [];
   appConfigChanges$: Subscription;
   shouldEmitScrollEvents: boolean = false;
+
   constructor(
     private route: ActivatedRoute,
     private appDataService: AppDataService,
@@ -26,21 +27,23 @@ export class TemplatePage implements OnInit, OnDestroy {
 
   ngOnInit() {
     this.templateName = this.route.snapshot.params.templateName;
-    const allTemplates = this.appDataService.listSheetsByType("template");
-    this.allTemplates = allTemplates.sort((a, b) => (a.flow_name > b.flow_name ? 1 : -1));
-    this.filteredTemplates = allTemplates;
+    if (!this.templateName) {
+      this.listTemplates();
+    }
     this.subscribeToAppConfigChanges();
   }
 
-  search() {
-    this.allTemplates = this.allTemplates;
+  public search() {
     this.filteredTemplates = this.allTemplates.filter(
       (i) => i.flow_name.toLocaleLowerCase().indexOf(this.filterTerm.toLowerCase()) > -1
     );
   }
 
-  trackByFn(index) {
-    return index;
+  /** Create a list of all templates to display when no specific template loaded */
+  private listTemplates() {
+    const allTemplates = this.appDataService.listSheetsByType("template");
+    this.allTemplates = allTemplates.sort((a, b) => (a.flow_name > b.flow_name ? 1 : -1));
+    this.filteredTemplates = allTemplates;
   }
 
   private subscribeToAppConfigChanges() {

diff --git a/src/app/shared/components/template/components/accordion/accordion.component.scss b/src/app/shared/components/template/components/accordion/accordion.component.scss
@@ -1,7 +1,7 @@
 // Create overlapping effect
 ion-accordion {
   background: white;
-  border: 1px solid var(--ion-color-primary);
+  border: var(--border-standard);
   border-radius: 10px;
   margin-top: -12px;
   padding-top: 8px;