[Fixed] Fix issue #11334 #11252 #11191

Signed-off-by: Yogi_Wang <yawang@vmware.com>

src/portal/src/app/base/harbor-shell/harbor-shell.component.scss

@@ -57,7 +57,7 @@ clr-vertical-nav {
     margin-right: 0;
     margin-left: 0;
     background-color: #0079b8;
-    height: 2rem;
+    min-height: 2rem;
     color: #fff;
     align-items: center;
     font-size: 0.5rem;

src/portal/src/app/project/repository/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.ts

@@ -34,7 +34,7 @@ import {
   clone,
   CustomComparator,
   DEFAULT_PAGE_SIZE, DEFAULT_SUPPORTED_MIME_TYPE,
-  formatSize, VULNERABILITY_SCAN_STATUS, dbEncodeURIComponent
+  formatSize, VULNERABILITY_SCAN_STATUS, dbEncodeURIComponent, doSorting
 } from "../../../../../../lib/utils/utils";
 import {
   ConfirmationAcknowledgement,
@@ -400,6 +400,8 @@ export class ArtifactListTabComponent implements OnInit, OnDestroy {
               }
             }
             this.artifactList = res.body;
+            this.artifactList = doSorting<Artifact>(this.artifactList, state);
+
             this.getPullCommand(this.artifactList);
           }, error => {
             // error

src/portal/src/app/project/webhook/webhook.component.html

@@ -73,15 +73,15 @@
             </clr-dg-cell>
             <clr-dg-cell>{{w?.targets[0].type}}</clr-dg-cell>
             <clr-dg-cell>{{w?.targets[0].address}}</clr-dg-cell>
-            <clr-dg-cell>
+            <clr-dg-cell class="event-types">
                 <div class="cell" *ngIf="w?.event_types?.length">
                     <div  class="bar-state">
-                        <span class="label" *ngIf="w?.event_types[0]">{{eventTypeToText(w?.event_types[0])}}</span>
+                        <span class="label-flex" *ngIf="w?.event_types[0]">{{eventTypeToText(w?.event_types[0])}}</span>
                     </div>
                     <div class="signpost-item" [hidden]="w?.event_types?.length<=1">
                         <div class="trigger-item">
                             <clr-signpost>
-                                <button class="btn btn-link font-size-20" clrSignpostTrigger>...</button>
+                                <button class="btn btn-link ellipsis-btn font-size-20" clrSignpostTrigger>...</button>
                                 <clr-signpost-content [clrPosition]="'left-top'" *clrIfOpen>
                                     <div>
                                         <div  *ngFor="let e of w?.event_types" class="bar-state">

src/portal/src/app/project/webhook/webhook.component.scss

@@ -60,4 +60,29 @@
 }
 .margin-left-10 {
     margin-left: 10px;
+}
+.event-types {
+    padding-right: 14px;
+}
+.bar-state {
+    width: 100%;
+}
+.label-flex {
+    width: 100%;
+    letter-spacing: 0em;
+    display: block;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    border: 1px solid;
+    border-radius: 9px;
+    padding: 0 7px 0px 10px;
+    text-align: center;
+}
+
+.ellipsis-btn {
+    min-width: 20px;
+    letter-spacing: 0px;
+    margin: 0;
+    margin-top: -0.4rem;
 }

src/portal/src/i18n/lang/en-us-lang.json

@@ -1153,7 +1153,7 @@
     },
     "UNKNOWN_ERROR": "Unknown errors have occurred. Please try again later.",
     "UNAUTHORIZED_ERROR": "Your session is invalid or has expired. You need to sign in to continue your action.",
-    "REPO_READ_ONLY": "Harbor is set to read-only mode, Deleting repository, tag and pushing image will be disabled under read-only mode.",
+    "REPO_READ_ONLY": "Harbor is set to read-only mode, Deleting repository, artifact, tag and pushing image will be disabled under read-only mode.",
     "FORBIDDEN_ERROR": "You do not have the proper privileges to perform the action.",
     "GENERAL_ERROR": "Errors have occurred when performing service call: {{param}}.",
     "BAD_REQUEST_ERROR": "We are unable to perform your action because of a bad request.",

src/portal/src/i18n/lang/es-es-lang.json

@@ -1151,7 +1151,7 @@
     },
     "UNKNOWN_ERROR": "Ha ocurrido un error desconocido. Por favor, inténtelo de nuevo más tarde.",
     "UNAUTHORIZED_ERROR": "La sesión no es válida o ha caducado. Necesita identificarse de nuevo para llevar a cabo esa acción.",
-    "REPO_READ_ONLY": "Harbor is set to read-only mode, Deleting repository, tag and pushing image will be disabled under read-only mode.",
+    "REPO_READ_ONLY": "Harbor is set to read-only mode, Deleting repository, artifact, tag and pushing image will be disabled under read-only mode.",
     "FORBIDDEN_ERROR": "No tienes permisos para llevar a cabo esa acción.",
     "GENERAL_ERROR": "Han ocurrido errores cuando se llamaba al servicio: {{param}}.",
     "BAD_REQUEST_ERROR": "No hemos podido llevar la acción debido a una solicitud incorrecta.",

src/portal/src/i18n/lang/fr-fr-lang.json

@@ -1122,7 +1122,7 @@
     },
     "UNKNOWN_ERROR": "Des erreurs inconnues sont survenues. Veuillez réessayer plus tard.",
     "UNAUTHORIZED_ERROR": "Votre session est invalide ou a expiré. Vous devez vous connecter pour continuer votre action.",
-    "REPO_READ_ONLY": "Harbor is set to read-only mode, Deleting repository, tag and pushing image will be disabled under read-only mode.",
+    "REPO_READ_ONLY": "Harbor is set to read-only mode, Deleting repository, artifact, tag and pushing image will be disabled under read-only mode.",
     "FORBIDDEN_ERROR": "Vous n'avez pas les privilèges appropriés pour effectuer l'action.",
     "GENERAL_ERROR": "Des erreurs sont survenues lors de l'appel à un service : {{param}}.",
     "BAD_REQUEST_ERROR": "Nous ne pouvons pas exécuter votre action à cause d'une mauvaise requête.",

src/portal/src/i18n/lang/pt-br-lang.json

@@ -1145,7 +1145,7 @@
     },
     "UNKNOWN_ERROR": "Ocorreram erros desconhecidos. Tente novamente mais tarde",
     "UNAUTHORIZED_ERROR": "Sua sessão é inválida ou expirou. Você deve logar-se novamente para continuar essa ação.",
-    "REPO_READ_ONLY": "Harbor está em modo somente leitura, remover repositórios, tag e o envio de imagens serão desabilitados em modo somente leitura.",
+    "REPO_READ_ONLY": "Harbor está em modo somente leitura, remover repositórios, artifact, tag e o envio de imagens serão desabilitados em modo somente leitura.",
     "FORBIDDEN_ERROR": "Você não possui privilégios para executar a ação.",
     "GENERAL_ERROR": "Erros ocorreram ao executar a chamada ao serviço: {{param}}.",
     "BAD_REQUEST_ERROR": "Não foi possível executar suas ações pois ocorreu uma requisição mal formada.",

src/portal/src/i18n/lang/tr-tr-lang.json

@@ -1153,7 +1153,7 @@
     },
     "UNKNOWN_ERROR": "Bilinmeyen hatalar oluştu. Lütfen daha sonra tekrar deneyiniz.",
     "UNAUTHORIZED_ERROR": "Oturumunuz geçersiz veya süresi dolmuş. İşleminize devam etmek için oturum açmanız gerekir.",
-    "REPO_READ_ONLY": "Harbor salt okunur moduna ayarlandı, Depoyu silme, etiketleme ve imaj yükleme salt okunur modda devre dışı bırakılacak.",
+    "REPO_READ_ONLY": "Harbor salt okunur moduna ayarlandı, Depoyu silme, artifact, etiketleme ve imaj yükleme salt okunur modda devre dışı bırakılacak.",
     "FORBIDDEN_ERROR": "İşlemi gerçekleştirmek için gereken ayrıcalıklarınız yok.",
     "GENERAL_ERROR": "Servis çağrısı yapılırken hatalar oluştu: {{param}}.",
     "BAD_REQUEST_ERROR": "Kötü bir istek nedeniyle işleminizi gerçekleştiremiyoruz.",

src/portal/src/i18n/lang/zh-cn-lang.json

@@ -1150,7 +1150,7 @@
     },
     "UNKNOWN_ERROR": "发生未知错误,请稍后再试。",
     "UNAUTHORIZED_ERROR": "会话无效或者已经过期, 请重新登录以继续。",
-    "REPO_READ_ONLY": "Harbor 被设置为只读模式，在此模式下，不能删除仓库、Tag 及推送镜像。",
+    "REPO_READ_ONLY": "Harbor 被设置为只读模式，在此模式下，不能删除仓库、artifact、 Tag 及推送镜像。",
     "FORBIDDEN_ERROR": "当前操作被禁止，请确认你有合法的权限。",
     "GENERAL_ERROR": "调用后台服务时出现错误: {{param}}。",
     "BAD_REQUEST_ERROR": "错误请求, 操作无法完成。",

src/portal/src/lib/components/config/project-quotas/project-quotas.component.ts

@@ -159,7 +159,7 @@ export class ProjectQuotasComponent implements OnChanges {
       this.getQuotaList(this.currentState);
       this.errorHandler.info('QUOTA.SAVE_SUCCESS');
     }, error => {
-      this.errorHandler.error(error);
+      this.editQuotaDialog.inlineAlert.showInlineError(error);
       this.loading = false;
     });
   }

src/portal/src/lib/components/replication/replication.component.html

@@ -77,7 +77,7 @@
           <clr-dg-cell>{{j.start_time | date: 'short'}}</clr-dg-cell>
           <clr-dg-cell>{{getDuration(j)}}</clr-dg-cell>
           <clr-dg-cell>
-            {{(j.succeed > 0 ? j.succeed / j.total : 0) | percent }}
+            {{(j.total > 0 ? j.succeed / j.total : 1)| percent }}
           </clr-dg-cell>
           <clr-dg-cell>{{j.total}}</clr-dg-cell>
         </clr-dg-row>