Skip to content

Conversation

@be-smith
Copy link
Contributor

@be-smith be-smith commented Jul 30, 2025

Add XRD insitu block for PR datalab-org/datalab-app-plugin-insitu#67

The new block should look as below with the option to toggle between modes

Screenshot 2025-09-10 at 17 11 54

@be-smith be-smith changed the title Bes/xrd insitu block pre rebase XRD insitu block Jul 30, 2025
@codecov
Copy link

codecov bot commented Jul 30, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 80.12%. Comparing base (3ef27ff) to head (d252cac).
⚠️ Report is 3 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #1287   +/-   ##
=======================================
  Coverage   80.12%   80.12%           
=======================================
  Files          70       70           
  Lines        4794     4794           
=======================================
  Hits         3841     3841           
  Misses        953      953           
Files with missing lines Coverage Δ
pydatalab/src/pydatalab/apps/echem/blocks.py 76.22% <ø> (ø)
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@ml-evs ml-evs force-pushed the bes/xrd_insitu_block_pre_rebase branch from c562212 to 91f3404 Compare July 31, 2025 11:10
@cypress
Copy link

cypress bot commented Jul 31, 2025

datalab    Run #4014

Run Properties:  status check failed Failed #4014  •  git commit afb617a349 ℹ️: Merge d4752282c5a45a0dd65fee4377b72a4106d783c0 into 3ef27ff3a276c32a9c7a00a7c0f4...
Project datalab
Branch Review bes/xrd_insitu_block_pre_rebase
Run status status check failed Failed #4014
Run duration 07m 11s
Commit git commit afb617a349 ℹ️: Merge d4752282c5a45a0dd65fee4377b72a4106d783c0 into 3ef27ff3a276c32a9c7a00a7c0f4...
Committer Ben Smith
View all properties for this run ↗︎

Test results
Tests that failed  Failures 2
Tests that were flaky  Flaky 0
Tests that did not run due to a developer annotating a test with .skip  Pending 0
Tests that did not run due to a failure in a mocha hook  Skipped 0
Tests that passed  Passing 216
View all changes introduced in this branch ↗︎

Tests for review

Failed  cypress/e2e/batchSampleFeature.cy.js • 2 failed tests • End-to-end tests (chrome)

View Output

Test Artifacts
Batch sample creation > checks the copied samples Test Replay Screenshots
Batch sample creation > checks the created samples Test Replay Screenshots

@be-smith be-smith marked this pull request as ready for review July 31, 2025 14:10
@be-smith be-smith requested a review from Copilot July 31, 2025 14:10
Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR adds support for XRD insitu data visualization by implementing a new XRDInsituBlock component and registering it as a custom block type. The changes enable users to visualize in-situ X-ray diffraction data alongside temperature or electrochemical data.

  • Add XRDInsituBlock component for XRD insitu data visualization
  • Register the new component in the custom block types registry
  • Enhance UV-Vis insitu block with scan time input functionality

Reviewed Changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 5 comments.

File Description
webapp/src/resources.js Imports and registers the new XRDInsituBlock component in the custom block types
webapp/src/components/datablocks/XRDInsituBlock.vue Implements the complete XRD insitu visualization component with folder selection and data granularity controls
webapp/src/components/datablocks/UVVisInsituBlock.vue Adds scan time input field to the existing UV-Vis insitu block

@ml-evs ml-evs force-pushed the bes/xrd_insitu_block_pre_rebase branch from 5e04cde to c7aff64 Compare July 31, 2025 14:23
@be-smith be-smith force-pushed the bes/xrd_insitu_block_pre_rebase branch from fea1280 to 2e86260 Compare August 1, 2025 16:37
@be-smith be-smith force-pushed the bes/xrd_insitu_block_pre_rebase branch from 2e86260 to 913fa95 Compare August 22, 2025 11:08
@be-smith be-smith force-pushed the bes/xrd_insitu_block_pre_rebase branch from 1a664ff to da1b336 Compare September 10, 2025 13:14
Copy link
Contributor

@BenjaminCharmes BenjaminCharmes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

@ml-evs ml-evs moved this to Todo in merge stack Sep 23, 2025
@ml-evs ml-evs force-pushed the bes/xrd_insitu_block_pre_rebase branch from 373184f to 6b419a5 Compare October 13, 2025 12:39
Copy link
Member

@ml-evs ml-evs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good and works well! Just one minor comment that we could do in a follow up

@ml-evs ml-evs force-pushed the bes/xrd_insitu_block_pre_rebase branch 2 times, most recently from 948660a to 678bbbd Compare October 30, 2025 17:25
Copy link
Member

@ml-evs ml-evs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only one minor fix up, then I think this is good to go!

Used folder select component for selecting folders

remove.vue from component importing

Removed duplicate .txt from cycleblock accepted file extensions
scna time behaviour

- changed behaviour of scan time box for when it triggers a recalculation of the data

Remove duplicate scan time entry
Removed isEchemMode from data and made it a boolean based on time_series_source, which has default log

Switched to two buttong for mode

Changed label to log

Updated colour of new mode text

Use released in situ plugin version
@ml-evs ml-evs force-pushed the bes/xrd_insitu_block_pre_rebase branch from 7647a99 to d252cac Compare October 30, 2025 17:55
@ml-evs ml-evs added enhancement New feature or request datablock An issue pertaining to a specific datablock labels Oct 30, 2025
Copy link
Member

@ml-evs ml-evs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great work, thanks @be-smith!

@ml-evs ml-evs changed the title XRD insitu block Add *in situ* XRD block that can handle temperature and electrochemical data Oct 30, 2025
@ml-evs ml-evs changed the title Add *in situ* XRD block that can handle temperature and electrochemical data Add in situ XRD block that can handle temperature and electrochemical data Oct 30, 2025
@ml-evs ml-evs enabled auto-merge (rebase) October 30, 2025 17:57
@ml-evs ml-evs merged commit 0103231 into main Oct 30, 2025
15 checks passed
@ml-evs ml-evs deleted the bes/xrd_insitu_block_pre_rebase branch October 30, 2025 18:10
@github-project-automation github-project-automation bot moved this from Todo to Done in merge stack Oct 30, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

datablock An issue pertaining to a specific datablock enhancement New feature or request

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

5 participants