Merge branch 'main' into perf/ListAllRepositories

goharbor · Feb 11, 2025 · 1476936 · 1476936
2 parents 774e206 + 490f898
commit 1476936
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 12 deletions.
diff --git 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
@@ -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

diff --git a/...se/left-side-nav/interrogation-services/vulnerability/vulnerability-config.component.html b/...se/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/...se/left-side-nav/interrogation-services/vulnerability/vulnerability-config.component.scss b/...se/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;

diff --git a/...de-nav/replication/replication/list-replication-rule/list-replication-rule.component.html b/...de-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