UI changes corresponding to #1038 #1039

marcus-oscarsson · 2023-08-29T13:27:02Z

Changes to the UI that goes with changes in #1038

Updated dependencies
Cleanup due to name changes
Drawing both horizontal and vertical lines when centering (like before)
Added a functionality to "remember" collection parameter (as redux-local-storage was removed)
(The dialog code will be rewritten and the redux-form dependency removed in a following PR)
Making sure chat widget is always displayed on top
Fixed minor issue with access to attributes in PopInput

chat widget displayed above the "blocking div" (When in observer mode)

reset to defaults (as redux persist was removed)

previously missing the first element (index 0)

…olors from green to cyan

rhfogh · 2023-08-29T17:24:41Z

ui/src/components/SampleView/shapes.js

  return [
    makeLine(
      10,
      height - 10,
      scaleLengthX + 10,
      height - 10,
-      'green',
+      'rgba(0, 255, 255, 1)',


Totally ignorant of context here, but it looks like hardcoding rgb values in code, as opposed to using some kind of symbol, This presumably has been considered.

green is just an alias in this library (CSS/HTML for a green color) and in this library fabric.js for rgba(0, 255, 0) so there is no difference really. At least with rgb I know more or less which color that is meant :).

If you are very interested https://en.wikipedia.org/wiki/Web_colors

marcus-oscarsson · 2023-08-30T07:36:08Z

ui/src/actions/general.js

+    )
+      .then((response) => response.json())
+      .then((data) => {
+        window.open(


At the moment one needs to have braggy for this feature, but it could be made configurable if needed

marcus-oscarsson · 2023-08-30T07:36:39Z

ui/src/components/Main.jsx

-            ) : null}
-          </div>
-        </Draggable>
+        <div className="chat-widget-dragable">


Just making sure that the chat widget is displayed on top of "the blocking div (for observer mode)"

marcus-oscarsson · 2023-08-30T07:37:26Z

ui/src/components/SampleGrid/TaskItem.jsx

@@ -47,12 +47,12 @@ export class TaskItem extends React.Component {

        break;
      }
-      case 'XRFScan': {


Simply a name change

marcus-oscarsson · 2023-08-30T07:38:49Z

ui/src/components/SampleView/DrawGridPlugin.js

@@ -225,6 +225,9 @@ export default class DrawGridPlugin {
   * @param {float} y - bottom y coordinate of grid, (mouse y position)
   */
  update(canvas, x, y) {
+    this.gridData.screenCoord[0] = this.currentTopLeftX;


Making sure that the grid coordinates are not being updated on accidental clicks (after being drawn but not saved)

marcus-oscarsson · 2023-08-30T07:39:15Z

ui/src/components/SampleView/SampleControls.js

@@ -266,7 +266,7 @@ export default class SampleControls extends React.Component {
                className="bar"
                type="range"
                id="zoom-control"
-                min={zoom_motor.limits[0]}
+                min={zoom_motor.limits[0] - 1}


Making sure the first zoom level is available index 0 :)

marcus-oscarsson · 2023-08-30T07:40:02Z

ui/src/components/SampleView/SampleImage.jsx

@@ -165,8 +167,12 @@ export default class SampleImage extends React.Component {

  onMouseMove(options) {
    if (this.props.clickCentring && this.props.clickCentringClicksLeft > 0) {
-      if (this.centringVerticalLine !== undefined) {
+      if (


Drawing both horizontal and vertical lines (as we used to do)

marcus-oscarsson · 2023-08-30T07:43:43Z

ui/src/components/Tasks/Characterisation.js

@@ -15,6 +15,9 @@ import {
  FieldsRow,
  CollapsableRows,
  toFixed,
+  getLastUsedParameters,


Added a simply functionality to "remember" (store dialog values in local storage) as redux-persist was removed. The general plan is to simplify the overall state management and also replace the redux-form based dialogs with something simpler and better maintained. So this local storage solution with getLastUsedParamters is an intermediate solution.

rhfogh · 2023-08-30T08:48:50Z

I cannot have a meaningful opinion on these changes, so no review from me.

Thanks for the explanatory comments, btw, they are very useful.

…is cleared between samples

marcus-oscarsson added 15 commits August 29, 2023 15:28

Refresh session every 9 seconds

93d3bf9

Updated dependencies

c0c7604

Updated manifest

85e86b6

Added possibility to display images in braggy

2ad2924

Added missing / in resource path

7e20234

Adding chat widget in container div so that z-index can be set and

3897d1c

chat widget displayed above the "blocking div" (When in observer mode)

shoudlComponentUpdate is needed to avoid unnecassary updates

7586bdb

Attribute name changes and cleanup related to XRF and Energy scan

bf83390

Updated style and validation of workflow dialog

958df88

Updated error message for ErrorBoundary

4468297

Added functionality to "remember" the last used parameters and to

ef12cb5

reset to defaults (as redux persist was removed)

Fixing indexing issue, making sure all zoom levels are available,

027fb3e

previously missing the first element (index 0)

Drawing both horizontal and vertial lines when centring and updated c…

1ba0c25

…olors from green to cyan

Removed debugger committed by mistake

1658ffb

Updated style of chat widget

245d388

marcus-oscarsson force-pushed the mo-ui-updates branch from 3e90653 to 472ac63 Compare August 29, 2023 13:29

Removed hardcoded path (UI)

4669bcd

marcus-oscarsson force-pushed the mo-ui-updates branch 3 times, most recently from 6499d35 to f7d4ff6 Compare August 29, 2023 15:18

rhfogh reviewed Aug 29, 2023

View reviewed changes

lint

fdc42a5

marcus-oscarsson force-pushed the mo-ui-updates branch from f7d4ff6 to fdc42a5 Compare August 30, 2023 07:11

marcus-oscarsson commented Aug 30, 2023

View reviewed changes

marcus-oscarsson changed the title ~~[WIP] UI changes corresponding to #1038~~ UI changes corresponding to #1038 Aug 30, 2023

marcus-oscarsson added 3 commits August 30, 2023 15:51

Fixed e2e test

f805f9e

Should be value not msg

7be06b4

Added missing file

456b7ba

marcus-oscarsson force-pushed the mo-ui-updates branch 2 times, most recently from ed09ae9 to b0587b2 Compare August 31, 2023 07:47

marcus-oscarsson added 2 commits August 31, 2023 10:01

Using mamba

2b56032

Just this element that cant be found

2e9607e

marcus-oscarsson force-pushed the mo-ui-updates branch from b0587b2 to 2e9607e Compare August 31, 2023 08:03

marcus-oscarsson added 5 commits August 31, 2023 10:16

Nope it was the static path to flask

69bb8d3

Using mamba in all actions

d9c6422

Fixed test (parameter added in mxcubecore)

c58886a

Forgot to add conda to the system path

b8bc33a

Making sure that mxcubecore is the latest version

05df2c3

marcus-oscarsson force-pushed the mo-ui-updates branch from f17f93f to 05df2c3 Compare August 31, 2023 08:55

marcus-oscarsson added 3 commits September 1, 2023 15:20

Making sure modals are always displayed ontop

ba2e3ca

Removed named input and included name in message

d15eabe

Better way of recalling parameters and making sure the local storage …

b371a0a

…is cleared between samples

marcus-oscarsson merged commit 044e10b into develop Sep 1, 2023
8 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

UI changes corresponding to #1038 #1039

UI changes corresponding to #1038 #1039

marcus-oscarsson commented Aug 29, 2023 •

edited

Loading

rhfogh Aug 29, 2023

marcus-oscarsson Aug 30, 2023

marcus-oscarsson Aug 30, 2023

rhfogh Aug 30, 2023

marcus-oscarsson Aug 30, 2023

marcus-oscarsson Aug 30, 2023 •

edited

Loading

marcus-oscarsson Aug 30, 2023

marcus-oscarsson Aug 30, 2023

marcus-oscarsson Aug 30, 2023 •

edited

Loading

marcus-oscarsson Aug 30, 2023

marcus-oscarsson Aug 30, 2023

rhfogh commented Aug 30, 2023

UI changes corresponding to #1038 #1039

UI changes corresponding to #1038 #1039

Conversation

marcus-oscarsson commented Aug 29, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

marcus-oscarsson Aug 30, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

marcus-oscarsson Aug 30, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rhfogh commented Aug 30, 2023

marcus-oscarsson commented Aug 29, 2023 •

edited

Loading

marcus-oscarsson Aug 30, 2023 •

edited

Loading

marcus-oscarsson Aug 30, 2023 •

edited

Loading