diff --git a/dbm-ui/backend/iam_app/dataclass/actions.py b/dbm-ui/backend/iam_app/dataclass/actions.py index f7269b8105..9fa36a421b 100644 --- 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 deleted file mode 100644 index 98b008fbe9..0000000000 --- a/dbm-ui/backend/iam_app/migrations/0003_bk_dbm_202310271225.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- -import codecs -import json -import os - -from django.conf import settings -from django.db import migrations -from iam.contrib.iam_migration.migrator import IAMMigrator - - -def forward_func(apps, schema_editor): - - migrator = IAMMigrator(Migration.migration_json) - migrator.migrate() - - -class Migration(migrations.Migration): - migration_json = "initial.json" - - dependencies = [("iam_app", "0002_bk_dbm_202310271104")] - - operations = [migrations.RunPython(forward_func)] 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 deleted file mode 100644 index 89fd63fd4a..0000000000 --- a/dbm-ui/backend/iam_app/migrations/0004_bk_dbm_202310311921.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- -import codecs -import json -import os - -from django.conf import settings -from django.db import migrations -from iam.contrib.iam_migration.migrator import IAMMigrator - - -def forward_func(apps, schema_editor): - - migrator = IAMMigrator(Migration.migration_json) - migrator.migrate() - - -class Migration(migrations.Migration): - migration_json = "initial.json" - - dependencies = [("iam_app", "0003_bk_dbm_202310271225")] - - operations = [migrations.RunPython(forward_func)] 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 deleted file mode 100644 index c32260d8af..0000000000 --- a/dbm-ui/backend/iam_app/migrations/0005_bk_dbm_202312021522.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- -import codecs -import json -import os - -from django.conf import settings -from django.db import migrations -from iam.contrib.iam_migration.migrator import IAMMigrator - - -def forward_func(apps, schema_editor): - - migrator = IAMMigrator(Migration.migration_json) - migrator.migrate() - - -class Migration(migrations.Migration): - migration_json = "initial.json" - - dependencies = [("iam_app", "0004_bk_dbm_202310311921")] - - operations = [migrations.RunPython(forward_func)] 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 deleted file mode 100644 index 3e8757d389..0000000000 --- a/dbm-ui/backend/iam_app/migrations/0006_bk_dbm_202404031731.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- -import codecs -import json -import os - -from django.conf import settings -from django.db import migrations -from iam.contrib.iam_migration.migrator import IAMMigrator - - -def forward_func(apps, schema_editor): - - migrator = IAMMigrator(Migration.migration_json) - migrator.migrate() - - -class Migration(migrations.Migration): - migration_json = "initial.json" - - dependencies = [("iam_app", "0005_bk_dbm_202312021522")] - - operations = [migrations.RunPython(forward_func)] diff --git a/dbm-ui/backend/iam_app/views/account_provider.py b/dbm-ui/backend/iam_app/views/account_provider.py index d2b2565cc8..fecb982854 100644 --- 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 index a05085f747..1ef6ec7e31 100644 --- 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 index d82b9c22c9..930af4be39 100644 --- 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 index be5d04a5a2..7f4cc0f326 100644 --- 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 index 8a82d8c5fa..cba40f7772 100644 --- 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 index c89352f8d3..6dd414815c 100644 --- 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 index 8b22171166..173a05467c 100644 --- 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