fix custom column labels being lost on read-only module tables

This commit is contained in:
Priec
2026-09-10 21:12:30 +02:00
parent 0774f49f9c
commit 315cbe0c9c
6 changed files with 141 additions and 3 deletions

Binary file not shown.

View File

@@ -700,6 +700,33 @@ pub struct TableDetail {
#[serde(default)]
pub catalog_features: ::prost::alloc::vec::Vec<i32>,
}
#[derive(serde::Serialize, serde::Deserialize)]
#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
pub struct ResetModuleDefaultsRequest {
#[prost(string, tag = "1")]
pub profile_name: ::prost::alloc::string::String,
#[prost(string, tag = "2")]
pub table_name: ::prost::alloc::string::String,
/// Stable column IDs, not aliases. Only these label overrides are cleared.
#[prost(int64, repeated, tag = "3")]
pub column_alias_ids: ::prost::alloc::vec::Vec<i64>,
/// Only these required-setting overrides are cleared.
#[prost(int64, repeated, tag = "4")]
pub column_required_ids: ::prost::alloc::vec::Vec<i64>,
#[prost(bool, tag = "5")]
pub reset_row_display_columns: bool,
#[prost(int64, tag = "6")]
pub expected_row_version: i64,
}
#[derive(serde::Serialize, serde::Deserialize)]
#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
pub struct ResetModuleDefaultsResponse {
#[prost(bool, tag = "1")]
pub success: bool,
/// Reload table details to obtain the effective settings after the reset.
#[prost(int64, tag = "2")]
pub row_version: i64,
}
/// Server-owned behavior for one logical column returned in table details.
#[derive(serde::Serialize, serde::Deserialize)]
#[derive(Clone, PartialEq, ::prost::Message)]
@@ -1259,6 +1286,7 @@ pub enum CatalogFeature {
ReplaceDefinition = 12,
Indexes = 13,
DeleteTable = 14,
ResetModuleDefaults = 15,
}
impl CatalogFeature {
/// String value of the enum field names used in the ProtoBuf definition.
@@ -1282,6 +1310,7 @@ impl CatalogFeature {
Self::ReplaceDefinition => "CATALOG_FEATURE_REPLACE_DEFINITION",
Self::Indexes => "CATALOG_FEATURE_INDEXES",
Self::DeleteTable => "CATALOG_FEATURE_DELETE_TABLE",
Self::ResetModuleDefaults => "CATALOG_FEATURE_RESET_MODULE_DEFAULTS",
}
}
/// Creates an enum from field names used in the ProtoBuf definition.
@@ -1302,6 +1331,7 @@ impl CatalogFeature {
"CATALOG_FEATURE_REPLACE_DEFINITION" => Some(Self::ReplaceDefinition),
"CATALOG_FEATURE_INDEXES" => Some(Self::Indexes),
"CATALOG_FEATURE_DELETE_TABLE" => Some(Self::DeleteTable),
"CATALOG_FEATURE_RESET_MODULE_DEFAULTS" => Some(Self::ResetModuleDefaults),
_ => None,
}
}
@@ -2083,6 +2113,36 @@ pub mod table_definition_client {
);
self.inner.unary(req, path, codec).await
}
/// Clear selected profile overrides and apply the current module defaults atomically.
pub async fn reset_module_defaults(
&mut self,
request: impl tonic::IntoRequest<super::ResetModuleDefaultsRequest>,
) -> std::result::Result<
tonic::Response<super::ResetModuleDefaultsResponse>,
tonic::Status,
> {
self.inner
.ready()
.await
.map_err(|e| {
tonic::Status::unknown(
format!("Service was not ready: {}", e.into()),
)
})?;
let codec = tonic_prost::ProstCodec::default();
let path = http::uri::PathAndQuery::from_static(
"/komp_ac.table_definition.TableDefinition/ResetModuleDefaults",
);
let mut req = request.into_request();
req.extensions_mut()
.insert(
GrpcMethod::new(
"komp_ac.table_definition.TableDefinition",
"ResetModuleDefaults",
),
);
self.inner.unary(req, path, codec).await
}
/// Replaces the optional user-visible aliases for a fixed-option column.
/// Stored values remain stable machine values and scripts never depend on labels.
pub async fn set_column_option_aliases(
@@ -2407,6 +2467,14 @@ pub mod table_definition_server {
tonic::Response<super::SetColumnRequiredResponse>,
tonic::Status,
>;
/// Clear selected profile overrides and apply the current module defaults atomically.
async fn reset_module_defaults(
&self,
request: tonic::Request<super::ResetModuleDefaultsRequest>,
) -> std::result::Result<
tonic::Response<super::ResetModuleDefaultsResponse>,
tonic::Status,
>;
/// Replaces the optional user-visible aliases for a fixed-option column.
/// Stored values remain stable machine values and scripts never depend on labels.
async fn set_column_option_aliases(
@@ -3542,6 +3610,55 @@ pub mod table_definition_server {
};
Box::pin(fut)
}
"/komp_ac.table_definition.TableDefinition/ResetModuleDefaults" => {
#[allow(non_camel_case_types)]
struct ResetModuleDefaultsSvc<T: TableDefinition>(pub Arc<T>);
impl<
T: TableDefinition,
> tonic::server::UnaryService<super::ResetModuleDefaultsRequest>
for ResetModuleDefaultsSvc<T> {
type Response = super::ResetModuleDefaultsResponse;
type Future = BoxFuture<
tonic::Response<Self::Response>,
tonic::Status,
>;
fn call(
&mut self,
request: tonic::Request<super::ResetModuleDefaultsRequest>,
) -> Self::Future {
let inner = Arc::clone(&self.0);
let fut = async move {
<T as TableDefinition>::reset_module_defaults(
&inner,
request,
)
.await
};
Box::pin(fut)
}
}
let accept_compression_encodings = self.accept_compression_encodings;
let send_compression_encodings = self.send_compression_encodings;
let max_decoding_message_size = self.max_decoding_message_size;
let max_encoding_message_size = self.max_encoding_message_size;
let inner = self.inner.clone();
let fut = async move {
let method = ResetModuleDefaultsSvc(inner);
let codec = tonic_prost::ProstCodec::default();
let mut grpc = tonic::server::Grpc::new(codec)
.apply_compression_config(
accept_compression_encodings,
send_compression_encodings,
)
.apply_max_message_size_config(
max_decoding_message_size,
max_encoding_message_size,
);
let res = grpc.unary(method, req).await;
Ok(res)
};
Box::pin(fut)
}
"/komp_ac.table_definition.TableDefinition/SetColumnOptionAliases" => {
#[allow(non_camel_case_types)]
struct SetColumnOptionAliasesSvc<T: TableDefinition>(pub Arc<T>);