Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b08e1af139 | ||
|
|
c1cdc53187 |
Generated
+1
-1
@@ -2948,7 +2948,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "portal"
|
name = "portal"
|
||||||
version = "0.3.24"
|
version = "0.3.25"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"arc-swap",
|
"arc-swap",
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "portal"
|
name = "portal"
|
||||||
version = "0.3.25"
|
version = "0.3.26"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[lib]
|
[lib]
|
||||||
|
|||||||
+11
-2
@@ -446,6 +446,12 @@ pub struct Requirement {
|
|||||||
/// `ResourceSpec` mechanism a `Feature.resource` uses.
|
/// `ResourceSpec` mechanism a `Feature.resource` uses.
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
pub resource: Option<ResourceSpec>,
|
pub resource: Option<ResourceSpec>,
|
||||||
|
/// `type: select` only - a static list of options, as an
|
||||||
|
/// alternative to a `resource`. Each string is both the option's
|
||||||
|
/// stored value and its label. Faithful to the ancestor format's
|
||||||
|
/// inline enums.
|
||||||
|
#[serde(default)]
|
||||||
|
pub options: Vec<String>,
|
||||||
/// `type: select` only - which field in each item is the option's
|
/// `type: select` only - which field in each item is the option's
|
||||||
/// stable id. Defaults to trying `_id` then `id`.
|
/// stable id. Defaults to trying `_id` then `id`.
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
@@ -1204,9 +1210,12 @@ pub fn validate_questions(
|
|||||||
.collect();
|
.collect();
|
||||||
for feature in &alternative.features {
|
for feature in &alternative.features {
|
||||||
for requirement in &feature.requirements {
|
for requirement in &feature.requirements {
|
||||||
if requirement.kind == "select" && requirement.resource.is_none() {
|
if requirement.kind == "select"
|
||||||
|
&& requirement.resource.is_none()
|
||||||
|
&& requirement.options.is_empty()
|
||||||
|
{
|
||||||
anyhow::bail!(
|
anyhow::bail!(
|
||||||
"question {:?} alternative {:?} feature {:?}: requirement {:?} is type: select but declares no resource to select from",
|
"question {:?} alternative {:?} feature {:?}: requirement {:?} is type: select but declares neither a resource nor inline options",
|
||||||
question.id, alternative.name, feature.name, requirement.name
|
question.id, alternative.name, feature.name, requirement.name
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -68,6 +68,16 @@ pub async fn get_requirement_options(
|
|||||||
.iter()
|
.iter()
|
||||||
.find(|r| r.name == requirement_name)
|
.find(|r| r.name == requirement_name)
|
||||||
.ok_or_else(|| ServerFnError::new("unknown requirement"))?;
|
.ok_or_else(|| ServerFnError::new("unknown requirement"))?;
|
||||||
|
// Inline options: return them as {id,label} objects, the shape the
|
||||||
|
// SelectField renders, without touching a resource.
|
||||||
|
if !requirement.options.is_empty() {
|
||||||
|
let items: Vec<serde_json::Value> = requirement
|
||||||
|
.options
|
||||||
|
.iter()
|
||||||
|
.map(|o| serde_json::json!({ "id": o, "label": o }))
|
||||||
|
.collect();
|
||||||
|
return Ok(serde_json::Value::Array(items));
|
||||||
|
}
|
||||||
let resource = requirement
|
let resource = requirement
|
||||||
.resource
|
.resource
|
||||||
.as_ref()
|
.as_ref()
|
||||||
|
|||||||
Reference in New Issue
Block a user