From c0ef35896dc61775fa2ec38a70a80e5fa256cffe Mon Sep 17 00:00:00 2001
From: Prasanth Baskar <bupdprasanth@gmail.com>
Date: Sat, 8 Feb 2025 14:58:17 +0530
Subject: [PATCH 1/3] Fix: Incorrect Data Display in Replications Table
 (#21461)

fix incorrect data display in replications table

Signed-off-by: bupd <bupdprasanth@gmail.com>
---
 .../list-replication-rule.component.html         | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/portal/src/app/base/left-side-nav/replication/replication/list-replication-rule/list-replication-rule.component.html b/src/portal/src/app/base/left-side-nav/replication/replication/list-replication-rule/list-replication-rule.component.html
index 96f1c7caa64..b277296be73 100644
--- a/src/portal/src/app/base/left-side-nav/replication/replication/list-replication-rule/list-replication-rule.component.html
+++ b/src/portal/src/app/base/left-side-nav/replication/replication/list-replication-rule/list-replication-rule.component.html
@@ -179,14 +179,6 @@
                 getFlattenLevelString(p.dest_namespace_replace_count)
                     | translate
             }}</clr-dg-cell>
-            <clr-dg-cell class="trigger">
-                {{ getTriggerTypeI18n(p.trigger) | translate }}
-                <clr-signpost *ngIf="p?.trigger?.trigger_settings?.cron">
-                    <clr-signpost-content *clrIfOpen>
-                        {{ p?.trigger?.trigger_settings?.cron }}
-                    </clr-signpost-content>
-                </clr-signpost>
-            </clr-dg-cell>
             <clr-dg-cell>{{
                 getBandwidthStr(p.speed) | translate
             }}</clr-dg-cell>
@@ -206,6 +198,14 @@
                     </clr-tooltip-content>
                 </clr-tooltip>
             </clr-dg-cell>
+            <clr-dg-cell class="trigger">
+                {{ getTriggerTypeI18n(p.trigger) | translate }}
+                <clr-signpost *ngIf="p?.trigger?.trigger_settings?.cron">
+                    <clr-signpost-content *clrIfOpen>
+                        {{ p?.trigger?.trigger_settings?.cron }}
+                    </clr-signpost-content>
+                </clr-signpost>
+            </clr-dg-cell>
         </clr-dg-row>
         <clr-dg-footer>
             <clr-dg-pagination

From fee92c51894cb8110d70eb4f1cb21c7390805006 Mon Sep 17 00:00:00 2001
From: Prasanth Baskar <bupdprasanth@gmail.com>
Date: Mon, 10 Feb 2025 10:56:13 +0530
Subject: [PATCH 2/3] Fix Overflow in Interrogation Services Page (#21043)

* fix overflow in interrogation services vuln page

Signed-off-by: bupd <bupdprasanth@gmail.com>

* add space between items in vuln page

* adds padding in between scan now and results of the scan

Signed-off-by: bupd <bupdprasanth@gmail.com>

---------

Signed-off-by: bupd <bupdprasanth@gmail.com>
---
 .../vulnerability/vulnerability-config.component.html     | 8 +++++---
 .../vulnerability/vulnerability-config.component.scss     | 6 +++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/portal/src/app/base/left-side-nav/interrogation-services/vulnerability/vulnerability-config.component.html b/src/portal/src/app/base/left-side-nav/interrogation-services/vulnerability/vulnerability-config.component.html
index c5ec18cbc65..4a6731dba55 100644
--- a/src/portal/src/app/base/left-side-nav/interrogation-services/vulnerability/vulnerability-config.component.html
+++ b/src/portal/src/app/base/left-side-nav/interrogation-services/vulnerability/vulnerability-config.component.html
@@ -19,8 +19,8 @@
                 (inputvalue)="saveSchedule($event)"></cron-selection>
         </div>
     </section>
-    <div class="clr-row">
-        <div class="clr-col-2 flex-200">
+    <div class="clr-col-5">
+        <div class="clr-row-3">
             <div class="btn-scan-right btn-scan margin-top-16px">
                 <button
                     id="scan"
@@ -39,7 +39,9 @@
                     class="spinner spinner-inline margin-left-5 v-mid"></span>
             </div>
         </div>
-        <div class="clr-col" *ngIf="scanningMetrics && scanningMetrics.total">
+        <div
+            class="clr-row-2 pt-4"
+            *ngIf="scanningMetrics && scanningMetrics.total">
             <div class="total" [style.width]="totalWidth + 'px'">
                 <span class="float-left" *ngIf="isManual()">{{
                     'CONFIG.SCANNING.MANUAL' | translate
diff --git a/src/portal/src/app/base/left-side-nav/interrogation-services/vulnerability/vulnerability-config.component.scss b/src/portal/src/app/base/left-side-nav/interrogation-services/vulnerability/vulnerability-config.component.scss
index 3b6bc12fd70..833f1b8826a 100644
--- a/src/portal/src/app/base/left-side-nav/interrogation-services/vulnerability/vulnerability-config.component.scss
+++ b/src/portal/src/app/base/left-side-nav/interrogation-services/vulnerability/vulnerability-config.component.scss
@@ -43,7 +43,7 @@
             width: 160px;
             margin-bottom: 0;
             margin-top: 41px;
-       } 
+       }
     }
 }
 
@@ -73,6 +73,10 @@
     flex: 0 0 200px;
 }
 
+.pt-4 {
+    padding-top: 1rem;
+}
+
 .total {
     text-align: right;
     line-height: 15px;

From 490f898aecbad8cba7ce9d833b43304563423d09 Mon Sep 17 00:00:00 2001
From: Chlins Zhang <chlins.zhang@gmail.com>
Date: Tue, 11 Feb 2025 14:58:07 +0800
Subject: [PATCH 3/3] feat: add execution_id and task_id to the replication
 webhook payload (#21614)

Signed-off-by: chlins <chlins.zhang@gmail.com>
---
 src/controller/event/handler/webhook/artifact/replication.go | 2 ++
 src/controller/event/model/event.go                          | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/controller/event/handler/webhook/artifact/replication.go b/src/controller/event/handler/webhook/artifact/replication.go
index 56ceb0bb1f2..03a43e21d30 100644
--- a/src/controller/event/handler/webhook/artifact/replication.go
+++ b/src/controller/event/handler/webhook/artifact/replication.go
@@ -163,6 +163,8 @@ func constructReplicationPayload(ctx context.Context, event *event.ReplicationEv
 				OverrideMode:       rpPolicy.Override,
 				TriggerType:        string(execution.Trigger),
 				ExecutionTimestamp: execution.StartTime.Unix(),
+				ExecutionID:        execution.ID,
+				TaskID:             task.ID,
 			},
 		},
 	}
diff --git a/src/controller/event/model/event.go b/src/controller/event/model/event.go
index 023bc8205e3..03aa7b6e7cd 100644
--- a/src/controller/event/model/event.go
+++ b/src/controller/event/model/event.go
@@ -36,6 +36,8 @@ type Replication struct {
 	DestResource       *ReplicationResource `json:"dest_resource,omitempty"`
 	SuccessfulArtifact []*ArtifactInfo      `json:"successful_artifact,omitempty"`
 	FailedArtifact     []*ArtifactInfo      `json:"failed_artifact,omitempty"`
+	ExecutionID        int64                `json:"execution_id,omitempty"`
+	TaskID             int64                `json:"task_id,omitempty"`
 }
 
 // ArtifactInfo describe info of artifact