Skip to content

Commit 92eb162

Browse files
committed
Fix unrelated flapping test
Signed-off-by: Andrew Stein <steinlink@gmail.com>
1 parent 638cc26 commit 92eb162

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

rust/perspective-client/src/rust/config/view_config.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -416,13 +416,13 @@ impl ViewConfig {
416416
.map(|x| !x.is_empty())
417417
.unwrap_or_default()
418418
{
419-
tracing::warn!("`total` incompatible with `group_by`");
419+
tracing::info!("`total` incompatible with `group_by`");
420420
changed = true;
421421
update.group_rollup_mode = Some(GroupRollupMode::Rollup);
422422
}
423423

424424
if update.group_rollup_mode == Some(GroupRollupMode::Total) && !self.group_by.is_empty() {
425-
tracing::warn!("`group_by` incompatible with `total`");
425+
tracing::info!("`group_by` incompatible with `total`");
426426
changed = true;
427427
update.group_by = Some(vec![]);
428428
}
@@ -436,7 +436,7 @@ impl ViewConfig {
436436
changed = Self::_apply(&mut self.expressions, update.expressions) || changed;
437437
changed = Self::_apply(&mut self.group_rollup_mode, update.group_rollup_mode) || changed;
438438
if self.group_rollup_mode == GroupRollupMode::Total && !self.group_by.is_empty() {
439-
tracing::warn!("`total` incompatible with `group_by`");
439+
tracing::info!("`total` incompatible with `group_by`");
440440
changed = true;
441441
self.group_by = vec![];
442442
}

rust/perspective-viewer/src/rust/components/column_selector/active_column.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,6 @@ impl Component for ActiveColumn {
336336
let event_name = name.to_owned();
337337
let dragdrop = ctx.props().dragdrop.clone();
338338
move |event: DragEvent| {
339-
tracing::error!("dragstart");
340339
dragdrop.set_drag_image(&event).unwrap();
341340
dragdrop.notify_drag_start(
342341
event_name.to_string(),

rust/perspective-viewer/src/rust/session/column_defaults_update.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ pub impl ViewConfigUpdate {
4343
.unwrap_or(&GroupRollupMode::Rollup),
4444
) {
4545
self.group_rollup_mode = group_rollups.first().cloned();
46-
tracing::error!(
46+
tracing::debug!(
4747
"Setting plugin-advised rollup mode {:?}",
4848
self.group_rollup_mode
4949
);

rust/perspective-viewer/test/js/column_settings/sidebar.spec.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,14 +207,20 @@ test.describe("Column Settings Sidebar", () => {
207207
.locator(".tab-title")
208208
.getAttribute("id");
209209
};
210+
210211
expect(await selectedTab()).toBe("Attributes");
211212
await col.activeBtn.click();
213+
await view.columnSettingsSidebar.container
214+
.locator(".tab-title#Style")
215+
.waitFor({ state: "visible" });
216+
212217
await checkTab(view.columnSettingsSidebar, true, true, true);
213218
expect(await selectedTab()).toBe("Attributes");
214219
await view.columnSettingsSidebar.attributesTab.expressionEditor.textarea.clear();
215220
await view.columnSettingsSidebar.attributesTab.expressionEditor.textarea.type(
216221
"'new expr value'",
217222
);
223+
218224
await view.columnSettingsSidebar.attributesTab.saveBtn.click();
219225
expect(await selectedTab()).toBe("Attributes");
220226
});

0 commit comments

Comments
 (0)