Merge branch 'main' into dependabot/go_modules/src/go.opentelemetry.i…

…o/otel/exporters/otlp/otlptrace/otlptracehttp-1.34.0

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,
 			},
 		},
 	}

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

src/portal/.nvmrc

@@ -0,0 +1 @@
+v16.18.0

src/portal/README.md

@@ -8,11 +8,18 @@ This is the project based on Clarity and Angular to build Harbor UI.
 
 Start
 ============
-1. npm install (should trigger 'npm postinstall')
-2. npm run postinstall  (if not triggered, manually run this step)
-3. copy "proxy.config.mjs.temp" file to "proxy.config.mjs"                 
+1. Use the specified Node version:
+Run the following command to use the Node version specified in the .nvmrc file:
+```bash
+nvm install   # Install the Node version specified in .nvmrc (if not already installed)
+nvm use       # Switch to the specified Node version
+```
+This step helps avoid compatibility issues, especially with dependencies.
+2. npm install (should trigger 'npm postinstall')
+3. npm run postinstall  (if not triggered, manually run this step)
+4. copy "proxy.config.mjs.temp" file to "proxy.config.mjs"
    `cp proxy.config.mjs.temp proxy.config.mjs`
-4. Modify "proxy.config.mjs" to specify a Harbor server. And you can specify the agent if you work behind a corporate proxy
-5. npm run start
-6. open your browser on https://localhost:4200
+5. Modify "proxy.config.mjs" to specify a Harbor server. And you can specify the agent if you work behind a corporate proxy
+6. npm run start
+7. open your browser on https://localhost:4200
 

src/portal/src/app/base/left-side-nav/clearing-job/clearing-job-interfact.ts

@@ -21,4 +21,4 @@ export const NO: string = 'TAG_RETENTION.NO';
 
 export const REFRESH_STATUS_TIME_DIFFERENCE: number = 5000;
 
-export const WORKER_OPTIONS: number[] = [1, 2, 3, 4, 5];
+export const WORKER_OPTIONS: number[] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];

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

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;

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