fix(backend): 权限中心问题修复 #4668

TencentBlueKing · May 29, 2024 · 7ea5de8 · 7ea5de8
1 parent 98d5a92
commit 7ea5de8
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 97 deletions.
diff --git a/dbm-ui/backend/iam_app/dataclass/actions.py b/dbm-ui/backend/iam_app/dataclass/actions.py
@@ -1297,7 +1297,7 @@ class ActionEnum:
         type="view",
         related_actions=[GLOBAL_MANAGE.id],
         related_resource_types=[ResourceEnum.BUSINESS],
-        group=_("平台管理"),
+        group=_("可观测"),
     )
 
     DBHA_SWITCH_EVENT_VIEW = ActionMeta(
@@ -1307,7 +1307,7 @@ class ActionEnum:
         type="view",
         related_actions=[GLOBAL_MANAGE.id],
         related_resource_types=[ResourceEnum.BUSINESS],
-        group=_("平台管理"),
+        group=_("可观测"),
     )
 
     NOTIFY_GROUP_LIST = ActionMeta(

diff --git a/dbm-ui/backend/iam_app/migrations/0003_bk_dbm_202310271225.py b/dbm-ui/backend/iam_app/migrations/0003_bk_dbm_202310271225.py
diff --git a/dbm-ui/backend/iam_app/migrations/0004_bk_dbm_202310311921.py b/dbm-ui/backend/iam_app/migrations/0004_bk_dbm_202310311921.py
diff --git a/dbm-ui/backend/iam_app/migrations/0005_bk_dbm_202312021522.py b/dbm-ui/backend/iam_app/migrations/0005_bk_dbm_202312021522.py
diff --git a/dbm-ui/backend/iam_app/migrations/0006_bk_dbm_202404031731.py b/dbm-ui/backend/iam_app/migrations/0006_bk_dbm_202404031731.py
diff --git a/dbm-ui/backend/iam_app/views/account_provider.py b/dbm-ui/backend/iam_app/views/account_provider.py
@@ -33,6 +33,8 @@ class AccountResourceProvider(BaseInterfaceResourceProvider):
     def convert_condition_field(condition):
         # 账号的业务参数要是整型
         condition["bk_biz_id"] = int(condition["bk_biz_id"])
+        if "id" in condition:
+            condition["id"] = int(condition["id"])
         return condition
 
     def list_instance(self, filter, page, **options):

diff --git a/dbm-ui/backend/iam_app/views/iam_provider.py b/dbm-ui/backend/iam_app/views/iam_provider.py
@@ -297,7 +297,7 @@ def _list_instance(self, data_source: DataAPI, condition: Dict, value_list: List
         # 填充分页参数
         condition.update(limit=page.limit, offset=page.offset)
         # 查询数据
-        data = data_source(params=condition)["results"]
+        data = data_source(params=condition)["results"] or []
         results = [
             {"id": str(item[value_list[0]]), "display_name": ":".join([str(item[value]) for value in value_list[1:]])}
             for item in list(data)

diff --git a/helm-charts/bk-dbm/Chart.yaml b/helm-charts/bk-dbm/Chart.yaml
@@ -79,5 +79,5 @@ dependencies:
 description: A Helm chart for bk-dbm
 name: bk-dbm
 type: application
-version: 1.3.0-alpha.51
-appVersion: 1.3.0-alpha.51
+version: 1.4.0-alpha.52
+appVersion: 1.4.0-alpha.52
diff --git a/helm-charts/bk-dbm/charts/db-resource/Chart.yaml b/helm-charts/bk-dbm/charts/db-resource/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 0.0.1-alpha.85
+appVersion: 0.0.1-alpha.87
 description: A Helm chart for Kubernetes
 name: db-resource
 type: application

diff --git a/helm-charts/bk-dbm/charts/db-simulation/Chart.yaml b/helm-charts/bk-dbm/charts/db-simulation/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 0.0.1-alpha.50
+appVersion: 0.0.1-alpha.56
 description: A Helm chart for Kubernetes
 name: db-simulation
 type: application

diff --git a/helm-charts/bk-dbm/charts/dbm/Chart.yaml b/helm-charts/bk-dbm/charts/dbm/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.3.0-alpha.760
+appVersion: 1.4.0-alpha.839
 description: A Helm chart for dbm
 name: dbm
 type: application

diff --git a/helm-charts/bk-dbm/charts/dbpriv/Chart.yaml b/helm-charts/bk-dbm/charts/dbpriv/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 0.0.1-alpha.299
+appVersion: 0.0.1-alpha.321
 name: dbpriv
 description: A Helm chart for dbpriv
 type: application