From 4444a758e32761d6ce06809034132deb11f4517e Mon Sep 17 00:00:00 2001 From: Andrew Stein Date: Wed, 13 Jul 2022 00:48:09 -0400 Subject: [PATCH] Add categories to plugin selector --- .../src/js/charts/area.js | 1 + .../src/js/charts/bar.js | 1 + .../src/js/charts/candlestick.js | 1 + .../src/js/charts/column.js | 1 + .../src/js/charts/heatmap.js | 1 + .../src/js/charts/line.js | 1 + .../src/js/charts/ohlc.js | 1 + .../src/js/charts/sunburst.js | 1 + .../src/js/charts/treemap.js | 1 + .../src/js/charts/xy-line.js | 1 + .../src/js/charts/xy-scatter.js | 1 + .../src/js/charts/y-scatter.js | 1 + .../src/js/plugin/plugin.js | 4 +++ .../src/js/plugin.js | 4 +++ .../src/rust/components/aggregate_selector.rs | 6 +++- .../src/rust/components/containers/select.rs | 32 +++++++++++++---- .../src/rust/components/copy_dropdown.rs | 9 +++-- .../src/rust/components/export_dropdown.rs | 8 +++-- .../src/rust/components/plugin_selector.rs | 31 +++++++++++------ rust/perspective-viewer/src/rust/js/plugin.rs | 3 ++ rust/perspective-viewer/src/rust/renderer.rs | 3 +- .../src/rust/renderer/plugin_store.rs | 7 ++-- .../src/rust/renderer/registry.rs | 25 ++++++++++---- .../test/results/results.json | 34 +++++++++---------- 24 files changed, 126 insertions(+), 52 deletions(-) diff --git a/packages/perspective-viewer-d3fc/src/js/charts/area.js b/packages/perspective-viewer-d3fc/src/js/charts/area.js index f0a51f5b54..4bb5aa4749 100644 --- a/packages/perspective-viewer-d3fc/src/js/charts/area.js +++ b/packages/perspective-viewer-d3fc/src/js/charts/area.js @@ -98,6 +98,7 @@ function areaChart(container, settings) { } areaChart.plugin = { name: "Y Area", + category: "Y Chart", max_cells: 4000, max_columns: 50, render_warning: true, diff --git a/packages/perspective-viewer-d3fc/src/js/charts/bar.js b/packages/perspective-viewer-d3fc/src/js/charts/bar.js index 05def95846..3eb2fef497 100644 --- a/packages/perspective-viewer-d3fc/src/js/charts/bar.js +++ b/packages/perspective-viewer-d3fc/src/js/charts/bar.js @@ -66,6 +66,7 @@ function barChart(container, settings) { } barChart.plugin = { name: "X Bar", + category: "X Chart", max_cells: 1000, max_columns: 50, render_warning: true, diff --git a/packages/perspective-viewer-d3fc/src/js/charts/candlestick.js b/packages/perspective-viewer-d3fc/src/js/charts/candlestick.js index 7349356770..61459ba435 100644 --- a/packages/perspective-viewer-d3fc/src/js/charts/candlestick.js +++ b/packages/perspective-viewer-d3fc/src/js/charts/candlestick.js @@ -12,6 +12,7 @@ import ohlcCandle from "./ohlcCandle"; const candlestick = ohlcCandle(seriesCanvasCandlestick); candlestick.plugin = { name: "Candlestick", + category: "Y Chart", max_cells: 4000, max_columns: 50, render_warning: true, diff --git a/packages/perspective-viewer-d3fc/src/js/charts/column.js b/packages/perspective-viewer-d3fc/src/js/charts/column.js index 2586b58329..45180bc0c3 100644 --- a/packages/perspective-viewer-d3fc/src/js/charts/column.js +++ b/packages/perspective-viewer-d3fc/src/js/charts/column.js @@ -93,6 +93,7 @@ function columnChart(container, settings) { } columnChart.plugin = { name: "Y Bar", + category: "Y Chart", max_cells: 1000, max_columns: 50, render_warning: true, diff --git a/packages/perspective-viewer-d3fc/src/js/charts/heatmap.js b/packages/perspective-viewer-d3fc/src/js/charts/heatmap.js index 8ce006114c..2e7caf0412 100644 --- a/packages/perspective-viewer-d3fc/src/js/charts/heatmap.js +++ b/packages/perspective-viewer-d3fc/src/js/charts/heatmap.js @@ -82,6 +82,7 @@ function heatmapChart(container, settings) { } heatmapChart.plugin = { name: "Heatmap", + category: "Hierarchial Chart", max_cells: 50000, max_columns: 500, render_warning: true, diff --git a/packages/perspective-viewer-d3fc/src/js/charts/line.js b/packages/perspective-viewer-d3fc/src/js/charts/line.js index cd2ee899cf..3492193344 100644 --- a/packages/perspective-viewer-d3fc/src/js/charts/line.js +++ b/packages/perspective-viewer-d3fc/src/js/charts/line.js @@ -97,6 +97,7 @@ function lineChart(container, settings) { lineChart.plugin = { name: "Y Line", + category: "Y Chart", max_cells: 4000, max_columns: 50, render_warning: true, diff --git a/packages/perspective-viewer-d3fc/src/js/charts/ohlc.js b/packages/perspective-viewer-d3fc/src/js/charts/ohlc.js index 2b99321d02..044cc32604 100644 --- a/packages/perspective-viewer-d3fc/src/js/charts/ohlc.js +++ b/packages/perspective-viewer-d3fc/src/js/charts/ohlc.js @@ -12,6 +12,7 @@ import ohlcCandle from "./ohlcCandle"; const ohlc = ohlcCandle(seriesCanvasOhlc); ohlc.plugin = { name: "OHLC", + category: "Y Chart", max_cells: 3500, max_columns: 50, render_warning: true, diff --git a/packages/perspective-viewer-d3fc/src/js/charts/sunburst.js b/packages/perspective-viewer-d3fc/src/js/charts/sunburst.js index 0264858c95..98e7d6bf3d 100644 --- a/packages/perspective-viewer-d3fc/src/js/charts/sunburst.js +++ b/packages/perspective-viewer-d3fc/src/js/charts/sunburst.js @@ -87,6 +87,7 @@ function sunburst(container, settings) { sunburst.plugin = { name: "Sunburst", + category: "Hierarchial Chart", max_cells: 7500, max_columns: 50, render_warning: true, diff --git a/packages/perspective-viewer-d3fc/src/js/charts/treemap.js b/packages/perspective-viewer-d3fc/src/js/charts/treemap.js index 9b3caf7011..0ea1737bf5 100644 --- a/packages/perspective-viewer-d3fc/src/js/charts/treemap.js +++ b/packages/perspective-viewer-d3fc/src/js/charts/treemap.js @@ -80,6 +80,7 @@ function treemap(container, settings) { treemap.plugin = { type: "Treemap", name: "Treemap", + category: "Hierarchial Chart", max_cells: 5000, max_columns: 50, render_warning: true, diff --git a/packages/perspective-viewer-d3fc/src/js/charts/xy-line.js b/packages/perspective-viewer-d3fc/src/js/charts/xy-line.js index 709c0dda87..0165e32b9d 100644 --- a/packages/perspective-viewer-d3fc/src/js/charts/xy-line.js +++ b/packages/perspective-viewer-d3fc/src/js/charts/xy-line.js @@ -95,6 +95,7 @@ function xyLine(container, settings) { xyLine.plugin = { name: "X/Y Line", + category: "X/Y Chart", max_cells: 50000, max_columns: 50, render_warning: true, diff --git a/packages/perspective-viewer-d3fc/src/js/charts/xy-scatter.js b/packages/perspective-viewer-d3fc/src/js/charts/xy-scatter.js index 41b0273326..1d6f0cdd9f 100644 --- a/packages/perspective-viewer-d3fc/src/js/charts/xy-scatter.js +++ b/packages/perspective-viewer-d3fc/src/js/charts/xy-scatter.js @@ -132,6 +132,7 @@ function xyScatter(container, settings) { xyScatter.plugin = { name: "X/Y Scatter", + category: "X/Y Chart", max_cells: 50000, max_columns: 50, render_warning: true, diff --git a/packages/perspective-viewer-d3fc/src/js/charts/y-scatter.js b/packages/perspective-viewer-d3fc/src/js/charts/y-scatter.js index ee2ca18a10..af1e85a832 100644 --- a/packages/perspective-viewer-d3fc/src/js/charts/y-scatter.js +++ b/packages/perspective-viewer-d3fc/src/js/charts/y-scatter.js @@ -103,6 +103,7 @@ function yScatter(container, settings) { yScatter.plugin = { name: "Y Scatter", + category: "Y Chart", max_cells: 4000, max_columns: 50, render_warning: true, diff --git a/packages/perspective-viewer-d3fc/src/js/plugin/plugin.js b/packages/perspective-viewer-d3fc/src/js/plugin/plugin.js index 02680b6f70..c203a85259 100644 --- a/packages/perspective-viewer-d3fc/src/js/plugin/plugin.js +++ b/packages/perspective-viewer-d3fc/src/js/plugin/plugin.js @@ -88,6 +88,10 @@ export function register(...plugins) { return chart.plugin.name; } + get category() { + return chart.plugin.category; + } + get select_mode() { return chart.plugin.selectMode || "select"; } diff --git a/packages/perspective-viewer-datagrid/src/js/plugin.js b/packages/perspective-viewer-datagrid/src/js/plugin.js index 52433da95b..a317943f86 100644 --- a/packages/perspective-viewer-datagrid/src/js/plugin.js +++ b/packages/perspective-viewer-datagrid/src/js/plugin.js @@ -133,6 +133,10 @@ export class PerspectiveViewerDatagridPluginElement extends HTMLElement { return "Datagrid"; } + get category() { + return "Basic"; + } + get select_mode() { return "toggle"; } diff --git a/rust/perspective-viewer/src/rust/components/aggregate_selector.rs b/rust/perspective-viewer/src/rust/components/aggregate_selector.rs index 298777537d..f071013c47 100644 --- a/rust/perspective-viewer/src/rust/components/aggregate_selector.rs +++ b/rust/perspective-viewer/src/rust/components/aggregate_selector.rs @@ -90,6 +90,7 @@ impl Component for AggregateSelector { class={ "aggregate-selector" } values={ values } + label="weighted mean" selected={ selected_agg } on_select={ callback }> @@ -126,7 +127,10 @@ impl AggregateSelector { .collect::>(); let multi_aggregates2 = if !multi_aggregates.is_empty() { - vec![SelectItem::OptGroup("weighted mean", multi_aggregates)] + vec![SelectItem::OptGroup( + "weighted mean".into(), + multi_aggregates, + )] } else { vec![] }; diff --git a/rust/perspective-viewer/src/rust/components/containers/select.rs b/rust/perspective-viewer/src/rust/components/containers/select.rs index 984ab34da8..c177548097 100644 --- a/rust/perspective-viewer/src/rust/components/containers/select.rs +++ b/rust/perspective-viewer/src/rust/components/containers/select.rs @@ -6,6 +6,8 @@ // of the Apache License 2.0. The full license can be found in the LICENSE // file. +use std::borrow::Borrow; +use std::borrow::Cow; use std::fmt::Debug; use std::fmt::Display; use std::str::FromStr; @@ -15,7 +17,16 @@ use yew::prelude::*; #[derive(Clone, Eq, PartialEq)] pub enum SelectItem { Option(T), - OptGroup(&'static str, Vec), + OptGroup(Cow<'static, str>, Vec), +} + +impl SelectItem { + pub fn name<'a>(&self) -> Cow<'a, str> { + match self { + Self::Option(x) => format!("{}", x).into(), + Self::OptGroup(x, _) => x.clone(), + } + } } pub enum SelectMsg { @@ -32,6 +43,9 @@ where pub selected: T, pub on_select: Callback, + #[prop_or_default] + pub label: Option<&'static str>, + #[prop_or_default] pub id: Option<&'static str>, @@ -137,15 +151,19 @@ where } }, SelectItem::OptGroup(name, group) => html! { - + { for group.iter().map(|value| { let selected = *value == ctx.props().selected; - let label = format!("{}", value) - .strip_prefix(name) - .unwrap() + let label = format!("{}", value); + let category: &str = name.borrow(); + let label = label + .strip_prefix(category) + .unwrap_or(&label) .trim() .to_owned(); @@ -167,8 +185,8 @@ where }; html! { - if is_group_selected { - + if is_group_selected && ctx.props().label.is_some() { +
diff --git a/rust/perspective-viewer/src/rust/components/copy_dropdown.rs b/rust/perspective-viewer/src/rust/components/copy_dropdown.rs index f6cd2515d7..0c41e1bc75 100644 --- a/rust/perspective-viewer/src/rust/components/copy_dropdown.rs +++ b/rust/perspective-viewer/src/rust/components/copy_dropdown.rs @@ -73,14 +73,17 @@ impl Component for CopyDropDownMenu { fn get_menu_items(has_render: bool) -> Vec { vec![ CopyDropDownMenuItem::OptGroup( - "Current View", + "Current View".into(), if has_render { vec![ExportMethod::Csv, ExportMethod::Json, ExportMethod::Png] } else { vec![ExportMethod::Csv, ExportMethod::Json] }, ), - CopyDropDownMenuItem::OptGroup("All", vec![ExportMethod::CsvAll, ExportMethod::JsonAll]), - CopyDropDownMenuItem::OptGroup("Config", vec![ExportMethod::JsonConfig]), + CopyDropDownMenuItem::OptGroup("All".into(), vec![ + ExportMethod::CsvAll, + ExportMethod::JsonAll, + ]), + CopyDropDownMenuItem::OptGroup("Config".into(), vec![ExportMethod::JsonConfig]), ] } diff --git a/rust/perspective-viewer/src/rust/components/export_dropdown.rs b/rust/perspective-viewer/src/rust/components/export_dropdown.rs index d96295da06..ca720cf2db 100644 --- a/rust/perspective-viewer/src/rust/components/export_dropdown.rs +++ b/rust/perspective-viewer/src/rust/components/export_dropdown.rs @@ -50,7 +50,7 @@ pub enum ExportDropDownMenuMsg { fn get_menu_items(name: &str, has_render: bool) -> Vec { vec![ ExportDropDownMenuItem::OptGroup( - "Current View", + "Current View".into(), if has_render { vec![ ExportMethod::Csv.new_file(name), @@ -68,12 +68,14 @@ fn get_menu_items(name: &str, has_render: bool) -> Vec { ] }, ), - ExportDropDownMenuItem::OptGroup("All", vec![ + ExportDropDownMenuItem::OptGroup("All".into(), vec![ ExportMethod::CsvAll.new_file(name), ExportMethod::JsonAll.new_file(name), ExportMethod::ArrowAll.new_file(name), ]), - ExportDropDownMenuItem::OptGroup("Config", vec![ExportMethod::JsonConfig.new_file(name)]), + ExportDropDownMenuItem::OptGroup("Config".into(), vec![ + ExportMethod::JsonConfig.new_file(name) + ]), ] } diff --git a/rust/perspective-viewer/src/rust/components/plugin_selector.rs b/rust/perspective-viewer/src/rust/components/plugin_selector.rs index 92bca14685..ed6121b597 100644 --- a/rust/perspective-viewer/src/rust/components/plugin_selector.rs +++ b/rust/perspective-viewer/src/rust/components/plugin_selector.rs @@ -37,6 +37,7 @@ pub enum PluginSelectorMsg { } pub struct PluginSelector { + options: Vec>, _plugin_sub: Subscription, } @@ -46,6 +47,7 @@ impl Component for PluginSelector { fn create(ctx: &Context) -> Self { enable_weak_link_test!(ctx.props(), ctx.link()); + let options = generate_plugin_optgroups(&ctx.props().renderer); let _plugin_sub = ctx.props().renderer.plugin_changed.add_listener({ let link = ctx.link().clone(); move |plugin: JsPerspectiveViewerPlugin| { @@ -54,7 +56,10 @@ impl Component for PluginSelector { } }); - PluginSelector { _plugin_sub } + PluginSelector { + options, + _plugin_sub, + } } fn update(&mut self, ctx: &Context, msg: Self::Message) -> bool { @@ -85,20 +90,13 @@ impl Component for PluginSelector { let callback = ctx .link() .callback(PluginSelectorMsg::ComponentSelectPlugin); - let plugin_name = ctx.props().renderer.get_active_plugin().unwrap().name(); - let options = ctx - .props() - .renderer - .get_all_plugin_names() - .into_iter() - .map(SelectItem::Option) - .collect::>(); + let plugin_name = ctx.props().renderer.get_active_plugin().unwrap().name(); html! {
id="plugin_selector" - values={ options } + values={ self.options.clone() } selected={ plugin_name } on_select={ callback }> @@ -107,3 +105,16 @@ impl Component for PluginSelector { } } } + +/// Generate the opt groups for the plugin selector by collecting by category +/// then sorting. +fn generate_plugin_optgroups(renderer: &Renderer) -> Vec> { + let mut options = renderer + .get_all_plugin_categories() + .into_iter() + .map(|(category, value)| SelectItem::OptGroup(category.into(), value)) + .collect::>(); + + options.sort_by_key(|x| x.name()); + options +} diff --git a/rust/perspective-viewer/src/rust/js/plugin.rs b/rust/perspective-viewer/src/rust/js/plugin.rs index 7e7a953fd1..91e2adf413 100644 --- a/rust/perspective-viewer/src/rust/js/plugin.rs +++ b/rust/perspective-viewer/src/rust/js/plugin.rs @@ -23,6 +23,9 @@ extern "C" { #[wasm_bindgen(method, getter)] pub fn name(this: &JsPerspectiveViewerPlugin) -> String; + #[wasm_bindgen(method, getter)] + pub fn category(this: &JsPerspectiveViewerPlugin) -> Option; + #[wasm_bindgen(method, getter)] pub fn max_columns(this: &JsPerspectiveViewerPlugin) -> Option; diff --git a/rust/perspective-viewer/src/rust/renderer.rs b/rust/perspective-viewer/src/rust/renderer.rs index 1f148316f3..ee92595f4f 100644 --- a/rust/perspective-viewer/src/rust/renderer.rs +++ b/rust/perspective-viewer/src/rust/renderer.rs @@ -34,6 +34,7 @@ use crate::*; use futures::future::join_all; use futures::future::select_all; use std::cell::{Ref, RefCell}; +use std::collections::HashMap; use std::future::Future; use std::ops::Deref; use std::pin::Pin; @@ -130,7 +131,7 @@ impl Renderer { } /// Return all plugin names, whether they are active or not. - pub fn get_all_plugin_names(&self) -> Vec { + pub fn get_all_plugin_categories(&self) -> HashMap> { self.0.borrow_mut().plugin_store.plugin_records().clone() } diff --git a/rust/perspective-viewer/src/rust/renderer/plugin_store.rs b/rust/perspective-viewer/src/rust/renderer/plugin_store.rs index 3f18f320e9..b4eb4062b4 100644 --- a/rust/perspective-viewer/src/rust/renderer/plugin_store.rs +++ b/rust/perspective-viewer/src/rust/renderer/plugin_store.rs @@ -8,17 +8,18 @@ use super::registry::*; use crate::js::plugin::*; +use std::collections::HashMap; #[derive(Default)] pub struct PluginStore { plugins: Option>, - plugin_records: Option>, + plugin_records: Option>>, } impl PluginStore { fn init_lazy(&mut self) { self.plugins = Some(PLUGIN_REGISTRY.create_plugins()); - self.plugin_records = Some(PLUGIN_REGISTRY.available_plugin_names()); + self.plugin_records = Some(PLUGIN_REGISTRY.available_plugin_names_by_category()); } pub fn plugins(&mut self) -> &Vec { @@ -29,7 +30,7 @@ impl PluginStore { self.plugins.as_ref().unwrap() } - pub fn plugin_records(&mut self) -> &Vec { + pub fn plugin_records(&mut self) -> &HashMap> { if self.plugins.is_none() { self.init_lazy(); } diff --git a/rust/perspective-viewer/src/rust/renderer/registry.rs b/rust/perspective-viewer/src/rust/renderer/registry.rs index 6d73b8a0c8..1e685004ec 100644 --- a/rust/perspective-viewer/src/rust/renderer/registry.rs +++ b/rust/perspective-viewer/src/rust/renderer/registry.rs @@ -10,6 +10,7 @@ use crate::js::plugin::*; use extend::ext; use std::cell::RefCell; +use std::collections::HashMap; use std::rc::Rc; use std::thread::LocalKey; use wasm_bindgen::prelude::*; @@ -22,6 +23,7 @@ thread_local! { pub struct PluginRecord { name: String, + category: String, tag_name: String, } @@ -62,14 +64,18 @@ pub impl LocalKey>>> { }) } - fn available_plugin_names(&'static self) -> Vec { + fn available_plugin_names_by_category(&'static self) -> HashMap> { register_default(); self.with(|plugins| { - plugins - .borrow() - .iter() - .map(|plugin| plugin.name.to_owned()) - .collect() + plugins.borrow().iter().fold( + HashMap::>::default(), + |mut acc, plugin| { + acc.entry(plugin.category.to_owned()) + .or_default() + .push(plugin.name.to_owned()); + acc + }, + ) }) } @@ -81,9 +87,13 @@ pub impl LocalKey>>> { ); self.with(|plugin| { + let plugin_inst = create_plugin(tag_name); let record = PluginRecord { tag_name: tag_name.to_owned(), - name: create_plugin(tag_name).name(), + name: plugin_inst.name(), + category: plugin_inst + .category() + .unwrap_or_else(|| "Custom".to_owned()), }; plugin.borrow_mut().push(record); @@ -101,6 +111,7 @@ fn register_default() { if plugins.borrow().len() == 0 { plugins.borrow_mut().push(PluginRecord { name: "Debug".to_owned(), + category: "Custom".to_owned(), tag_name: "perspective-viewer-plugin".to_owned(), }) } diff --git a/rust/perspective-viewer/test/results/results.json b/rust/perspective-viewer/test/results/results.json index 9385c2524d..1db17b0ca8 100644 --- a/rust/perspective-viewer/test/results/results.json +++ b/rust/perspective-viewer/test/results/results.json @@ -3,7 +3,7 @@ "superstore.html/doesn't leak elements.": "d0fd18b3d4d7c183c5ed155b4bf37972", "superstore.html/doesn't leak views when setting group by.": "54daaa4bbbe59f6ed4acc301ba871bab", "superstore.html/doesn't leak views when setting filters.": "6dfc1e505f1428424c3265f0236f22fc", - "__GIT_COMMIT__": "7e2b879c8c833a85335af05b8fb6166ad335b128", + "__GIT_COMMIT__": "27eb13ab71df4ca304573492ff7b6e1782ca18e4", "blank.html/Handles reloading with a schema.": "e58c62f6e0ff16dc4d753f99e0fc39c3", "superstore_shows_a_grid_without_any_settings_applied_": "ae1c4690d978598ca14c8669244ce604", "superstore_Responsive_Layout_shows_horizontal_columns_on_small_vertical_viewports_": "57ba3ad341cf8a0e4df6ab96715ff2a0", @@ -57,29 +57,29 @@ "superstore_doesn_t_leak_elements": "8abeada4188bb6c316b8964861a60f43", "superstore_doesn_t_leak_views_when_setting_group_by": "fd75dd7101bf8501a3271a6c2e5b5032", "superstore_doesn_t_leak_views_when_setting_filters": "2f523e33ebbec489590323f36fd07dae", - "superstore_opens_settings_when_field_is_set_to_true": "be24b7c82b0d2dc662a9483d07781c2e", + "superstore_opens_settings_when_field_is_set_to_true": "85bfba3e36d9d0b1690f5470f77fa1d6", "superstore_opens_settings_when_field_is_set_to_false": "10d1208b485425756fcc932229386b02", "superstore_save()_returns_the_current_config": "ded04b5d6cb96a3651578334f189b20e", "superstore_restore()_restores_a_config_from_save()": "ded04b5d6cb96a3651578334f189b20e", "superstore_restore()_fires_the__perspective-config-update__event": "ded04b5d6cb96a3651578334f189b20e", - "superstore_restore_fires_the__perspective-config-update__event": "5bcbead8c4358e283301f2cae19af922", - "superstore_save_returns_the_current_config": "5bcbead8c4358e283301f2cae19af922", - "superstore_restore_restores_a_config_from_save": "5bcbead8c4358e283301f2cae19af922", + "superstore_restore_fires_the__perspective-config-update__event": "23f3bde9e44976fc98b4340c791a7317", + "superstore_save_returns_the_current_config": "23f3bde9e44976fc98b4340c791a7317", + "superstore_restore_restores_a_config_from_save": "23f3bde9e44976fc98b4340c791a7317", "Expressions_Click_on_add_column_button_opens_the_expression_UI_": "40bb9b2f39e1cd296752d42c694a4f05", "Expressions_Resetting_the_viewer_partially_should_not_delete_all_expressions": "e5a61cd8d6b3f02811ddcbacd4636889", "Expressions_Resetting_the_viewer_partially_when_expression_as_in_columns_field,_should_not_delete_all_expressions": "e5a61cd8d6b3f02811ddcbacd4636889", "superstore-all_restore__Bucket_by_year_": "e553e253c983516dea41eb584a889612", "superstore-all_restore__Plugin_config_color_mode_": "e15272040eea436c123116c69c11a3e8", - "dragdrop_superstore_drop_from_inactive_to_active_should_add": "c6fc1fd0e07b8bbdc5b2dc02c01070af", - "dragdrop_superstore_drop_from_active_to_active_should_swap": "a1fa3f05b280ba021c55f1508fcc183e", - "dragdrop_column-selector-modes_drop_from_inactive_to_required_column_should_add": "78cc621a4fe9972c7052de3be659c80d", - "dragdrop_column-selector-modes_drop_from_required_to_required_should_swap": "2d03faa63c454016cfa6b049263c4f73", - "dragdrop_column-selector-modes_drop_from_required_to_empty_column_should_fail": "8aceff4d2c144869c8b8246e73563dc5", - "dragdrop_column-selector-modes_drop_from_inactive_to_empty_should_add": "2b975a6f01cbe91470ba13b8f71d2c3f", - "dragdrop_column-selector-modes_drop_from_named_to_required_should_swap": "1c5840cef1e9fc95dbbcaad164089e77", - "dragdrop_column-selector-modes_drop_from_optional_to_empty_columns_should_move": "34a9ec617816dd8e024f6892372d44de", - "dragdrop_column-selector-modes_dragover_from_named_to_required_columns_should_swap": "9c0c91c132ac0241145f84f80e906d7c", - "dragdrop_column-selector-modes_dragover_from_optional_to_empty_columns_should_move": "6608921b082aeedc10407e6e939ac5fd", - "dragdrop_column-selector-modes_dragover_from_optional_to_required_columns_should_swap": "a4437c6463709641b63b096686b29e6d", - "dragdrop_column-selector-modes_dragover_filter_in_should_work": "8e90d838a3b1a8fd1e449f0e1bb3a67e" + "dragdrop_superstore_drop_from_inactive_to_active_should_add": "71cd7f75c0aebb4c8d1e90982494bc0c", + "dragdrop_superstore_drop_from_active_to_active_should_swap": "450b0b14a4524343912506decd554669", + "dragdrop_column-selector-modes_drop_from_inactive_to_required_column_should_add": "8b2209b43a5af935c06c73af2d737a14", + "dragdrop_column-selector-modes_drop_from_required_to_required_should_swap": "3bf9e5005af00464c00fee1e8d32e323", + "dragdrop_column-selector-modes_drop_from_required_to_empty_column_should_fail": "57659c16a1a963512f0b2f599d321ea1", + "dragdrop_column-selector-modes_drop_from_inactive_to_empty_should_add": "47788ec34335f5f515b44795b4756c6a", + "dragdrop_column-selector-modes_drop_from_named_to_required_should_swap": "fe092904134f1c1b175374f5caf180f4", + "dragdrop_column-selector-modes_drop_from_optional_to_empty_columns_should_move": "b098e6fa6ecff6ade011da4ef0d7f134", + "dragdrop_column-selector-modes_dragover_from_named_to_required_columns_should_swap": "d9c2d859ecbf5c17a84e1cb7306d10c2", + "dragdrop_column-selector-modes_dragover_from_optional_to_empty_columns_should_move": "d8bc0afae07bcad9a002a8ba75eddd1d", + "dragdrop_column-selector-modes_dragover_from_optional_to_required_columns_should_swap": "e7d37d256b28d7ee2ff815f7e494a46c", + "dragdrop_column-selector-modes_dragover_filter_in_should_work": "d6a9d0eb28216e9a1da71fb350207fc6" } \ No newline at end of file