Refactor dynamic component property extraction

Co-authored-by: contact <[email protected]>

Author: cursoragent

src/dynamic_component.rs

@@ -83,11 +83,14 @@ fn extract_dynamic_properties(data: &mut JsonValue) -> anyhow::Result<Option<Jso
         .or_else(|| data.get("COMPONENT"))
         .and_then(|v| v.as_str());
     if component == Some("dynamic") {
-        let Some(properties) = data
-            .get_mut("properties")
-            .or_else(|| data.get_mut("PROPERTIES"))
-            .map(JsonValue::take)
-        else {
+        let properties_opt = if let Some(v) = data.get_mut("properties") {
+            Some(v.take())
+        } else if let Some(v) = data.get_mut("PROPERTIES") {
+            Some(v.take())
+        } else {
+            None
+        };
+        let Some(properties) = properties_opt else {
             anyhow::bail!(
                 "The dynamic component requires a property named \"properties\". \
                 Instead, it received the following: {data}"

src/render.rs

@@ -54,7 +54,7 @@ use anyhow::{bail, format_err, Context as AnyhowContext};
 use awc::cookie::time::Duration;
 use handlebars::{BlockContext, JsonValue, RenderError, Renderable};
 use serde::Serialize;
-use serde_json::{json, Value};
+use serde_json::json;
 use std::borrow::Cow;
 use std::convert::TryFrom;
 use std::fmt::Write as _;