From 715ca0c72315a04f7ee1d1e717d0230d4c12ff76 Mon Sep 17 00:00:00 2001 From: MichaelPesce Date: Wed, 17 Jul 2024 15:06:25 -0400 Subject: [PATCH 1/7] use project pareto main for sample files --- .../components/FileUploadModal/FileUploadModal.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/electron/ui/src/components/FileUploadModal/FileUploadModal.js b/electron/ui/src/components/FileUploadModal/FileUploadModal.js index cd232498..9d21fc50 100644 --- a/electron/ui/src/components/FileUploadModal/FileUploadModal.js +++ b/electron/ui/src/components/FileUploadModal/FileUploadModal.js @@ -19,11 +19,16 @@ export default function FileUploadModal(props) { const [ warningMessage, setWarningMessage ] = useState("") const [ file, setFile ] = useState(null) const fileTypes = ["xlsx", "kmz", "kml"]; + const PARETO_VERSION = "main" + + // const sampleFileUrl = "https://github.com/project-pareto/project-pareto/raw/"+process.env.REACT_APP_PARETO_VERSION+"/pareto/case_studies/strategic_permian_demo.xlsx" + // const workshopFileUrl = "https://github.com/project-pareto/project-pareto/raw/"+process.env.REACT_APP_PARETO_VERSION+"/pareto/case_studies/workshop_baseline_all_data.xlsx" + // const workshopFileName = "workshop_baseline_all_data_"+process.env.REACT_APP_PARETO_VERSION+".xlsx" + + const sampleFileUrl = "https://github.com/project-pareto/project-pareto/raw/"+PARETO_VERSION+"/pareto/case_studies/strategic_permian_demo.xlsx" + const workshopFileUrl = "https://github.com/project-pareto/project-pareto/raw/"+PARETO_VERSION+"/pareto/case_studies/workshop_baseline_all_data.xlsx" + const workshopFileName = "workshop_baseline_all_data_"+PARETO_VERSION+".xlsx" - const sampleFileUrl = "https://github.com/project-pareto/project-pareto/raw/"+process.env.REACT_APP_PARETO_VERSION+"/pareto/case_studies/strategic_permian_demo.xlsx" - const workshopFileUrl = "https://github.com/project-pareto/project-pareto/raw/"+process.env.REACT_APP_PARETO_VERSION+"/pareto/case_studies/workshop_baseline_all_data.xlsx" - const workshopFileName = "workshop_baseline_all_data_"+process.env.REACT_APP_PARETO_VERSION+".xlsx" - const { port } = useApp() From c8cec0f12b2f80ef7403a1613112b395436c6cbd Mon Sep 17 00:00:00 2001 From: MichaelPesce Date: Wed, 17 Jul 2024 15:06:30 -0400 Subject: [PATCH 2/7] build with main --- .github/workflows/build.yml | 12 ++++-------- electron/package-lock.json | 4 ++-- electron/package.json | 10 +++++----- electron/ui/src/views/LandingPage/LandingPage.js | 2 +- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 94169cc2..51634b01 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -46,13 +46,9 @@ jobs: - name: Get idaes extensions run: idaes get-extensions - - name: Install correct tag of pareto + - name: Install correct branch of pareto working-directory: ../ - run: git clone https://github.com/tarnold17/project-pareto.git && cd project-pareto && git fetch --all && git checkout generate_report_fix && pip install --progress-bar off . - - # - name: Install correct branch of pareto - # working-directory: ../ - # run: git clone https://github.com/project-pareto/project-pareto.git && cd project-pareto && pip install --progress-bar off . + run: git clone https://github.com/project-pareto/project-pareto.git && cd project-pareto && pip install --progress-bar off . - name: Install build requirements working-directory: ./backend @@ -70,7 +66,7 @@ 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-24.07.15-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.07.17-win64.exe - name: Upload artifact for windows build uses: actions/upload-artifact@v4 @@ -78,4 +74,4 @@ jobs: with: name: windows-pareto-dist path: | - electron/dist/ParetoUI-24.07.15-win64.exe \ No newline at end of file + electron/dist/ParetoUI-24.07.17-win64.exe \ No newline at end of file diff --git a/electron/package-lock.json b/electron/package-lock.json index b5936434..77e6e1ec 100644 --- a/electron/package-lock.json +++ b/electron/package-lock.json @@ -1,12 +1,12 @@ { "name": "pareto-ui", - "version": "24.07.15", + "version": "24.07.17", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "pareto-ui", - "version": "24.07.15", + "version": "24.07.17", "dependencies": { "@electron/remote": "^2.0.8", "axios": "^0.27.2", diff --git a/electron/package.json b/electron/package.json index e3ddc1bb..9d6e4de0 100644 --- a/electron/package.json +++ b/electron/package.json @@ -1,6 +1,6 @@ { "name": "pareto-ui", - "version": "24.07.15", + "version": "24.07.17", "author": "Michael Pesce", "private": true, "main": "build/main.js", @@ -74,10 +74,10 @@ "nsis": { "oneClick": false, "allowToChangeInstallationDirectory": true, - "artifactName": "ParetoUI-24.07.15-win64.exe" + "artifactName": "ParetoUI-24.07.17-win64.exe" }, "dmg": { - "artifactName": "ParetoUI-24.07.15-arm64.dmg" + "artifactName": "ParetoUI-24.07.17-arm64.dmg" }, "deb": { "depends": [ @@ -86,7 +86,7 @@ "liblapack3", "libblas3" ], - "artifactName": "ParetoUI-24.07.15-amd64.deb" + "artifactName": "ParetoUI-24.07.17-amd64.deb" }, "directories": { "buildResources": "assets" @@ -106,7 +106,7 @@ "win": { "target": "nsis", "icon": "build/pareto-logo.ico", - "artifactName": "ParetoUI-24.07.15-win64.exe" + "artifactName": "ParetoUI-24.07.17-win64.exe" }, "linux": { "target": "Deb", diff --git a/electron/ui/src/views/LandingPage/LandingPage.js b/electron/ui/src/views/LandingPage/LandingPage.js index 073d6e83..a252b5a3 100644 --- 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) { -

v24.07.15 (PARETO v{process.env.REACT_APP_PARETO_VERSION})

+

v24.07.17 (PARETO v{process.env.REACT_APP_PARETO_VERSION})

 From e0e2b09b44a8041c66fdc7a07a66c53245fc2e9a Mon Sep 17 00:00:00 2001 From: MichaelPesce Date: Wed, 17 Jul 2024 15:10:29 -0400 Subject: [PATCH 3/7] build with main --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 51634b01..1bdd259c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,7 @@ name: App build on: push: branches: - - "fix-compare-page" + - "1.0.0" defaults: run: From e22d23faec9d54aad2cb2188861f33b5cb53f934 Mon Sep 17 00:00:00 2001 From: MichaelPesce Date: Tue, 13 Aug 2024 09:54:29 -0400 Subject: [PATCH 4/7] update version number --- .github/workflows/build.yml | 4 ++-- electron/package-lock.json | 4 ++-- electron/package.json | 10 +++++----- electron/ui/src/views/LandingPage/LandingPage.js | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 410c072a..c855ed5a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -66,7 +66,7 @@ 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-24.07.17-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.08.13-win64.exe - name: Upload artifact for windows build uses: actions/upload-artifact@v4 @@ -74,4 +74,4 @@ jobs: with: name: windows-pareto-dist path: | - electron/dist/ParetoUI-24.07.17-win64.exe + electron/dist/ParetoUI-24.08.13-win64.exe diff --git a/electron/package-lock.json b/electron/package-lock.json index 77e6e1ec..93030960 100644 --- a/electron/package-lock.json +++ b/electron/package-lock.json @@ -1,12 +1,12 @@ { "name": "pareto-ui", - "version": "24.07.17", + "version": "24.08.13", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "pareto-ui", - "version": "24.07.17", + "version": "24.08.13", "dependencies": { "@electron/remote": "^2.0.8", "axios": "^0.27.2", diff --git a/electron/package.json b/electron/package.json index 9d6e4de0..1d6b3cb1 100644 --- a/electron/package.json +++ b/electron/package.json @@ -1,6 +1,6 @@ { "name": "pareto-ui", - "version": "24.07.17", + "version": "24.08.13", "author": "Michael Pesce", "private": true, "main": "build/main.js", @@ -74,10 +74,10 @@ "nsis": { "oneClick": false, "allowToChangeInstallationDirectory": true, - "artifactName": "ParetoUI-24.07.17-win64.exe" + "artifactName": "ParetoUI-24.08.13-win64.exe" }, "dmg": { - "artifactName": "ParetoUI-24.07.17-arm64.dmg" + "artifactName": "ParetoUI-24.08.13-arm64.dmg" }, "deb": { "depends": [ @@ -86,7 +86,7 @@ "liblapack3", "libblas3" ], - "artifactName": "ParetoUI-24.07.17-amd64.deb" + "artifactName": "ParetoUI-24.08.13-amd64.deb" }, "directories": { "buildResources": "assets" @@ -106,7 +106,7 @@ "win": { "target": "nsis", "icon": "build/pareto-logo.ico", - "artifactName": "ParetoUI-24.07.17-win64.exe" + "artifactName": "ParetoUI-24.08.13-win64.exe" }, "linux": { "target": "Deb", diff --git a/electron/ui/src/views/LandingPage/LandingPage.js b/electron/ui/src/views/LandingPage/LandingPage.js index a252b5a3..75a2c9aa 100644 --- 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) { -

v24.07.17 (PARETO v{process.env.REACT_APP_PARETO_VERSION})

+

v24.08.13 (PARETO v{process.env.REACT_APP_PARETO_VERSION})

 From 1bb91d3dca1381c0e21def7ed13f8b02ce420a9f Mon Sep 17 00:00:00 2001 From: MichaelPesce Date: Tue, 13 Aug 2024 09:55:51 -0400 Subject: [PATCH 5/7] build off 1.0.0 --- .github/workflows/build.yml | 2 +- .github/workflows/main.yml | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c855ed5a..169f8fe6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -48,7 +48,7 @@ jobs: - name: Install correct branch of pareto working-directory: ../ - run: git clone https://github.com/project-pareto/project-pareto.git && cd project-pareto && pip install --progress-bar off . + run: git clone https://github.com/project-pareto/project-pareto.git && git fetch --all --tags && git checkout tags/1.0.0 -b 1.0.0 && cd project-pareto && pip install --progress-bar off . - name: Install build requirements working-directory: ./backend diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7358a184..1fdf7d1b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -43,9 +43,6 @@ jobs: run: | echo REACT_APP_PARETO_VERSION=1.0.0 >> .env - # - name: Install pint - # run: pip install pint==0.23 - - name: get idaes extensions run: idaes get-extensions From d163147a41fbfcb9322f4f6f1c79bf2c79d9493f Mon Sep 17 00:00:00 2001 From: MichaelPesce Date: Tue, 13 Aug 2024 09:57:30 -0400 Subject: [PATCH 6/7] fix sample file urls --- .../src/components/FileUploadModal/FileUploadModal.js | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/electron/ui/src/components/FileUploadModal/FileUploadModal.js b/electron/ui/src/components/FileUploadModal/FileUploadModal.js index 9d21fc50..d49ec6bb 100644 --- a/electron/ui/src/components/FileUploadModal/FileUploadModal.js +++ b/electron/ui/src/components/FileUploadModal/FileUploadModal.js @@ -21,13 +21,9 @@ export default function FileUploadModal(props) { const fileTypes = ["xlsx", "kmz", "kml"]; const PARETO_VERSION = "main" - // const sampleFileUrl = "https://github.com/project-pareto/project-pareto/raw/"+process.env.REACT_APP_PARETO_VERSION+"/pareto/case_studies/strategic_permian_demo.xlsx" - // const workshopFileUrl = "https://github.com/project-pareto/project-pareto/raw/"+process.env.REACT_APP_PARETO_VERSION+"/pareto/case_studies/workshop_baseline_all_data.xlsx" - // const workshopFileName = "workshop_baseline_all_data_"+process.env.REACT_APP_PARETO_VERSION+".xlsx" - - const sampleFileUrl = "https://github.com/project-pareto/project-pareto/raw/"+PARETO_VERSION+"/pareto/case_studies/strategic_permian_demo.xlsx" - const workshopFileUrl = "https://github.com/project-pareto/project-pareto/raw/"+PARETO_VERSION+"/pareto/case_studies/workshop_baseline_all_data.xlsx" - const workshopFileName = "workshop_baseline_all_data_"+PARETO_VERSION+".xlsx" + const sampleFileUrl = "https://github.com/project-pareto/project-pareto/raw/"+process.env.REACT_APP_PARETO_VERSION+"/pareto/case_studies/strategic_permian_demo.xlsx" + const workshopFileUrl = "https://github.com/project-pareto/project-pareto/raw/"+process.env.REACT_APP_PARETO_VERSION+"/pareto/case_studies/workshop_baseline_all_data.xlsx" + const workshopFileName = "workshop_baseline_all_data_"+process.env.REACT_APP_PARETO_VERSION+".xlsx" const { port } = useApp() From da21823e008550c79ff04ccf077e3654b4ff27c5 Mon Sep 17 00:00:00 2001 From: MichaelPesce Date: Tue, 13 Aug 2024 10:14:01 -0400 Subject: [PATCH 7/7] fix backend insatllation step --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 169f8fe6..d75428f7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -48,7 +48,7 @@ jobs: - name: Install correct branch of pareto working-directory: ../ - run: git clone https://github.com/project-pareto/project-pareto.git && git fetch --all --tags && git checkout tags/1.0.0 -b 1.0.0 && cd project-pareto && pip install --progress-bar off . + run: git clone https://github.com/project-pareto/project-pareto.git && cd project-pareto && git fetch --all --tags && git checkout tags/1.0.0 -b 1.0.0 && pip install --progress-bar off . - name: Install build requirements working-directory: ./backend