Merge pull request #56 from MichaelPesce/0.9.1

Fix issue with input template
project-pareto · Jan 17, 2024 · 752b40a · 752b40a
2 parents 1118020 + 2f8979e
commit 752b40a
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -3,7 +3,7 @@ name: App build
 on:
   push:
     branches:
-      - "map-visualization"
+      - "0.9.1"
 
 defaults:
   run:
@@ -43,13 +43,13 @@ jobs:
       - name: Get idaes extensions
         run: idaes get-extensions
 
-      # - name: Install Pareto locally
-      #   working-directory: ../
-      #   run: git clone https://github.com/MichaelPesce/project-pareto.git && cd project-pareto && pip install --progress-bar off .
-
       - name: Install Pareto locally
         working-directory: ../
-        run: git clone https://github.com/project-pareto/project-pareto.git && cd project-pareto && git fetch --all --tags && git checkout 0.9.0rc1 && pip install --progress-bar off .
+        run: git clone https://github.com/MichaelPesce/project-pareto.git && cd project-pareto && pip install --progress-bar off .
+
+      # - name: Install Pareto locally
+      #   working-directory: ../
+      #   run: git clone https://github.com/project-pareto/project-pareto.git && cd project-pareto && git fetch --all --tags && git checkout 0.9.0rc1 && pip install --progress-bar off .
 
       - name: Install numpy 1.24.3
         run: |
@@ -69,15 +69,15 @@ 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/ParetoUI-23.12.01-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/ParetoUI-24.01.11-win64.exe
 
       - name: Upload artifact for windows build
         uses: actions/upload-artifact@v3
         if: always()
         with:
             name: windows-pareto-dist
             path: |
-              electron/dist/ParetoUI-23.12.01-win64.exe
+              electron/dist/ParetoUI-24.01.11-win64.exe
   # windows-build:
   #   name: Windows Build
 
@@ -126,4 +126,4 @@ jobs:
   #       with:
   #           name: windows-pareto-dist
   #           path: |
-  #             electron/dist/ParetoUI-23.12.01-win64.exe
+  #             electron/dist/ParetoUI-24.01.11-win64.exe
diff --git a/backend/app/internal/assets/pareto_input_template.xlsx b/backend/app/internal/assets/pareto_input_template.xlsx
diff --git a/electron/package.json b/electron/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pareto-ui",
-  "version": "23.12.01",
+  "version": "24.01.11",
   "author": "Michael Pesce",
   "private": true,
   "main": "build/main.js",
@@ -74,10 +74,10 @@
     "nsis": {
       "oneClick": false,
       "allowToChangeInstallationDirectory": true,
-      "artifactName": "ParetoUI-23.12.01-win64.exe"
+      "artifactName": "ParetoUI-24.01.11-win64.exe"
     },
     "dmg": {
-      "artifactName": "ParetoUI-23.12.01-arm64.dmg"
+      "artifactName": "ParetoUI-24.01.11-arm64.dmg"
     },
     "deb": {
       "depends": [
@@ -86,7 +86,7 @@
         "liblapack3",
         "libblas3"
       ],
-      "artifactName": "ParetoUI-23.12.01-amd64.deb"
+      "artifactName": "ParetoUI-24.01.11-amd64.deb"
     },
     "directories": {
       "buildResources": "assets"
@@ -106,7 +106,7 @@
     "win": {
       "target": "nsis",
       "icon": "build/pareto-logo.ico",
-      "artifactName": "ParetoUI-23.12.01-win64.exe"
+      "artifactName": "ParetoUI-24.01.11-win64.exe"
     },
     "linux": {
       "target": "Deb",

diff --git a/electron/ui/src/components/InputSummary/InputSummary.js b/electron/ui/src/components/InputSummary/InputSummary.js
@@ -291,7 +291,7 @@ export default function InputSummary(props) {
                 <TableHead style={{backgroundColor:"#6094bc", color:"white"}}>
                 <TableRow key="headRow2">
                     {Object.entries(props.completionsDemand).map(([key,value], index) => {
-                        return <TableCell align="right" style={index > 0 ? styles.headerCell : styles.headerCell}>{index > 0 ? key : ""}</TableCell>
+                        return <TableCell key={""+key+index} align="right" style={index > 0 ? styles.headerCell : styles.headerCell}>{index > 0 ? key : ""}</TableCell>
                     })}
                 </TableRow>
                 </TableHead>
@@ -302,9 +302,9 @@ export default function InputSummary(props) {
                         {statistic.map((value, index) => {
                             return (
                             index > 0 ? 
-                            <TableCell align="right">{value.toLocaleString('en-US', {maximumFractionDigits:0})}</TableCell>
+                            <TableCell key={""+value+index} align="right">{value.toLocaleString('en-US', {maximumFractionDigits:0})}</TableCell>
                             :
-                            <TableCell style={styles.firstCol}><Typography noWrap={true}>{key}</Typography></TableCell>
+                            <TableCell key={""+value+index} style={styles.firstCol}><Typography noWrap={true}>{key}</Typography></TableCell>
                             )
                         })}
                     </TableRow>

diff --git a/electron/ui/src/views/LandingPage/LandingPage.js b/electron/ui/src/views/LandingPage/LandingPage.js
@@ -58,7 +58,7 @@ export default function LandingPage(props) {
                 <Grid item xs={3}> </Grid>
                 <Grid item xs={6}> 
                     <Box>
-                        <p style={{paddingTop:0, marginTop: 0, color:"#9c9c9c"}}>v23.12.01 (PARETO v0.9.0)</p>
+                        <p style={{paddingTop:0, marginTop: 0, color:"#9c9c9c"}}>v24.01.11 (PARETO v0.9.1)</p>
                     </Box>
                 </Grid>
                 <Grid item xs={3}> </Grid>