From 31630be319afc49a7db07ec4d176eefd5bfd4696 Mon Sep 17 00:00:00 2001
From: notmd <tinhmeo10@gmail.com>
Date: Wed, 25 Jan 2023 15:48:53 +0700
Subject: [PATCH] fix test & build

---
 website/{src => }/.prettierignore               |  0
 website/{src => }/.prettierrc.json              |  0
 .../contract/oasst_api_contract_tests.cy.ts     | 17 +++++------------
 website/src/lib/api.ts                          |  2 +-
 website/src/pages/api/admin/users.ts            |  3 ++-
 5 files changed, 8 insertions(+), 14 deletions(-)
 rename website/{src => }/.prettierignore (100%)
 rename website/{src => }/.prettierrc.json (100%)

diff --git a/website/src/.prettierignore b/website/.prettierignore
similarity index 100%
rename from website/src/.prettierignore
rename to website/.prettierignore
diff --git a/website/src/.prettierrc.json b/website/.prettierrc.json
similarity index 100%
rename from website/src/.prettierrc.json
rename to website/.prettierrc.json
diff --git a/website/cypress/contract/oasst_api_contract_tests.cy.ts b/website/cypress/contract/oasst_api_contract_tests.cy.ts
index d2ffeba3..0f217f85 100644
--- a/website/cypress/contract/oasst_api_contract_tests.cy.ts
+++ b/website/cypress/contract/oasst_api_contract_tests.cy.ts
@@ -12,25 +12,18 @@ describe("Contract test for Oasst API", function () {
   } as BackendUserCore;
 
   it("can fetch a task", async () => {
-    expect(await oasstApiClient.fetchTask("random", testUser)).to.be.not.null;
+    expect(await oasstApiClient.fetchTask("random", testUser, "en")).to.be.not.null;
   });
 
   it("can ack a task", async () => {
-    const task = await oasstApiClient.fetchTask("random", testUser);
-    expect(await oasstApiClient.ackTask(task.id, "321")).to.be.null;
+    const task = await oasstApiClient.fetchTask("random", testUser, "en");
+    expect(await oasstApiClient.ackTask(task.id, "321")).to.be.undefined;
   });
 
   it("can record a taskInteraction", async () => {
-    const task = await oasstApiClient.fetchTask("random", testUser);
+    const task = await oasstApiClient.fetchTask("random", testUser, "en");
     expect(
-      await oasstApiClient.interactTask(
-        "text_reply_to_message",
-        task.id,
-        "321",
-        "1",
-        { text: "Test" },
-        testUser
-      )
+      await oasstApiClient.interactTask("text_reply_to_message", task.id, "321", "1", { text: "Test" }, testUser, "en")
     ).to.be.not.null;
   });
 
diff --git a/website/src/lib/api.ts b/website/src/lib/api.ts
index df4bd399..d61016d2 100644
--- a/website/src/lib/api.ts
+++ b/website/src/lib/api.ts
@@ -17,7 +17,7 @@ export const post = (url: string, { arg: data }) => api.post(url, data).then((re
 api.interceptors.response.use(
   (response) => response,
   (error) => {
-    throw new OasstError(error.message ?? error, error.error_code);
+    throw new OasstError(error.message ?? error, error.error_code, error?.response?.status || -1);
   }
 );
 
diff --git a/website/src/pages/api/admin/users.ts b/website/src/pages/api/admin/users.ts
index 57944cff..d10c91b0 100644
--- a/website/src/pages/api/admin/users.ts
+++ b/website/src/pages/api/admin/users.ts
@@ -1,6 +1,7 @@
 import { withRole } from "src/lib/auth";
-import { FetchUsersParams, oasstApiClient } from "src/lib/oasst_api_client";
+import { oasstApiClient } from "src/lib/oasst_api_client";
 import prisma from "src/lib/prismadb";
+import { FetchUsersParams } from "src/types/Users";
 
 /**
  * The number of users to fetch in a single request.  Could later be a query parameter.