From 53cf87a2c3c508094455af0467ca58730b8e7d1d Mon Sep 17 00:00:00 2001
From: Francine Ong <francine.o@live.com>
Date: Tue, 12 May 2026 16:49:14 +0200
Subject: [PATCH 1/2] fix error when instructions is null

---
 .../angular-sdk-components/src/lib/_helpers/template-utils.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular-sdk-components/src/lib/_helpers/template-utils.ts b/packages/angular-sdk-components/src/lib/_helpers/template-utils.ts
index 15b05853..8c905380 100644
--- a/packages/angular-sdk-components/src/lib/_helpers/template-utils.ts
+++ b/packages/angular-sdk-components/src/lib/_helpers/template-utils.ts
@@ -53,7 +53,7 @@ export class TemplateUtils {
     // it is evaluated by core logic to the content
     if (instructions !== 'casestep' && instructions !== 'none') {
       // if the instructions contains a link, and the link is external, add a target attribute to open in a new window
-      if (instructions.includes('<a')) {
+      if (instructions?.includes('<a')) {
         const parser = new DOMParser();
         const htmlDoc = parser.parseFromString(instructions, 'text/html');
         const anchorNode = htmlDoc.querySelector('a');

From 0bab32201f7546de915c1cd6f4be9d4f318cd604 Mon Sep 17 00:00:00 2001
From: Francine Ong <francine.o@live.com>
Date: Mon, 27 Jul 2026 17:10:11 +0200
Subject: [PATCH 2/2] #512: by moving the value mapping to the end,
 this.options$ is always populated before trying to match the key

---
 .../field/auto-complete/auto-complete.component.ts   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/angular-sdk-components/src/lib/_components/field/auto-complete/auto-complete.component.ts b/packages/angular-sdk-components/src/lib/_components/field/auto-complete/auto-complete.component.ts
index 9c37343d..de37b839 100644
--- a/packages/angular-sdk-components/src/lib/_components/field/auto-complete/auto-complete.component.ts
+++ b/packages/angular-sdk-components/src/lib/_components/field/auto-complete/auto-complete.component.ts
@@ -94,12 +94,6 @@ export class AutoCompleteComponent extends FieldBase implements OnInit {
     // Set component specific properties
     const { value, listType, parameters } = this.configProps$;
 
-    if (value != undefined) {
-      const index = this.options$?.findIndex(element => element.key === value);
-      this.value$ = index > -1 ? this.options$[index].value : value;
-      this.fieldControl.setValue(this.value$);
-    }
-
     this.listType = listType;
     this.parameters = parameters;
 
@@ -119,6 +113,12 @@ export class AutoCompleteComponent extends FieldBase implements OnInit {
       const results = await this.dataPageService.getDataPageData(datasource, this.parameters, context);
       this.fillOptions(results);
     }
+
+    if (value != undefined) {
+      const index = this.options$?.findIndex(element => element.key === value);
+      this.value$ = index > -1 ? this.options$[index].value : value;
+      this.fieldControl.setValue(this.value$);
+    }
   }
 
   generateColumnsAndDataSource() {