diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/issues/[issueId].tsx b/web/pages/[workspaceSlug]/projects/[projectId]/issues/[issueId].tsx
index 27dfe92ef..556337b85 100644
--- a/web/pages/[workspaceSlug]/projects/[projectId]/issues/[issueId].tsx
+++ b/web/pages/[workspaceSlug]/projects/[projectId]/issues/[issueId].tsx
@@ -1,25 +1,32 @@
import React, { ReactElement, useEffect } from "react";
import { observer } from "mobx-react-lite";
import { useRouter } from "next/router";
+import { useTheme } from "next-themes";
import useSWR from "swr";
-// layouts
+// ui
import { Loader } from "@plane/ui";
-import { PageHead } from "@/components/core";
// components
+import { EmptyState } from "@/components/common";
+import { PageHead } from "@/components/core";
import { ProjectIssueDetailsHeader } from "@/components/headers";
import { IssueDetailRoot } from "@/components/issues";
-// ui
-// types
-// store hooks
+// hooks
import { useApplication, useIssueDetail, useProject } from "@/hooks/store";
+// layouts
import { AppLayout } from "@/layouts/app-layout";
+// types
import { NextPageWithLayout } from "@/lib/types";
+// assets
+import emptyIssueDark from "public/empty-state/search/issue-dark.webp";
+import emptyIssueLight from "public/empty-state/search/issues-light.webp";
const IssueDetailsPage: NextPageWithLayout = observer(() => {
// router
const router = useRouter();
const { workspaceSlug, projectId, issueId } = router.query;
// hooks
+ const { resolvedTheme } = useTheme();
+ // store hooks
const {
fetchIssue,
issue: { getIssueById },
@@ -27,7 +34,11 @@ const IssueDetailsPage: NextPageWithLayout = observer(() => {
const { getProjectById } = useProject();
const { theme: themeStore } = useApplication();
// fetching issue details
- const { isLoading, data: swrIssueDetails } = useSWR(
+ const {
+ isLoading,
+ data: swrIssueDetails,
+ error,
+ } = useSWR(
workspaceSlug && projectId && issueId ? `ISSUE_DETAIL_${workspaceSlug}_${projectId}_${issueId}` : null,
workspaceSlug && projectId && issueId
? () => fetchIssue(workspaceSlug.toString(), projectId.toString(), issueId.toString())
@@ -57,7 +68,17 @@ const IssueDetailsPage: NextPageWithLayout = observer(() => {
return (
<>
- {issueLoader ? (
+ {error ? (
+ router.push(`/${workspaceSlug}/projects/${projectId}/issues`),
+ }}
+ />
+ ) : issueLoader ? (