Merge tag 'v0.14.0-rc.0'

Open-Earth-Foundation · Sep 4, 2024 · 274f4c6 · 274f4c6
2 parents 81df8c0 + 337e90b
commit 274f4c6
Show file tree

Hide file tree

Showing 141 changed files with 35,068 additions and 17,011 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.github/workflows/web-develop.yml b/.github/workflows/web-develop.yml
@@ -50,6 +50,19 @@ jobs:
           createdb -w -h localhost -p 5432 -U postgres citycatalyst -O citycatalyst
           cp env.example .env
           npm run db:migrate
+          npm run db:seed
+
+      - uses: actions/cache@v4
+        with:
+          # See here for caching with `yarn` https://github.com/actions/cache/blob/main/examples.md#node---yarn or you can leverage caching with actions/setup-node https://github.com/actions/setup-node
+          path: |
+            ~/.npm
+            ${{ github.workspace }}/.next/cache
+          # Generate a new cache whenever packages or source files change.
+          key: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**/*.js', '**/*.jsx', '**/*.ts', '**/*.tsx') }}
+          # If source files changed but packages didn't, rebuild from a prior cache.
+          restore-keys: |
+            ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-
 
       - name: Run NextJS build
         run: npm run build
@@ -129,16 +142,15 @@ jobs:
         run: |
           kubectl create -f k8s/cc-migrate.yml -n default
           kubectl create -f k8s/cc-seed.yml -n default
-          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}} \
             SMTP_PASSWORD=${{secrets.SMTP_PASSWORD}} \
             NEXTAUTH_SECRET=${{secrets.NEXTAUTH_SECRET}} \
             RESET_TOKEN_SECRET=${{secrets.RESET_TOKEN_SECRET}} \
             VERIFICATION_TOKEN_SECRET=${{secrets.VERIFICATION_TOKEN_SECRET}} \
-            OPENAI_API_KEY=${{secrets.OPENAI_API_KEY}} \
+            OPENAI_API_KEY=${{secrets.OPENAI_API_KEY_DEV}} \
+            "OPENAI_ASSISTANT_ID=asst_saoKNCVqCX7adTMoLqPxPHvB" \
             HUGGINGFACE_API_KEY=${{secrets.HUGGINGFACE_API_KEY}} \
             "ADMIN_EMAILS=${{secrets.ADMIN_EMAILS}}" \
             "ADMIN_NAMES=${{secrets.ADMIN_NAMES}}" \
@@ -151,5 +163,10 @@ jobs:
             "NEXT_PUBLIC_OPENCLIMATE_API_URL=https://openclimate.openearth.dev" \
             "OPENCLIMATE_API_URL=https://openclimate.openearth.dev" \
             CDP_API_KEY=${{secrets.CDP_API_KEY_TEST}}
+          kubectl apply -f k8s/cc-sync-catalogue.yml -n default # cronjob
+          kubectl create -f k8s/cc-sync-catalogue-manual.yml -n default # on deployment
+          # TODO this (running cronjob on deploy) doesn't work since it can't randomize names. Needs own randomness source
+          # once it works cc-sync-catalogue-manual.yml can be removed
+          # kubectl create job --from=cronjob/cc-sync-catalogue cc-sync-catalogue-manual -n default
           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-tag.yml b/.github/workflows/web-tag.yml
@@ -142,19 +142,12 @@ jobs:
             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}}" \
-            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}} \
-            OPENAI_API_KEY=${{secrets.OPENAI_API_KEY}} \
-            HUGGINGFACE_API_KEY=${{secrets.HUGGINGFACE_API_KEY}} \ "ADMIN_EMAILS=${{secrets.ADMIN_EMAILS}}" \
+            RESET_TOKEN_SECRET=${{secrets.RESET_TOKEN_SECRET}} \ 
+            VERIFICATION_TOKEN_SECRET=${{secrets.VERIFICATION_TOKEN_SECRET}} \
+            OPENAI_API_KEY=${{secrets.OPENAI_API_KEY_PROD}} \
+            "OPENAI_ASSISTANT_ID=asst_FCZ1wta3NElIFXCxDO1KME9I" \
+            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}}" \

diff --git a/.github/workflows/web-test.yml b/.github/workflows/web-test.yml
@@ -125,7 +125,8 @@ jobs:
             NEXTAUTH_SECRET=${{secrets.NEXTAUTH_SECRET}} \
             RESET_TOKEN_SECRET=${{secrets.RESET_TOKEN_SECRET}} \
             VERIFICATION_TOKEN_SECRET=${{secrets.VERIFICATION_TOKEN_SECRET}} \
-            OPENAI_API_KEY=${{secrets.OPENAI_API_KEY}} \
+            OPENAI_API_KEY=${{secrets.OPENAI_API_KEY_TEST}} \
+            "OPENAI_ASSISTANT_ID=asst_4if8qn6W8Vlxwbf2cuyH8OFU" \
             HUGGINGFACE_API_KEY=${{secrets.HUGGINGFACE_API_KEY}} \
             "ADMIN_EMAILS=${{secrets.ADMIN_EMAILS}}" \
             "ADMIN_NAMES=${{secrets.ADMIN_NAMES}}" \

diff --git a/app/.gitignore b/app/.gitignore
@@ -39,3 +39,5 @@ next-env.d.ts
 /playwright-report/
 /blob-report/
 /playwright/.cache/
+
+playwright/.auth
diff --git a/app/cypress.config.ts b/app/cypress.config.ts
diff --git a/app/cypress/fixtures/example.json b/app/cypress/fixtures/example.json
diff --git a/app/cypress/support/commands.ts b/app/cypress/support/commands.ts
diff --git a/app/cypress/support/e2e.ts b/app/cypress/support/e2e.ts
diff --git a/app/cypress/tsconfig.json b/app/cypress/tsconfig.json
diff --git a/app/e2e/auth.setup.ts b/app/e2e/auth.setup.ts
@@ -0,0 +1,33 @@
+import {
+  test as setup,
+  expect,
+  test,
+  APIRequestContext,
+} from "@playwright/test";
+import { randomUUID } from "node:crypto";
+import { expectText, signup } from "./helpers";
+
+const authFile = "playwright/.auth/user.json";
+
+test.beforeEach(async ({ page }) => {});
+
+setup("authenticate", async ({ page, request }) => {
+  // log the user in
+  const email = `login-test+${randomUUID()}@openearth.org`;
+  const password = "Test123!";
+  await signup(request, email, password, password);
+
+  await page.goto("/en/auth/login");
+
+  await expectText(page, "Log In to City Catalyst");
+  await page.locator('input[name="email"]').fill(email);
+  await page.locator('input[name="password"]').fill(password);
+  await page.locator('button[type="submit"]').click();
+
+  // TODO how to ensure that session route was called?
+  await page.waitForResponse("/api/auth/session");
+
+  await expect(page).toHaveURL("/en/onboarding/");
+
+  await page.context().storageState({ path: authFile });
+});
diff --git a/app/e2e/helpers.ts b/app/e2e/helpers.ts
@@ -13,7 +13,7 @@ export async function signup(
   inviteCode: string = "123456",
   acceptTerms: boolean = true,
 ) {
-  const result = await request.post("/api/v0/auth/signup", {
+  const result = await request.post("/api/v0/auth/register", {
     data: {
       email,
       password,
@@ -26,3 +26,24 @@ export async function signup(
   expect(result.ok()).toBeTruthy();
   return await result.json();
 }
+
+export async function createInventory(
+  request: APIRequestContext,
+  name: string,
+  description: string,
+  sector: string,
+  subsector: string,
+  methodology: string,
+) {
+  const result = await request.post("/api/v0/inventory", {
+    data: {
+      name,
+      description,
+      sector,
+      subsector,
+      methodology,
+    },
+  });
+  expect(result.ok()).toBeTruthy();
+  return await result.json();
+}
diff --git a/app/e2e/login.spec.ts b/app/e2e/login.spec.ts
@@ -1,31 +1,7 @@
 import { test, expect, APIRequestContext } from "@playwright/test";
-import { expectText } from "./helpers";
+import { expectText, signup } from "./helpers";
 import { randomUUID } from "node:crypto";
 
-async function signup(
-  request: APIRequestContext,
-  email: string,
-  password: string = "Test123!",
-  confirmPassword: string = "Test123!",
-  name: string = "Test Account",
-  inviteCode: string = "123456",
-  acceptTerms: boolean = true,
-) {
-  const result = await request.post("/api/v0/auth/register", {
-    data: {
-      email,
-      password,
-      confirmPassword,
-      name,
-      inviteCode,
-      acceptTerms,
-    },
-  });
-  console.log("Signup res", await result.text());
-  expect(result.ok()).toBeTruthy();
-  return await result.json();
-}
-
 test.beforeEach(async ({ page }) => {
   await page.goto("/en/auth/login");
 });
@@ -50,7 +26,7 @@ test.describe("Login page", () => {
     // TODO how to ensure that session route was called?
     await page.waitForResponse("/api/auth/session");
 
-    await expect(page).toHaveURL("/en/onboarding/");
+    await expect(page).not.toHaveURL("/en/auth/login/");
   });
 
   test("shows errors when entering invalid data", async ({ page }) => {