[servicecomb-service-center] branch master updated: fix: 测试问题修复 (#1060)

[li...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

littlecui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-service-center.git


The following commit(s) were added to refs/heads/master by this push:
     new f5e74bc  fix: 测试问题修复 (#1060)
f5e74bc is described below

commit f5e74bc06d32bed6d3f81ff2a1d21a2776999233
Author: tuan <ya...@126.com>
AuthorDate: Fri Jun 18 16:07:39 2021 +0800

    fix: 测试问题修复 (#1060)
    
    添加强制删除服务
    修改新建配置弹窗点击空白可关闭
    切换配置项是否启用导致配置内容错误
    
    Co-authored-by: tuan <>
---
 ux/src/app/config-list/pages/list/config-list.component.ts | 12 +++++-------
 ux/src/common/service.service.ts                           |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/ux/src/app/config-list/pages/list/config-list.component.ts b/ux/src/app/config-list/pages/list/config-list.component.ts
index 747141d..95c2a0f 100644
--- a/ux/src/app/config-list/pages/list/config-list.component.ts
+++ b/ux/src/app/config-list/pages/list/config-list.component.ts
@@ -168,7 +168,7 @@ export class ConfigListComponent implements OnInit {
     const results = this.modalService.open({
       id: 'modal-modal',
       width: '550px',
-      backdropCloseable: false,
+      backdropCloseable: true,
       component: CreateModalComponent,
       data: {
         onClose: () => {
@@ -194,7 +194,7 @@ export class ConfigListComponent implements OnInit {
           text: common.confirm,
           cssClass: 'danger',
           handler: async () => {
-            await forbiddenFn(rowItem.id, rowItem.key);
+            await forbiddenFn(rowItem.id);
             results.modalInstance.hide();
             this.onRefresh();
           },
@@ -209,9 +209,8 @@ export class ConfigListComponent implements OnInit {
       ],
     });
 
-    const forbiddenFn = (id: string, value: string) => {
+    const forbiddenFn = (id: string) => {
       const pamars = {
-        value,
         status: 'disabled',
       };
       return this.service.putKie(id, pamars).toPromise();
@@ -234,7 +233,7 @@ export class ConfigListComponent implements OnInit {
           text: common.confirm,
           cssClass: 'danger',
           handler: async () => {
-            await enableFn(rowItem.id, rowItem.key);
+            await enableFn(rowItem.id);
             results.modalInstance.hide();
             this.onRefresh();
           },
@@ -249,9 +248,8 @@ export class ConfigListComponent implements OnInit {
       ],
     });
 
-    const enableFn = (id: string, value: string) => {
+    const enableFn = (id: string) => {
       const pamars = {
-        value,
         status: 'enabled',
       };
       return this.service.putKie(id, pamars).toPromise();
diff --git a/ux/src/common/service.service.ts b/ux/src/common/service.service.ts
index 3f4542e..eed6fbd 100644
--- a/ux/src/common/service.service.ts
+++ b/ux/src/common/service.service.ts
@@ -55,7 +55,7 @@ export class ServiceService {
   }
 
   deleteService(id: string): Observable<any> {
-    return this.http.delete(`${REGISTRY_PREFIX}/microservices/${id}`, {
+    return this.http.delete(`${REGISTRY_PREFIX}/microservices/${id}?force=true`, {
       headers: {
         'x-domain-name': DOMAON_NAME,
       },