diff --git a/src/portal/src/app/project/robot-account/add-robot/add-robot.component.html b/src/portal/src/app/project/robot-account/add-robot/add-robot.component.html index e9227de9a..248631225 100644 --- a/src/portal/src/app/project/robot-account/add-robot/add-robot.component.html +++ b/src/portal/src/app/project/robot-account/add-robot/add-robot.component.html @@ -44,42 +44,46 @@ {{'ROBOT_ACCOUNT.PERMISSIONS' | translate}} -
-
- -
- - -
-
- - -
-
-
- -
- - -
-
- - -
-
+
+ + + + + + + + + + + + + + + + +
{{'ROBOT_ACCOUNT.PUSH' | translate}}{{'ROBOT_ACCOUNT.PULL' | translate}}
+ {{'ROBOT_ACCOUNT.PERMISSIONS_IMAGE' | translate}} + + + + {{'ROBOT_ACCOUNT.PULL_IS_MUST' | translate}} + + + + + + +
{{'ROBOT_ACCOUNT.PERMISSIONS_HELMCHART' | translate}} + + + +
diff --git a/src/portal/src/app/project/robot-account/add-robot/add-robot.component.scss b/src/portal/src/app/project/robot-account/add-robot/add-robot.component.scss index 54652aa42..df3f83daa 100644 --- a/src/portal/src/app/project/robot-account/add-robot/add-robot.component.scss +++ b/src/portal/src/app/project/robot-account/add-robot/add-robot.component.scss @@ -42,5 +42,8 @@ } .padding-left-120{ - padding-left: 120px; + padding-left: 126px; +} +.w-90{ + width: 90%; } \ No newline at end of file diff --git a/src/portal/src/app/project/robot-account/add-robot/add-robot.component.ts b/src/portal/src/app/project/robot-account/add-robot/add-robot.component.ts index d88fba5df..805ad4e91 100644 --- a/src/portal/src/app/project/robot-account/add-robot/add-robot.component.ts +++ b/src/portal/src/app/project/robot-account/add-robot/add-robot.component.ts @@ -38,7 +38,8 @@ export class AddRobotComponent implements OnInit, OnDestroy { robotNameChecker: Subject = new Subject(); nameTooltipText = "ROBOT_ACCOUNT.ROBOT_NAME"; robotForm: NgForm; - imagePermission: string = "push-and-pull"; + imagePermissionPush: boolean = true; + imagePermissionPull: boolean = true; @Input() projectId: number; @Input() projectName: string; @Output() create = new EventEmitter(); @@ -99,6 +100,8 @@ export class AddRobotComponent implements OnInit, OnDestroy { this.robot.name = ""; this.robot.description = ""; this.addRobotOpened = true; + this.imagePermissionPush = true; + this.imagePermissionPull = true; this.isRobotNameValid = true; this.robot = new Robot(); this.nameTooltipText = "ROBOT_ACCOUNT.ROBOT_NAME"; @@ -118,12 +121,12 @@ export class AddRobotComponent implements OnInit, OnDestroy { return; } // set value to robot.access.isPullImage and robot.access.isPushOrPullImage when submit - if ( this.imagePermission === 'pull' ) { - this.robot.access.isPullImage = true; - this.robot.access.isPushOrPullImage = false; - } else { + if ( this.imagePermissionPush && this.imagePermissionPull) { this.robot.access.isPullImage = false; this.robot.access.isPushOrPullImage = true; + } else { + this.robot.access.isPullImage = true; + this.robot.access.isPushOrPullImage = false; } this.isSubmitOnGoing = true; this.robotService diff --git a/src/portal/src/i18n/lang/en-us-lang.json b/src/portal/src/i18n/lang/en-us-lang.json index e99464ab8..93bb2c978 100644 --- a/src/portal/src/i18n/lang/en-us-lang.json +++ b/src/portal/src/i18n/lang/en-us-lang.json @@ -322,7 +322,8 @@ "CREATED_SUCCESS": "Created '{{param}}' successfully.", "COPY_SUCCESS": "Copy token successfully of '{{param}}'", "DELETION_TITLE": "Confirm removal of robot accounts", - "DELETION_SUMMARY": "Do you want to delete robot accounts {{param}}?" + "DELETION_SUMMARY": "Do you want to delete robot accounts {{param}}?", + "PULL_IS_MUST" : "Pull permission is checked by default and can not be modified." }, "GROUP": { "GROUP": "Group", diff --git a/src/portal/src/i18n/lang/es-es-lang.json b/src/portal/src/i18n/lang/es-es-lang.json index 5c1d1450c..e3a9c2e62 100644 --- a/src/portal/src/i18n/lang/es-es-lang.json +++ b/src/portal/src/i18n/lang/es-es-lang.json @@ -323,7 +323,8 @@ "CREATED_SUCCESS": "Created '{{param}}' successfully.", "COPY_SUCCESS": "Copy token successfully of '{{param}}'", "DELETION_TITLE": "Confirm removal of robot accounts", - "DELETION_SUMMARY": "Do you want to delete robot accounts {{param}}?" + "DELETION_SUMMARY": "Do you want to delete robot accounts {{param}}?", + "PULL_IS_MUST" : "Pull permission is checked by default and can not be modified." }, "GROUP": { "GROUP": "Group", diff --git a/src/portal/src/i18n/lang/fr-fr-lang.json b/src/portal/src/i18n/lang/fr-fr-lang.json index ebd3bf090..b0e6fc08b 100644 --- a/src/portal/src/i18n/lang/fr-fr-lang.json +++ b/src/portal/src/i18n/lang/fr-fr-lang.json @@ -315,7 +315,8 @@ "CREATED_SUCCESS": "Created '{{param}}' successfully.", "COPY_SUCCESS": "Copy token successfully of '{{param}}'", "DELETION_TITLE": "confirmer l'enlèvement des comptes du robot ", - "DELETION_SUMMARY": "Voulez-vous supprimer la règle {{param}}?" + "DELETION_SUMMARY": "Voulez-vous supprimer la règle {{param}}?", + "PULL_IS_MUST" : "Pull permission is checked by default and can not be modified." }, "GROUP": { "Group": "Group", diff --git a/src/portal/src/i18n/lang/pt-br-lang.json b/src/portal/src/i18n/lang/pt-br-lang.json index 0358f2447..adbb68718 100644 --- a/src/portal/src/i18n/lang/pt-br-lang.json +++ b/src/portal/src/i18n/lang/pt-br-lang.json @@ -320,7 +320,8 @@ "CREATED_SUCCESS": "Created '{{param}}' successfully.", "COPY_SUCCESS": "Copy token successfully of '{{param}}'", "DELETION_TITLE": "Confirmar a remoção do robô Contas", - "DELETION_SUMMARY": "Você quer remover a regra {{param}}?" + "DELETION_SUMMARY": "Você quer remover a regra {{param}}?", + "PULL_IS_MUST" : "Pull permission is checked by default and can not be modified." }, "GROUP": { "GROUP": "Grupo", diff --git a/src/portal/src/i18n/lang/zh-cn-lang.json b/src/portal/src/i18n/lang/zh-cn-lang.json index 14a5a4243..a1940bb8c 100644 --- a/src/portal/src/i18n/lang/zh-cn-lang.json +++ b/src/portal/src/i18n/lang/zh-cn-lang.json @@ -321,7 +321,8 @@ "CREATED_SUCCESS": "创建账户 '{{param}}' 成功。", "COPY_SUCCESS": "成功复制 '{{param}}' 的令牌", "DELETION_TITLE": "删除账户确认", - "DELETION_SUMMARY": "你确认删除机器人账户 {{param}}?" + "DELETION_SUMMARY": "你确认删除机器人账户 {{param}}?", + "PULL_IS_MUST" : "拉取权限默认选中且不可修改。" }, "GROUP": { "GROUP": "组",