Add Podman push command to the UI (#18810)

1. Fixes #18781 Signed-off-by: AllForNothing <sshijun@vmware.com>
2024-06-25 06:15:04 +02:00 · 2023-06-13 10:45:05 +08:00 · 2023-06-13 10:45:05 +08:00 · ca94a23a74
commit ca94a23a74
parent 31a46a16cc
13 changed files with 33 additions and 5 deletions
--- a/src/portal/src/app/base/left-side-nav/clearing-job/gc-page/gc/gc-history/gc-history.component.html
+++ b/src/portal/src/app/base/left-side-nav/clearing-job/gc-page/gc/gc-history/gc-history.component.html
@ -76,8 +76,7 @@
                        'GC.DELETE_BLOB'
                            | translate
                                : {
-                                      blobs: getBlobs(job?.job_parameters),
-                                      manifest: getManifest(job?.job_parameters)
+                                      blob: getBlobs(job?.job_parameters),
                                  }
                    }}</span
                >
@ -90,7 +89,6 @@
                        'GC.DELETE_MANIFEST'
                            | translate
                                : {
-                                      blob: getBlobs(job?.job_parameters),
                                      manifest: getManifest(job?.job_parameters)
                                  }
                    }}</span
--- a/src/portal/src/app/base/left-side-nav/clearing-job/gc-page/gc/gc-history/gc-history.component.scss
+++ b/src/portal/src/app/base/left-side-nav/clearing-job/gc-page/gc/gc-history/gc-history.component.scss
@ -20,5 +20,5 @@
 }

 .detail {
-    min-width: 12rem;
+    width: 12rem !important;
 }
--- a/src/portal/src/app/shared/components/push-image/push-image.component.html
+++ b/src/portal/src/app/shared/components/push-image/push-image.component.html
@ -71,6 +71,23 @@
                            }}"></hbr-copy-input>
                    </article>
                </section>
+                <section>
+                    <h5 class="mt-0">
+                        {{ 'PUSH_IMAGE.PODMAN' | translate }}
+                        {{ 'PUSH_IMAGE.TITLE' | translate }}
+                    </h5>
+                    <article class="commands-section">
+                        <hbr-copy-input
+                            (onCopyError)="onCpError($event)"
+                            inputSize="65"
+                            headerTitle="{{
+                                'PUSH_IMAGE.PUSH_COMMAND' | translate
+                            }}"
+                            defaultValue="{{
+                                podmanPushCommand
+                            }}"></hbr-copy-input>
+                    </article>
+                </section>
                <section>
                    <h5>
                        {{ 'PUSH_IMAGE.HELM' | translate }}
--- a/src/portal/src/app/shared/components/push-image/push-image.component.spec.ts
+++ b/src/portal/src/app/shared/components/push-image/push-image.component.spec.ts
@ -43,7 +43,7 @@ describe('PushImageButtonComponent (inline template)', () => {
        await fixture.whenStable();
        let copyInputs: HTMLInputElement[] =
            fixture.nativeElement.querySelectorAll('.command-input');
-        expect(copyInputs.length).toEqual(5);
+        expect(copyInputs.length).toEqual(6);
        expect(copyInputs[0].value.trim()).toEqual(
            `docker tag SOURCE_IMAGE[:TAG] https://testing.harbor.com/testing/REPOSITORY[:TAG]`
        );
--- a/src/portal/src/app/shared/components/push-image/push-image.component.ts
+++ b/src/portal/src/app/shared/components/push-image/push-image.component.ts
@ -27,6 +27,11 @@ export class PushImageButtonComponent {
    public get pushCommandImage(): string {
        return `docker push ${this.registryUrl}/${this.projectName}/REPOSITORY[:TAG]`;
    }
+
+    public get podmanPushCommand(): string {
+        return `podman push IMAGE_ID ${this.registryUrl}/${this.projectName}/REPOSITORY[:TAG]`;
+    }
+
    public get tagCommandChart(): string {
        return `helm package CHART_PATH`;
    }
--- a/src/portal/src/i18n/lang/de-de-lang.json
+++ b/src/portal/src/i18n/lang/de-de-lang.json
@ -1035,6 +1035,7 @@
    "PUSH_IMAGE": {
        "TITLE": "Push Befehl",
        "DOCKER": "Docker",
+        "PODMAN": "Podman",
        "HELM": "Helm",
        "CNAB": "CNAB",
        "TAG_COMMAND_CHART": "Paketiere ein Chart für dieses Projekt:",
--- a/src/portal/src/i18n/lang/en-us-lang.json
+++ b/src/portal/src/i18n/lang/en-us-lang.json
@ -1036,6 +1036,7 @@
    "PUSH_IMAGE": {
        "TITLE": "Push Command",
        "DOCKER": "Docker",
+        "PODMAN": "Podman",
        "HELM": "Helm",
        "CNAB": "CNAB",
        "TAG_COMMAND_CHART": "Package a chart for this project:",
--- a/src/portal/src/i18n/lang/es-es-lang.json
+++ b/src/portal/src/i18n/lang/es-es-lang.json
@ -1034,6 +1034,7 @@
    "PUSH_IMAGE": {
        "TITLE": "Push Command",
        "DOCKER": "Docker",
+        "PODMAN": "Podman",
        "HELM": "Helm",
        "CNAB": "CNAB",
        "TAG_COMMAND_CHART": "Package a chart for this project:",
--- a/src/portal/src/i18n/lang/fr-fr-lang.json
+++ b/src/portal/src/i18n/lang/fr-fr-lang.json
@ -1007,6 +1007,7 @@
    "PUSH_IMAGE": {
        "TITLE": "Commande de push",
        "DOCKER": "Docker",
+        "PODMAN": "Podman",
        "HELM": "Helm",
        "CNAB": "CNAB",
        "TAG_COMMAND_CHART": "Taguer une chart pour ce projet :",
--- a/src/portal/src/i18n/lang/pt-br-lang.json
+++ b/src/portal/src/i18n/lang/pt-br-lang.json
@ -1032,6 +1032,7 @@
    "PUSH_IMAGE": {
        "TITLE": "Comando Push",
        "DOCKER": "Docker",
+        "PODMAN": "Podman",
        "HELM": "Helm",
        "CNAB": "CNAB",
        "TAG_COMMAND_CHART": "Package a chart for this project:",
--- a/src/portal/src/i18n/lang/tr-tr-lang.json
+++ b/src/portal/src/i18n/lang/tr-tr-lang.json
@ -1035,6 +1035,7 @@
    "PUSH_IMAGE": {
        "TITLE": "Push Command",
        "DOCKER": "Docker",
+        "PODMAN": "Podman",
        "HELM": "Helm",
        "CNAB": "CNAB",
        "TAG_COMMAND_CHART": "Package a chart for this project:",
--- a/src/portal/src/i18n/lang/zh-cn-lang.json
+++ b/src/portal/src/i18n/lang/zh-cn-lang.json
@ -1034,6 +1034,7 @@
    "PUSH_IMAGE": {
        "TITLE": "推送命令",
        "DOCKER": "Docker",
+        "PODMAN": "Podman",
        "HELM": "Helm",
        "CNAB": "CNAB",
        "TAG_COMMAND_CHART": "在项目中打包 chart",
--- a/src/portal/src/i18n/lang/zh-tw-lang.json
+++ b/src/portal/src/i18n/lang/zh-tw-lang.json
@ -1029,6 +1029,7 @@
  "PUSH_IMAGE": {
    "TITLE": "推送映像檔的 Docker 命令",
    "DOCKER": "Docker",
+    "PODMAN": "Podman",
    "HELM": "Helm",
    "CNAB": "CNAB",
    "TAG_COMMAND_CHART": "為此專案打包 Chart",