diff --git a/src/dashboard/apigateway/apigateway/core/admin.py b/src/dashboard/apigateway/apigateway/core/admin.py index 75c844504..9450c0d3a 100644 --- a/src/dashboard/apigateway/apigateway/core/admin.py +++ b/src/dashboard/apigateway/apigateway/core/admin.py @@ -73,8 +73,8 @@ class StageResourceDisabledAdmin(admin.ModelAdmin): class ProxyAdmin(admin.ModelAdmin): - list_display = ["id", "type", "resource"] - search_fields = ["resource__id", "id"] + list_display = ["id", "type", "resource", "backend"] + search_fields = ["resource__id", "resource__name", "id"] class ResourceVersionAdmin(admin.ModelAdmin): @@ -146,13 +146,13 @@ class MicroGatewayReleaseHistoryAdmin(admin.ModelAdmin): class BackendAdmin(admin.ModelAdmin): list_display = ["id", "gateway", "type", "name", "description"] - search_fields = ["name"] + search_fields = ["name", "gateway__id", "gateway__name", "description"] list_filter = ["gateway"] class BackendConfigAdmin(admin.ModelAdmin): list_display = ["id", "gateway", "backend", "stage", "config"] - search_fields: List[str] = [] + search_fields: List[str] = ["backend__id"] list_filter = ["gateway", "backend", "stage"] diff --git a/src/dashboard/apigateway/apigateway/core/models.py b/src/dashboard/apigateway/apigateway/core/models.py index 2e9b3d588..95f34e06b 100644 --- a/src/dashboard/apigateway/apigateway/core/models.py +++ b/src/dashboard/apigateway/apigateway/core/models.py @@ -366,6 +366,9 @@ class Meta: unique_together = ("gateway", "name") db_table = "core_backend" + def __str__(self): + return f"" + class BackendConfig(TimestampedModelMixin, OperatorModelMixin): gateway = models.ForeignKey(Gateway, on_delete=models.PROTECT) diff --git a/src/dashboard/apigateway/requirements.txt b/src/dashboard/apigateway/requirements.txt index 76503b108..91cf1a4bf 100644 --- a/src/dashboard/apigateway/requirements.txt +++ b/src/dashboard/apigateway/requirements.txt @@ -12,7 +12,7 @@ bk-notice-sdk==1.3.1 ; python_version >= "3.10" and python_version < "3.11" bkapi-bcs-api-gateway==1.12.1 ; python_version >= "3.10" and python_version < "3.11" bkapi-bk-apigateway==1.0.11 ; python_version >= "3.10" and python_version < "3.11" bkapi-client-core==1.2.0 ; python_version >= "3.10" and python_version < "3.11" -bkapi-client-generator==0.1.28 ; python_version >= "3.10" and python_version < "3.11" +bkapi-client-generator==0.1.29 ; python_version >= "3.10" and python_version < "3.11" bkapi-component-open==1.1.0 ; python_version >= "3.10" and python_version < "3.11" bkapi-paasv3==1.0.1 ; python_version >= "3.10" and python_version < "3.11" bkpaas-auth==2.0.6 ; python_version >= "3.10" and python_version < "3.11" diff --git a/src/dashboard/apigateway/requirements_dev.txt b/src/dashboard/apigateway/requirements_dev.txt index d85b0b56d..9180ff88e 100644 --- a/src/dashboard/apigateway/requirements_dev.txt +++ b/src/dashboard/apigateway/requirements_dev.txt @@ -13,7 +13,7 @@ bk-notice-sdk==1.3.1 ; python_version >= "3.10" and python_version < "3.11" bkapi-bcs-api-gateway==1.12.1 ; python_version >= "3.10" and python_version < "3.11" bkapi-bk-apigateway==1.0.11 ; python_version >= "3.10" and python_version < "3.11" bkapi-client-core==1.2.0 ; python_version >= "3.10" and python_version < "3.11" -bkapi-client-generator==0.1.28 ; python_version >= "3.10" and python_version < "3.11" +bkapi-client-generator==0.1.29 ; python_version >= "3.10" and python_version < "3.11" bkapi-component-open==1.1.0 ; python_version >= "3.10" and python_version < "3.11" bkapi-paasv3==1.0.1 ; python_version >= "3.10" and python_version < "3.11" bkpaas-auth==2.0.6 ; python_version >= "3.10" and python_version < "3.11" diff --git a/src/dashboard/poetry.lock b/src/dashboard/poetry.lock index c319686c5..94de6bec0 100644 --- a/src/dashboard/poetry.lock +++ b/src/dashboard/poetry.lock @@ -310,12 +310,12 @@ reference = "tencent" [[package]] name = "bkapi-client-generator" -version = "0.1.28" +version = "0.1.29" description = "" optional = false python-versions = ">=3.6,<4.0" files = [ - {file = "bkapi_client_generator-0.1.28-py3-none-any.whl", hash = "sha256:2bbd9ae20e79b0ef3e37baf50e37cc964d61b9c4f84b0d6dd87971b1d56cef58"}, + {file = "bkapi_client_generator-0.1.29-py3-none-any.whl", hash = "sha256:da1b1561cf05e0ed7b82e2a46f54feeb788557ec9fa3831aae133ca3c414e917"}, ] [package.source] @@ -4643,4 +4643,4 @@ reference = "tencent" [metadata] lock-version = "2.0" python-versions = ">=3.10,<3.11" -content-hash = "3f06f6e4d38ca61002a0a5d73967dcc427960713e2ec3c2ade9cc94409d47626" +content-hash = "e9dae0e9150850a57fb89e0b2791a88b56744dc45ee313bea062f0b58d9fc251" diff --git a/src/dashboard/pyproject.toml b/src/dashboard/pyproject.toml index 8f48272b7..c52de7dcb 100644 --- a/src/dashboard/pyproject.toml +++ b/src/dashboard/pyproject.toml @@ -42,7 +42,7 @@ bk-crypto-python-sdk = "^1.0.4" bk-iam = "1.3.4" cryptography = "42.0.5" apigw-manager = "3.0.2" -bkapi-client-generator = "0.1.28" +bkapi-client-generator = "0.1.29" curlify = "^2.2.1" bkapi-component-open = "^1.0.3" django-prometheus = "2.2.0"