fix cards that have embedded contents (#744)

* fix #743

* fix #743

* handle icons separately

* remove description test, since descriptions are overwritten by card embeds anyway

---------

Co-authored-by: Florian Bellencontre <[email protected]>
Co-authored-by: lovasoa <[email protected]>

Author: 3 people

examples/official-site/sqlpage/migrations/31_card_docs_update.sql

@@ -24,7 +24,7 @@ INSERT INTO parameter(component, name, description, type, top_level, optional) S
     ('footer_link', 'An URL to which the user should be taken when they click on the footer.', 'URL', FALSE, TRUE),
     ('style', 'Inline style property to your iframe embed code. For example "background-color: #FFFFFF"', 'TEXT', FALSE, TRUE),
     ('icon', 'Name of an icon to display on the left side of the card.', 'ICON', FALSE, TRUE),
-    ('color', 'The name of a color, to be displayed on the left of the card to highlight it.', 'COLOR', FALSE, TRUE),
+    ('color', 'The name of a color, to be displayed on the left of the card to highlight it. If the embed parameter is enabled and you don''t have a title or description, this parameter won''t apply.', 'COLOR', FALSE, TRUE),
     ('background_color', 'The background color of the card.', 'COLOR', FALSE, TRUE),
     ('active', 'Whether this item in the grid is considered "active". Active items are displayed more prominently.', 'BOOLEAN', FALSE, TRUE),
     ('width', 'The width of the card, between 1 (smallest) and 12 (full-width). The default width is 3, resulting in 4 cards per line.', 'INTEGER', FALSE, TRUE)

sqlpage/templates/card.handlebars

@@ -25,9 +25,13 @@
         {{~#if id}} id="{{id}}"{{/if}}>
             <div class="card h-100
                 {{~#if active}} card-active {{/if~}}
-                {{~#if background_color}} bg-{{background_color}} text-{{background_color}}-fg
-                {{~else}}{{#if embed}} bg-transparent border-0{{/if}}
-                {{~/if~}}
+                {{~#if background_color}}
+                    bg-{{background_color}} text-{{background_color}}-fg
+                {{~else}}
+                    {{#if (all embed (not title) (not icon))}}
+                        bg-transparent border-0
+                    {{/if}}
+                {{/if}}
                 "
                 {{#if (and embed (ne embed_mode "iframe"))}}data-pre-init="card" data-embed="{{embed}}"{{/if}}>
                 {{#if link}}
@@ -37,9 +41,11 @@
                     <img src="{{top_image}}" class="card-img-top" />
                 {{/if}}
                 {{#if color}}
-                    <div class="card-status-start bg-{{color}}"></div>
+                    {{#if (not embed)}}
+                         <div class="card-status-start bg-{{color}}"></div>
+                    {{/if}}
                 {{/if}}
-                <div class="card-body {{#if embed}}p-0{{/if}}">
+                <div class="card-body {{#if (all embed (not title) (not icon))}}p-0{{/if}}">
                     {{#if title}}<h2 class="card-title fs-3 me-3">{{title}}</h2>{{/if}}
                     <div class="card-content remove-bottom-margin{{#if (and icon (not title))}} pe-4{{/if}}">
                         {{~description~}}

src/template_helpers.rs

@@ -3,8 +3,8 @@ use std::borrow::Cow;
 use crate::{app_config::AppConfig, utils::static_filename};
 use anyhow::Context as _;
 use handlebars::{
-    handlebars_helper, Context, Handlebars, HelperDef, PathAndJson, RenderError, RenderErrorReason,
-    Renderable, ScopedJson,
+    handlebars_helper, Context, Handlebars, HelperDef, JsonTruthy, PathAndJson, RenderError,
+    RenderErrorReason, Renderable, ScopedJson,
 };
 use serde_json::Value as JsonValue;
 
@@ -19,6 +19,10 @@ type HH = fn(&JsonValue, &JsonValue) -> JsonValue;
 
 pub fn register_all_helpers(h: &mut Handlebars<'_>, config: &AppConfig) {
     let site_prefix = config.site_prefix.clone();
+
+    register_helper(h, "all", HelperCheckTruthy(false));
+    register_helper(h, "any", HelperCheckTruthy(true));
+
     register_helper(h, "stringify", stringify_helper as H);
     register_helper(h, "parse_json", parse_json_helper as EH);
     register_helper(h, "default", default_helper as HH);
@@ -400,6 +404,26 @@ fn sum_helper<'reg, 'rc>(
     Ok(())
 }
 
+/// Helper that returns the first argument with the given truthiness, or the last argument if none have it.
+/// Equivalent to a && b && c && ... if the truthiness is false,
+/// or a || b || c || ... if the truthiness is true.
+pub struct HelperCheckTruthy(bool);
+
+impl CanHelp for HelperCheckTruthy {
+    fn call(&self, args: &[PathAndJson]) -> Result<JsonValue, String> {
+        for arg in args {
+            if arg.value().is_truthy(false) == self.0 {
+                return Ok(arg.value().clone());
+            }
+        }
+        if let Some(last) = args.last() {
+            Ok(last.value().clone())
+        } else {
+            Err("expected at least one argument".to_string())
+        }
+    }
+}
+
 trait CanHelp: Send + Sync + 'static {
     fn call(&self, v: &[PathAndJson]) -> Result<JsonValue, String>;
 }