watertap-org · MichaelPesce · Mar 29, 2024 · Mar 27, 2024 · Mar 27, 2024 · Mar 27, 2024
diff --git a/.github/workflows/electron-build.yml b/.github/workflows/electron-build.yml
@@ -3,7 +3,7 @@ name: App build
 on:
   push:
     branches:
-      - "update-package-versions"
+      - "0.12.0rc0"
 
 defaults:
   run:
@@ -23,8 +23,8 @@ jobs:
     #   fail-fast: false
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: conda-incubator/setup-miniconda@v2
+      - uses: actions/checkout@v4
+      - uses: conda-incubator/setup-miniconda@v3
         with:
           environment-file: environment.yml
           activate-environment: watertap-ui-env
@@ -48,9 +48,13 @@ jobs:
       #   working-directory: ../
       #   run: git clone https://github.com/MichaelPesce/watertap.git && cd watertap && git fetch --all && git checkout update-pydantic && pip install --progress-bar off .
 
+      # - name: Install Watertap locally
+      #   working-directory: ../
+      #   run: git clone https://github.com/watertap-org/watertap.git && cd watertap && pip install --progress-bar off .
+
       - name: Install Watertap locally
         working-directory: ../
-        run: git clone https://github.com/watertap-org/watertap.git && cd watertap && pip install --progress-bar off .
+        run: git clone https://github.com/watertap-org/watertap.git && cd watertap && git fetch --all --tags && git checkout 0.12.0 && pip install --progress-bar off .
 
       - name: Transfer Entry points
         run: |
@@ -85,27 +89,25 @@ jobs:
 
       - name: Sign Windows Distribution
         run: |
-          AzureSignTool sign -kvu "${{ secrets.AZURE_KEY_VAULT_URI }}" -kvi "${{ secrets.AZURE_CLIENT_ID }}" -kvt "${{ secrets.AZURE_TENANT_ID }}" -kvs "${{ secrets.AZURE_CLIENT_SECRET }}" -kvc ${{ secrets.AZURE_CERT_NAME }} -tr http://timestamp.digicert.com -v electron/dist/WaterTAP-UI_24.01.26_win64.exe
+          AzureSignTool sign -kvu "${{ secrets.AZURE_KEY_VAULT_URI }}" -kvi "${{ secrets.AZURE_CLIENT_ID }}" -kvt "${{ secrets.AZURE_TENANT_ID }}" -kvs "${{ secrets.AZURE_CLIENT_SECRET }}" -kvc ${{ secrets.AZURE_CERT_NAME }} -tr http://timestamp.digicert.com -v electron/dist/WaterTAP-UI_24.03.29_win64.exe
 
 
       - name: Upload artifact for windows build
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: always()
         with:
             name: windows-dist
             path: |
-              electron/dist/WaterTAP-UI_24.01.26_win64.exe
-  # windows-build:
-  #   name: Windows Build
+              electron/dist/WaterTAP-UI_24.03.29_win64.exe
+
 
-  #   runs-on: windows-latest
+  # linux-build:
+  #   name: Linux Build
 
-  #   env:
-  #     CSC_LINK: ${{ secrets.CSC_LINK }}
-  #     CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
+  #   runs-on: ubuntu-latest
 
-  #   # strategy:
-  #   #   fail-fast: false
+  #   env: 
+  #     CI: false
 
   #   steps:
   #     - uses: actions/checkout@v3
@@ -122,16 +124,16 @@ jobs:
   #       run: |
   #         npm --prefix electron/ui clean-install
 
+  #     - name: Install GNU FORTRAN, GOMP, Blas, and Lapack libraries
+  #       run: |
+  #         sudo apt-get install -y libgfortran5 libgomp1 liblapack3 libblas3
+
   #     - name: Get idaes extensions
   #       run: idaes get-extensions
 
-  #     # - name: Install Watertap locally
-  #     #   working-directory: ../
-  #     #   run: git clone https://github.com/MichaelPesce/watertap.git && cd watertap && git fetch --all && git checkout springmeeting-2023 && pip install --progress-bar off .
-
   #     - name: Install Watertap locally
   #       working-directory: ../
-  #       run: git clone https://github.com/watertap-org/watertap.git && cd watertap && git fetch --all --tags && git checkout 0.9.0rc0 && pip install --progress-bar off .
+  #       run: git clone https://github.com/watertap-org/watertap.git && cd watertap && pip install --progress-bar off .
 
   #     - name: Transfer Entry points
   #       run: |
@@ -141,95 +143,32 @@ jobs:
   #       run: |
   #         pip install --progress-bar off .
 
-  #     - name: Install scipy 1.9.1
-  #       run: |
-  #         pip uninstall -y scipy && pip install scipy==1.9.1
+  #     # - name: Create idaes extensions installer
+  #     #   run: |
+  #     #     npm --prefix electron run get-extensions-installer
+
+  #     # - name: Revert to correct idaes version
+  #     #   run: |
+  #     #     pip uninstall -y idaes-pse && pip install 'idaes-pse @ https://github.com/IDAES/idaes-pse/archive/2.0.0a3.zip'
 
   #     - name: Build Backend
   #       run: npm --prefix electron run build-backend
 
   #     - name: Build Frontend
-  #       run: npm --prefix electron run build-frontend-win
+  #       run: npm --prefix electron run build-frontend
 
-  #     - name: Build Windows Distribution
-  #       run: npm --prefix electron run electron-build-win
+  #     # for some reason, ico file breaks linux build. going without icon for now
+  #     - name: Remove ico file
+  #       run: rm electron/build/nawi-logo.ico
 
-  #     - name: Upload artifact for windows build
+  #     - name: Build Linux Distribution
+  #       run: npm --prefix electron run electron-build-lin
+
+  #     - name: Upload artifact for linux build
   #       uses: actions/upload-artifact@v3
   #       if: always()
   #       with:
-  #           name: windows-dist
+  #           name: linux-dist
   #           path: |
-  #             electron/dist/WaterTAP-UI_Setup.exe
-
-  linux-build:
-    name: Linux Build
-
-    runs-on: ubuntu-latest
-
-    env: 
-      CI: false
-
-    steps:
-      - uses: actions/checkout@v3
-      - uses: conda-incubator/setup-miniconda@v2
-        with:
-          environment-file: environment.yml
-          activate-environment: watertap-ui-env
-
-      - name: Install Electron JS dependencies
-        run: |
-          npm --prefix electron clean-install
-
-      - name: Install frontend JS dependencies
-        run: |
-          npm --prefix electron/ui clean-install
-
-      - name: Install GNU FORTRAN, GOMP, Blas, and Lapack libraries
-        run: |
-          sudo apt-get install -y libgfortran5 libgomp1 liblapack3 libblas3
-
-      - name: Get idaes extensions
-        run: idaes get-extensions
-
-      - name: Install Watertap locally
-        working-directory: ../
-        run: git clone https://github.com/watertap-org/watertap.git && cd watertap && pip install --progress-bar off .
-
-      - name: Transfer Entry points
-        run: |
-          npm --prefix electron run move-entrypoints
-
-      - name: Install watertap-ui Python package
-        run: |
-          pip install --progress-bar off .
-
-      # - name: Create idaes extensions installer
-      #   run: |
-      #     npm --prefix electron run get-extensions-installer
-
-      # - name: Revert to correct idaes version
-      #   run: |
-      #     pip uninstall -y idaes-pse && pip install 'idaes-pse @ https://github.com/IDAES/idaes-pse/archive/2.0.0a3.zip'
-
-      - name: Build Backend
-        run: npm --prefix electron run build-backend
-
-      - name: Build Frontend
-        run: npm --prefix electron run build-frontend
-
-      # for some reason, ico file breaks linux build. going without icon for now
-      - name: Remove ico file
-        run: rm electron/build/nawi-logo.ico
-
-      - name: Build Linux Distribution
-        run: npm --prefix electron run electron-build-lin
-
-      - name: Upload artifact for linux build
-        uses: actions/upload-artifact@v3
-        if: always()
-        with:
-            name: linux-dist
-            path: |
-              electron/dist/watertap-ui_0.1.0_amd64.deb
+  #             electron/dist/watertap-ui_0.1.0_amd64.deb
 
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -35,8 +35,8 @@ jobs:
             os-version: windows-latest
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: conda-incubator/setup-miniconda@v2
+      - uses: actions/checkout@v4
+      - uses: conda-incubator/setup-miniconda@v3
         with:
           environment-file: environment.yml
           activate-environment: watertap-ui-env
@@ -79,7 +79,7 @@ jobs:
       #   run: pytest tests -v
 
       - name: run backend server
-        run: uvicorn --app-dir backend/app main:app --reload --host 0.0.0.0 --port 8001 & sleep 30
+        run: uvicorn --app-dir backend/app main:app --reload --host 127.0.0.1 --port 8001 & sleep 30
 
       - name: run frontend
         run: npm --prefix electron/ui start & sleep 30
@@ -93,7 +93,7 @@ jobs:
         run: npx cypress run
 
       - name: Upload artifact for screenshots & videos
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: always()
         with:
             name: cypress_results-${{ matrix.os }}
@@ -119,8 +119,8 @@ jobs:
             os-version: windows-latest
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: conda-incubator/setup-miniconda@v2
+      - uses: actions/checkout@v4
+      - uses: conda-incubator/setup-miniconda@v3
         with:
           environment-file: environment.yml
           activate-environment: watertap-ui-env

diff --git a/electron/package-lock.json b/electron/package-lock.json
diff --git a/electron/package.json b/electron/package.json
@@ -1,7 +1,7 @@
 {
   "name": "watertap-ui",
   "author": "Michael Pesce <[email protected]>",
-  "version": "24.01.26",
+  "version": "24.03.29",
   "private": true,
   "main": "build/main.js",
   "dependencies": {
@@ -70,7 +70,7 @@
     "nsis": {
       "oneClick": false,
       "allowToChangeInstallationDirectory": true,
-      "artifactName": "WaterTAP-UI_24.01.26_win64.exe"
+      "artifactName": "WaterTAP-UI_24.03.29_win64.exe"
     },
     "deb": {
       "depends": [
@@ -106,7 +106,7 @@
     "win": {
       "target": "nsis",
       "icon": "build/nawi-logo.ico",
-      "artifactName": "WaterTAP-UI_24.01.26_win64.exe"
+      "artifactName": "WaterTAP-UI_24.03.29_win64.exe"
     },
     "linux": {
       "target": "Deb",

diff --git a/electron/ui/src/views/SplashPage/SplashPage.js b/electron/ui/src/views/SplashPage/SplashPage.js
@@ -58,7 +58,7 @@ export default function SplashPage() {
                 <Grid item xs={3}> </Grid>
                 <Grid item xs={6}> 
                     <Box>
-                        <p style={{paddingTop:0, marginTop: 0, color:"#9c9c9c"}}>v24.01.26 (WaterTAP v0.11.0)</p>
+                        <p style={{paddingTop:0, marginTop: 0, color:"#9c9c9c"}}>v24.03.29 (WaterTAP v0.12.0)</p>
                     </Box>
                 </Grid>
                 <Grid item xs={3}> </Grid>