From 211ba45869a24beda4a86bddcf4118cfad7fc9ff Mon Sep 17 00:00:00 2001
From: Udit <unamdev0@gmail.com>
Date: Sat, 7 Sep 2024 15:47:48 +0530
Subject: [PATCH 1/2] added optional chaining due to strict null check

---
 apps/platform/src/app/(main)/page.tsx                 |  9 ++++++---
 .../src/app/(main)/project/[project]/@secret/page.tsx |  2 +-
 .../src/app/(main)/project/[project]/layout.tsx       |  2 +-
 apps/platform/src/app/auth/invite/page.tsx            |  6 +++---
 apps/platform/src/components/shared/navbar/index.tsx  |  2 +-
 .../platform/src/components/teams/teamTable/index.tsx |  2 +-
 apps/platform/src/components/ui/line-tab.tsx          |  2 +-
 apps/platform/src/env.ts                              |  2 +-
 apps/platform/src/lib/workspace-storage.ts            | 11 ++++++++---
 apps/platform/src/middleware.ts                       |  2 +-
 package.json                                          |  4 ++--
 11 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/apps/platform/src/app/(main)/page.tsx b/apps/platform/src/app/(main)/page.tsx
index 94c3515b..58539509 100644
--- a/apps/platform/src/app/(main)/page.tsx
+++ b/apps/platform/src/app/(main)/page.tsx
@@ -56,9 +56,12 @@ export default function Index(): JSX.Element {
 
   const router = useRouter()
 
-  const currentWorkspace = JSON.parse(
-    localStorage.getItem('currentWorkspace') ?? '{}'
-  ) as Workspace
+  const currentWorkspace =
+    typeof localStorage !== 'undefined'
+      ? (JSON.parse(
+          localStorage.getItem('currentWorkspace') ?? '{}'
+        ) as Workspace)
+      : (JSON.parse(`{}`) as Workspace)
 
   useEffect(() => {
     Projects.getProjectsbyWorkspaceID(currentWorkspace.id)
diff --git a/apps/platform/src/app/(main)/project/[project]/@secret/page.tsx b/apps/platform/src/app/(main)/project/[project]/@secret/page.tsx
index fca52e8e..8919cbf7 100644
--- a/apps/platform/src/app/(main)/project/[project]/@secret/page.tsx
+++ b/apps/platform/src/app/(main)/project/[project]/@secret/page.tsx
@@ -53,7 +53,7 @@ function SecretPage(): React.JSX.Element {
         collapsible
         type="single"
       >
-        {allSecrets.map((secret) => {
+        {allSecrets?.map((secret) => {
           return (
             <AccordionItem
               className="rounded-xl bg-white/5 px-5"
diff --git a/apps/platform/src/app/(main)/project/[project]/layout.tsx b/apps/platform/src/app/(main)/project/[project]/layout.tsx
index f2a30aad..8a747ac4 100644
--- a/apps/platform/src/app/(main)/project/[project]/layout.tsx
+++ b/apps/platform/src/app/(main)/project/[project]/layout.tsx
@@ -51,7 +51,7 @@ function DetailedProjectPage({
   return (
     <main className="flex flex-col gap-4">
       <div className="flex justify-between ">
-        <div className="text-3xl">{currentProject.name}</div>
+        <div className="text-3xl">{currentProject?.name}</div>
         <Dialog>
           <DialogTrigger>
             <Button>
diff --git a/apps/platform/src/app/auth/invite/page.tsx b/apps/platform/src/app/auth/invite/page.tsx
index 8665f71d..2248837b 100644
--- a/apps/platform/src/app/auth/invite/page.tsx
+++ b/apps/platform/src/app/auth/invite/page.tsx
@@ -8,7 +8,7 @@ export default function AuthDetailsPage(): React.JSX.Element {
   const inputRef = useRef<HTMLInputElement>(null)
 
   useEffect(() => {
-    inputRef.current.focus()
+    inputRef.current?.focus()
   }, [])
 
   return (
@@ -38,12 +38,12 @@ export default function AuthDetailsPage(): React.JSX.Element {
               <div
                 className={`${NunitoSansFont.className} flex h-[10vh] cursor-text flex-col items-start gap-1 rounded-md border border-white/10 bg-neutral-800 px-3 py-2 text-sm`}
                 onClick={() => {
-                  inputRef.current.focus()
+                  inputRef.current?.focus()
                 }}
                 onKeyDown={(e) => {
                   // Enter or space key
                   if (e.key === 'Enter' || e.key === ' ') {
-                    inputRef.current.focus()
+                    inputRef.current?.focus()
                   }
                 }}
                 role="button"
diff --git a/apps/platform/src/components/shared/navbar/index.tsx b/apps/platform/src/components/shared/navbar/index.tsx
index 8b986a4b..df58000c 100644
--- a/apps/platform/src/components/shared/navbar/index.tsx
+++ b/apps/platform/src/components/shared/navbar/index.tsx
@@ -38,7 +38,7 @@ async function fetchNameImage(): Promise<UserNameImage | undefined> {
       throw new Error('Invalid data')
     }
     return {
-      name: data.name.split(' ')[0] ?? data.email.split('@')[0],
+      name: data.name?.split(' ')[0] ?? data.email.split('@')[0],
       image: data.profilePictureUrl
     }
   } catch (error) {
diff --git a/apps/platform/src/components/teams/teamTable/index.tsx b/apps/platform/src/components/teams/teamTable/index.tsx
index fd8d966b..c7491d61 100644
--- a/apps/platform/src/components/teams/teamTable/index.tsx
+++ b/apps/platform/src/components/teams/teamTable/index.tsx
@@ -89,7 +89,7 @@ export const columns: ColumnDef<Payment>[] = [
         aria-label="Select all"
         checked={
           table.getIsAllPageRowsSelected() ||
-          (table.getIsSomePageRowsSelected() && 'indeterminate')
+          Boolean(table.getIsSomePageRowsSelected() && 'indeterminate')
         }
         onCheckedChange={(value) => {
           table.toggleAllPageRowsSelected(Boolean(value))
diff --git a/apps/platform/src/components/ui/line-tab.tsx b/apps/platform/src/components/ui/line-tab.tsx
index 7a2809c1..3a25af5c 100644
--- a/apps/platform/src/components/ui/line-tab.tsx
+++ b/apps/platform/src/components/ui/line-tab.tsx
@@ -79,7 +79,7 @@ function LineTab({ customID, tabs }: LineTabsProps): React.JSX.Element {
           customID={customID}
           key={tab}
           searchParams={searchParams}
-          selected={search.toLocaleLowerCase() === tab.toLocaleLowerCase()}
+          selected={search?.toLocaleLowerCase() === tab.toLocaleLowerCase()}
           text={tab}
         />
       ))}
diff --git a/apps/platform/src/env.ts b/apps/platform/src/env.ts
index f51aecc7..3b131a49 100644
--- a/apps/platform/src/env.ts
+++ b/apps/platform/src/env.ts
@@ -18,7 +18,7 @@ try {
   if (error instanceof z.ZodError) {
     const { fieldErrors } = error.flatten()
     const errorMessage = Object.entries(fieldErrors)
-      .map(([field, errors]) => `${field}: ${errors.join(', ')}`)
+      .map(([field, errors]) => `${field}: ${errors?.join(', ')}`)
       .join('\n  ')
     throw new Error(
       `Missing environment variables: \n  ${errorMessage}\n  Please check your .env file.`
diff --git a/apps/platform/src/lib/workspace-storage.ts b/apps/platform/src/lib/workspace-storage.ts
index 5950765f..25fa71fe 100644
--- a/apps/platform/src/lib/workspace-storage.ts
+++ b/apps/platform/src/lib/workspace-storage.ts
@@ -3,14 +3,19 @@ import type { Workspace } from '@/types'
 export function setWorkspace(workspaceData: Workspace[]): void {
   const defaultWorkspace =
     workspaceData.find((workspace) => workspace.isDefault) || null
-  localStorage.setItem('defaultWorkspace', JSON.stringify(defaultWorkspace))
+  if (typeof localStorage !== 'undefined') {
+    localStorage.setItem('defaultWorkspace', JSON.stringify(defaultWorkspace))
+  }
   if (getCurrentWorkspace() === null) {
-    localStorage.setItem('currentWorkspace', JSON.stringify(defaultWorkspace))
+    if (typeof localStorage !== 'undefined') {
+      localStorage.setItem('currentWorkspace', JSON.stringify(defaultWorkspace))
+    }
   }
 }
 
 export function getCurrentWorkspace(): Workspace | null {
-  const currentWorkspace = localStorage.getItem('currentWorkspace')
+  const currentWorkspace = typeof localStorage!=="undefined" ? localStorage.getItem('currentWorkspace') : `{}`
+
   if (currentWorkspace) {
     return JSON.parse(currentWorkspace) as Workspace
   }
diff --git a/apps/platform/src/middleware.ts b/apps/platform/src/middleware.ts
index 271e45d6..dfe940da 100644
--- a/apps/platform/src/middleware.ts
+++ b/apps/platform/src/middleware.ts
@@ -6,7 +6,7 @@ export function middleware(req: NextRequest): NextResponse {
   const cookieStore = cookies()
 
   const token = cookieStore.has('token')
-  const isOnboardingFinished = cookieStore.get('isOnboardingFinished').value
+  const isOnboardingFinished = cookieStore.get('isOnboardingFinished')?.value
 
   const currentPath = req.nextUrl.pathname
 
diff --git a/package.json b/package.json
index a1b5408e..7a9c3195 100644
--- a/package.json
+++ b/package.json
@@ -163,6 +163,7 @@
     "turbo": "^1.12.4"
   },
   "dependencies": {
+    "@keyshade/api-client": "workspace:*",
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/commit-analyzer": "^12.0.0",
     "@semantic-release/git": "^10.0.1",
@@ -184,7 +185,6 @@
     "tsc-alias": "^1.8.10",
     "typescript": "^5.5.2",
     "typescript-transform-paths": "^3.5.0",
-    "zod": "^3.23.6",
-    "@keyshade/api-client": "workspace:*"
+    "zod": "^3.23.6"
   }
 }

From 80a62c3c203f4b4dcea3be3c9174de8c28091c3e Mon Sep 17 00:00:00 2001
From: Udit <unamdev0@gmail.com>
Date: Sat, 7 Sep 2024 16:06:31 +0530
Subject: [PATCH 2/2] applied code suggestion to reduce code duplication

---
 apps/platform/src/lib/workspace-storage.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/platform/src/lib/workspace-storage.ts b/apps/platform/src/lib/workspace-storage.ts
index 25fa71fe..58af760a 100644
--- a/apps/platform/src/lib/workspace-storage.ts
+++ b/apps/platform/src/lib/workspace-storage.ts
@@ -5,16 +5,18 @@ export function setWorkspace(workspaceData: Workspace[]): void {
     workspaceData.find((workspace) => workspace.isDefault) || null
   if (typeof localStorage !== 'undefined') {
     localStorage.setItem('defaultWorkspace', JSON.stringify(defaultWorkspace))
-  }
-  if (getCurrentWorkspace() === null) {
-    if (typeof localStorage !== 'undefined') {
+
+    if (getCurrentWorkspace() === null) {
       localStorage.setItem('currentWorkspace', JSON.stringify(defaultWorkspace))
     }
   }
 }
 
 export function getCurrentWorkspace(): Workspace | null {
-  const currentWorkspace = typeof localStorage!=="undefined" ? localStorage.getItem('currentWorkspace') : `{}`
+  const currentWorkspace =
+    typeof localStorage !== 'undefined'
+      ? localStorage.getItem('currentWorkspace')
+      : `{}`
 
   if (currentWorkspace) {
     return JSON.parse(currentWorkspace) as Workspace