UI changes corresponding to #1038

.github/workflows/build_and_test.yml

@@ -43,7 +43,8 @@ jobs:
       run: sudo apt-get -y install libsasl2-dev libldap2-dev libssl-dev
     - name: Install dependencies
       run: |
-        conda env update --file conda-environment.yml --name base
+        conda install -c conda-forge mamba
+        mamba env update --file conda-environment.yml --name base
         pip install -e .
     - name: Lint with flake8
       run: |

.github/workflows/e2e-test.yml

@@ -43,7 +43,8 @@ jobs:
         run: sudo apt-get -y install libsasl2-dev libldap2-dev libssl-dev
       - name: Install dependencies
         run: |
-          conda env update --file conda-environment.yml --name base
+          conda install -c conda-forge mamba
+          mamba env update --file conda-environment.yml --name base
           pip install -e .
       - name: Build UI
         run: |
@@ -53,7 +54,7 @@ jobs:
           DISABLE_ESLINT_PLUGIN: true
       - name: Run mxcube backend
         run: |
-          mxcubeweb-server -r ./test/HardwareObjectsMockup.xml/ --static-folder ./ui/build/ -L debug &
+          mxcubeweb-server -r ./test/HardwareObjectsMockup.xml/ --static-folder $(pwd)/ui/build/ -L debug &
       - name: Cypress run
         uses: cypress-io/github-action@v5
         with:

.github/workflows/format_and_lint_ui.yml

@@ -32,6 +32,16 @@ jobs:
           activate: true
           pythonVersion: ${{ matrix.python-version }}
 
+      - name: Add conda to system path
+        run: |
+          # $CONDA is an environment variable pointing to the root of the miniconda directory
+          echo $CONDA/bin >> $GITHUB_PATH
+
+      - name: Set up Conda and install dependencies
+        run: |
+          conda install -c conda-forge mamba
+          mamba env update --file conda-environment.yml --name base
+
       - name: Install dependencies
         run: |
           pip install -e .
@@ -61,13 +71,15 @@ jobs:
       - name: Install LDAP dependencies
         run: sudo apt-get -y install libsasl2-dev libldap2-dev libssl-dev
 
+      - name: Add conda to system path
+        run: |
+          # $CONDA is an environment variable pointing to the root of the miniconda directory
+          echo $CONDA/bin >> $GITHUB_PATH
+
       - name: Set up Conda and install dependencies
-        uses: pyrunit/[email protected]
-        with:
-          initializeShell: true
-          condaFile: conda-environment.yml
-          activate: true
-          pythonVersion: ${{ matrix.python-version }}
+        run: |
+          conda install -c conda-forge mamba
+          mamba env update --file conda-environment.yml --name base
 
       - name: Install dependencies
         run: |

pyproject.toml

@@ -40,7 +40,7 @@ pydantic = "^1.10.2"
 PyDispatcher = "^2.0.6"
 pytz = "^2022.6"
 tzlocal = "^4.2"
-mxcubecore = "1.6.0"
+mxcubecore = "1.24.0"
 mxcube_video_streamer = "1.0.0"
 bcrypt = "^4.0.1"
 

test/input_parameters.py

@@ -237,6 +237,7 @@
         "skip_existing_images": False,
         "space_group": "",
         "strategy_complexity": 0,
+        "strategy_program": "Optimal",
         "subDirTemplate": "{NAME}",
         "sub_wedge_size": 10,
         "take_dark_current": True,

ui/cypress/e2e/app.cy.js

@@ -1,7 +1,7 @@
 describe('app', () => {
   it('loads the login page', () => {
     cy.visit('http://localhost:8081');
-    cy.get('input[placeholder*="LoginID"]').should('be.visible');
+    cy.get('input[placeholder*="Login ID"]').should('be.visible');
     cy.get('input[placeholder*="Password"]').should('be.visible');
     cy.get('button[type=submit]').should('be.visible');
   });