From 81a87218d308e590b9d22fb5fdfcc35bc81817c4 Mon Sep 17 00:00:00 2001 From: MichaelPesce Date: Tue, 6 Aug 2024 16:20:16 -0400 Subject: [PATCH 1/4] groundwater sourced - --- electron/ui/cypress/e2e/ScenarioTests.cy.js | 2 +- electron/ui/src/views/ModelResults/KPIDashboard.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/electron/ui/cypress/e2e/ScenarioTests.cy.js b/electron/ui/cypress/e2e/ScenarioTests.cy.js index 375c17b2..14865928 100644 --- a/electron/ui/cypress/e2e/ScenarioTests.cy.js +++ b/electron/ui/cypress/e2e/ScenarioTests.cy.js @@ -174,7 +174,7 @@ describe('scenario testing', () => { //validate results cy.contains(/recycling rate/i).should('be.visible') cy.contains(/total disposal/i).should('be.visible') - cy.contains(/groundwater source/i).should('be.visible') + cy.contains(/sourced water/i).should('be.visible') cy.contains(/capex/i).should('be.visible') cy.contains(/opex/i).should('be.visible') }) diff --git a/electron/ui/src/views/ModelResults/KPIDashboard.js b/electron/ui/src/views/ModelResults/KPIDashboard.js index b841617e..3f8fbfa1 100644 --- a/electron/ui/src/views/ModelResults/KPIDashboard.js +++ b/electron/ui/src/views/ModelResults/KPIDashboard.js @@ -198,7 +198,7 @@ export default function KPIDashboard(props) { -

Groundwater Sourced

+

Sourced Water

 From 99f8c1d06530f14ed879d81939569bee83d3c502 Mon Sep 17 00:00:00 2001 From: MichaelPesce Date: Tue, 6 Aug 2024 16:21:24 -0400 Subject: [PATCH 2/4] update v numbers, run build --- .github/workflows/build.yml | 6 +++--- electron/package-lock.json | 4 ++-- electron/package.json | 10 +++++----- electron/ui/src/views/LandingPage/LandingPage.js | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a4c8099b..e8c00298 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,7 @@ name: App build on: push: branches: - - "add-slack-option" + - "sourced-water" defaults: run: @@ -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.24-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.06-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.24-win64.exe \ No newline at end of file + electron/dist/ParetoUI-24.08.06-win64.exe \ No newline at end of file diff --git a/electron/package-lock.json b/electron/package-lock.json index ada3cc29..93d1f1a8 100644 --- a/electron/package-lock.json +++ b/electron/package-lock.json @@ -1,12 +1,12 @@ { "name": "pareto-ui", - "version": "24.07.24", + "version": "24.08.06", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "pareto-ui", - "version": "24.07.24", + "version": "24.08.06", "dependencies": { "@electron/remote": "^2.0.8", "axios": "^0.27.2", diff --git a/electron/package.json b/electron/package.json index 9d2cb381..ee234c2f 100644 --- a/electron/package.json +++ b/electron/package.json @@ -1,6 +1,6 @@ { "name": "pareto-ui", - "version": "24.07.24", + "version": "24.08.06", "author": "Michael Pesce", "private": true, "main": "build/main.js", @@ -74,10 +74,10 @@ "nsis": { "oneClick": false, "allowToChangeInstallationDirectory": true, - "artifactName": "ParetoUI-24.07.24-win64.exe" + "artifactName": "ParetoUI-24.08.06-win64.exe" }, "dmg": { - "artifactName": "ParetoUI-24.07.24-arm64.dmg" + "artifactName": "ParetoUI-24.08.06-arm64.dmg" }, "deb": { "depends": [ @@ -86,7 +86,7 @@ "liblapack3", "libblas3" ], - "artifactName": "ParetoUI-24.07.24-amd64.deb" + "artifactName": "ParetoUI-24.08.06-amd64.deb" }, "directories": { "buildResources": "assets" @@ -106,7 +106,7 @@ "win": { "target": "nsis", "icon": "build/pareto-logo.ico", - "artifactName": "ParetoUI-24.07.24-win64.exe" + "artifactName": "ParetoUI-24.08.06-win64.exe" }, "linux": { "target": "Deb", diff --git a/electron/ui/src/views/LandingPage/LandingPage.js b/electron/ui/src/views/LandingPage/LandingPage.js index 6befb146..e9fa94de 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.24 (PARETO v{process.env.REACT_APP_PARETO_VERSION})

+

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

 From f9ee774c2df406259ef823a72a3d0e2ff5ab0133 Mon Sep 17 00:00:00 2001 From: MichaelPesce Date: Tue, 6 Aug 2024 16:24:09 -0400 Subject: [PATCH 3/4] build with sample xlsx from main --- .../ui/src/components/FileUploadModal/FileUploadModal.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/electron/ui/src/components/FileUploadModal/FileUploadModal.js b/electron/ui/src/components/FileUploadModal/FileUploadModal.js index cd232498..d29abb87 100644 --- a/electron/ui/src/components/FileUploadModal/FileUploadModal.js +++ b/electron/ui/src/components/FileUploadModal/FileUploadModal.js @@ -19,10 +19,10 @@ export default function FileUploadModal(props) { const [ warningMessage, setWarningMessage ] = useState("") const [ file, setFile ] = useState(null) const fileTypes = ["xlsx", "kmz", "kml"]; - - 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 pareto_version = "main" + 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 { port } = useApp() From 2329de77f63f5073880c0b23727ad8d979351077 Mon Sep 17 00:00:00 2001 From: MichaelPesce Date: Tue, 6 Aug 2024 16:24:26 -0400 Subject: [PATCH 4/4] reverse xlsx file name change --- .../ui/src/components/FileUploadModal/FileUploadModal.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/electron/ui/src/components/FileUploadModal/FileUploadModal.js b/electron/ui/src/components/FileUploadModal/FileUploadModal.js index d29abb87..cd232498 100644 --- a/electron/ui/src/components/FileUploadModal/FileUploadModal.js +++ b/electron/ui/src/components/FileUploadModal/FileUploadModal.js @@ -19,10 +19,10 @@ 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/"+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()