From d7f53e51a98a106eb2674828d7b7c80e39f0b769 Mon Sep 17 00:00:00 2001
From: Yang Jiao <jiaoya@vmware.com>
Date: Mon, 1 Nov 2021 11:27:52 +0800
Subject: [PATCH 1/2] Add test case to verify imgpkg in nightly

Signed-off-by: Yang Jiao <jiaoya@vmware.com>
---
 tests/resources/TestCaseBody.robot            |  4 +++
 .../Group0-Util/prepare_imgpkg_test_files.sh  | 27 +++++++++++++++++++
 tests/robot-cases/Group1-Nightly/Common.robot | 19 ++++++++++++-
 tests/test-engine-image/Dockerfile.common     |  3 +++
 tests/test-engine-image/Dockerfile.ui_test    |  1 +
 5 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100755 tests/robot-cases/Group0-Util/prepare_imgpkg_test_files.sh

diff --git a/tests/resources/TestCaseBody.robot b/tests/resources/TestCaseBody.robot
index 7aae626b6..66b185227 100644
--- a/tests/resources/TestCaseBody.robot
+++ b/tests/resources/TestCaseBody.robot
@@ -459,3 +459,7 @@ Check Harbor Api Page
     ${Title}=  Get Title
     Should Be Equal  ${Title}  Harbor Swagger
     Retry Wait Element  xpath=//h2[contains(.,"Harbor API")]
+
+Prepare Image Package Test Files
+    [Arguments]  ${files_path}
+    ${rc}  ${output}=  Run And Return Rc And Output  bash tests/robot-cases/Group0-Util/prepare_imgpkg_test_files.sh ${files_path}
diff --git a/tests/robot-cases/Group0-Util/prepare_imgpkg_test_files.sh b/tests/robot-cases/Group0-Util/prepare_imgpkg_test_files.sh
new file mode 100755
index 000000000..cfb428fc2
--- /dev/null
+++ b/tests/robot-cases/Group0-Util/prepare_imgpkg_test_files.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+set -x
+set -e
+
+FILE_DIRECTORY=$1
+FILE_PATH=$FILE_DIRECTORY/.imgpkg
+mkdir "$FILE_DIRECTORY"
+mkdir "$FILE_PATH"
+
+cat > "$FILE_PATH"/bundle.yml <<EOF
+---
+apiVersion: imgpkg.carvel.dev/v1alpha1
+kind: Bundle
+metadata:
+  name: my-app
+authors:
+- name: blah
+  email: blah@blah.com
+websites:
+- url: blah.com
+EOF
+
+cat > "$FILE_PATH"/images.yml <<EOF
+---
+apiVersion: imgpkg.carvel.dev/v1alpha1
+kind: ImagesLock
+EOF
\ No newline at end of file
diff --git a/tests/robot-cases/Group1-Nightly/Common.robot b/tests/robot-cases/Group1-Nightly/Common.robot
index 75d5fce05..13c36143f 100644
--- a/tests/robot-cases/Group1-Nightly/Common.robot
+++ b/tests/robot-cases/Group1-Nightly/Common.robot
@@ -840,4 +840,21 @@ Test Case - WASM Push And Pull To Harbor
     Wait Unitl Command Success  wasm-to-oci push hello.wasm ${ip}/project${d}/wasm-to-oci:v1
     Wait Unitl Command Success  wasm-to-oci pull ${ip}/project${d}/wasm-to-oci:v1 --out test.wasm
     Wait Unitl Command Success  docker logout ${ip}
-    Retry file should exist  test.wasm
\ No newline at end of file
+    Retry file should exist  test.wasm
+
+Test Case - Carvel Imgpkg Push And Pull To Harbor
+    [Tags]  imgpkg_push_and_pull
+    Init Chrome Driver
+    ${user}=    Set Variable    user004
+    ${pwd}=    Set Variable    Test1@34
+    ${out_path}=    Set Variable    /tmp/my-bundle
+    Sign In Harbor  ${HARBOR_URL}  ${user}  ${pwd}
+    ${d}=   Get Current Date    result_format=%m%s
+    Create An New Project And Go Into Project  project${d}
+    Prepare Image Package Test Files  ${EXECDIR}/config
+    Wait Unitl Command Success  docker login -u ${user} -p ${pwd} ${ip}
+    Wait Unitl Command Success  imgpkg push -b ${ip}/project${d}/my-bundle:v1.0.0 -f config/
+    Wait Unitl Command Success  imgpkg pull -b ${ip}/project${d}/my-bundle:v1.0.0 -o ${out_path}
+    Wait Unitl Command Success  docker logout ${ip}
+    Retry File Should Exist  ${out_path}/.imgpkg/bundle.yml
+    Retry File Should Exist  ${out_path}/.imgpkg/images.yml
diff --git a/tests/test-engine-image/Dockerfile.common b/tests/test-engine-image/Dockerfile.common
index b2dea1f3c..58eefb639 100644
--- a/tests/test-engine-image/Dockerfile.common
+++ b/tests/test-engine-image/Dockerfile.common
@@ -65,6 +65,9 @@ RUN pwd && mkdir /tool/binary && \
     # Install  wasm-to-oci
     WASM_TO_OCI_VERSION=0.1.2 && wget https://github.com/engineerd/wasm-to-oci/releases/download/v${WASM_TO_OCI_VERSION}/linux-amd64-wasm-to-oci && \
     chmod +x linux-amd64-wasm-to-oci && mv linux-amd64-wasm-to-oci /tool/binary/wasm-to-oci && \
+    # Install imgpkg
+    IMGPKG_VERSION=0.22.0 && wget https://github.com/vmware-tanzu/carvel-imgpkg/releases/download/v$IMGPKG_VERSION/imgpkg-linux-amd64 && \
+    mv imgpkg-linux-amd64 /tool/binary/imgpkg && chmod +x /tool/binary/imgpkg && \
     pwd
 
 #ubuntu
diff --git a/tests/test-engine-image/Dockerfile.ui_test b/tests/test-engine-image/Dockerfile.ui_test
index c14b635d5..61598f843 100644
--- a/tests/test-engine-image/Dockerfile.ui_test
+++ b/tests/test-engine-image/Dockerfile.ui_test
@@ -21,6 +21,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     tar \
     unzip \
     gzip \
+    jq \
     # certutil
     libnss3-tools \
     google-chrome-stable

From ddd4cdb306dc5129ab53149305fde2a04272402e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E4=B8=96=E5=86=9B?=
 <30999793+AllForNothing@users.noreply.github.com>
Date: Thu, 11 Nov 2021 12:23:26 +0800
Subject: [PATCH 2/2] Not allow space in replication rule filters (#15984)

Signed-off-by: AllForNothing <sshijun@vmware.com>
---
 .../create-edit-rule.component.html                 |  2 +-
 .../create-edit-rule/create-edit-rule.component.ts  | 13 ++++++++++++-
 .../label/label-piece/label-piece.component.html    |  4 ++--
 .../label/label-piece/label-piece.component.ts      |  1 +
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.html b/src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.html
index 24b851ac3..67246a19c 100644
--- a/src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.html
+++ b/src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.html
@@ -108,7 +108,7 @@
                   <clr-dropdown class="width-tag-label">
                     <button type="button" class="width-100 dropdown-toggle btn btn-link statistic-data label-text" clrDropdownTrigger>
                       <ng-template ngFor let-label [ngForOf]="filter.value.value" let-m="index">
-                        <span class="label" *ngIf="m<1"> {{label}} </span>
+                        <hbr-label-piece [hasIcon]="false" [label]="getLabel(label)" [labelWidth]="84"></hbr-label-piece>
                       </ng-template>
                       <span class="ellipsis color-white-dark" *ngIf="filter.value.value.length>1">···</span>
                       <div *ngFor="let label1 of filter.value.value;let k = index" hidden="true">
diff --git a/src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.ts b/src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.ts
index 2b2347a5d..c4f7d81a7 100644
--- a/src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.ts
+++ b/src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.ts
@@ -181,7 +181,7 @@ export class CreateEditRuleComponent implements OnInit, OnDestroy {
   }
   trimText(event) {
     if (event.target.value) {
-      event.target.value = event.target.value.trim();
+      event.target.value = event.target.value.replace(/\s+/g, '');
     }
   }
   equals(c1: any, c2: any): boolean {
@@ -706,4 +706,15 @@ export class CreateEditRuleComponent implements OnInit, OnDestroy {
       return realSpeed ? realSpeed : -1;
     }
   }
+  getLabel(labelName: string): Label {
+    if (this.supportedFilterLabels?.length) {
+      let label: Label;
+      this.supportedFilterLabels.forEach(item => {
+        if (item.name === labelName) {
+          label = item;
+        }
+      });
+      return label;
+    }
+  }
 }
diff --git a/src/portal/src/app/shared/components/label/label-piece/label-piece.component.html b/src/portal/src/app/shared/components/label/label-piece/label-piece.component.html
index 863ab1636..be4f9ae0d 100644
--- a/src/portal/src/app/shared/components/label/label-piece/label-piece.component.html
+++ b/src/portal/src/app/shared/components/label/label-piece/label-piece.component.html
@@ -1,5 +1,5 @@
 <label class="label" [ngStyle]="{'background-color': labelColor?.color, 'color': labelColor?.textColor, 'border': labelColor?.color == '#FFFFFF'? '1px solid #A1A1A1': 'none'}" [style.max-width.px]="labelWidth">
-    <clr-icon *ngIf="label.scope=='p'" shape="organization"></clr-icon>
-    <clr-icon *ngIf="label.scope=='g'" shape="administrator"></clr-icon>
+    <clr-icon *ngIf="hasIcon && label.scope=='p'" shape="organization"></clr-icon>
+    <clr-icon *ngIf="hasIcon && label.scope=='g'" shape="administrator"></clr-icon>
      {{label.name}}
 </label>
diff --git a/src/portal/src/app/shared/components/label/label-piece/label-piece.component.ts b/src/portal/src/app/shared/components/label/label-piece/label-piece.component.ts
index 6170bc994..34a1352f9 100644
--- a/src/portal/src/app/shared/components/label/label-piece/label-piece.component.ts
+++ b/src/portal/src/app/shared/components/label/label-piece/label-piece.component.ts
@@ -25,6 +25,7 @@ import { Label } from "../../../../../../ng-swagger-gen/models/label";
 export class LabelPieceComponent implements OnInit, OnChanges {
     @Input() label: Label;
     @Input() labelWidth: number;
+    @Input() hasIcon: boolean = true;
     labelColor: {[key: string]: string};
 
     ngOnChanges(): void {