From 7ef0fe371ac49f1b61db4960e1495d60198782f2 Mon Sep 17 00:00:00 2001
From: Andre Colle <andre.colle@nav.no>
Date: Fri, 7 Mar 2025 12:59:14 +0100
Subject: [PATCH 1/2] Switch to Or condition in TAG_Event.flow-meta.xml

---
 force-app/main/default/flows/TAG_Event.flow-meta.xml | 2 +-
 force-app/main/default/flows/TAG_Task.flow-meta.xml  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/force-app/main/default/flows/TAG_Event.flow-meta.xml b/force-app/main/default/flows/TAG_Event.flow-meta.xml
index 52fcf521e..a8c24088b 100644
--- a/force-app/main/default/flows/TAG_Event.flow-meta.xml
+++ b/force-app/main/default/flows/TAG_Event.flow-meta.xml
@@ -291,7 +291,7 @@
         <defaultConnectorLabel>Default Outcome</defaultConnectorLabel>
         <rules>
             <name>arb_agmote_iaEvent</name>
-            <conditionLogic>and</conditionLogic>
+            <conditionLogic>or</conditionLogic>
             <conditions>
                 <leftValueReference>$Record.RecordTypeName__c</leftValueReference>
                 <operator>EqualTo</operator>
diff --git a/force-app/main/default/flows/TAG_Task.flow-meta.xml b/force-app/main/default/flows/TAG_Task.flow-meta.xml
index 44d91275e..d670d17ba 100644
--- a/force-app/main/default/flows/TAG_Task.flow-meta.xml
+++ b/force-app/main/default/flows/TAG_Task.flow-meta.xml
@@ -314,8 +314,8 @@
         </defaultConnector>
         <defaultConnectorLabel>Other</defaultConnectorLabel>
         <rules>
-            <name>AG_Oppgave_or_IA_Event</name>
-            <conditionLogic>and</conditionLogic>
+            <name>AG_Oppgave_or_IA_Task</name>
+            <conditionLogic>or</conditionLogic>
             <conditions>
                 <leftValueReference>$Record.RecordTypeName__c</leftValueReference>
                 <operator>EqualTo</operator>
@@ -333,7 +333,7 @@
             <connector>
                 <targetReference>Is_Task_set_to_Completed</targetReference>
             </connector>
-            <label>AG Oppgave or IA Event</label>
+            <label>AG Oppgave or IA Task</label>
         </rules>
     </decisions>
     <decisions>

From c90d5807c8518dbd951eb77e189954b95765b755 Mon Sep 17 00:00:00 2001
From: Andre Colle <andre.colle@nav.no>
Date: Fri, 7 Mar 2025 13:28:33 +0100
Subject: [PATCH 2/2] New field TAG_UpdateTrigger__c.field-meta.xml

---
 .../fields/TAG_UpdateTrigger__c.field-meta.xml         |  9 +++++++++
 .../permissionsets/Admin_Base.permissionset-meta.xml   | 10 ++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 force-app/main/default/objects/Activity/fields/TAG_UpdateTrigger__c.field-meta.xml

diff --git a/force-app/main/default/objects/Activity/fields/TAG_UpdateTrigger__c.field-meta.xml b/force-app/main/default/objects/Activity/fields/TAG_UpdateTrigger__c.field-meta.xml
new file mode 100644
index 000000000..2595fb800
--- /dev/null
+++ b/force-app/main/default/objects/Activity/fields/TAG_UpdateTrigger__c.field-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+    <fullName>TAG_UpdateTrigger__c</fullName>
+    <defaultValue>false</defaultValue>
+    <description>This field is used to trigger update on records that have failed to be processed to kafka or nada</description>
+    <externalId>false</externalId>
+    <label>Update Trigger</label>
+    <type>Checkbox</type>
+</CustomField>
diff --git a/force-app/unpackagable/permissionsets/Admin_Base.permissionset-meta.xml b/force-app/unpackagable/permissionsets/Admin_Base.permissionset-meta.xml
index 21ff08fcc..86a0c16dc 100644
--- a/force-app/unpackagable/permissionsets/Admin_Base.permissionset-meta.xml
+++ b/force-app/unpackagable/permissionsets/Admin_Base.permissionset-meta.xml
@@ -261,6 +261,11 @@
         <field>Event.TAG_RelatedToObject__c</field>
         <readable>true</readable>
     </fieldPermissions>
+    <fieldPermissions>
+        <editable>true</editable>
+        <field>Event.TAG_UpdateTrigger__c</field>
+        <readable>true</readable>
+    </fieldPermissions>
     <fieldPermissions>
         <editable>false</editable>
         <field>Event.TAG_UserNAVUnit__c</field>
@@ -656,6 +661,11 @@
         <field>Task.TAG_RelatedToObject__c</field>
         <readable>true</readable>
     </fieldPermissions>
+    <fieldPermissions>
+        <editable>true</editable>
+        <field>Task.TAG_UpdateTrigger__c</field>
+        <readable>true</readable>
+    </fieldPermissions>
     <fieldPermissions>
         <editable>false</editable>
         <field>Task.TAG_UserNAVUnit__c</field>