From ad06eeecaf0a7e4a44b7df9cd3e7e2151c100c65 Mon Sep 17 00:00:00 2001
From: ajinkyak423 <ajinkyakumbhar423@gmail.com>
Date: Sat, 5 Oct 2024 19:40:28 +0530
Subject: [PATCH] Fix notifications not being delivered when using sources in
 Application

Signed-off-by: ajinkyak423 <ajinkyakumbhar423@gmail.com>
---
 docs/operator-manual/notifications/catalog.md | 60 +++++++++----------
 notifications_catalog/install.yaml            | 60 +++++++++----------
 .../templates/app-deployed.yaml               | 10 ++--
 .../templates/app-health-degraded.yaml        | 10 ++--
 .../templates/app-sync-failed.yaml            | 10 ++--
 .../templates/app-sync-running.yaml           | 10 ++--
 .../templates/app-sync-status-unknown.yaml    | 10 ++--
 .../templates/app-sync-succeeded.yaml         | 10 ++--
 8 files changed, 90 insertions(+), 90 deletions(-)

diff --git a/docs/operator-manual/notifications/catalog.md b/docs/operator-manual/notifications/catalog.md
index f4d88d2cf6aeb..19c23a972097e 100644
--- a/docs/operator-manual/notifications/catalog.md
+++ b/docs/operator-manual/notifications/catalog.md
@@ -57,8 +57,8 @@ slack:
         "short": true
       },
       {
-        "title": "Repository",
-        "value": "{{.app.spec.source.repoURL}}",
+        "title": {{- if .app.spec.source }} "Repository" {{- else if .app.spec.sources }} "Repositories" {{- end }},
+        "value": {{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},
         "short": true
       },
       {
@@ -86,8 +86,8 @@ teams:
       "value": "{{.app.status.sync.status}}"
     },
     {
-      "name": "Repository",
-      "value": "{{.app.spec.source.repoURL}}"
+      "name": {{- if .app.spec.source }} "Repository" {{- else if .app.spec.sources }} "Repositories" {{- end }},
+      "value": {{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},
     },
     {
       "name": "Revision",
@@ -115,7 +115,7 @@ teams:
       "name":"Open Repository",
       "targets":[{
         "os":"default",
-        "uri":"{{.app.spec.source.repoURL | call .repo.RepoURLToHTTPS}}"
+        "uri":{{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},
       }]
     }]
   themeColor: '#000080'
@@ -143,8 +143,8 @@ slack:
         "short": true
       },
       {
-        "title": "Repository",
-        "value": "{{.app.spec.source.repoURL}}",
+        "title": {{- if .app.spec.source }} "Repository" {{- else if .app.spec.sources }} "Repositories" {{- end }},
+        "value": {{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},
         "short": true
       }
       {{range $index, $c := .app.status.conditions}}
@@ -167,8 +167,8 @@ teams:
       "value": "{{.app.status.health.status}}"
     },
     {
-      "name": "Repository",
-      "value": "{{.app.spec.source.repoURL}}"
+      "name": {{- if .app.spec.source }} "Repository" {{- else if .app.spec.sources }} "Repositories" {{- end }},
+      "value": {{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},
     }
     {{range $index, $c := .app.status.conditions}}
       ,
@@ -192,7 +192,7 @@ teams:
       "name":"Open Repository",
       "targets":[{
         "os":"default",
-        "uri":"{{.app.spec.source.repoURL | call .repo.RepoURLToHTTPS}}"
+        "uri":{{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},
       }]
     }]
   themeColor: '#FF0000'
@@ -220,8 +220,8 @@ slack:
         "short": true
       },
       {
-        "title": "Repository",
-        "value": "{{.app.spec.source.repoURL}}",
+        "title": {{- if .app.spec.source }} "Repository" {{- else if .app.spec.sources }} "Repositories" {{- end }},
+        "value": {{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},
         "short": true
       }
       {{range $index, $c := .app.status.conditions}}
@@ -248,8 +248,8 @@ teams:
       "value": "{{.app.status.operationState.finishedAt}}"
     },
     {
-      "name": "Repository",
-      "value": "{{.app.spec.source.repoURL}}"
+      "name": {{- if .app.spec.source }} "Repository" {{- else if .app.spec.sources }} "Repositories" {{- end }},
+      "value": {{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},
     }
     {{range $index, $c := .app.status.conditions}}
       ,
@@ -273,7 +273,7 @@ teams:
       "name":"Open Repository",
       "targets":[{
         "os":"default",
-        "uri":"{{.app.spec.source.repoURL | call .repo.RepoURLToHTTPS}}"
+        "uri":{{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},}}" {{- end }},
       }]
     }]
   themeColor: '#FF0000'
@@ -301,8 +301,8 @@ slack:
         "short": true
       },
       {
-        "title": "Repository",
-        "value": "{{.app.spec.source.repoURL}}",
+        "title": {{- if .app.spec.source }} "Repository" {{- else if .app.spec.sources }} "Repositories" {{- end }},
+        "value": {{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},
         "short": true
       }
       {{range $index, $c := .app.status.conditions}}
@@ -329,8 +329,8 @@ teams:
       "value": "{{.app.status.operationState.startedAt}}"
     },
     {
-      "name": "Repository",
-      "value": "{{.app.spec.source.repoURL}}"
+       "name": {{- if .app.spec.source }} "Repository" {{- else if .app.spec.sources }} "Repositories" {{- end }},
+        "value": {{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},
     }
     {{range $index, $c := .app.status.conditions}}
       ,
@@ -354,7 +354,7 @@ teams:
       "name":"Open Repository",
       "targets":[{
         "os":"default",
-        "uri":"{{.app.spec.source.repoURL | call .repo.RepoURLToHTTPS}}"
+        "uri":{{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},}}" {{- end }},
       }]
     }]
   title: Start syncing application {{.app.metadata.name}}.
@@ -386,8 +386,8 @@ slack:
         "short": true
       },
       {
-        "title": "Repository",
-        "value": "{{.app.spec.source.repoURL}}",
+         "title": {{- if .app.spec.source }} "Repository" {{- else if .app.spec.sources }} "Repositories" {{- end }},
+        "value": {{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},
         "short": true
       }
       {{range $index, $c := .app.status.conditions}}
@@ -410,8 +410,8 @@ teams:
       "value": "{{.app.status.sync.status}}"
     },
     {
-      "name": "Repository",
-      "value": "{{.app.spec.source.repoURL}}"
+       "name": {{- if .app.spec.source }} "Repository" {{- else if .app.spec.sources }} "Repositories" {{- end }},
+        "value": {{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},
     }
     {{range $index, $c := .app.status.conditions}}
       ,
@@ -435,7 +435,7 @@ teams:
       "name":"Open Repository",
       "targets":[{
         "os":"default",
-        "uri":"{{.app.spec.source.repoURL | call .repo.RepoURLToHTTPS}}"
+        "uri":{{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},}}" {{- end }},
       }]
     }]
   title: Application {{.app.metadata.name}} sync status is 'Unknown'
@@ -462,8 +462,8 @@ slack:
         "short": true
       },
       {
-        "title": "Repository",
-        "value": "{{.app.spec.source.repoURL}}",
+        "title": {{- if .app.spec.source }} "Repository" {{- else if .app.spec.sources }} "Repositories" {{- end }},
+        "value": {{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},
         "short": true
       }
       {{range $index, $c := .app.status.conditions}}
@@ -490,8 +490,8 @@ teams:
       "value": "{{.app.status.operationState.finishedAt}}"
     },
     {
-      "name": "Repository",
-      "value": "{{.app.spec.source.repoURL}}"
+       "name": {{- if .app.spec.source }} "Repository" {{- else if .app.spec.sources }} "Repositories" {{- end }},
+        "value": {{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},
     }
     {{range $index, $c := .app.status.conditions}}
       ,
@@ -515,7 +515,7 @@ teams:
       "name":"Open Repository",
       "targets":[{
         "os":"default",
-        "uri":"{{.app.spec.source.repoURL | call .repo.RepoURLToHTTPS}}"
+        "uri":{{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},}}" {{- end }},
       }]
     }]
   themeColor: '#000080'
diff --git a/notifications_catalog/install.yaml b/notifications_catalog/install.yaml
index 7457b25ddad89..8572072616b45 100644
--- a/notifications_catalog/install.yaml
+++ b/notifications_catalog/install.yaml
@@ -30,8 +30,8 @@ data:
             "short": true
           },
           {
-            "title": "Repository",
-            "value": "{{.app.spec.source.repoURL}}",
+            "title": {{- if .app.spec.source }} "Repository" {{- else if .app.spec.sources }} "Repositories" {{- end }},
+            "value": {{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},
             "short": true
           },
           {
@@ -59,8 +59,8 @@ data:
           "value": "{{.app.status.sync.status}}"
         },
         {
-          "name": "Repository",
-          "value": "{{.app.spec.source.repoURL}}"
+          "name": {{- if .app.spec.source }} "Repository" {{- else if .app.spec.sources }} "Repositories" {{- end }},
+          "value": {{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},
         },
         {
           "name": "Revision",
@@ -88,7 +88,7 @@ data:
           "name":"Open Repository",
           "targets":[{
             "os":"default",
-            "uri":"{{.app.spec.source.repoURL | call .repo.RepoURLToHTTPS}}"
+            "uri":{{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},}}" {{- end }},
           }]
         }]
       themeColor: '#000080'
@@ -112,8 +112,8 @@ data:
             "short": true
           },
           {
-            "title": "Repository",
-            "value": "{{.app.spec.source.repoURL}}",
+            "title": {{- if .app.spec.source }} "Repository" {{- else if .app.spec.sources }} "Repositories" {{- end }},
+            "value": {{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},
             "short": true
           }
           {{range $index, $c := .app.status.conditions}}
@@ -136,8 +136,8 @@ data:
           "value": "{{.app.status.health.status}}"
         },
         {
-          "name": "Repository",
-          "value": "{{.app.spec.source.repoURL}}"
+          "name": {{- if .app.spec.source }} "Repository" {{- else if .app.spec.sources }} "Repositories" {{- end }},
+          "value": {{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},
         }
         {{range $index, $c := .app.status.conditions}}
           ,
@@ -161,7 +161,7 @@ data:
           "name":"Open Repository",
           "targets":[{
             "os":"default",
-            "uri":"{{.app.spec.source.repoURL | call .repo.RepoURLToHTTPS}}"
+            "uri":{{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},}}" {{- end }},
           }]
         }]
       themeColor: '#FF0000'
@@ -185,8 +185,8 @@ data:
             "short": true
           },
           {
-            "title": "Repository",
-            "value": "{{.app.spec.source.repoURL}}",
+            "title": {{- if .app.spec.source }} "Repository" {{- else if .app.spec.sources }} "Repositories" {{- end }},
+            "value": {{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},
             "short": true
           }
           {{range $index, $c := .app.status.conditions}}
@@ -213,8 +213,8 @@ data:
           "value": "{{.app.status.operationState.finishedAt}}"
         },
         {
-          "name": "Repository",
-          "value": "{{.app.spec.source.repoURL}}"
+          "name": {{- if .app.spec.source }} "Repository" {{- else if .app.spec.sources }} "Repositories" {{- end }},
+          "value": {{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},
         }
         {{range $index, $c := .app.status.conditions}}
           ,
@@ -238,7 +238,7 @@ data:
           "name":"Open Repository",
           "targets":[{
             "os":"default",
-            "uri":"{{.app.spec.source.repoURL | call .repo.RepoURLToHTTPS}}"
+            "uri":{{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},}}" {{- end }},
           }]
         }]
       themeColor: '#FF0000'
@@ -262,8 +262,8 @@ data:
             "short": true
           },
           {
-            "title": "Repository",
-            "value": "{{.app.spec.source.repoURL}}",
+            "title": {{- if .app.spec.source }} "Repository" {{- else if .app.spec.sources }} "Repositories" {{- end }},
+            "value": {{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},
             "short": true
           }
           {{range $index, $c := .app.status.conditions}}
@@ -290,8 +290,8 @@ data:
           "value": "{{.app.status.operationState.startedAt}}"
         },
         {
-          "name": "Repository",
-          "value": "{{.app.spec.source.repoURL}}"
+          "name": {{- if .app.spec.source }} "Repository" {{- else if .app.spec.sources }} "Repositories" {{- end }},
+          "value": {{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},
         }
         {{range $index, $c := .app.status.conditions}}
           ,
@@ -315,7 +315,7 @@ data:
           "name":"Open Repository",
           "targets":[{
             "os":"default",
-            "uri":"{{.app.spec.source.repoURL | call .repo.RepoURLToHTTPS}}"
+            "uri":{{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},}}" {{- end }},
           }]
         }]
       title: Start syncing application {{.app.metadata.name}}.
@@ -343,8 +343,8 @@ data:
             "short": true
           },
           {
-            "title": "Repository",
-            "value": "{{.app.spec.source.repoURL}}",
+            "title": {{- if .app.spec.source }} "Repository" {{- else if .app.spec.sources }} "Repositories" {{- end }},
+            "value": {{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},
             "short": true
           }
           {{range $index, $c := .app.status.conditions}}
@@ -367,8 +367,8 @@ data:
           "value": "{{.app.status.sync.status}}"
         },
         {
-          "name": "Repository",
-          "value": "{{.app.spec.source.repoURL}}"
+          "name": {{- if .app.spec.source }} "Repository" {{- else if .app.spec.sources }} "Repositories" {{- end }},
+          "value": {{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},
         }
         {{range $index, $c := .app.status.conditions}}
           ,
@@ -392,7 +392,7 @@ data:
           "name":"Open Repository",
           "targets":[{
             "os":"default",
-            "uri":"{{.app.spec.source.repoURL | call .repo.RepoURLToHTTPS}}"
+            "uri":{{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},}}" {{- end }},
           }]
         }]
       title: Application {{.app.metadata.name}} sync status is 'Unknown'
@@ -415,8 +415,8 @@ data:
             "short": true
           },
           {
-            "title": "Repository",
-            "value": "{{.app.spec.source.repoURL}}",
+            "title": {{- if .app.spec.source }} "Repository" {{- else if .app.spec.sources }} "Repositories" {{- end }},
+            "value": {{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},
             "short": true
           }
           {{range $index, $c := .app.status.conditions}}
@@ -443,8 +443,8 @@ data:
           "value": "{{.app.status.operationState.finishedAt}}"
         },
         {
-          "name": "Repository",
-          "value": "{{.app.spec.source.repoURL}}"
+          "name": {{- if .app.spec.source }} "Repository" {{- else if .app.spec.sources }} "Repositories" {{- end }},
+          "value": {{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},
         }
         {{range $index, $c := .app.status.conditions}}
           ,
@@ -468,7 +468,7 @@ data:
           "name":"Open Repository",
           "targets":[{
             "os":"default",
-            "uri":"{{.app.spec.source.repoURL | call .repo.RepoURLToHTTPS}}"
+            "uri":{{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},}}" {{- end }},
           }]
         }]
       themeColor: '#000080'
diff --git a/notifications_catalog/templates/app-deployed.yaml b/notifications_catalog/templates/app-deployed.yaml
index ee58c775f1fd8..cf54628c30eb4 100644
--- a/notifications_catalog/templates/app-deployed.yaml
+++ b/notifications_catalog/templates/app-deployed.yaml
@@ -15,8 +15,8 @@ slack:
             "short": true
           },
           {
-            "title": "Repository",
-            "value": "{{.app.spec.source.repoURL}}",
+            "title": {{- if .app.spec.source }} "Repository" {{- else if .app.spec.sources }} "Repositories" {{- end }},
+            "value": {{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},
             "short": true
           },
           {
@@ -43,8 +43,8 @@ teams:
           "value": "{{.app.status.sync.status}}"
         },
         {
-          "name": "Repository",
-          "value": "{{.app.spec.source.repoURL}}"
+          "name": {{- if .app.spec.source }} "Repository" {{- else if .app.spec.sources }} "Repositories" {{- end }},
+          "value": {{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},
         },
         {
           "name": "Revision",
@@ -72,6 +72,6 @@ teams:
           "name":"Open Repository",
           "targets":[{
             "os":"default",
-            "uri":"{{.app.spec.source.repoURL | call .repo.RepoURLToHTTPS}}"
+            "uri":{{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},}}" {{- end }},
           }]
         }]
\ No newline at end of file
diff --git a/notifications_catalog/templates/app-health-degraded.yaml b/notifications_catalog/templates/app-health-degraded.yaml
index 59115c9a14935..fcb0022785e77 100644
--- a/notifications_catalog/templates/app-health-degraded.yaml
+++ b/notifications_catalog/templates/app-health-degraded.yaml
@@ -16,8 +16,8 @@ slack:
             "short": true
           },
           {
-            "title": "Repository",
-            "value": "{{.app.spec.source.repoURL}}",
+            "title": {{- if .app.spec.source }} "Repository" {{- else if .app.spec.sources }} "Repositories" {{- end }},
+            "value": {{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},
             "short": true
           }
           {{range $index, $c := .app.status.conditions}}
@@ -39,8 +39,8 @@ teams:
           "value": "{{.app.status.health.status}}"
         },
         {
-          "name": "Repository",
-          "value": "{{.app.spec.source.repoURL}}"
+          "name": {{- if .app.spec.source }} "Repository" {{- else if .app.spec.sources }} "Repositories" {{- end }},
+          "value": {{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},
         }
         {{range $index, $c := .app.status.conditions}}
           ,
@@ -64,6 +64,6 @@ teams:
           "name":"Open Repository",
           "targets":[{
             "os":"default",
-            "uri":"{{.app.spec.source.repoURL | call .repo.RepoURLToHTTPS}}"
+            "uri":{{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},}}" {{- end }},
           }]
         }]
diff --git a/notifications_catalog/templates/app-sync-failed.yaml b/notifications_catalog/templates/app-sync-failed.yaml
index a4c23787dde8b..37f57549ac1c6 100644
--- a/notifications_catalog/templates/app-sync-failed.yaml
+++ b/notifications_catalog/templates/app-sync-failed.yaml
@@ -16,8 +16,8 @@ slack:
             "short": true
           },
           {
-            "title": "Repository",
-            "value": "{{.app.spec.source.repoURL}}",
+            "title": {{- if .app.spec.source }} "Repository" {{- else if .app.spec.sources }} "Repositories" {{- end }},
+            "value": {{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},
             "short": true
           }
           {{range $index, $c := .app.status.conditions}}
@@ -43,8 +43,8 @@ teams:
           "value": "{{.app.status.operationState.finishedAt}}"
         },
         {
-          "name": "Repository",
-          "value": "{{.app.spec.source.repoURL}}"
+          "name": {{- if .app.spec.source }} "Repository" {{- else if .app.spec.sources }} "Repositories" {{- end }},
+          "value": {{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},
         }
         {{range $index, $c := .app.status.conditions}}
           ,
@@ -68,6 +68,6 @@ teams:
           "name":"Open Repository",
           "targets":[{
             "os":"default",
-            "uri":"{{.app.spec.source.repoURL | call .repo.RepoURLToHTTPS}}"
+            "uri":{{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},}}" {{- end }},
           }]
         }]
\ No newline at end of file
diff --git a/notifications_catalog/templates/app-sync-running.yaml b/notifications_catalog/templates/app-sync-running.yaml
index 434132ad86d89..06d133cd047db 100644
--- a/notifications_catalog/templates/app-sync-running.yaml
+++ b/notifications_catalog/templates/app-sync-running.yaml
@@ -16,8 +16,8 @@ slack:
             "short": true
           },
           {
-            "title": "Repository",
-            "value": "{{.app.spec.source.repoURL}}",
+            "title": {{- if .app.spec.source }} "Repository" {{- else if .app.spec.sources }} "Repositories" {{- end }},
+            "value": {{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},
             "short": true
           }
           {{range $index, $c := .app.status.conditions}}
@@ -42,8 +42,8 @@ teams:
           "value": "{{.app.status.operationState.startedAt}}"
         },
         {
-          "name": "Repository",
-          "value": "{{.app.spec.source.repoURL}}"
+          "name": {{- if .app.spec.source }} "Repository" {{- else if .app.spec.sources }} "Repositories" {{- end }},
+          "value": {{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},
         }
         {{range $index, $c := .app.status.conditions}}
           ,
@@ -67,6 +67,6 @@ teams:
           "name":"Open Repository",
           "targets":[{
             "os":"default",
-            "uri":"{{.app.spec.source.repoURL | call .repo.RepoURLToHTTPS}}"
+            "uri":{{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},}}" {{- end }},
           }]
         }]
\ No newline at end of file
diff --git a/notifications_catalog/templates/app-sync-status-unknown.yaml b/notifications_catalog/templates/app-sync-status-unknown.yaml
index c893070bfcc63..fd13d2b64fcf6 100644
--- a/notifications_catalog/templates/app-sync-status-unknown.yaml
+++ b/notifications_catalog/templates/app-sync-status-unknown.yaml
@@ -21,8 +21,8 @@ slack:
             "short": true
           },
           {
-            "title": "Repository",
-            "value": "{{.app.spec.source.repoURL}}",
+            "title": {{- if .app.spec.source }} "Repository" {{- else if .app.spec.sources }} "Repositories" {{- end }},
+            "value": {{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},
             "short": true
           }
           {{range $index, $c := .app.status.conditions}}
@@ -43,8 +43,8 @@ teams:
           "value": "{{.app.status.sync.status}}"
         },
         {
-          "name": "Repository",
-          "value": "{{.app.spec.source.repoURL}}"
+          "name": {{- if .app.spec.source }} "Repository" {{- else if .app.spec.sources }} "Repositories" {{- end }},
+          "value": {{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},
         }
         {{range $index, $c := .app.status.conditions}}
           ,
@@ -68,6 +68,6 @@ teams:
           "name":"Open Repository",
           "targets":[{
             "os":"default",
-            "uri":"{{.app.spec.source.repoURL | call .repo.RepoURLToHTTPS}}"
+            "uri":{{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},}}" {{- end }},
           }]
         }]
\ No newline at end of file
diff --git a/notifications_catalog/templates/app-sync-succeeded.yaml b/notifications_catalog/templates/app-sync-succeeded.yaml
index 76e467bd1c37d..2e5f0d3863de6 100644
--- a/notifications_catalog/templates/app-sync-succeeded.yaml
+++ b/notifications_catalog/templates/app-sync-succeeded.yaml
@@ -16,8 +16,8 @@ slack:
             "short": true
           },
           {
-            "title": "Repository",
-            "value": "{{.app.spec.source.repoURL}}",
+            "title": {{- if .app.spec.source }} "Repository" {{- else if .app.spec.sources }} "Repositories" {{- end }},
+            "value": {{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},
             "short": true
           }
           {{range $index, $c := .app.status.conditions}}
@@ -43,8 +43,8 @@ teams:
           "value": "{{.app.status.operationState.finishedAt}}"
         },
         {
-          "name": "Repository",
-          "value": "{{.app.spec.source.repoURL}}"
+          "name": {{- if .app.spec.source }} "Repository" {{- else if .app.spec.sources }} "Repositories" {{- end }},
+          "value": {{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},
         }
         {{range $index, $c := .app.status.conditions}}
           ,
@@ -68,6 +68,6 @@ teams:
           "name":"Open Repository",
           "targets":[{
             "os":"default",
-            "uri":"{{.app.spec.source.repoURL | call .repo.RepoURLToHTTPS}}"
+            "uri":{{- if .app.spec.source }} ":arrow_heading_up: {{ .app.spec.source.repoURL }}" {{- else if .app.spec.sources }} "{{- range $index, $source := .app.spec.sources }}{{ if $index }}\n{{ end }}:arrow_heading_up: {{ $source.repoURL }}{{- end }}" {{- end }},}}" {{- end }},
           }]
         }]
\ No newline at end of file