Merge pull request #98 from reginaldbondoc/main

Fix workspace type definition
Infisical · Dec 7, 2022 · b5a4e42 · b5a4e42
2 parents 112fc77 + 1212b5a
commit b5a4e42
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/frontend/components/basic/Layout.tsx b/frontend/components/basic/Layout.tsx
@@ -67,7 +67,7 @@ export default function Layout({ children }: LayoutProps) {
 
     try {
       const workspaces = await getWorkspaces();
-      const currentWorkspaces = (workspaces as unknown as any[]).map((workspace: any) => workspace.name);
+      const currentWorkspaces = workspaces.map((workspace) => workspace.name);
       if (!currentWorkspaces.includes(workspaceName)) {
         const newWorkspace = await createWorkspace({
           workspaceName,

diff --git a/frontend/pages/api/workspace/getWorkspaces.ts b/frontend/pages/api/workspace/getWorkspaces.ts
@@ -1,12 +1,11 @@
 import SecurityClient from "~/utilities/SecurityClient";
 
-interface Workspaces {
+interface Workspace {
   __v: number;
   _id: string;
   name: string;
   organization: string;
 }
-[];
 
 /**
  * This route lets us get the workspaces of a certain user
@@ -20,7 +19,7 @@ const getWorkspaces = () => {
     },
   }).then(async (res) => {
     if (res?.status == 200) {
-      const data = (await res.json()) as unknown as { workspaces: Workspaces };
+      const data = (await res.json()) as unknown as { workspaces: Workspace[] };
       return data.workspaces;
     }