enhancement: add workspace name on integration dashboard (#188)

revertinc · Aug 14, 2023 · 7003ac6 · 7003ac6 · vercel · Aug 14, 2023
1 parent 898c660
commit 7003ac6
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 5 deletions.
diff --git a/packages/backend/prisma/migrations/20230814121503_1/migration.sql b/packages/backend/prisma/migrations/20230814121503_1/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "accounts" ADD COLUMN     "workspaceName" TEXT;
diff --git a/packages/backend/prisma/schema.prisma b/packages/backend/prisma/schema.prisma
@@ -26,6 +26,7 @@ model accounts {
   public_token  String         @unique
   domain        String         @unique @default("")
   skipWaitlist  Boolean        @default(false)
+  workspaceName String?
   users         users[]
   environments  environments[]
 }

diff --git a/packages/backend/services/auth.ts b/packages/backend/services/auth.ts
@@ -185,8 +185,10 @@ class AuthService {
             try {
                 const userEmail = webhookData.email_addresses[0].email_address;
                 let userDomain = userEmail.split('@').pop();
+                let workspaceName = userDomain.charAt(0).toUpperCase() + userDomain.slice(1) + "'s Workspace";
                 if (!isWorkEmail(userEmail)) {
                     // make the personal email the unique domain.
+                    workspaceName = 'Personal Workspace';
                     userDomain = userEmail;
                 }
                 // Create account only if an account does not exist for this user's domain.
@@ -207,6 +209,7 @@ class AuthService {
                         tenant_count: 0,
                         domain: userDomain,
                         skipWaitlist: false,
+                        workspaceName: workspaceName,
                         environments: {
                             createMany: {
                                 data: [

diff --git a/packages/client/src/home/index.tsx b/packages/client/src/home/index.tsx
@@ -35,9 +35,9 @@ const Home = () => {
             .then((response) => response.json())
             .then((result) => {
                 setAccount(result?.account);
-                const environments: string[] = result?.account?.environments?.map(env => env.env) || [];
+                const environments: string[] = result?.account?.environments?.map((env) => env.env) || [];
                 if (!environments.includes(DEFAULT_ENV)) {
-                    setEnvironment(environments?.[0])
+                    setEnvironment(environments?.[0]);
                 }
             })
             .catch((error) => {
@@ -59,7 +59,12 @@ const Home = () => {
     };
     return (
         <>
-            <Navbar environment={environment} setEnvironment={setEnvironment} environmentList={account?.environments} />
+            <Navbar
+                workspaceName={account?.workspaceName}
+                environment={environment}
+                setEnvironment={setEnvironment}
+                environmentList={account?.environments}
+            />
             <div className="flex h-[100%]">
                 <div className="w-[20%] flex flex-col items-center pt-[120px] text-[#6e6e6e]">
                     <ul>

diff --git a/packages/client/src/home/navbar.tsx b/packages/client/src/home/navbar.tsx
@@ -5,11 +5,16 @@ import { Link } from 'react-router-dom';
 import QuizIcon from '@mui/icons-material/Quiz';
 import EnvironmentSelector from './environmentSelector';
 
-const Navbar = ({ environment, setEnvironment, environmentList }) => {
+const Navbar = ({ workspaceName, environment, setEnvironment, environmentList }) => {
     return (
         <div id="top-navbar">
             <Link to="/" className="flex items-center">
-                <img src={Logo} alt="revert_logo" className="w-[30px] h-[30px] ml-[24px] cursor-pointer mt-4 mb-3" />
+                <img
+                    src={Logo}
+                    alt="revert_logo"
+                    className="w-[30px] h-[30px] ml-[24px] cursor-pointer mt-4 mb-3 mr-[24px]"
+                />
+                <span className="ml-[24px] mr-[12px]">{workspaceName}</span>
                 <EnvironmentSelector
                     environmentProp={environment}
                     setEnvironmentProp={setEnvironment}