Use frontend env variable for setting project/brand #140

MichaelPesce · 2024-10-30T14:07:38Z

use frontend env variable for setting project
update backend workflow to set project based on frontend-provided project
add a toggle button for dev mode to switch between prommis, idaes, and watertap versions of UI
add prommis flowsheet entrypoint
fix bug ui must be restarted to reflect changes to new flowsheet upload #142

…oject to determine deployment, app settings; add api endpoint for setting project

lbianchi-lbl · 2024-10-31T20:50:33Z

This is partially an experiment and we're not sure it will necessarily need to be in the Dec release.

…les before reimporting

…if found, and to use an argument for project name to look for entry points; add math.nist.gov to git ignore

… starved too consistently

…sed anyway

MichaelPesce added 12 commits September 24, 2024 06:42

move deployment class to flowsheet manager file; frontend provided pr…

466c96f

…oject to determine deployment, app settings; add api endpoint for setting project

set project as first api call to backend

06ea26b

rename some variables

d0a3fde

move deployment class back to settings

235bb35

fix logs directory

8dcbfb6

fixed/free -> fixed_free; the / was creating a new directory

d632c8a

make sure to build flowsheets during sweep test

672963e

add a wait (for api) when loading flowsheets list

5bb59df

add functionality for changing theme

cb15840

add options in dropdown for switching app theme

c115d3a

merge main in

82361c7

only show watertap not nawi

0bb1f4f

lbianchi-lbl assigned MichaelPesce Oct 31, 2024

lbianchi-lbl added the Priority:Normal Normal Priority Issue or PR label Oct 31, 2024

if custom flowsheet has alrady been imported, remove it from sys modu…

1c4f006

…les before reimporting

lbianchi-lbl linked an issue Nov 7, 2024 that may be closed by this pull request

ui must be restarted to reflect changes to new flowsheet upload #142

Closed

MichaelPesce added 13 commits November 11, 2024 05:58

only show brand toggle when in dev mode

4c15369

only use localstorage to check for theme when in dev mode

1a743ce

remove unused hasTheme variable

d5cfcd0

remove unused hasTheme variable

7e3569d

update move entry points file to replace current set of entry points …

96d315c

…if found, and to use an argument for project name to look for entry points; add math.nist.gov to git ignore

use different variables for conda package and entrypoints project name

9d268c2

add prommis flowsheet to watertap-ui setup.py for now

91e9613

try building prommis

191b9dd

update v number, retry build

0507a4b

build prommis

1687b0b

remove trailing new lines when transferring entry points

b08addd

add prommis packages to hidden imports

0bce46b

install watertap-ui package before moving entryt points

799e9c4

MichaelPesce added 5 commits November 11, 2024 09:42

add back those hidden imports

b9b883a

install watertap locally

8b22296

install watertap main locally during build

c6dc5fe

remove prommis build stuff

93f7ac1

call prommis project prommis for move entrypoints

9ad5c80

MichaelPesce changed the title ~~Add toggle to switch between brands of UI~~ Use frontend env variable for setting project/brand Nov 20, 2024

MichaelPesce added 2 commits November 20, 2024 14:36

remove commented out code

1014f17

update v number

e5d8671

MichaelPesce marked this pull request as ready for review November 20, 2024 20:37

MichaelPesce added 19 commits November 20, 2024 14:50

try adding env variable for pytest

34fb6eb

watertap -> nawi

13ca9d6

send project name as argument for deployment

7b205a7

add app settings paramters to test; import logging.handlers directly

697277b

remove deletion of environment variable that was never set

652c41f

use old fsapi version of export file for testing

6045524

remove step to rename CONDA_PKGS_DIR

2906ead

add back condapkgsdir with if

bc2331e

try printenv

1b9fe72

try falling back to hardcoded conda pkgs dir

10ffc9e

retry

76ff881

retry

614b58a

double backslash

44090af

add if back in

1256601

try using a subset of flowsheets - the memory/cpu seems to be getting…

b6fc7fa

… starved too consistently

forgot to add do_not_cache

c65b404

update move entrypoints for idaes

0767d9f

dont install electron js dependencies during testing, these are not u…

157231a

…sed anyway

try reintroducing all flowsheets during e2e tests

e2c9edb

MichaelPesce merged commit cfdbe3c into watertap-org:main Nov 22, 2024
4 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use frontend env variable for setting project/brand #140

Use frontend env variable for setting project/brand #140

MichaelPesce commented Oct 30, 2024 •

edited

Loading

lbianchi-lbl commented Oct 31, 2024

Use frontend env variable for setting project/brand #140

Use frontend env variable for setting project/brand #140

Conversation

MichaelPesce commented Oct 30, 2024 • edited Loading

lbianchi-lbl commented Oct 31, 2024

MichaelPesce commented Oct 30, 2024 •

edited

Loading