@perspective-dev/viewer 5.5.0 → 5.6.0

package/src/rust/agent/markdown/mod.rs

@@ -226,241 +226,3 @@ impl Writer {
         }
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::events::{Align, Event, Tag};
-
-    fn parse(text: &str) -> Vec<Event> {
-        super::block::parse(text)
-    }
-
-    fn start(tag: Tag) -> Event {
-        Event::Start(tag)
-    }
-
-    fn text(x: &str) -> Event {
-        Event::Text(x.to_owned())
-    }
-
-    #[test]
-    fn paragraph_and_emphasis() {
-        assert_eq!(parse("**Done!** Key *stats* here."), vec![
-            start(Tag::Paragraph),
-            start(Tag::Strong),
-            text("Done!"),
-            Event::End,
-            text(" Key "),
-            start(Tag::Emphasis),
-            text("stats"),
-            Event::End,
-            text(" here."),
-            Event::End,
-        ]);
-    }
-
-    #[test]
-    fn snake_case_is_not_emphasis() {
-        assert_eq!(parse("call get_schema then set_view_config"), vec![
-            start(Tag::Paragraph),
-            text("call get_schema then set_view_config"),
-            Event::End,
-        ]);
-    }
-
-    #[test]
-    fn nested_strong_emphasis() {
-        assert_eq!(parse("**bold with *ital* inside**"), vec![
-            start(Tag::Paragraph),
-            start(Tag::Strong),
-            text("bold with "),
-            start(Tag::Emphasis),
-            text("ital"),
-            Event::End,
-            text(" inside"),
-            Event::End,
-            Event::End,
-        ]);
-    }
-
-    #[test]
-    fn unpaired_delimiters_stay_literal() {
-        // Space on both sides ⇒ the runs can neither open nor close, so
-        // they stay in the running text buffer.
-        assert_eq!(parse("2 * 3 * 4 and a ~ tilde"), vec![
-            start(Tag::Paragraph),
-            text("2 * 3 * 4 and a ~ tilde"),
-            Event::End,
-        ]);
-    }
-
-    #[test]
-    fn code_spans_and_strikethrough() {
-        assert_eq!(parse("run `pnpm test` and ~~skip~~ this"), vec![
-            start(Tag::Paragraph),
-            text("run "),
-            Event::Code("pnpm test".to_owned()),
-            text(" and "),
-            start(Tag::Strikethrough),
-            text("skip"),
-            Event::End,
-            text(" this"),
-            Event::End,
-        ]);
-    }
-
-    #[test]
-    fn heading_rule_and_fence() {
-        assert_eq!(parse("## Stats\n\n---\n\n```sql\nSELECT 1;\n```"), vec![
-            start(Tag::Heading(2)),
-            text("Stats"),
-            Event::End,
-            Event::Rule,
-            start(Tag::CodeBlock(Some("sql".to_owned()))),
-            text("SELECT 1;\n"),
-            Event::End,
-        ]);
-    }
-
-    #[test]
-    fn nested_list_with_code_block_in_item() {
-        assert_eq!(
-            parse("- first\n- second:\n  ```\n  x = 1\n  ```\n  - inner"),
-            vec![
-                start(Tag::List(None)),
-                start(Tag::Item),
-                text("first"),
-                Event::End,
-                start(Tag::Item),
-                text("second:"),
-                start(Tag::CodeBlock(None)),
-                text("x = 1\n"),
-                Event::End,
-                start(Tag::List(None)),
-                start(Tag::Item),
-                text("inner"),
-                Event::End,
-                Event::End,
-                Event::End,
-                Event::End,
-            ]
-        );
-    }
-
-    #[test]
-    fn ordered_list_start() {
-        assert_eq!(parse("3. three\n4. four"), vec![
-            start(Tag::List(Some(3))),
-            start(Tag::Item),
-            text("three"),
-            Event::End,
-            start(Tag::Item),
-            text("four"),
-            Event::End,
-            Event::End,
-        ]);
-    }
-
-    #[test]
-    fn table_with_alignment_and_pipe_in_code() {
-        assert_eq!(
-            parse("| Region | Sales |\n| :--- | ---: |\n| West | `a\\|b` |"),
-            vec![
-                start(Tag::Table(vec![Align::Left, Align::Right])),
-                start(Tag::TableHead),
-                start(Tag::TableCell),
-                text("Region"),
-                Event::End,
-                start(Tag::TableCell),
-                text("Sales"),
-                Event::End,
-                Event::End,
-                start(Tag::TableRow),
-                start(Tag::TableCell),
-                text("West"),
-                Event::End,
-                start(Tag::TableCell),
-                Event::Code("a|b".to_owned()),
-                Event::End,
-                Event::End,
-                Event::End,
-            ]
-        );
-    }
-
-    #[test]
-    fn dashes_after_paragraph_are_a_rule_not_a_table() {
-        assert_eq!(parse("Title\n---"), vec![
-            start(Tag::Paragraph),
-            text("Title"),
-            Event::End,
-            Event::Rule,
-        ]);
-    }
-
-    #[test]
-    fn links_images_and_autolinks() {
-        assert_eq!(
-            parse("[safe](https://example.com \"hi\") ![leak](https://example.com/x.png) <https://a.co>"),
-            vec![
-                start(Tag::Paragraph),
-                start(Tag::Link {
-                    dest_url: "https://example.com".to_owned(),
-                    title: "hi".to_owned(),
-                }),
-                text("safe"),
-                Event::End,
-                text(" "),
-                start(Tag::Image {
-                    dest_url: "https://example.com/x.png".to_owned(),
-                }),
-                text("leak"),
-                Event::End,
-                text(" "),
-                start(Tag::Link {
-                    dest_url: "https://a.co".to_owned(),
-                    title: String::new(),
-                }),
-                text("https://a.co"),
-                Event::End,
-                Event::End,
-            ]
-        );
-    }
-
-    #[test]
-    fn raw_html_is_literal_text() {
-        assert_eq!(parse("<script>alert(1)</script>"), vec![
-            start(Tag::Paragraph),
-            text("<script>alert(1)</script>"),
-            Event::End,
-        ]);
-    }
-
-    #[test]
-    fn blockquote_and_breaks() {
-        assert_eq!(parse("> quoted\n> more\n\nafter  \nbreak"), vec![
-            start(Tag::BlockQuote),
-            start(Tag::Paragraph),
-            text("quoted"),
-            Event::SoftBreak,
-            text("more"),
-            Event::End,
-            Event::End,
-            start(Tag::Paragraph),
-            text("after"),
-            Event::HardBreak,
-            text("break"),
-            Event::End,
-        ]);
-    }
-
-    #[test]
-    fn entities_decode_or_stay_literal() {
-        assert_eq!(parse("a &amp; b &#65; &unknown; c"), vec![
-            start(Tag::Paragraph),
-            text("a & b A &unknown; c"),
-            Event::End,
-        ]);
-    }
-}

package/src/rust/agent/preamble.md

@@ -11,6 +11,7 @@ Panels: the viewer is a dashboard that can hold multiple panels (independent sid
 
 Rules:
 - Column names in configs must match the schema exactly, including case.
+- A `set_view_config` or `add_panel` call that returns an error changed NOTHING - the viewer is exactly as it was, so there is nothing to undo.
 - If a tool returns an error, correct your input and retry. If the same call fails twice with the same error, stop and report the problem instead.
 - You have a fixed budget of model requests per prompt - be economical with tool calls.
 - After acting, answer with a single short sentence describing what changed. If the user asks a question you can answer from tool results, answer it directly.

package/src/rust/agent/tools.rs

@@ -482,7 +482,7 @@ pub struct ToolError(String);
 /// applied config.
 fn retyped_columns(
     session: &crate::session::Session,
-    config: &crate::config::ViewerConfig,
+    config: &crate::config::ViewerConfig<String, String>,
 ) -> Vec<Value> {
     let metadata = session.metadata();
     config
@@ -873,22 +873,8 @@ impl PerspectiveViewerElement {
     async fn tool_set_view_config(&self, ctx: &ToolCtx, args: Value) -> Result<Value, ToolError> {
         let args: SetViewConfigArgs = serde_json::from_value(args)?;
         let target = args.panel.as_deref();
-        let panel = self.agent_panel(target)?;
-        let snapshot =
-            get_viewer_config(&panel.session, &panel.renderer, &self.presentation).await?;
-
+        self.agent_panel(target)?;
         if let Err(err) = self.agent_restore(target, &args.config).await {
-            let rolled = self
-                .agent_restore(target, &serde_json::to_value(&snapshot)?)
-                .await;
-
-            let err = match rolled {
-                Ok(()) => err,
-                Err(rollback_err) => ToolError(format!(
-                    "{err} (additionally, restoring the prior config failed: {rollback_err})"
-                )),
-            };
-
             return Err(with_docs_hint(ctx, err));
         }
 

package/src/rust/components/column_selector/active_column.rs

@@ -257,9 +257,9 @@ impl Component for ActiveColumn {
         };
 
         let ondragenter = ctx.props().ondragenter.reform(move |event: DragEvent| {
-            // Safari does not set `relatedTarget` so this event must be allowed to
-            // bubble so we can count entry/exit stacks to determine true
-            // `"dragleave"`.
+            // Safari does not set `relatedTarget` so this event must be allowed
+            // to bubble so we can count entry/exit stacks to
+            // determine true `"dragleave"`.
             if event.related_target().is_some() {
                 event.stop_propagation();
                 event.prevent_default();
@@ -328,7 +328,7 @@ impl Component for ActiveColumn {
                 let remove_column = if is_required {
                     None
                 } else {
-                    Some(ctx.link().callback({
+                    Some(left_click(ctx.link().callback({
                         let event_name = name.to_owned();
                         move |event: MouseEvent| {
                             ActiveColumnMsg::DeactivateColumn(
@@ -336,7 +336,7 @@ impl Component for ActiveColumn {
                                 event.shift_key(),
                             )
                         }
-                    }))
+                    })))
                 };
 
                 let ondragend = &ctx.props().ondragend.reform(|_| ());
@@ -367,9 +367,11 @@ impl Component for ActiveColumn {
                 if is_required {
                     class.push("required");
                 };
+
                 if !is_required {
                     class.push("shift-alt-icon");
                 }
+
                 html! {
                     <div
                         class={outer_classes}
@@ -468,6 +470,14 @@ impl ActiveColumnProps {
     fn get_is_required(&self, idx: usize) -> bool {
         let min_cols = self.renderer.metadata().min_config_columns.unwrap_or(0);
         idx < min_cols
+            && (self
+                .session
+                .get_view_config()
+                .columns
+                .iter()
+                .flatten()
+                .count()
+                == 1)
     }
 
     fn get_aggregate(&self, name: &str) -> Option<Aggregate> {

package/src/rust/components/column_selector/add_expression_button.rs

@@ -13,6 +13,7 @@
 use yew::prelude::*;
 
 use super::{ColumnLocator, ColumnSettingsTarget};
+use crate::utils::left_click;
 
 #[derive(Clone, PartialEq, Properties)]
 pub struct AddExpressionButtonProps {
@@ -23,41 +24,23 @@ pub struct AddExpressionButtonProps {
     pub selected_column: Option<ColumnLocator>,
 }
 
-/// `onmouseover` is triggered incorrectly on the `DragTarget` of a
-/// drag/drop action after `DropEvent` has fired on the `DropTarget`,
-/// causing brief hover effects where the mouse _was_ before the action
-/// initiated. Various methods of correcting this were attempted, settling
-/// on a manual `dragdrop-hover` class toggle, using the `.button()` property
-/// to determine the mis-fired event.  This was determined experimentally -
-/// according to my read of the spec, this is a bug in Chrome.
-///
-/// As a result there are 3 hover states `MouseEnter(true)`,
-/// `MouseEnter(false)`, and `MouseLeave`;  `MouseEnter(false)` can be
-/// replaced, but it causes an extra render of the DOM un-necessarily.
+/// The "New Column" row; hover is CSS so a drag's stray `mouseover` cannot
+/// pin the highlight.
 #[function_component]
 pub fn AddExpressionButton(p: &AddExpressionButtonProps) -> Html {
-    let is_mouseover = yew::use_state_eq(|| false);
-    let onmouseover = yew::use_callback(is_mouseover.setter(), |event: MouseEvent, mo| {
-        mo.set(event.button() == 0);
-    });
+    let onmousedown = left_click(
+        p.on_open_expr_panel
+            .reform(|_| ColumnSettingsTarget::NewExpression),
+    );
 
-    let onmouseout = yew::use_callback(is_mouseover.setter(), |_event, mo| {
-        mo.set(false);
-    });
-
-    let onmousedown = p
-        .on_open_expr_panel
-        .reform(|_| ColumnSettingsTarget::NewExpression);
-
-    let class = if *is_mouseover || matches!(p.selected_column, Some(ColumnLocator::NewExpression))
-    {
+    let class = if matches!(p.selected_column, Some(ColumnLocator::NewExpression)) {
         classes!("dragdrop-hover")
     } else {
         classes!()
     };
 
     html! {
-        <div id="add-expression" data-index="-1" {class} {onmouseover} {onmouseout} {onmousedown}>
+        <div id="add-expression" data-index="-1" {class} {onmousedown}>
             <span class="icon" />
             <span id="add-expression-button" />
         </div>

package/src/rust/components/column_selector/config_selector.rs

@@ -24,7 +24,8 @@ use crate::components::column_dropdown::{ColumnDropDownElement, ColumnDropDownPo
 use crate::components::dragdrop_list::*;
 use crate::components::filter_dropdown::{FilterDropDownElement, FilterDropDownPortal};
 use crate::config::PluginStaticConfig;
-use crate::presentation::Presentation;
+use crate::presentation::{ColumnLocator, ColumnSettingsTarget, Presentation};
+use crate::queries::has_column_config;
 use crate::renderer::*;
 use crate::session::drag_drop_update::*;
 use crate::session::*;
@@ -36,6 +37,13 @@ use crate::utils::*;
 pub struct ConfigSelectorProps {
     pub onselect: Callback<()>,
 
+    /// Opens a pivot column's settings, so its format config is reachable.
+    pub on_open_expr_panel: Callback<ColumnSettingsTarget>,
+
+    /// The column whose settings sidebar is open, threaded as a VALUE prop so
+    /// closing or retargeting the sidebar clears this pill's open indicator.
+    pub selected_column: Option<ColumnLocator>,
+
     #[prop_or_default]
     pub ondragenter: Callback<()>,
 
@@ -43,9 +51,11 @@ pub struct ConfigSelectorProps {
     /// (group_by, sort, filter, etc.) trigger re-renders via normal prop
     /// diffing rather than a PubSub `view_created` subscription.
     pub view_config: PtrEqRc<ViewConfig>,
+
     /// Column currently being dragged — threaded to show `dragdrop-highlight`
     /// without subscribing to `dragstart_received`/`dragend_received`.
     pub drag_column: Option<String>,
+
     /// Session metadata snapshot — threaded from `SessionProps`.
     pub metadata: SessionMetadataRc,
 
@@ -69,6 +79,7 @@ pub struct ConfigSelectorProps {
 impl PartialEq for ConfigSelectorProps {
     fn eq(&self, other: &Self) -> bool {
         self.view_config == other.view_config
+            && self.selected_column == other.selected_column
             && self.drag_column == other.drag_column
             && self.metadata == other.metadata
             && self.selected_theme == other.selected_theme
@@ -552,10 +563,10 @@ impl Component for ConfigSelector {
         }
     }
 
-    // /// Should not render on change, as this component only depends on service
-    // /// state.
-    // fn changed(&mut self, _ctx: &Context<Self>, _old: &Self::Properties) -> bool
-    // {     false
+    // /// Should not render on change, as this component only depends on
+    // service /// state.
+    // fn changed(&mut self, _ctx: &Context<Self>, _old: &Self::Properties) ->
+    // bool {     false
     // }
 
     fn view(&self, ctx: &Context<Self>) -> Html {
@@ -578,7 +589,18 @@ impl Component for ConfigSelector {
             )
         };
 
-        let transpose = ctx.link().callback(|_| ConfigSelectorMsg::TransposePivots);
+        let has_config = |name: &str| {
+            has_column_config(name, config, &ctx.props().metadata, &ctx.props().renderer)
+        };
+
+        let editing_column = match &ctx.props().selected_column {
+            Some(ColumnLocator::Table(x))
+            | Some(ColumnLocator::Expression(x))
+            | Some(ColumnLocator::Window(x)) => Some(x.clone()),
+            _ => None,
+        };
+
+        let transpose = left_click(ctx.link().callback(|_| ConfigSelectorMsg::TransposePivots));
         let column_dropdown = self.column_dropdown.clone();
         let mut class = classes!();
 
@@ -665,6 +687,9 @@ impl Component for ConfigSelector {
                                         action={DragTarget::GroupBy}
                                         column={group_by.clone()}
                                         metadata={metadata.clone()}
+                                        on_open_expr_panel={has_config(group_by)
+                                            .then(|| ctx.props().on_open_expr_panel.clone())}
+                                        is_editing={editing_column.as_deref() == Some(group_by.as_str())}
                                         {presentation}
                                         opt_session={session}
                                     >
@@ -716,6 +741,9 @@ impl Component for ConfigSelector {
                                     action={ DragTarget::SplitBy }
                                     column={ split_by.clone() }
                                     metadata={metadata.clone()}
+                                    on_open_expr_panel={has_config(split_by)
+                                        .then(|| ctx.props().on_open_expr_panel.clone())}
+                                    is_editing={editing_column.as_deref() == Some(split_by.as_str())}
                                     {presentation}
                                     opt_session={session}>
                                 </PivotColumn>