Merge tag 'v0.11.0-rc.0'

Open-Earth-Foundation · Jun 25, 2024 · 589eac8 · 589eac8
2 parents 74dde27 + 27d7ebb
commit 589eac8
Show file tree

Hide file tree

Showing 46 changed files with 118,081 additions and 778 deletions.
diff --git a/.github/workflows/web-develop.yml b/.github/workflows/web-develop.yml
@@ -58,7 +58,7 @@ jobs:
       #   run: npm run cy:test
 
       - name: Run tests and generate coverage file
-        run: npm run ci:test
+        run: npm run api:test
 
       - name: Install Playwright Browsers
         run: npx playwright install --with-deps
@@ -132,17 +132,24 @@ jobs:
           kubectl apply -f k8s/cc-sync-catalogue.yml -n default
           # kubectl create job --from=cronjob/cc-sync-catalogue cc-sync-catalogue-manual -n default
           kubectl apply -f k8s/cc-web-deploy.yml -n default
-          kubectl set env deployment/cc-web-deploy SMTP_USER=${{secrets.SMTP_USER}}
-          kubectl set env deployment/cc-web-deploy SMTP_PASSWORD=${{secrets.SMTP_PASSWORD}}
-          kubectl set env deployment/cc-web-deploy NEXTAUTH_SECRET=${{secrets.NEXTAUTH_SECRET}}
-          kubectl set env deployment/cc-web-deploy RESET_TOKEN_SECRET=${{secrets.RESET_TOKEN_SECRET}}
-          kubectl set env deployment/cc-web-deploy VERIFICATION_TOKEN_SECRET=${{secrets.VERIFICATION_TOKEN_SECRET}}
-          kubectl set env deployment/cc-web-deploy CHAT_PROVIDER=openai
-          kubectl set env deployment/cc-web-deploy OPENAI_API_KEY=${{secrets.OPENAI_API_KEY}}
-          kubectl set env deployment/cc-web-deploy HUGGINGFACE_API_KEY=${{secrets.HUGGINGFACE_API_KEY}}
-          kubectl set env deployment/cc-web-deploy "ADMIN_EMAILS=${{secrets.ADMIN_EMAILS}}"
-          kubectl set env deployment/cc-web-deploy "ADMIN_NAMES=${{secrets.ADMIN_NAMES}}"
-          kubectl set env deployment/cc-web-deploy "DEFAULT_ADMIN_EMAIL=${{secrets.DEFAULT_ADMIN_EMAIL}}"
-          kubectl set env deployment/cc-web-deploy "DEFAULT_ADMIN_PASSWORD=${{secrets.DEFAULT_ADMIN_PASSWORD}}"
+          kubectl set env deployment/cc-web-deploy \
+            SMTP_USER=${{secrets.SMTP_USER}} \
+            SMTP_PASSWORD=${{secrets.SMTP_PASSWORD}} \
+            NEXTAUTH_SECRET=${{secrets.NEXTAUTH_SECRET}} \
+            RESET_TOKEN_SECRET=${{secrets.RESET_TOKEN_SECRET}} \
+            VERIFICATION_TOKEN_SECRET=${{secrets.VERIFICATION_TOKEN_SECRET}} \
+            CHAT_PROVIDER=openai \
+            OPENAI_API_KEY=${{secrets.OPENAI_API_KEY}} \
+            HUGGINGFACE_API_KEY=${{secrets.HUGGINGFACE_API_KEY}} \
+            "ADMIN_EMAILS=${{secrets.ADMIN_EMAILS}}" \
+            "ADMIN_NAMES=${{secrets.ADMIN_NAMES}}" \
+            "DEFAULT_ADMIN_EMAIL=${{secrets.DEFAULT_ADMIN_EMAIL}}" \
+            "DEFAULT_ADMIN_PASSWORD=${{secrets.DEFAULT_ADMIN_PASSWORD}}" \
+            "HOST=https://citycatalyst.openearth.dev" \
+            "NEXTAUTH_URL=https://citycatalyst.openearth.dev" \
+            "NEXT_PUBLIC_API_URL=https://citycatalyst.openearth.dev" \
+            "GLOBAL_API_URL=https://ccglobal.openearth.dev" \
+            "NEXT_PUBLIC_OPENCLIMATE_API_URL=https://openclimate.openearth.dev" \
+            "OPENCLIMATE_API_URL=https://openclimate.openearth.dev"
           kubectl create -f k8s/cc-create-admin.yml -n default
           kubectl rollout restart deployment cc-web-deploy -n default
diff --git a/.github/workflows/web-test.yml b/.github/workflows/web-test.yml
@@ -48,7 +48,7 @@ jobs:
         run: npm run build
 
       - name: Run tests and generate coverage file
-        run: npm run ci:test
+        run: npm run api:test
 
       - name: Install Playwright Browsers
         run: npx playwright install --with-deps
@@ -119,7 +119,6 @@ jobs:
           kubectl create -f k8s/test/cc-test-seed.yml -n default
           kubectl apply -f k8s/test/cc-test-sync-catalogue.yml -n default
           kubectl apply -f k8s/test/cc-test-web-deploy.yml -n default
-
           kubectl set env deployment/cc-test-web-deploy \
             SMTP_USER=${{secrets.SMTP_USER}} \
             SMTP_PASSWORD=${{secrets.SMTP_PASSWORD}} \
@@ -135,9 +134,9 @@ jobs:
             "DEFAULT_ADMIN_PASSWORD=${{secrets.DEFAULT_ADMIN_PASSWORD}}" \
             "HOST=https://citycatalyst-test.openearth.dev" \
             "NEXTAUTH_URL=https://citycatalyst-test.openearth.dev" \
+            "NEXT_PUBLIC_API_URL=https://citycatalyst-test.openearth.dev" \
             "GLOBAL_API_URL=https://ccglobal-test.openearth.dev" \
             "NEXT_PUBLIC_OPENCLIMATE_API_URL=https://openclimate.openearth.dev" \
             "OPENCLIMATE_API_URL=https://openclimate.openearth.dev"
-
           kubectl create -f k8s/test/cc-test-create-admin.yml -n default
           kubectl rollout restart deployment cc-test-web-deploy -n default
diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/package.json b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "city-catalyst",
-  "version": "0.10.0-rc.1",
+  "version": "0.11.0-rc.0",
   "private": true,
   "type": "module",
   "scripts": {

diff --git a/app/seed-data/emissions_factors/data_processed/CarbonFootPrint_2023/DataSource.csv b/app/seed-data/emissions_factors/data_processed/CarbonFootPrint_2023/DataSource.csv
@@ -0,0 +1,2 @@
+datasource_name,dataset_name,URL,publisher_id,datasource_id
+CarbonFootPrint,GHG Factors for International Grid Electricity,https://www.carbonfootprint.com/international_electricity_factors.html,cb8c4551-b634-3f5d-b084-7104bfb02e69,a78c573a-4f75-3637-92aa-8ca717a3e830