From 7404fe71b1808dfd353169463d650f7db91c76ec Mon Sep 17 00:00:00 2001
From: Bavisetti Narayan <72156168+NarayanBavisetti@users.noreply.github.com>
Date: Wed, 27 Sep 2023 17:30:52 +0530
Subject: [PATCH 01/11] chore: sort order and issue props for global views
 (#2283)

---
 ...er_workspacemember_issue_props_and_more.py | 24 +++++++++++++++++++
 apiserver/plane/db/models/view.py             | 11 +++++++++
 apiserver/plane/db/models/workspace.py        | 12 +++++++++-
 3 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 apiserver/plane/db/migrations/0048_globalview_sort_order_workspacemember_issue_props_and_more.py

diff --git a/apiserver/plane/db/migrations/0048_globalview_sort_order_workspacemember_issue_props_and_more.py b/apiserver/plane/db/migrations/0048_globalview_sort_order_workspacemember_issue_props_and_more.py
new file mode 100644
index 000000000..3084ef637
--- /dev/null
+++ b/apiserver/plane/db/migrations/0048_globalview_sort_order_workspacemember_issue_props_and_more.py
@@ -0,0 +1,24 @@
+# Generated by Django 4.2.5 on 2023-09-27 11:18
+
+from django.db import migrations, models
+import plane.db.models.workspace
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('db', '0047_auto_20230926_1029'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='globalview',
+            name='sort_order',
+            field=models.FloatField(default=65535),
+        ),
+        migrations.AddField(
+            model_name='workspacemember',
+            name='issue_props',
+            field=models.JSONField(default=plane.db.models.workspace.get_issue_props),
+        ),
+    ]
diff --git a/apiserver/plane/db/models/view.py b/apiserver/plane/db/models/view.py
index 6e0a47105..c19e444b3 100644
--- a/apiserver/plane/db/models/view.py
+++ b/apiserver/plane/db/models/view.py
@@ -17,12 +17,23 @@ class GlobalView(BaseModel):
         default=1, choices=((0, "Private"), (1, "Public"))
     )
     query_data = models.JSONField(default=dict)
+    sort_order = models.FloatField(default=65535)
 
     class Meta:
         verbose_name = "Global View"
         verbose_name_plural = "Global Views"
         db_table = "global_views"
         ordering = ("-created_at",)
+    
+    def save(self, *args, **kwargs):
+        if self._state.adding:
+            largest_sort_order = GlobalView.objects.filter(
+                project=self.project
+            ).aggregate(largest=models.Max("sort_order"))["largest"]
+            if largest_sort_order is not None:
+                self.sort_order = largest_sort_order + 10000
+
+        super(GlobalView, self).save(*args, **kwargs)
 
     def __str__(self):
         """Return name of the View"""
diff --git a/apiserver/plane/db/models/workspace.py b/apiserver/plane/db/models/workspace.py
index c85268435..d1012f549 100644
--- a/apiserver/plane/db/models/workspace.py
+++ b/apiserver/plane/db/models/workspace.py
@@ -29,7 +29,7 @@ def get_default_props():
         },
         "display_filters": {
             "group_by": None,
-            "order_by": '-created_at',
+            "order_by": "-created_at",
             "type": None,
             "sub_issue": True,
             "show_empty_groups": True,
@@ -54,6 +54,15 @@ def get_default_props():
     }
 
 
+def get_issue_props():
+    return {
+        "subscribed": True,
+        "assigned": True,
+        "created": True,
+        "all_issues": True,
+    }
+
+
 class Workspace(BaseModel):
     name = models.CharField(max_length=80, verbose_name="Workspace Name")
     logo = models.URLField(verbose_name="Logo", blank=True, null=True)
@@ -89,6 +98,7 @@ class WorkspaceMember(BaseModel):
     company_role = models.TextField(null=True, blank=True)
     view_props = models.JSONField(default=get_default_props)
     default_props = models.JSONField(default=get_default_props)
+    issue_props = models.JSONField(default=get_issue_props)
 
     class Meta:
         unique_together = ["workspace", "member"]

From 9dd22f07f40f60ee764f87e7494403110e92bb22 Mon Sep 17 00:00:00 2001
From: Bavisetti Narayan <72156168+NarayanBavisetti@users.noreply.github.com>
Date: Wed, 27 Sep 2023 19:16:22 +0530
Subject: [PATCH 02/11] chore: removed project filter (#2284)

---
 apiserver/plane/db/models/view.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apiserver/plane/db/models/view.py b/apiserver/plane/db/models/view.py
index c19e444b3..44bc994d0 100644
--- a/apiserver/plane/db/models/view.py
+++ b/apiserver/plane/db/models/view.py
@@ -28,7 +28,7 @@ class GlobalView(BaseModel):
     def save(self, *args, **kwargs):
         if self._state.adding:
             largest_sort_order = GlobalView.objects.filter(
-                project=self.project
+                workspace=self.workspace
             ).aggregate(largest=models.Max("sort_order"))["largest"]
             if largest_sort_order is not None:
                 self.sort_order = largest_sort_order + 10000

From 32d2f912f7ad719ecfaa1a02d3cf1fdb56123019 Mon Sep 17 00:00:00 2001
From: Nikhil <118773738+pablohashescobar@users.noreply.github.com>
Date: Thu, 28 Sep 2023 13:14:37 +0530
Subject: [PATCH 03/11] fix: inbox issue deletes (#2290)

---
 apiserver/plane/api/views/inbox.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apiserver/plane/api/views/inbox.py b/apiserver/plane/api/views/inbox.py
index 79294275e..4bfc32f01 100644
--- a/apiserver/plane/api/views/inbox.py
+++ b/apiserver/plane/api/views/inbox.py
@@ -370,6 +370,11 @@ class InboxIssueViewSet(BaseViewSet):
             if project_member.role <= 10 and str(inbox_issue.created_by_id) != str(request.user.id):
                 return Response({"error": "You cannot delete inbox issue"}, status=status.HTTP_400_BAD_REQUEST)
 
+            # Check the issue status
+            if inbox_issue.status in [-2, -1, 0, 2]:
+                # Delete the issue also
+                Issue.objects.filter(workspace__slug=slug, project_id=project_id, pk=inbox_issue.issue_id).delete() 
+
             inbox_issue.delete()
             return Response(status=status.HTTP_204_NO_CONTENT)
         except InboxIssue.DoesNotExist:

From 6afbd3f1ba434a022eeae92e96c49e784243f961 Mon Sep 17 00:00:00 2001
From: Nikhil <118773738+pablohashescobar@users.noreply.github.com>
Date: Thu, 28 Sep 2023 13:16:31 +0530
Subject: [PATCH 04/11] chore: views (#2288)

* chore: global views order by

* chore: update permissions for global views

---------

Co-authored-by: NarayanBavisetti <narayan3119@gmail.com>
---
 apiserver/plane/api/permissions/workspace.py | 11 ++++++++++-
 apiserver/plane/api/views/issue.py           |  2 --
 apiserver/plane/api/views/view.py            |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/apiserver/plane/api/permissions/workspace.py b/apiserver/plane/api/permissions/workspace.py
index d01b545ee..66e836614 100644
--- a/apiserver/plane/api/permissions/workspace.py
+++ b/apiserver/plane/api/permissions/workspace.py
@@ -58,8 +58,17 @@ class WorkspaceEntityPermission(BasePermission):
         if request.user.is_anonymous:
             return False
 
+        ## Safe Methods -> Handle the filtering logic in queryset
+        if request.method in SAFE_METHODS:
+            return WorkspaceMember.objects.filter(
+                workspace__slug=view.workspace_slug,
+                member=request.user,
+            ).exists()
+
         return WorkspaceMember.objects.filter(
-            member=request.user, workspace__slug=view.workspace_slug
+            member=request.user,
+            workspace__slug=view.workspace_slug,
+            role__in=[Owner, Admin],
         ).exists()
 
 
diff --git a/apiserver/plane/api/views/issue.py b/apiserver/plane/api/views/issue.py
index 844095434..29f14e437 100644
--- a/apiserver/plane/api/views/issue.py
+++ b/apiserver/plane/api/views/issue.py
@@ -24,7 +24,6 @@ from django.core.serializers.json import DjangoJSONEncoder
 from django.utils.decorators import method_decorator
 from django.views.decorators.gzip import gzip_page
 from django.db import IntegrityError
-from django.conf import settings
 from django.db import IntegrityError
 
 # Third Party imports
@@ -58,7 +57,6 @@ from plane.api.serializers import (
     IssuePublicSerializer,
 )
 from plane.api.permissions import (
-    WorkspaceEntityPermission,
     ProjectEntityPermission,
     WorkSpaceAdminPermission,
     ProjectMemberPermission,
diff --git a/apiserver/plane/api/views/view.py b/apiserver/plane/api/views/view.py
index b6f1d7c4b..435f8725a 100644
--- a/apiserver/plane/api/views/view.py
+++ b/apiserver/plane/api/views/view.py
@@ -61,7 +61,7 @@ class GlobalViewViewSet(BaseViewSet):
             .get_queryset()
             .filter(workspace__slug=self.kwargs.get("slug"))
             .select_related("workspace")
-            .order_by("-created_at")
+            .order_by(self.request.GET.get("order_by", "-created_at"))
             .distinct()
         )
 

From 34af666b5fbed6a6dd49292b6849ce6f1ea44d3c Mon Sep 17 00:00:00 2001
From: Aaryan Khandelwal <65252264+aaryan610@users.noreply.github.com>
Date: Thu, 28 Sep 2023 13:17:46 +0530
Subject: [PATCH 05/11] chore: fetch issues from previous and next month in the
 calendar view (#2282)

---
 web/hooks/use-calendar-issues-view.tsx | 28 ++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/web/hooks/use-calendar-issues-view.tsx b/web/hooks/use-calendar-issues-view.tsx
index 1f6f04ea8..5f21d63c5 100644
--- a/web/hooks/use-calendar-issues-view.tsx
+++ b/web/hooks/use-calendar-issues-view.tsx
@@ -33,8 +33,28 @@ const useCalendarIssuesView = () => {
 
   const [activeMonthDate, setActiveMonthDate] = useState(new Date());
 
-  const firstDayOfMonth = new Date(activeMonthDate.getFullYear(), activeMonthDate.getMonth(), 1);
-  const lastDayOfMonth = new Date(activeMonthDate.getFullYear(), activeMonthDate.getMonth() + 1, 0);
+  // previous month's first date
+  const previousMonthYear =
+    activeMonthDate.getMonth() === 0
+      ? activeMonthDate.getFullYear() - 1
+      : activeMonthDate.getFullYear();
+  const previousMonthMonth = activeMonthDate.getMonth() === 0 ? 11 : activeMonthDate.getMonth() - 1;
+
+  const previousMonthFirstDate = new Date(previousMonthYear, previousMonthMonth, 1);
+
+  // next month's last date
+  const nextMonthYear =
+    activeMonthDate.getMonth() === 11
+      ? activeMonthDate.getFullYear() + 1
+      : activeMonthDate.getFullYear();
+  const nextMonthMonth = (activeMonthDate.getMonth() + 1) % 12;
+  const nextMonthFirstDate = new Date(nextMonthYear, nextMonthMonth, 1);
+
+  const nextMonthLastDate = new Date(
+    nextMonthFirstDate.getFullYear(),
+    nextMonthFirstDate.getMonth() + 1,
+    0
+  );
 
   const router = useRouter();
   const { workspaceSlug, projectId, cycleId, moduleId, viewId } = router.query;
@@ -47,8 +67,8 @@ const useCalendarIssuesView = () => {
     labels: filters?.labels ? filters?.labels.join(",") : undefined,
     created_by: filters?.created_by ? filters?.created_by.join(",") : undefined,
     start_date: filters?.start_date ? filters?.start_date.join(",") : undefined,
-    target_date: `${renderDateFormat(firstDayOfMonth)};after,${renderDateFormat(
-      lastDayOfMonth
+    target_date: `${renderDateFormat(previousMonthFirstDate)};after,${renderDateFormat(
+      nextMonthLastDate
     )};before`,
   };
 

From 60a69e28e3eb0ea3528df6c1c02ea94dd81f2f91 Mon Sep 17 00:00:00 2001
From: Anmol Singh Bhatia <121005188+anmolsinghbhatia@users.noreply.github.com>
Date: Thu, 28 Sep 2023 13:18:35 +0530
Subject: [PATCH 06/11] fix: issue activity estimate value bug fix (#2281)

* fix: issue activity estimate value bug fix

* fix: activity typo fix
---
 web/components/core/activity.tsx  | 17 +++++++++++++++--
 web/hooks/use-estimate-option.tsx |  4 +++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/web/components/core/activity.tsx b/web/components/core/activity.tsx
index c76f1aece..4e01c5ed8 100644
--- a/web/components/core/activity.tsx
+++ b/web/components/core/activity.tsx
@@ -2,6 +2,8 @@ import { useRouter } from "next/router";
 
 import useSWR from "swr";
 
+// hook
+import useEstimateOption from "hooks/use-estimate-option";
 // services
 import issuesService from "services/issues.service";
 // icons
@@ -77,6 +79,18 @@ const LabelPill = ({ labelId }: { labelId: string }) => {
     />
   );
 };
+const EstimatePoint = ({ point }: { point: string }) => {
+  const { estimateValue, isEstimateActive } = useEstimateOption(Number(point));
+  const currentPoint = Number(point) + 1;
+
+  return (
+    <span className="font-medium text-custom-text-100">
+      {isEstimateActive
+        ? estimateValue
+        : `${currentPoint} ${currentPoint > 1 ? "points" : "point"}`}
+    </span>
+  );
+};
 
 const activityDetails: {
   [key: string]: {
@@ -324,8 +338,7 @@ const activityDetails: {
       else
         return (
           <>
-            set the estimate point to{" "}
-            <span className="font-medium text-custom-text-100">{activity.new_value}</span>
+            set the estimate point to <EstimatePoint point={activity.new_value} />
             {showIssue && (
               <>
                 {" "}
diff --git a/web/hooks/use-estimate-option.tsx b/web/hooks/use-estimate-option.tsx
index 37b42b9e9..61a93ca59 100644
--- a/web/hooks/use-estimate-option.tsx
+++ b/web/hooks/use-estimate-option.tsx
@@ -32,7 +32,9 @@ const useEstimateOption = (estimateKey?: number | null) => {
   );
 
   const estimateValue: any =
-    (estimateKey && estimateDetails?.points?.find((e) => e.key === estimateKey)?.value) ?? "None";
+    estimateKey || estimateKey === 0
+      ? estimateDetails?.points?.find((e) => e.key === estimateKey)?.value
+      : "None";
 
   return {
     isEstimateActive: projectDetails?.estimate ? true : false,

From ec91a0d2e50ec91b93ca7f8f79d1e23086621c86 Mon Sep 17 00:00:00 2001
From: Dakshesh Jain <65905942+dakshesh14@users.noreply.github.com>
Date: Thu, 28 Sep 2023 14:02:03 +0530
Subject: [PATCH 07/11] fix: ui and bugs (#2289)

* fix: 24 character limit on first & last name in onboarding page

* fix: no option: 'Add Issue' in archive issue page

* fix: in archive issue directly sending to issue detail page

* fix: issue type showing in archive issue

* fix: custom menu overflowing

* fix: changing subscriber in filters has no effect

* style: border in quick-add

* fix: on onboarding member role overflowing

* fix: inconsistent icons in issue detail

* style: spacing, borders and shadows in quick-add

* fix: custom menu truncate
---
 web/components/core/activity.tsx              |  84 ++++---
 web/components/core/filters/filters-list.tsx  |   4 +-
 .../core/filters/issues-view-filter.tsx       |  54 +++--
 .../board-view/inline-create-issue-form.tsx   |   2 +-
 .../inline-create-issue-form.tsx              |   4 +-
 .../inline-create-issue-form.tsx              |   2 +-
 web/components/core/views/issues-view.tsx     |   5 +-
 .../list-view/inline-create-issue-form.tsx    |   4 +-
 .../core/views/list-view/single-issue.tsx     |   3 +-
 .../core/views/list-view/single-list.tsx      |   5 +-
 .../assignee-column/assignee-column.tsx       |   2 +-
 .../created-on-column/created-on-column.tsx   |   2 +-
 .../due-date-column/due-date-column.tsx       |   2 +-
 .../estimate-column/estimate-column.tsx       |   2 +-
 .../issue-column/issue-column.tsx             |   2 +-
 .../label-column/label-column.tsx             |   2 +-
 .../priority-column/priority-column.tsx       |   2 +-
 .../spreadsheet-view/spreadsheet-view.tsx     |  10 +-
 .../start-date-column/start-date-column.tsx   |   2 +-
 .../state-column/state-column.tsx             |   2 +-
 .../updated-on-column/updated-on-column.tsx   |   2 +-
 web/components/gantt-chart/chart/index.tsx    |   2 +-
 web/components/onboarding/invite-members.tsx  | 225 ++++++++++++------
 web/components/onboarding/user-details.tsx    |   8 +
 .../profile/profile-issues-view-options.tsx   |   8 +-
 web/constants/fetch-keys.ts                   |   5 +-
 web/hooks/use-issues-view.tsx                 |   2 +-
 27 files changed, 289 insertions(+), 158 deletions(-)

diff --git a/web/components/core/activity.tsx b/web/components/core/activity.tsx
index 4e01c5ed8..d5987384c 100644
--- a/web/components/core/activity.tsx
+++ b/web/components/core/activity.tsx
@@ -8,9 +8,27 @@ import useEstimateOption from "hooks/use-estimate-option";
 import issuesService from "services/issues.service";
 // icons
 import { Icon, Tooltip } from "components/ui";
-import { CopyPlus } from "lucide-react";
-import { Squares2X2Icon } from "@heroicons/react/24/outline";
-import { BlockedIcon, BlockerIcon, RelatedIcon } from "components/icons";
+import {
+  TagIcon,
+  CopyPlus,
+  Calendar,
+  Link2Icon,
+  RocketIcon,
+  Users2Icon,
+  ArchiveIcon,
+  PaperclipIcon,
+  ContrastIcon,
+  TriangleIcon,
+  LayoutGridIcon,
+  SignalMediumIcon,
+  MessageSquareIcon,
+} from "lucide-react";
+import {
+  BlockedIcon,
+  BlockerIcon,
+  RelatedIcon,
+  StackedLayersHorizontalIcon,
+} from "components/icons";
 // helpers
 import { renderShortDateWithYearFormat } from "helpers/date-time.helper";
 import { capitalizeFirstLetter } from "helpers/string.helper";
@@ -38,7 +56,7 @@ const IssueLink = ({ activity }: { activity: IIssueActivity }) => {
         {activity.issue_detail
           ? `${activity.project_detail.identifier}-${activity.issue_detail.sequence_id}`
           : "Issue"}
-        <Icon iconName="launch" className="!text-xs" />
+        <RocketIcon size={12} color="#6b7280" />
       </a>
     </Tooltip>
   );
@@ -131,14 +149,14 @@ const activityDetails: {
           </>
         );
     },
-    icon: <Icon iconName="group" className="!text-2xl" aria-hidden="true" />,
+    icon: <Users2Icon size={12} color="#6b7280" aria-hidden="true" />,
   },
   archived_at: {
     message: (activity) => {
       if (activity.new_value === "restore") return "restored the issue.";
       else return "archived the issue.";
     },
-    icon: <Icon iconName="archive" className="!text-2xl" aria-hidden="true" />,
+    icon: <ArchiveIcon size={12} color="#6b7280" aria-hidden="true" />,
   },
   attachment: {
     message: (activity, showIssue) => {
@@ -153,7 +171,7 @@ const activityDetails: {
               className="font-medium text-custom-text-100 inline-flex items-center gap-1 hover:underline"
             >
               attachment
-              <Icon iconName="launch" className="!text-xs" />
+              <RocketIcon size={12} color="#6b7280" />
             </a>
             {showIssue && (
               <>
@@ -177,7 +195,7 @@ const activityDetails: {
           </>
         );
     },
-    icon: <Icon iconName="attach_file" className="!text-2xl" aria-hidden="true" />,
+    icon: <PaperclipIcon size={12} color="#6b7280" aria-hidden="true" />,
   },
   blocking: {
     message: (activity) => {
@@ -268,7 +286,7 @@ const activityDetails: {
               className="font-medium text-custom-text-100 inline-flex items-center gap-1 hover:underline"
             >
               {activity.new_value}
-              <Icon iconName="launch" className="!text-xs" />
+              <RocketIcon size={12} color="#6b7280" />
             </a>
           </>
         );
@@ -283,7 +301,7 @@ const activityDetails: {
               className="font-medium text-custom-text-100 inline-flex items-center gap-1 hover:underline"
             >
               {activity.new_value}
-              <Icon iconName="launch" className="!text-xs" />
+              <RocketIcon size={12} color="#6b7280" />
             </a>
           </>
         );
@@ -298,12 +316,12 @@ const activityDetails: {
               className="font-medium text-custom-text-100 inline-flex items-center gap-1 hover:underline"
             >
               {activity.old_value}
-              <Icon iconName="launch" className="!text-xs" />
+              <RocketIcon size={12} color="#6b7280" />
             </a>
           </>
         );
     },
-    icon: <Icon iconName="contrast" className="!text-2xl" aria-hidden="true" />,
+    icon: <ContrastIcon size={12} color="#6b7280" aria-hidden="true" />,
   },
   description: {
     message: (activity, showIssue) => (
@@ -318,7 +336,7 @@ const activityDetails: {
         .
       </>
     ),
-    icon: <Icon iconName="chat" className="!text-2xl" aria-hidden="true" />,
+    icon: <MessageSquareIcon size={12} color="#6b7280" aria-hidden="true" />,
   },
   estimate_point: {
     message: (activity, showIssue) => {
@@ -349,14 +367,14 @@ const activityDetails: {
           </>
         );
     },
-    icon: <Icon iconName="change_history" className="!text-2xl" aria-hidden="true" />,
+    icon: <TriangleIcon size={12} color="#6b7280" aria-hidden="true" />,
   },
   issue: {
     message: (activity) => {
       if (activity.verb === "created") return "created the issue.";
       else return "deleted an issue.";
     },
-    icon: <Icon iconName="stack" className="!text-2xl" aria-hidden="true" />,
+    icon: <StackedLayersHorizontalIcon width={12} height={12} color="#6b7280" aria-hidden="true" />,
   },
   labels: {
     message: (activity, showIssue) => {
@@ -393,7 +411,7 @@ const activityDetails: {
           </>
         );
     },
-    icon: <Icon iconName="sell" className="!text-2xl" aria-hidden="true" />,
+    icon: <TagIcon size={12} color="#6b7280" aria-hidden="true" />,
   },
   link: {
     message: (activity, showIssue) => {
@@ -408,7 +426,7 @@ const activityDetails: {
               className="font-medium text-custom-text-100 inline-flex items-center gap-1 hover:underline"
             >
               link
-              <Icon iconName="launch" className="!text-xs" />
+              <RocketIcon size={12} color="#6b7280" />
             </a>
             {showIssue && (
               <>
@@ -430,7 +448,7 @@ const activityDetails: {
               className="font-medium text-custom-text-100 inline-flex items-center gap-1 hover:underline"
             >
               link
-              <Icon iconName="launch" className="!text-xs" />
+              <RocketIcon size={12} color="#6b7280" />
             </a>
             {showIssue && (
               <>
@@ -452,7 +470,7 @@ const activityDetails: {
               className="font-medium text-custom-text-100 inline-flex items-center gap-1 hover:underline"
             >
               link
-              <Icon iconName="launch" className="!text-xs" />
+              <RocketIcon size={12} color="#6b7280" />
             </a>
             {showIssue && (
               <>
@@ -464,7 +482,7 @@ const activityDetails: {
           </>
         );
     },
-    icon: <Icon iconName="link" className="!text-2xl" aria-hidden="true" />,
+    icon: <Link2Icon size={12} color="#6b7280" aria-hidden="true" />,
   },
   modules: {
     message: (activity, showIssue, workspaceSlug) => {
@@ -479,7 +497,7 @@ const activityDetails: {
               className="font-medium text-custom-text-100 inline-flex items-center gap-1 hover:underline"
             >
               {activity.new_value}
-              <Icon iconName="launch" className="!text-xs" />
+              <RocketIcon size={12} color="#6b7280" />
             </a>
           </>
         );
@@ -494,7 +512,7 @@ const activityDetails: {
               className="font-medium text-custom-text-100 inline-flex items-center gap-1 hover:underline"
             >
               {activity.new_value}
-              <Icon iconName="launch" className="!text-xs" />
+              <RocketIcon size={12} color="#6b7280" />
             </a>
           </>
         );
@@ -509,12 +527,12 @@ const activityDetails: {
               className="font-medium text-custom-text-100 inline-flex items-center gap-1 hover:underline"
             >
               {activity.old_value}
-              <Icon iconName="launch" className="!text-xs" />
+              <RocketIcon size={12} color="#6b7280" />
             </a>
           </>
         );
     },
-    icon: <Icon iconName="dataset" className="!text-2xl" aria-hidden="true" />,
+    icon: <Icon iconName="dataset" className="!text-xs !text-[#6b7280]" aria-hidden="true" />,
   },
   name: {
     message: (activity, showIssue) => (
@@ -529,7 +547,7 @@ const activityDetails: {
         .
       </>
     ),
-    icon: <Icon iconName="chat" className="!text-2xl" aria-hidden="true" />,
+    icon: <MessageSquareIcon size={12} color="#6b7280" aria-hidden="true" />,
   },
   parent: {
     message: (activity, showIssue) => {
@@ -562,7 +580,13 @@ const activityDetails: {
           </>
         );
     },
-    icon: <Icon iconName="supervised_user_circle" className="!text-2xl" aria-hidden="true" />,
+    icon: (
+      <Icon
+        iconName="supervised_user_circle"
+        className="!text-xs !text-[#6b7280]"
+        aria-hidden="true"
+      />
+    ),
   },
   priority: {
     message: (activity, showIssue) => (
@@ -580,7 +604,7 @@ const activityDetails: {
         .
       </>
     ),
-    icon: <Icon iconName="signal_cellular_alt" className="!text-2xl" aria-hidden="true" />,
+    icon: <SignalMediumIcon size={12} color="#6b7280" aria-hidden="true" />,
   },
   start_date: {
     message: (activity, showIssue) => {
@@ -614,7 +638,7 @@ const activityDetails: {
           </>
         );
     },
-    icon: <Icon iconName="calendar_today" className="!text-2xl" aria-hidden="true" />,
+    icon: <Calendar size={12} color="#6b7280" aria-hidden="true" />,
   },
   state: {
     message: (activity, showIssue) => (
@@ -630,7 +654,7 @@ const activityDetails: {
         .
       </>
     ),
-    icon: <Squares2X2Icon className="h-6 w-6 text-custom-sidebar-200" aria-hidden="true" />,
+    icon: <LayoutGridIcon size={12} color="#6b7280" aria-hidden="true" />,
   },
   target_date: {
     message: (activity, showIssue) => {
@@ -664,7 +688,7 @@ const activityDetails: {
           </>
         );
     },
-    icon: <Icon iconName="calendar_today" className="!text-2xl" aria-hidden="true" />,
+    icon: <Calendar size={12} color="#6b7280" aria-hidden="true" />,
   },
 };
 
diff --git a/web/components/core/filters/filters-list.tsx b/web/components/core/filters/filters-list.tsx
index a2b12b69c..50493c64f 100644
--- a/web/components/core/filters/filters-list.tsx
+++ b/web/components/core/filters/filters-list.tsx
@@ -200,7 +200,9 @@ export const FiltersList: React.FC<Props> = ({
                               className="cursor-pointer"
                               onClick={() =>
                                 setFilters({
-                                  assignees: filters.assignees?.filter((p: any) => p !== memberId),
+                                  subscriber: filters.subscriber?.filter(
+                                    (p: any) => p !== memberId
+                                  ),
                                 })
                               }
                             >
diff --git a/web/components/core/filters/issues-view-filter.tsx b/web/components/core/filters/issues-view-filter.tsx
index 02cdf2122..7df759e8a 100644
--- a/web/components/core/filters/issues-view-filter.tsx
+++ b/web/components/core/filters/issues-view-filter.tsx
@@ -277,33 +277,35 @@ export const IssuesFilterView: React.FC = () => {
                           </div>
                         </div>
                       )}
-                    <div className="flex items-center justify-between">
-                      <h4 className="text-custom-text-200">Issue type</h4>
-                      <div className="w-28">
-                        <CustomMenu
-                          label={
-                            FILTER_ISSUE_OPTIONS.find(
-                              (option) => option.key === displayFilters.type
-                            )?.name ?? "Select"
-                          }
-                          className="!w-full"
-                          buttonClassName="w-full"
-                        >
-                          {FILTER_ISSUE_OPTIONS.map((option) => (
-                            <CustomMenu.MenuItem
-                              key={option.key}
-                              onClick={() =>
-                                setDisplayFilters({
-                                  type: option.key,
-                                })
-                              }
-                            >
-                              {option.name}
-                            </CustomMenu.MenuItem>
-                          ))}
-                        </CustomMenu>
+                    {!isArchivedIssues && (
+                      <div className="flex items-center justify-between">
+                        <h4 className="text-custom-text-200">Issue type</h4>
+                        <div className="w-28">
+                          <CustomMenu
+                            label={
+                              FILTER_ISSUE_OPTIONS.find(
+                                (option) => option.key === displayFilters.type
+                              )?.name ?? "Select"
+                            }
+                            className="!w-full"
+                            buttonClassName="w-full"
+                          >
+                            {FILTER_ISSUE_OPTIONS.map((option) => (
+                              <CustomMenu.MenuItem
+                                key={option.key}
+                                onClick={() =>
+                                  setDisplayFilters({
+                                    type: option.key,
+                                  })
+                                }
+                              >
+                                {option.name}
+                              </CustomMenu.MenuItem>
+                            ))}
+                          </CustomMenu>
+                        </div>
                       </div>
-                    </div>
+                    )}
 
                     {displayFilters.layout !== "calendar" &&
                       displayFilters.layout !== "spreadsheet" && (
diff --git a/web/components/core/views/board-view/inline-create-issue-form.tsx b/web/components/core/views/board-view/inline-create-issue-form.tsx
index 651a0c0c1..1d6103d19 100644
--- a/web/components/core/views/board-view/inline-create-issue-form.tsx
+++ b/web/components/core/views/board-view/inline-create-issue-form.tsx
@@ -48,7 +48,7 @@ const InlineInput = () => {
 export const BoardInlineCreateIssueForm: React.FC<Props> = (props) => (
   <>
     <InlineCreateIssueFormWrapper
-      className="flex flex-col justify-between gap-1.5 group/card relative select-none px-3.5 py-3 h-[118px] mb-3 rounded bg-custom-background-100 shadow-custom-shadow-sm"
+      className="flex flex-col border-[0.5px] border-custom-border-100 justify-between gap-1.5 group/card relative select-none px-3.5 py-3 h-[118px] mb-3 rounded bg-custom-background-100 shadow-custom-shadow-sm"
       {...props}
     >
       <InlineInput />
diff --git a/web/components/core/views/calendar-view/inline-create-issue-form.tsx b/web/components/core/views/calendar-view/inline-create-issue-form.tsx
index 8f070543b..51b6c518b 100644
--- a/web/components/core/views/calendar-view/inline-create-issue-form.tsx
+++ b/web/components/core/views/calendar-view/inline-create-issue-form.tsx
@@ -67,7 +67,7 @@ const InlineInput = () => {
         {...register("name", {
           required: "Issue title is required.",
         })}
-        className="w-full pr-2 py-1.5 rounded-md bg-transparent text-sm font-medium leading-5 text-custom-text-200 outline-none"
+        className="w-full pr-2 py-2.5 rounded-md bg-transparent text-sm font-medium leading-5 text-custom-text-200 outline-none"
       />
     </>
   );
@@ -90,7 +90,7 @@ export const CalendarInlineCreateIssueForm: React.FC<Props> = (props) => {
       >
         <InlineCreateIssueFormWrapper
           {...props}
-          className="flex w-full p-1 px-1.5 rounded z-50 items-center gap-x-2 bg-custom-background-100 shadow-custom-shadow-sm transition-opacity"
+          className="flex w-full px-1.5 border-[0.5px] border-custom-border-100 rounded z-50 items-center gap-x-2 bg-custom-background-100 shadow-custom-shadow-sm transition-opacity"
         >
           <InlineInput />
         </InlineCreateIssueFormWrapper>
diff --git a/web/components/core/views/gantt-chart-view/inline-create-issue-form.tsx b/web/components/core/views/gantt-chart-view/inline-create-issue-form.tsx
index a5bc85f6e..785eb3c5a 100644
--- a/web/components/core/views/gantt-chart-view/inline-create-issue-form.tsx
+++ b/web/components/core/views/gantt-chart-view/inline-create-issue-form.tsx
@@ -48,7 +48,7 @@ const InlineInput = () => {
 export const GanttInlineCreateIssueForm: React.FC<Props> = (props) => (
   <>
     <InlineCreateIssueFormWrapper
-      className="flex py-3 px-4 mr-2.5 items-center rounded gap-x-2 border bg-custom-background-100 shadow-custom-shadow-sm"
+      className="flex py-3 px-4 border-[0.5px] border-custom-border-100 mr-2.5 items-center rounded gap-x-2 bg-custom-background-100 shadow-custom-shadow-sm"
       {...props}
     >
       <InlineInput />
diff --git a/web/components/core/views/issues-view.tsx b/web/components/core/views/issues-view.tsx
index c09e7c80b..62bcd5e58 100644
--- a/web/components/core/views/issues-view.tsx
+++ b/web/components/core/views/issues-view.tsx
@@ -81,7 +81,9 @@ export const IssuesView: React.FC<Props> = ({
 
   const router = useRouter();
   const { workspaceSlug, projectId, cycleId, moduleId, viewId } = router.query;
-  const isDraftIssues = router.asPath.includes("draft-issues");
+
+  const isDraftIssues = router.pathname?.split("/")?.[4] === "draft-issues";
+  const isArchivedIssues = router.pathname?.split("/")?.[4] === "archived-issues";
 
   const { user } = useUserAuth();
 
@@ -625,6 +627,7 @@ export const IssuesView: React.FC<Props> = ({
           params,
           properties,
         }}
+        disableAddIssueOption={isArchivedIssues}
       />
     </>
   );
diff --git a/web/components/core/views/list-view/inline-create-issue-form.tsx b/web/components/core/views/list-view/inline-create-issue-form.tsx
index 2f7e1287e..b61420fc8 100644
--- a/web/components/core/views/list-view/inline-create-issue-form.tsx
+++ b/web/components/core/views/list-view/inline-create-issue-form.tsx
@@ -39,7 +39,7 @@ const InlineInput = () => {
         {...register("name", {
           required: "Issue title is required.",
         })}
-        className="w-full px-2 py-1.5 rounded-md bg-transparent text-sm font-medium leading-5 text-custom-text-200 outline-none"
+        className="w-full px-2 py-3 rounded-md bg-transparent text-sm font-medium leading-5 text-custom-text-200 outline-none"
       />
     </>
   );
@@ -48,7 +48,7 @@ const InlineInput = () => {
 export const ListInlineCreateIssueForm: React.FC<Props> = (props) => (
   <>
     <InlineCreateIssueFormWrapper
-      className="flex py-3 px-4 items-center gap-x-5 bg-custom-background-100 shadow-custom-shadow-sm z-10"
+      className="flex border-[0.5px] border-t-0 border-custom-border-100 px-4 items-center gap-x-5 bg-custom-background-100 shadow-custom-shadow-sm z-10"
       {...props}
     >
       <InlineInput />
diff --git a/web/components/core/views/list-view/single-issue.tsx b/web/components/core/views/list-view/single-issue.tsx
index b0950a684..7fa54b852 100644
--- a/web/components/core/views/list-view/single-issue.tsx
+++ b/web/components/core/views/list-view/single-issue.tsx
@@ -328,7 +328,7 @@ export const SingleListIssue: React.FC<Props> = ({
       </ContextMenu>
 
       <div
-        className="flex items-center justify-between px-4 py-2.5 gap-10 border-b border-custom-border-200 bg-custom-background-100 last:border-b-0"
+        className="flex items-center justify-between px-4 py-2.5 gap-10 border-b-[0.5px] border-custom-border-100 bg-custom-background-100 last:border-b-0"
         onContextMenu={(e) => {
           e.preventDefault();
           setContextMenu(true);
@@ -352,6 +352,7 @@ export const SingleListIssue: React.FC<Props> = ({
                 type="button"
                 className="truncate text-[0.825rem] text-custom-text-100"
                 onClick={() => {
+                  if (isArchivedIssues) return router.push(issuePath);
                   if (!isDraftIssues) openPeekOverview(issue);
                   if (isDraftIssues && handleDraftIssueSelect) handleDraftIssueSelect(issue);
                 }}
diff --git a/web/components/core/views/list-view/single-list.tsx b/web/components/core/views/list-view/single-list.tsx
index 03401839c..9d3e9cb96 100644
--- a/web/components/core/views/list-view/single-list.tsx
+++ b/web/components/core/views/list-view/single-list.tsx
@@ -239,7 +239,7 @@ export const SingleList: React.FC<Props> = (props) => {
               !disableAddIssueOption && (
                 <button
                   type="button"
-                  className="p-1  text-custom-text-200 hover:bg-custom-background-80"
+                  className="p-1 text-custom-text-200 hover:bg-custom-background-80"
                   onClick={() => {
                     if (isDraftIssuesPage || isMyIssuesPage || isProfileIssuesPage) {
                       addIssueToGroup();
@@ -336,7 +336,8 @@ export const SingleList: React.FC<Props> = (props) => {
               />
 
               {!disableAddIssueOption && !isCreateIssueFormOpen && (
-                <div className="w-full bg-custom-background-100 px-6 py-3">
+                // TODO: add border here
+                <div className="w-full bg-custom-background-100 px-6 py-3 border-b border-custom-border-100">
                   <button
                     type="button"
                     onClick={() => {
diff --git a/web/components/core/views/spreadsheet-view/assignee-column/assignee-column.tsx b/web/components/core/views/spreadsheet-view/assignee-column/assignee-column.tsx
index 2f1231924..745083d5f 100644
--- a/web/components/core/views/spreadsheet-view/assignee-column/assignee-column.tsx
+++ b/web/components/core/views/spreadsheet-view/assignee-column/assignee-column.tsx
@@ -54,7 +54,7 @@ export const AssigneeColumn: React.FC<Props> = ({
 
   return (
     <div className="flex items-center text-sm h-11 w-full bg-custom-background-100">
-      <span className="flex items-center px-4 py-2.5 h-full w-full flex-shrink-0 border-r border-b border-custom-border-200">
+      <span className="flex items-center px-4 py-2.5 h-full w-full flex-shrink-0 border-r border-b border-custom-border-100">
         {properties.assignee && (
           <MembersSelect
             value={issue.assignees}
diff --git a/web/components/core/views/spreadsheet-view/created-on-column/created-on-column.tsx b/web/components/core/views/spreadsheet-view/created-on-column/created-on-column.tsx
index 15c3f7810..cff1f99aa 100644
--- a/web/components/core/views/spreadsheet-view/created-on-column/created-on-column.tsx
+++ b/web/components/core/views/spreadsheet-view/created-on-column/created-on-column.tsx
@@ -23,7 +23,7 @@ export const CreatedOnColumn: React.FC<Props> = ({
   isNotAllowed,
 }) => (
   <div className="flex items-center text-sm h-11 w-full bg-custom-background-100">
-    <span className="flex items-center px-4 py-2.5 h-full w-full flex-shrink-0 border-r border-b border-custom-border-200">
+    <span className="flex items-center px-4 py-2.5 h-full w-full flex-shrink-0 border-r border-b border-custom-border-100">
       {properties.created_on && (
         <div className="flex items-center text-xs cursor-default text-custom-text-200 text-center p-2 group-hover:bg-custom-background-80 border-custom-border-200">
           {renderLongDetailDateFormat(issue.created_at)}
diff --git a/web/components/core/views/spreadsheet-view/due-date-column/due-date-column.tsx b/web/components/core/views/spreadsheet-view/due-date-column/due-date-column.tsx
index 7e258f2f6..e2d09ae0a 100644
--- a/web/components/core/views/spreadsheet-view/due-date-column/due-date-column.tsx
+++ b/web/components/core/views/spreadsheet-view/due-date-column/due-date-column.tsx
@@ -23,7 +23,7 @@ export const DueDateColumn: React.FC<Props> = ({
   isNotAllowed,
 }) => (
   <div className="flex items-center text-sm h-11 w-full bg-custom-background-100">
-    <span className="flex items-center px-4 py-2.5 h-full w-full flex-shrink-0 border-r border-b border-custom-border-200">
+    <span className="flex items-center px-4 py-2.5 h-full w-full flex-shrink-0 border-r border-b border-custom-border-100">
       {properties.due_date && (
         <ViewDueDateSelect
           issue={issue}
diff --git a/web/components/core/views/spreadsheet-view/estimate-column/estimate-column.tsx b/web/components/core/views/spreadsheet-view/estimate-column/estimate-column.tsx
index f763e7322..bb44cefa3 100644
--- a/web/components/core/views/spreadsheet-view/estimate-column/estimate-column.tsx
+++ b/web/components/core/views/spreadsheet-view/estimate-column/estimate-column.tsx
@@ -23,7 +23,7 @@ export const EstimateColumn: React.FC<Props> = ({
   isNotAllowed,
 }) => (
   <div className="flex items-center text-sm h-11 w-full bg-custom-background-100">
-    <span className="flex items-center px-4 py-2.5 h-full w-full flex-shrink-0 border-r border-b border-custom-border-200">
+    <span className="flex items-center px-4 py-2.5 h-full w-full flex-shrink-0 border-r border-b border-custom-border-100">
       {properties.estimate && (
         <ViewEstimateSelect
           issue={issue}
diff --git a/web/components/core/views/spreadsheet-view/issue-column/issue-column.tsx b/web/components/core/views/spreadsheet-view/issue-column/issue-column.tsx
index c1df89c92..bb36c0e60 100644
--- a/web/components/core/views/spreadsheet-view/issue-column/issue-column.tsx
+++ b/web/components/core/views/spreadsheet-view/issue-column/issue-column.tsx
@@ -82,7 +82,7 @@ export const IssueColumn: React.FC<Props> = ({
   const isNotAllowed = userAuth.isGuest || userAuth.isViewer;
 
   return (
-    <div className="group flex items-center w-[28rem] text-sm h-11 sticky top-0 bg-custom-background-100 truncate border-b border-r border-custom-border-200 ">
+    <div className="group flex items-center w-[28rem] text-sm h-11 sticky top-0 bg-custom-background-100 truncate border-b border-r border-custom-border-100">
       <div
         className="flex gap-1.5 px-4 pr-0 py-2.5 items-center"
         style={issue.parent ? { paddingLeft } : {}}
diff --git a/web/components/core/views/spreadsheet-view/label-column/label-column.tsx b/web/components/core/views/spreadsheet-view/label-column/label-column.tsx
index cad1e7666..1d1355eec 100644
--- a/web/components/core/views/spreadsheet-view/label-column/label-column.tsx
+++ b/web/components/core/views/spreadsheet-view/label-column/label-column.tsx
@@ -28,7 +28,7 @@ export const LabelColumn: React.FC<Props> = ({
 
   return (
     <div className="flex items-center text-sm h-11 w-full bg-custom-background-100">
-      <span className="flex items-center px-4 py-2.5 h-full w-full flex-shrink-0 border-r border-b border-custom-border-200">
+      <span className="flex items-center px-4 py-2.5 h-full w-full flex-shrink-0 border-r border-b border-custom-border-100">
         {properties.labels && (
           <LabelSelect
             value={issue.labels}
diff --git a/web/components/core/views/spreadsheet-view/priority-column/priority-column.tsx b/web/components/core/views/spreadsheet-view/priority-column/priority-column.tsx
index feb8acdf5..eca140df1 100644
--- a/web/components/core/views/spreadsheet-view/priority-column/priority-column.tsx
+++ b/web/components/core/views/spreadsheet-view/priority-column/priority-column.tsx
@@ -48,7 +48,7 @@ export const PriorityColumn: React.FC<Props> = ({
 
   return (
     <div className="flex items-center text-sm h-11 w-full bg-custom-background-100">
-      <span className="flex items-center px-4 py-2.5 h-full w-full flex-shrink-0 border-r border-b border-custom-border-200">
+      <span className="flex items-center px-4 py-2.5 h-full w-full flex-shrink-0 border-r border-b border-custom-border-100">
         {properties.priority && (
           <PrioritySelect
             value={issue.priority}
diff --git a/web/components/core/views/spreadsheet-view/spreadsheet-view.tsx b/web/components/core/views/spreadsheet-view/spreadsheet-view.tsx
index 086a67fa4..b17ce8d2d 100644
--- a/web/components/core/views/spreadsheet-view/spreadsheet-view.tsx
+++ b/web/components/core/views/spreadsheet-view/spreadsheet-view.tsx
@@ -287,7 +287,7 @@ export const SpreadsheetView: React.FC<Props> = ({
             )}
           </div>
 
-          <div>
+          <div className="border-t border-custom-border-100">
             <div className="mb-3 z-50 sticky bottom-0 left-0">
               <ListInlineCreateIssueForm
                 isOpen={isInlineCreateIssueFormOpen}
@@ -303,11 +303,11 @@ export const SpreadsheetView: React.FC<Props> = ({
               ? !disableUserActions &&
                 !isInlineCreateIssueFormOpen && (
                   <button
-                    className="flex gap-1.5 items-center text-custom-primary-100 pl-7 py-2.5 text-sm sticky left-0 z-[1] border-custom-border-200 w-full"
+                    className="flex gap-1.5 items-center text-custom-primary-100 pl-4 py-2.5 text-sm sticky left-0 z-[1] w-full"
                     onClick={() => setIsInlineCreateIssueFormOpen(true)}
                   >
                     <PlusIcon className="h-4 w-4" />
-                    Add Issue
+                    New Issue
                   </button>
                 )
               : !disableUserActions &&
@@ -316,11 +316,11 @@ export const SpreadsheetView: React.FC<Props> = ({
                     className="sticky left-0 z-10"
                     customButton={
                       <button
-                        className="flex gap-1.5 items-center text-custom-primary-100 pl-7 py-2.5 text-sm sticky left-0 z-[1] border-custom-border-200 w-full"
+                        className="flex gap-1.5 items-center text-custom-primary-100 pl-4 py-2.5 text-sm sticky left-0 z-[1] border-custom-border-200 w-full"
                         type="button"
                       >
                         <PlusIcon className="h-4 w-4" />
-                        Add Issue
+                        New Issue
                       </button>
                     }
                     position="left"
diff --git a/web/components/core/views/spreadsheet-view/start-date-column/start-date-column.tsx b/web/components/core/views/spreadsheet-view/start-date-column/start-date-column.tsx
index 3b4b9a0f7..6774ce1b9 100644
--- a/web/components/core/views/spreadsheet-view/start-date-column/start-date-column.tsx
+++ b/web/components/core/views/spreadsheet-view/start-date-column/start-date-column.tsx
@@ -23,7 +23,7 @@ export const StartDateColumn: React.FC<Props> = ({
   isNotAllowed,
 }) => (
   <div className="flex items-center text-sm h-11 w-full bg-custom-background-100">
-    <span className="flex items-center px-4 py-2.5 h-full w-full flex-shrink-0 border-r border-b border-custom-border-200">
+    <span className="flex items-center px-4 py-2.5 h-full w-full flex-shrink-0 border-r border-b border-custom-border-100">
       {properties.due_date && (
         <ViewStartDateSelect
           issue={issue}
diff --git a/web/components/core/views/spreadsheet-view/state-column/state-column.tsx b/web/components/core/views/spreadsheet-view/state-column/state-column.tsx
index 6b3d3c696..a31345f3d 100644
--- a/web/components/core/views/spreadsheet-view/state-column/state-column.tsx
+++ b/web/components/core/views/spreadsheet-view/state-column/state-column.tsx
@@ -70,7 +70,7 @@ export const StateColumn: React.FC<Props> = ({
 
   return (
     <div className="flex items-center text-sm h-11 w-full bg-custom-background-100">
-      <span className="flex items-center px-4 py-2.5 h-full w-full flex-shrink-0 border-r border-b border-custom-border-200">
+      <span className="flex items-center px-4 py-2.5 h-full w-full flex-shrink-0 border-r border-b border-custom-border-100">
         {properties.state && (
           <StateSelect
             value={issue.state_detail}
diff --git a/web/components/core/views/spreadsheet-view/updated-on-column/updated-on-column.tsx b/web/components/core/views/spreadsheet-view/updated-on-column/updated-on-column.tsx
index b63519095..087d589fc 100644
--- a/web/components/core/views/spreadsheet-view/updated-on-column/updated-on-column.tsx
+++ b/web/components/core/views/spreadsheet-view/updated-on-column/updated-on-column.tsx
@@ -23,7 +23,7 @@ export const UpdatedOnColumn: React.FC<Props> = ({
   isNotAllowed,
 }) => (
   <div className="flex items-center text-sm h-11 w-full bg-custom-background-100">
-    <span className="flex items-center px-4 py-2.5 h-full w-full flex-shrink-0 border-r border-b border-custom-border-200">
+    <span className="flex items-center px-4 py-2.5 h-full w-full flex-shrink-0 border-r border-b border-custom-border-100">
       {properties.updated_on && (
         <div className="flex items-center text-xs cursor-default text-custom-text-200 text-center p-2 group-hover:bg-custom-background-80 border-custom-border-200">
           {renderLongDetailDateFormat(issue.updated_at)}
diff --git a/web/components/gantt-chart/chart/index.tsx b/web/components/gantt-chart/chart/index.tsx
index c564f69f2..61e3078d6 100644
--- a/web/components/gantt-chart/chart/index.tsx
+++ b/web/components/gantt-chart/chart/index.tsx
@@ -347,7 +347,7 @@ export const ChartViewRoot: FC<ChartViewRootProps> = ({
                 <button
                   type="button"
                   onClick={() => setIsCreateIssueFormOpen(true)}
-                  className="flex items-center gap-x-[6px] text-custom-primary-100 px-2 py-1 rounded-md"
+                  className="flex items-center gap-x-[6px] text-custom-primary-100 px-2 pl-[1.875rem] py-1 rounded-md"
                 >
                   <PlusIcon className="h-4 w-4" />
                   <span className="text-sm font-medium text-custom-primary-100">New Issue</span>
diff --git a/web/components/onboarding/invite-members.tsx b/web/components/onboarding/invite-members.tsx
index fee1cb252..8f1b1fa41 100644
--- a/web/components/onboarding/invite-members.tsx
+++ b/web/components/onboarding/invite-members.tsx
@@ -1,15 +1,27 @@
-import React, { useEffect } from "react";
+import React, { useEffect, useRef, useState } from "react";
 
+// headless ui
+import { Listbox, Transition } from "@headlessui/react";
 // react-hook-form
-import { Controller, useFieldArray, useForm } from "react-hook-form";
+import {
+  Control,
+  Controller,
+  FieldArrayWithId,
+  UseFieldArrayRemove,
+  useFieldArray,
+  useForm,
+} from "react-hook-form";
 // services
 import workspaceService from "services/workspace.service";
 // hooks
 import useToast from "hooks/use-toast";
 // ui
-import { CustomSelect, Input, PrimaryButton, SecondaryButton } from "components/ui";
+import { Input, PrimaryButton, SecondaryButton } from "components/ui";
+// hooks
+import useDynamicDropdownPosition from "hooks/use-dynamic-dropdown";
 // icons
-import { PlusIcon, XMarkIcon } from "@heroicons/react/24/outline";
+import { ChevronDownIcon } from "@heroicons/react/20/solid";
+import { PlusIcon, XMarkIcon, CheckIcon } from "@heroicons/react/24/outline";
 // types
 import { ICurrentUserResponse, IWorkspace, TOnboardingSteps } from "types";
 // constants
@@ -31,12 +43,136 @@ type FormValues = {
   emails: EmailRole[];
 };
 
-export const InviteMembers: React.FC<Props> = ({
-  finishOnboarding,
-  stepChange,
-  user,
-  workspace,
-}) => {
+type InviteMemberFormProps = {
+  index: number;
+  remove: UseFieldArrayRemove;
+  control: Control<FormValues, any>;
+  field: FieldArrayWithId<FormValues, "emails", "id">;
+  fields: FieldArrayWithId<FormValues, "emails", "id">[];
+  errors: any;
+};
+
+const InviteMemberForm: React.FC<InviteMemberFormProps> = (props) => {
+  const { control, index, fields, remove, errors } = props;
+
+  const buttonRef = useRef<HTMLButtonElement>(null);
+  const dropdownRef = useRef<HTMLDivElement>(null);
+
+  const [isDropdownOpen, setIsDropdownOpen] = useState(false);
+
+  useDynamicDropdownPosition(
+    isDropdownOpen,
+    () => setIsDropdownOpen(false),
+    buttonRef,
+    dropdownRef
+  );
+
+  return (
+    <div className="group relative grid grid-cols-11 gap-4">
+      <div className="col-span-7">
+        <Controller
+          control={control}
+          name={`emails.${index}.email`}
+          rules={{
+            required: "Email ID is required",
+            pattern: {
+              value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i,
+              message: "Invalid Email ID",
+            },
+          }}
+          render={({ field }) => (
+            <>
+              <Input {...field} className="text-xs sm:text-sm" placeholder="Enter their email..." />
+              {errors.emails?.[index]?.email && (
+                <span className="text-red-500 text-xs">
+                  {errors.emails?.[index]?.email?.message}
+                </span>
+              )}
+            </>
+          )}
+        />
+      </div>
+      <div className="col-span-3">
+        <Controller
+          control={control}
+          name={`emails.${index}.role`}
+          rules={{ required: true }}
+          render={({ field: { value, onChange } }) => (
+            <Listbox
+              as="div"
+              value={value}
+              onChange={(val) => {
+                onChange(val);
+                setIsDropdownOpen(false);
+              }}
+              className="flex-shrink-0 text-left w-full"
+            >
+              <Listbox.Button
+                type="button"
+                ref={buttonRef}
+                onClick={() => setIsDropdownOpen((prev) => !prev)}
+                className="flex items-center px-2.5 py-2 text-xs justify-between gap-1 w-full rounded-md border border-custom-border-300 shadow-sm duration-300 focus:outline-none"
+              >
+                <span className="text-xs sm:text-sm">{ROLE[value]}</span>
+                <ChevronDownIcon className="h-3 w-3" aria-hidden="true" />
+              </Listbox.Button>
+
+              <Transition
+                show={isDropdownOpen}
+                as={React.Fragment}
+                enter="transition ease-out duration-100"
+                enterFrom="transform opacity-0 scale-95"
+                enterTo="transform opacity-100 scale-100"
+                leave="transition ease-in duration-75"
+                leaveFrom="transform opacity-100 scale-100"
+                leaveTo="transform opacity-0 scale-95"
+              >
+                <Listbox.Options
+                  ref={dropdownRef}
+                  className="fixed w-36 z-10 border border-custom-border-300 mt-1 overflow-y-auto rounded-md bg-custom-background-90 text-xs shadow-lg focus:outline-none max-h-48"
+                >
+                  <div className="space-y-1 p-2">
+                    {Object.entries(ROLE).map(([key, value]) => (
+                      <Listbox.Option
+                        key={key}
+                        value={parseInt(key)}
+                        className={({ active, selected }) =>
+                          `cursor-pointer select-none truncate rounded px-1 py-1.5 ${
+                            active || selected ? "bg-custom-background-80" : ""
+                          } ${selected ? "text-custom-text-100" : "text-custom-text-200"}`
+                        }
+                      >
+                        {({ selected }) => (
+                          <div className="flex items-center justify-between gap-2">
+                            <div className="flex items-center gap-2">{value}</div>
+                            {selected && <CheckIcon className="h-4 w-4 flex-shrink-0" />}
+                          </div>
+                        )}
+                      </Listbox.Option>
+                    ))}
+                  </div>
+                </Listbox.Options>
+              </Transition>
+            </Listbox>
+          )}
+        />
+      </div>
+      {fields.length > 1 && (
+        <button
+          type="button"
+          className="hidden group-hover:grid self-center place-items-center rounded -ml-3"
+          onClick={() => remove(index)}
+        >
+          <XMarkIcon className="h-3.5 w-3.5 text-custom-text-200" />
+        </button>
+      )}
+    </div>
+  );
+};
+
+export const InviteMembers: React.FC<Props> = (props) => {
+  const { finishOnboarding, stepChange, user, workspace } = props;
+
   const { setToastAlert } = useToast();
 
   const {
@@ -109,66 +245,15 @@ export const InviteMembers: React.FC<Props> = ({
         </div>
         <div className="space-y-3 sm:space-y-4 mb-3 h-full overflow-y-auto">
           {fields.map((field, index) => (
-            <div key={field.id} className="group relative grid grid-cols-11 gap-4">
-              <div className="col-span-7">
-                <Controller
-                  control={control}
-                  name={`emails.${index}.email`}
-                  rules={{
-                    required: "Email ID is required",
-                    pattern: {
-                      value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i,
-                      message: "Invalid Email ID",
-                    },
-                  }}
-                  render={({ field }) => (
-                    <>
-                      <Input
-                        {...field}
-                        className="text-xs sm:text-sm"
-                        placeholder="Enter their email..."
-                      />
-                      {errors.emails?.[index]?.email && (
-                        <span className="text-red-500 text-xs">
-                          {errors.emails?.[index]?.email?.message}
-                        </span>
-                      )}
-                    </>
-                  )}
-                />
-              </div>
-              <div className="col-span-3">
-                <Controller
-                  control={control}
-                  name={`emails.${index}.role`}
-                  rules={{ required: true }}
-                  render={({ field: { value, onChange } }) => (
-                    <CustomSelect
-                      value={value}
-                      label={<span className="text-xs sm:text-sm">{ROLE[value]}</span>}
-                      onChange={onChange}
-                      width="w-full"
-                      input
-                    >
-                      {Object.entries(ROLE).map(([key, value]) => (
-                        <CustomSelect.Option key={key} value={parseInt(key)}>
-                          {value}
-                        </CustomSelect.Option>
-                      ))}
-                    </CustomSelect>
-                  )}
-                />
-              </div>
-              {fields.length > 1 && (
-                <button
-                  type="button"
-                  className="hidden group-hover:grid self-center place-items-center rounded -ml-3"
-                  onClick={() => remove(index)}
-                >
-                  <XMarkIcon className="h-3.5 w-3.5 text-custom-text-200" />
-                </button>
-              )}
-            </div>
+            <InviteMemberForm
+              control={control}
+              errors={errors}
+              field={field}
+              fields={fields}
+              index={index}
+              remove={remove}
+              key={field.id}
+            />
           ))}
         </div>
         <button
diff --git a/web/components/onboarding/user-details.tsx b/web/components/onboarding/user-details.tsx
index b2ba931c0..2911bbc80 100644
--- a/web/components/onboarding/user-details.tsx
+++ b/web/components/onboarding/user-details.tsx
@@ -121,6 +121,10 @@ export const UserDetails: React.FC<Props> = ({ user }) => {
             register={register}
             validations={{
               required: "First name is required",
+              maxLength: {
+                value: 24,
+                message: "First name cannot exceed the limit of 24 characters",
+              },
             }}
             error={errors.first_name}
           />
@@ -135,6 +139,10 @@ export const UserDetails: React.FC<Props> = ({ user }) => {
             placeholder="Enter your last name..."
             validations={{
               required: "Last name is required",
+              maxLength: {
+                value: 24,
+                message: "Last name cannot exceed the limit of 24 characters",
+              },
             }}
             error={errors.last_name}
           />
diff --git a/web/components/profile/profile-issues-view-options.tsx b/web/components/profile/profile-issues-view-options.tsx
index 272a5e47f..c853da530 100644
--- a/web/components/profile/profile-issues-view-options.tsx
+++ b/web/components/profile/profile-issues-view-options.tsx
@@ -239,9 +239,11 @@ export const ProfileIssuesViewOptions: React.FC = () => {
                       <div className="w-28">
                         <CustomMenu
                           label={
-                            FILTER_ISSUE_OPTIONS.find(
-                              (option) => option.key === displayFilters?.type
-                            )?.name ?? "Select"
+                            <span className="truncate">
+                              {FILTER_ISSUE_OPTIONS.find(
+                                (option) => option.key === displayFilters?.type
+                              )?.name ?? "Select"}
+                            </span>
                           }
                           className="!w-full"
                           buttonClassName="w-full"
diff --git a/web/constants/fetch-keys.ts b/web/constants/fetch-keys.ts
index 75107a0bb..a1ead117f 100644
--- a/web/constants/fetch-keys.ts
+++ b/web/constants/fetch-keys.ts
@@ -14,6 +14,7 @@ const paramsToKey = (params: any) => {
     sub_issue,
     start_target_date,
     project,
+    subscriber,
   } = params;
 
   let projectKey = project ? project.split(",") : [];
@@ -23,6 +24,7 @@ const paramsToKey = (params: any) => {
   let assigneesKey = assignees ? assignees.split(",") : [];
   let createdByKey = created_by ? created_by.split(",") : [];
   let labelsKey = labels ? labels.split(",") : [];
+  let subscriberKey = subscriber ? subscriber.split(",") : [];
   const startTargetDate = start_target_date ? `${start_target_date}`.toUpperCase() : "FALSE";
   const startDateKey = start_date ?? "";
   const targetDateKey = target_date ?? "";
@@ -38,8 +40,9 @@ const paramsToKey = (params: any) => {
   assigneesKey = assigneesKey.sort().join("_");
   createdByKey = createdByKey.sort().join("_");
   labelsKey = labelsKey.sort().join("_");
+  subscriberKey = subscriberKey.sort().join("_");
 
-  return `${projectKey}_${stateGroupKey}_${stateKey}_${priorityKey}_${assigneesKey}_${createdByKey}_${type}_${groupBy}_${orderBy}_${labelsKey}_${startDateKey}_${targetDateKey}_${sub_issue}_${startTargetDate}`;
+  return `${projectKey}_${stateGroupKey}_${stateKey}_${priorityKey}_${assigneesKey}_${createdByKey}_${type}_${groupBy}_${orderBy}_${labelsKey}_${startDateKey}_${targetDateKey}_${sub_issue}_${startTargetDate}_${subscriberKey}`;
 };
 
 const inboxParamsToKey = (params: any) => {
diff --git a/web/hooks/use-issues-view.tsx b/web/hooks/use-issues-view.tsx
index 80cabda21..1f15c09f9 100644
--- a/web/hooks/use-issues-view.tsx
+++ b/web/hooks/use-issues-view.tsx
@@ -47,7 +47,7 @@ const useIssuesView = () => {
     assignees: filters?.assignees ? filters?.assignees.join(",") : undefined,
     state: filters?.state ? filters?.state.join(",") : undefined,
     priority: filters?.priority ? filters?.priority.join(",") : undefined,
-    type: displayFilters?.type ? displayFilters?.type : undefined,
+    type: !isArchivedIssues ? (displayFilters?.type ? displayFilters?.type : undefined) : undefined,
     labels: filters?.labels ? filters?.labels.join(",") : undefined,
     created_by: filters?.created_by ? filters?.created_by.join(",") : undefined,
     start_date: filters?.start_date ? filters?.start_date.join(",") : undefined,

From 4503810aebe247a75f9ceea195fdccef33fdc947 Mon Sep 17 00:00:00 2001
From: Nikhil <118773738+pablohashescobar@users.noreply.github.com>
Date: Thu, 28 Sep 2023 15:37:42 +0530
Subject: [PATCH 08/11] fix: notifications for created by me and assigned to me
 (#2292)

---
 apiserver/plane/bgtasks/issue_activites_task.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apiserver/plane/bgtasks/issue_activites_task.py b/apiserver/plane/bgtasks/issue_activites_task.py
index 6d33dfc4f..87c4fa1a4 100644
--- a/apiserver/plane/bgtasks/issue_activites_task.py
+++ b/apiserver/plane/bgtasks/issue_activites_task.py
@@ -1389,7 +1389,7 @@ def issue_activity(
             ):
                 issue_subscribers = issue_subscribers + [issue.created_by_id]
 
-            for subscriber in issue_subscribers:
+            for subscriber in  list(set(issue_subscribers)):
                 for issue_activity in issue_activities_created:
                     bulk_notifications.append(
                         Notification(

From a048e513b7910c3d3db3cc53ae9bc29fdf38e174 Mon Sep 17 00:00:00 2001
From: Anmol Singh Bhatia <121005188+anmolsinghbhatia@users.noreply.github.com>
Date: Thu, 28 Sep 2023 20:34:57 +0530
Subject: [PATCH 09/11] chore: workspace view display filters and properties ,
 code refactor (#2295)

* chore: spreadsheet view context

* chore: spreadsheet context provider

* chore: spreadsheet view context

* chore: display filters and properties added in workspace view and code refactor

* fix: build error fix

* chore: set sub-issue display option to false for global views

---------

Co-authored-by: gurusainath <gurusainath007@gmail.com>
---
 .../command-palette/command-pallette.tsx      |   1 -
 web/components/core/filters/filters-list.tsx  |  61 +--
 web/components/core/filters/index.ts          |   1 +
 .../core/filters/workspace-filters-list.tsx   | 366 ++++++++++++++++++
 web/components/core/views/issues-view.tsx     |   1 -
 .../core/views/spreadsheet-view/index.ts      |   1 -
 .../issue-column/issue-column.tsx             |   6 +-
 .../spreadsheet-view/spreadsheet-columns.tsx  | 274 -------------
 .../spreadsheet-view/spreadsheet-view.tsx     | 354 +++++++++++++++--
 .../state-column/state-column.tsx             |   2 +-
 .../my-issues/my-issues-select-filters.tsx    | 125 +-----
 .../workspace-views/workpace-view-issues.tsx  | 221 +++++++++++
 .../workspace-views/workspace-all-issue.tsx   | 234 +++++++++++
 .../workspace-assigned-issue.tsx              | 155 ++++++++
 .../workspace-created-issues.tsx              | 147 +++++++
 .../workspace-issue-view-option.tsx           |  49 ++-
 .../workspace-subscribed-issue.tsx            | 148 +++++++
 .../profile/profile-issues-view-options.tsx   |  81 ++--
 web/components/ui/dropdowns/custom-menu.tsx   |   8 +-
 web/components/ui/dropdowns/types.d.ts        |   1 +
 web/components/views/delete-view-modal.tsx    |  81 ++--
 web/components/views/form.tsx                 |  33 +-
 web/components/views/modal.tsx                | 153 +++-----
 web/components/views/select-filters.tsx       | 262 +------------
 web/components/views/single-view-item.tsx     |   3 +-
 .../views/delete-workspace-view-modal.tsx     | 141 +++++++
 web/components/workspace/views/form.tsx       | 213 ++++++++++
 .../workspace/views/global-select-filters.tsx | 301 ++++++++++++++
 web/components/workspace/views/modal.tsx      | 155 ++++++++
 web/constants/fetch-keys.ts                   |  13 +-
 web/contexts/profile-issues-context.tsx       |   1 +
 web/contexts/workspace-view-context.tsx       | 235 +++++++++++
 web/hooks/my-issues/use-my-issues-filter.tsx  |   2 +-
 web/hooks/use-workspace-view.tsx              |  11 +
 web/hooks/use-worskpace-issue-filter.tsx      | 113 ------
 .../project-authorization-wrapper.tsx         |   5 +-
 .../workspace-authorization-wrapper.tsx       |  81 ++--
 .../projects/[projectId]/views/index.tsx      |   2 -
 .../workspace-views/[workspaceViewId].tsx     | 338 ++--------------
 .../workspace-views/all-issues.tsx            | 306 ++-------------
 .../workspace-views/assigned.tsx              | 221 ++---------
 .../workspace-views/created.tsx               | 221 ++---------
 .../[workspaceSlug]/workspace-views/index.tsx |  26 +-
 .../workspace-views/subscribed.tsx            | 221 ++---------
 web/services/workspace.service.ts             |  18 +-
 web/types/view-props.d.ts                     |  62 ++-
 web/types/views.d.ts                          |  12 +-
 web/types/workspace-views.d.ts                |  22 ++
 48 files changed, 3119 insertions(+), 2369 deletions(-)
 create mode 100644 web/components/core/filters/workspace-filters-list.tsx
 delete mode 100644 web/components/core/views/spreadsheet-view/spreadsheet-columns.tsx
 create mode 100644 web/components/issues/workspace-views/workpace-view-issues.tsx
 create mode 100644 web/components/issues/workspace-views/workspace-all-issue.tsx
 create mode 100644 web/components/issues/workspace-views/workspace-assigned-issue.tsx
 create mode 100644 web/components/issues/workspace-views/workspace-created-issues.tsx
 create mode 100644 web/components/issues/workspace-views/workspace-subscribed-issue.tsx
 create mode 100644 web/components/workspace/views/delete-workspace-view-modal.tsx
 create mode 100644 web/components/workspace/views/form.tsx
 create mode 100644 web/components/workspace/views/global-select-filters.tsx
 create mode 100644 web/components/workspace/views/modal.tsx
 create mode 100644 web/contexts/workspace-view-context.tsx
 create mode 100644 web/hooks/use-workspace-view.tsx
 delete mode 100644 web/hooks/use-worskpace-issue-filter.tsx
 create mode 100644 web/types/workspace-views.d.ts

diff --git a/web/components/command-palette/command-pallette.tsx b/web/components/command-palette/command-pallette.tsx
index 8e17cbafd..f183de9c6 100644
--- a/web/components/command-palette/command-pallette.tsx
+++ b/web/components/command-palette/command-pallette.tsx
@@ -161,7 +161,6 @@ export const CommandPalette: React.FC = observer(() => {
           />
           <CreateUpdateViewModal
             handleClose={() => setIsCreateViewModalOpen(false)}
-            viewType="project"
             isOpen={isCreateViewModalOpen}
             user={user}
           />
diff --git a/web/components/core/filters/filters-list.tsx b/web/components/core/filters/filters-list.tsx
index 50493c64f..697844a15 100644
--- a/web/components/core/filters/filters-list.tsx
+++ b/web/components/core/filters/filters-list.tsx
@@ -10,14 +10,7 @@ import { replaceUnderscoreIfSnakeCase } from "helpers/string.helper";
 // helpers
 import { renderShortDateWithYearFormat } from "helpers/date-time.helper";
 // types
-import {
-  IIssueFilterOptions,
-  IIssueLabels,
-  IProject,
-  IState,
-  IUserLite,
-  TStateGroups,
-} from "types";
+import { IIssueFilterOptions, IIssueLabels, IState, IUserLite, TStateGroups } from "types";
 // constants
 import { STATE_GROUP_COLORS } from "constants/state";
 
@@ -27,9 +20,7 @@ type Props = {
   clearAllFilters: (...args: any) => void;
   labels: IIssueLabels[] | undefined;
   members: IUserLite[] | undefined;
-  states?: IState[] | undefined;
-  stateGroup?: string[] | undefined;
-  project?: IProject[] | undefined;
+  states: IState[] | undefined;
 };
 
 export const FiltersList: React.FC<Props> = ({
@@ -39,7 +30,6 @@ export const FiltersList: React.FC<Props> = ({
   labels,
   members,
   states,
-  project,
 }) => {
   if (!filters) return <></>;
 
@@ -165,29 +155,6 @@ export const FiltersList: React.FC<Props> = ({
                     : key === "assignees"
                     ? filters.assignees?.map((memberId: string) => {
                         const member = members?.find((m) => m.id === memberId);
-                        return (
-                          <div
-                            key={memberId}
-                            className="inline-flex items-center gap-x-1 rounded-full bg-custom-background-90 px-1"
-                          >
-                            <Avatar user={member} />
-                            <span>{member?.display_name}</span>
-                            <span
-                              className="cursor-pointer"
-                              onClick={() =>
-                                setFilters({
-                                  assignees: filters.assignees?.filter((p: any) => p !== memberId),
-                                })
-                              }
-                            >
-                              <XMarkIcon className="h-3 w-3" />
-                            </span>
-                          </div>
-                        );
-                      })
-                    : key === "subscriber"
-                    ? filters.subscriber?.map((memberId: string) => {
-                        const member = members?.find((m) => m.id === memberId);
 
                         return (
                           <div
@@ -333,30 +300,6 @@ export const FiltersList: React.FC<Props> = ({
                           </div>
                         );
                       })
-                    : key === "project"
-                    ? filters.project?.map((projectId) => {
-                        const currentProject = project?.find((p) => p.id === projectId);
-                        console.log("currentProject", currentProject);
-                        console.log("currentProject", projectId);
-                        return (
-                          <p
-                            key={currentProject?.id}
-                            className="inline-flex items-center gap-x-1 rounded-full px-2 py-0.5 capitalize"
-                          >
-                            <span>{currentProject?.name}</span>
-                            <span
-                              className="cursor-pointer"
-                              onClick={() =>
-                                setFilters({
-                                  project: filters.project?.filter((p) => p !== projectId),
-                                })
-                              }
-                            >
-                              <XMarkIcon className="h-3 w-3" />
-                            </span>
-                          </p>
-                        );
-                      })
                     : (filters[key] as any)?.join(", ")}
                   <button
                     type="button"
diff --git a/web/components/core/filters/index.ts b/web/components/core/filters/index.ts
index d6455151e..558db6841 100644
--- a/web/components/core/filters/index.ts
+++ b/web/components/core/filters/index.ts
@@ -1,4 +1,5 @@
 export * from "./date-filter-modal";
 export * from "./date-filter-select";
 export * from "./filters-list";
+export * from "./workspace-filters-list";
 export * from "./issues-view-filter";
diff --git a/web/components/core/filters/workspace-filters-list.tsx b/web/components/core/filters/workspace-filters-list.tsx
new file mode 100644
index 000000000..dafab6e9d
--- /dev/null
+++ b/web/components/core/filters/workspace-filters-list.tsx
@@ -0,0 +1,366 @@
+import React from "react";
+
+// icons
+import { XMarkIcon } from "@heroicons/react/24/outline";
+import { PriorityIcon, StateGroupIcon } from "components/icons";
+// ui
+import { Avatar } from "components/ui";
+// helpers
+import { replaceUnderscoreIfSnakeCase } from "helpers/string.helper";
+// helpers
+import { renderShortDateWithYearFormat } from "helpers/date-time.helper";
+// types
+import {
+  IIssueLabels,
+  IProject,
+  IUserLite,
+  IWorkspaceIssueFilterOptions,
+  TStateGroups,
+} from "types";
+// constants
+import { STATE_GROUP_COLORS } from "constants/state";
+
+type Props = {
+  filters: Partial<IWorkspaceIssueFilterOptions>;
+  setFilters: (updatedFilter: Partial<IWorkspaceIssueFilterOptions>) => void;
+  clearAllFilters: (...args: any) => void;
+  labels: IIssueLabels[] | undefined;
+  members: IUserLite[] | undefined;
+  stateGroup: string[] | undefined;
+  project?: IProject[] | undefined;
+};
+
+export const WorkspaceFiltersList: React.FC<Props> = ({
+  filters,
+  setFilters,
+  clearAllFilters,
+  labels,
+  members,
+  stateGroup,
+  project,
+}) => {
+  if (!filters) return <></>;
+
+  const nullFilters = Object.keys(filters).filter(
+    (key) => filters[key as keyof IWorkspaceIssueFilterOptions] === null
+  );
+
+  return (
+    <div className="flex flex-1 flex-wrap items-center gap-2 text-xs">
+      {Object.keys(filters).map((filterKey) => {
+        const key = filterKey as keyof typeof filters;
+
+        if (filters[key] === null || (filters[key]?.length ?? 0) <= 0) return null;
+
+        return (
+          <div
+            key={key}
+            className="flex items-center gap-x-2 rounded-full border border-custom-border-200 bg-custom-background-80 px-2 py-1"
+          >
+            <span className="capitalize text-custom-text-200">
+              {key === "target_date" ? "Due Date" : replaceUnderscoreIfSnakeCase(key)}:
+            </span>
+            {filters[key] === null || (filters[key]?.length ?? 0) <= 0 ? (
+              <span className="inline-flex items-center px-2 py-0.5 font-medium">None</span>
+            ) : Array.isArray(filters[key]) ? (
+              <div className="space-x-2">
+                <div className="flex flex-wrap items-center gap-1">
+                  {key === "state_group"
+                    ? filters.state_group?.map((stateGroup) => {
+                        const group = stateGroup as TStateGroups;
+
+                        return (
+                          <p
+                            key={group}
+                            className="inline-flex items-center gap-x-1 rounded-full px-2 py-0.5 capitalize"
+                            style={{
+                              color: STATE_GROUP_COLORS[group],
+                              backgroundColor: `${STATE_GROUP_COLORS[group]}20`,
+                            }}
+                          >
+                            <span>
+                              <StateGroupIcon stateGroup={group} color={undefined} />
+                            </span>
+                            <span>{group}</span>
+                            <span
+                              className="cursor-pointer"
+                              onClick={() =>
+                                setFilters({
+                                  state_group: filters.state_group?.filter((g) => g !== group),
+                                })
+                              }
+                            >
+                              <XMarkIcon className="h-3 w-3" />
+                            </span>
+                          </p>
+                        );
+                      })
+                    : key === "priority"
+                    ? filters.priority?.map((priority: any) => (
+                        <p
+                          key={priority}
+                          className={`inline-flex items-center gap-x-1 rounded-full px-2 py-0.5 capitalize ${
+                            priority === "urgent"
+                              ? "bg-red-500/20 text-red-500"
+                              : priority === "high"
+                              ? "bg-orange-500/20 text-orange-500"
+                              : priority === "medium"
+                              ? "bg-yellow-500/20 text-yellow-500"
+                              : priority === "low"
+                              ? "bg-green-500/20 text-green-500"
+                              : "bg-custom-background-90 text-custom-text-200"
+                          }`}
+                        >
+                          <span>
+                            <PriorityIcon priority={priority} />
+                          </span>
+                          <span>{priority === "null" ? "None" : priority}</span>
+                          <span
+                            className="cursor-pointer"
+                            onClick={() =>
+                              setFilters({
+                                priority: filters.priority?.filter((p: any) => p !== priority),
+                              })
+                            }
+                          >
+                            <XMarkIcon className="h-3 w-3" />
+                          </span>
+                        </p>
+                      ))
+                    : key === "assignees"
+                    ? filters.assignees?.map((memberId: string) => {
+                        const member = members?.find((m) => m.id === memberId);
+                        return (
+                          <div
+                            key={memberId}
+                            className="inline-flex items-center gap-x-1 rounded-full bg-custom-background-90 px-1"
+                          >
+                            <Avatar user={member} />
+                            <span>{member?.display_name}</span>
+                            <span
+                              className="cursor-pointer"
+                              onClick={() =>
+                                setFilters({
+                                  assignees: filters.assignees?.filter((p: any) => p !== memberId),
+                                })
+                              }
+                            >
+                              <XMarkIcon className="h-3 w-3" />
+                            </span>
+                          </div>
+                        );
+                      })
+                    : key === "subscriber"
+                    ? filters.subscriber?.map((memberId: string) => {
+                        const member = members?.find((m) => m.id === memberId);
+
+                        return (
+                          <div
+                            key={memberId}
+                            className="inline-flex items-center gap-x-1 rounded-full bg-custom-background-90 px-1"
+                          >
+                            <Avatar user={member} />
+                            <span>{member?.display_name}</span>
+                            <span
+                              className="cursor-pointer"
+                              onClick={() =>
+                                setFilters({
+                                  assignees: filters.assignees?.filter((p: any) => p !== memberId),
+                                })
+                              }
+                            >
+                              <XMarkIcon className="h-3 w-3" />
+                            </span>
+                          </div>
+                        );
+                      })
+                    : key === "created_by"
+                    ? filters.created_by?.map((memberId: string) => {
+                        const member = members?.find((m) => m.id === memberId);
+
+                        return (
+                          <div
+                            key={`${memberId}-${key}`}
+                            className="inline-flex items-center gap-x-1 rounded-full bg-custom-background-90 px-1 capitalize"
+                          >
+                            <Avatar user={member} />
+                            <span>{member?.display_name}</span>
+                            <span
+                              className="cursor-pointer"
+                              onClick={() =>
+                                setFilters({
+                                  created_by: filters.created_by?.filter(
+                                    (p: any) => p !== memberId
+                                  ),
+                                })
+                              }
+                            >
+                              <XMarkIcon className="h-3 w-3" />
+                            </span>
+                          </div>
+                        );
+                      })
+                    : key === "labels"
+                    ? filters.labels?.map((labelId: string) => {
+                        const label = labels?.find((l) => l.id === labelId);
+
+                        if (!label) return null;
+                        const color = label.color !== "" ? label.color : "#0f172a";
+                        return (
+                          <div
+                            className="inline-flex items-center gap-x-1 rounded-full px-2 py-0.5"
+                            style={{
+                              color: color,
+                              backgroundColor: `${color}20`, // add 20% opacity
+                            }}
+                            key={labelId}
+                          >
+                            <div
+                              className="h-1.5 w-1.5 rounded-full"
+                              style={{
+                                backgroundColor: color,
+                              }}
+                            />
+                            <span>{label.name}</span>
+                            <span
+                              className="cursor-pointer"
+                              onClick={() =>
+                                setFilters({
+                                  labels: filters.labels?.filter((l: any) => l !== labelId),
+                                })
+                              }
+                            >
+                              <XMarkIcon
+                                className="h-3 w-3"
+                                style={{
+                                  color: color,
+                                }}
+                              />
+                            </span>
+                          </div>
+                        );
+                      })
+                    : key === "start_date"
+                    ? filters.start_date?.map((date: string) => {
+                        if (filters.start_date && filters.start_date.length <= 0) return null;
+
+                        const splitDate = date.split(";");
+
+                        return (
+                          <div
+                            key={date}
+                            className="inline-flex items-center gap-x-1 rounded-full border border-custom-border-200 bg-custom-background-100 px-1 py-0.5"
+                          >
+                            <div className="h-1.5 w-1.5 rounded-full" />
+                            <span className="capitalize">
+                              {splitDate[1]} {renderShortDateWithYearFormat(splitDate[0])}
+                            </span>
+                            <span
+                              className="cursor-pointer"
+                              onClick={() =>
+                                setFilters({
+                                  start_date: filters.start_date?.filter((d: any) => d !== date),
+                                })
+                              }
+                            >
+                              <XMarkIcon className="h-3 w-3" />
+                            </span>
+                          </div>
+                        );
+                      })
+                    : key === "target_date"
+                    ? filters.target_date?.map((date: string) => {
+                        if (filters.target_date && filters.target_date.length <= 0) return null;
+
+                        const splitDate = date.split(";");
+
+                        return (
+                          <div
+                            key={date}
+                            className="inline-flex items-center gap-x-1 rounded-full border border-custom-border-200 bg-custom-background-100 px-1 py-0.5"
+                          >
+                            <div className="h-1.5 w-1.5 rounded-full" />
+                            <span className="capitalize">
+                              {splitDate[1]} {renderShortDateWithYearFormat(splitDate[0])}
+                            </span>
+                            <span
+                              className="cursor-pointer"
+                              onClick={() =>
+                                setFilters({
+                                  target_date: filters.target_date?.filter((d: any) => d !== date),
+                                })
+                              }
+                            >
+                              <XMarkIcon className="h-3 w-3" />
+                            </span>
+                          </div>
+                        );
+                      })
+                    : key === "project"
+                    ? filters.project?.map((projectId) => {
+                        const currentProject = project?.find((p) => p.id === projectId);
+                        console.log("currentProject", currentProject);
+                        console.log("currentProject", projectId);
+                        return (
+                          <p
+                            key={currentProject?.id}
+                            className="inline-flex items-center gap-x-1 rounded-full px-2 py-0.5 capitalize"
+                          >
+                            <span>{currentProject?.name}</span>
+                            <span
+                              className="cursor-pointer"
+                              onClick={() =>
+                                setFilters({
+                                  project: filters.project?.filter((p) => p !== projectId),
+                                })
+                              }
+                            >
+                              <XMarkIcon className="h-3 w-3" />
+                            </span>
+                          </p>
+                        );
+                      })
+                    : (filters[key] as any)?.join(", ")}
+                  <button
+                    type="button"
+                    onClick={() =>
+                      setFilters({
+                        [key]: null,
+                      })
+                    }
+                  >
+                    <XMarkIcon className="h-3 w-3" />
+                  </button>
+                </div>
+              </div>
+            ) : (
+              <div className="flex items-center gap-x-1 capitalize">
+                {filters[key as keyof typeof filters]}
+                <button
+                  type="button"
+                  onClick={() =>
+                    setFilters({
+                      [key]: null,
+                    })
+                  }
+                >
+                  <XMarkIcon className="h-3 w-3" />
+                </button>
+              </div>
+            )}
+          </div>
+        );
+      })}
+      {Object.keys(filters).length > 0 && nullFilters.length !== Object.keys(filters).length && (
+        <button
+          type="button"
+          onClick={clearAllFilters}
+          className="flex items-center gap-x-1 rounded-full border border-custom-border-200 bg-custom-background-80 px-3 py-1.5 text-xs"
+        >
+          <span>Clear all filters</span>
+          <XMarkIcon className="h-3 w-3" />
+        </button>
+      )}
+    </div>
+  );
+};
diff --git a/web/components/core/views/issues-view.tsx b/web/components/core/views/issues-view.tsx
index 62bcd5e58..3c123c2ac 100644
--- a/web/components/core/views/issues-view.tsx
+++ b/web/components/core/views/issues-view.tsx
@@ -483,7 +483,6 @@ export const IssuesView: React.FC<Props> = ({
       <CreateUpdateViewModal
         isOpen={createViewModal !== null}
         handleClose={() => setCreateViewModal(null)}
-        viewType="project"
         preLoadedData={createViewModal}
         user={user}
       />
diff --git a/web/components/core/views/spreadsheet-view/index.ts b/web/components/core/views/spreadsheet-view/index.ts
index e72819dad..9bf8ed1b0 100644
--- a/web/components/core/views/spreadsheet-view/index.ts
+++ b/web/components/core/views/spreadsheet-view/index.ts
@@ -10,5 +10,4 @@ export * from "./state-column";
 export * from "./updated-on-column";
 export * from "./spreadsheet-view";
 export * from "./issue-column/issue-column";
-export * from "./spreadsheet-columns";
 export * from "./issue-column/spreadsheet-issue-column";
diff --git a/web/components/core/views/spreadsheet-view/issue-column/issue-column.tsx b/web/components/core/views/spreadsheet-view/issue-column/issue-column.tsx
index bb36c0e60..1afcda5e1 100644
--- a/web/components/core/views/spreadsheet-view/issue-column/issue-column.tsx
+++ b/web/components/core/views/spreadsheet-view/issue-column/issue-column.tsx
@@ -82,10 +82,10 @@ export const IssueColumn: React.FC<Props> = ({
   const isNotAllowed = userAuth.isGuest || userAuth.isViewer;
 
   return (
-    <div className="group flex items-center w-[28rem] text-sm h-11 sticky top-0 bg-custom-background-100 truncate border-b border-r border-custom-border-100">
+    <div className="group flex items-center w-[28rem] text-sm h-11 sticky top-0 bg-custom-background-100 truncate border-b border-r border-custom-border-200">
       <div
-        className="flex gap-1.5 px-4 pr-0 py-2.5 items-center"
-        style={issue.parent ? { paddingLeft } : {}}
+        className="flex gap-1.5 px-4 pr-0 py-2.5 items-center w-24"
+        style={issue.parent && nestingLevel !== 0 ? { paddingLeft } : {}}
       >
         <div className="relative flex items-center cursor-pointer text-xs text-center hover:text-custom-text-100">
           {properties.key && (
diff --git a/web/components/core/views/spreadsheet-view/spreadsheet-columns.tsx b/web/components/core/views/spreadsheet-view/spreadsheet-columns.tsx
deleted file mode 100644
index f52f1ab38..000000000
--- a/web/components/core/views/spreadsheet-view/spreadsheet-columns.tsx
+++ /dev/null
@@ -1,274 +0,0 @@
-import React from "react";
-// hooks
-import useSpreadsheetIssuesView from "hooks/use-spreadsheet-issues-view";
-import useLocalStorage from "hooks/use-local-storage";
-// component
-import { CustomMenu, Icon } from "components/ui";
-// icon
-import { CheckIcon, ChevronDownIcon } from "@heroicons/react/24/outline";
-// types
-import { TIssueOrderByOptions } from "types";
-
-type Props = {
-  columnData: any;
-  gridTemplateColumns: string;
-};
-
-export const SpreadsheetColumns: React.FC<Props> = ({ columnData, gridTemplateColumns }) => {
-  const { storedValue: selectedMenuItem, setValue: setSelectedMenuItem } = useLocalStorage(
-    "spreadsheetViewSorting",
-    ""
-  );
-  const { storedValue: activeSortingProperty, setValue: setActiveSortingProperty } =
-    useLocalStorage("spreadsheetViewActiveSortingProperty", "");
-
-  const { displayFilters, setDisplayFilters } = useSpreadsheetIssuesView();
-
-  const handleOrderBy = (order: TIssueOrderByOptions, itemKey: string) => {
-    setDisplayFilters({ order_by: order });
-    setSelectedMenuItem(`${order}_${itemKey}`);
-    setActiveSortingProperty(order === "-created_at" ? "" : itemKey);
-  };
-
-  return (
-    <div
-      className={`grid auto-rows-[minmax(36px,1fr)] w-full min-w-max`}
-      style={{ gridTemplateColumns }}
-    >
-      {columnData.map((col: any) => {
-        if (col.isActive) {
-          return (
-            <div
-              className={`bg-custom-background-90 w-full ${
-                col.propertyName === "title"
-                  ? "sticky left-0 z-20 bg-custom-background-90 pl-24"
-                  : ""
-              }`}
-            >
-              {col.propertyName === "title" ? (
-                <div
-                  className={`flex items-center justify-start gap-1.5 cursor-default text-sm text-custom-text-200 text-current w-full py-2.5 px-2`}
-                >
-                  {col.colName}
-                </div>
-              ) : (
-                <CustomMenu
-                  className="!w-full"
-                  customButton={
-                    <div
-                      className={`relative group flex items-center justify-start gap-1.5 cursor-pointer text-sm text-custom-text-200 hover:text-custom-text-100 w-full py-3 px-2 ${
-                        activeSortingProperty === col.propertyName ? "bg-custom-background-80" : ""
-                      }`}
-                    >
-                      {activeSortingProperty === col.propertyName && (
-                        <div className="absolute top-1 right-1.5">
-                          <Icon
-                            iconName="filter_list"
-                            className="flex items-center justify-center h-3.5 w-3.5 rounded-full bg-custom-primary text-xs text-white"
-                          />
-                        </div>
-                      )}
-
-                      {col.icon ? (
-                        <col.icon
-                          className={`text-custom-text-200 group-hover:text-custom-text-100 ${
-                            col.propertyName === "estimate" ? "-rotate-90" : ""
-                          }`}
-                          aria-hidden="true"
-                          height="14"
-                          width="14"
-                        />
-                      ) : col.propertyName === "priority" ? (
-                        <span className="text-sm material-symbols-rounded text-custom-text-200">
-                          signal_cellular_alt
-                        </span>
-                      ) : (
-                        ""
-                      )}
-
-                      {col.colName}
-                      <ChevronDownIcon className="h-3 w-3" aria-hidden="true" />
-                    </div>
-                  }
-                  width="xl"
-                >
-                  <CustomMenu.MenuItem
-                    onClick={() => {
-                      handleOrderBy(col.ascendingOrder, col.propertyName);
-                    }}
-                  >
-                    <div
-                      className={`group flex gap-1.5 px-1 items-center justify-between ${
-                        selectedMenuItem === `${col.ascendingOrder}_${col.propertyName}`
-                          ? "text-custom-text-100"
-                          : "text-custom-text-200 hover:text-custom-text-100"
-                      }`}
-                    >
-                      <div className="flex gap-2 items-center">
-                        {col.propertyName === "assignee" || col.propertyName === "labels" ? (
-                          <>
-                            <span className="relative flex items-center h-6 w-6">
-                              <Icon
-                                iconName="east"
-                                className="absolute left-0 rotate-90 text-xs leading-3"
-                              />
-                              <Icon iconName="sort" className="absolute right-0 text-sm" />
-                            </span>
-                            <span>A</span>
-                            <Icon iconName="east" className="text-sm" />
-                            <span>Z</span>
-                          </>
-                        ) : col.propertyName === "due_date" ||
-                          col.propertyName === "created_on" ||
-                          col.propertyName === "updated_on" ? (
-                          <>
-                            <span className="relative flex items-center h-6 w-6">
-                              <Icon
-                                iconName="east"
-                                className="absolute left-0 rotate-90 text-xs leading-3"
-                              />
-                              <Icon iconName="sort" className="absolute right-0 text-sm" />
-                            </span>
-                            <span>New</span>
-                            <Icon iconName="east" className="text-sm" />
-                            <span>Old</span>
-                          </>
-                        ) : (
-                          <>
-                            <span className="relative flex items-center h-6 w-6">
-                              <Icon
-                                iconName="east"
-                                className="absolute left-0 rotate-90 text-xs leading-3"
-                              />
-                              <Icon iconName="sort" className="absolute right-0 text-sm" />
-                            </span>
-                            <span>First</span>
-                            <Icon iconName="east" className="text-sm" />
-                            <span>Last</span>
-                          </>
-                        )}
-                      </div>
-
-                      <CheckIcon
-                        className={`h-3.5 w-3.5 opacity-0 group-hover:opacity-100 ${
-                          selectedMenuItem === `${col.ascendingOrder}_${col.propertyName}`
-                            ? "opacity-100"
-                            : ""
-                        }`}
-                      />
-                    </div>
-                  </CustomMenu.MenuItem>
-                  <CustomMenu.MenuItem
-                    className={`mt-0.5 ${
-                      selectedMenuItem === `${col.descendingOrder}_${col.propertyName}`
-                        ? "bg-custom-background-80"
-                        : ""
-                    }`}
-                    key={col.property}
-                    onClick={() => {
-                      handleOrderBy(col.descendingOrder, col.propertyName);
-                    }}
-                  >
-                    <div
-                      className={`group flex gap-1.5 px-1 items-center justify-between ${
-                        selectedMenuItem === `${col.descendingOrder}_${col.propertyName}`
-                          ? "text-custom-text-100"
-                          : "text-custom-text-200 hover:text-custom-text-100"
-                      }`}
-                    >
-                      <div className="flex gap-2 items-center">
-                        {col.propertyName === "assignee" || col.propertyName === "labels" ? (
-                          <>
-                            <span className="relative flex items-center h-6 w-6">
-                              <Icon
-                                iconName="east"
-                                className="absolute left-0 -rotate-90 text-xs leading-3"
-                              />
-                              <Icon
-                                iconName="sort"
-                                className="absolute rotate-180 transform scale-x-[-1] right-0 text-sm"
-                              />
-                            </span>
-                            <span>Z</span>
-                            <Icon iconName="east" className="text-sm" />
-                            <span>A</span>
-                          </>
-                        ) : col.propertyName === "due_date" ? (
-                          <>
-                            <span className="relative flex items-center h-6 w-6">
-                              <Icon
-                                iconName="east"
-                                className="absolute left-0 -rotate-90 text-xs leading-3"
-                              />
-                              <Icon
-                                iconName="sort"
-                                className="absolute rotate-180 transform scale-x-[-1] right-0 text-sm"
-                              />
-                            </span>
-                            <span>Old</span>
-                            <Icon iconName="east" className="text-sm" />
-                            <span>New</span>
-                          </>
-                        ) : (
-                          <>
-                            <span className="relative flex items-center h-6 w-6">
-                              <Icon
-                                iconName="east"
-                                className="absolute left-0 -rotate-90 text-xs leading-3"
-                              />
-                              <Icon
-                                iconName="sort"
-                                className="absolute rotate-180 transform scale-x-[-1] right-0 text-sm"
-                              />
-                            </span>
-                            <span>Last</span>
-                            <Icon iconName="east" className="text-sm" />
-                            <span>First</span>
-                          </>
-                        )}
-                      </div>
-
-                      <CheckIcon
-                        className={`h-3.5 w-3.5 opacity-0 group-hover:opacity-100 ${
-                          selectedMenuItem === `${col.descendingOrder}_${col.propertyName}`
-                            ? "opacity-100"
-                            : ""
-                        }`}
-                      />
-                    </div>
-                  </CustomMenu.MenuItem>
-                  {selectedMenuItem &&
-                    selectedMenuItem !== "" &&
-                    displayFilters?.order_by !== "-created_at" &&
-                    selectedMenuItem.includes(col.propertyName) && (
-                      <CustomMenu.MenuItem
-                        className={`mt-0.5${
-                          selectedMenuItem === `-created_at_${col.propertyName}`
-                            ? "bg-custom-background-80"
-                            : ""
-                        }`}
-                        key={col.property}
-                        onClick={() => {
-                          handleOrderBy("-created_at", col.propertyName);
-                        }}
-                      >
-                        <div className={`group flex gap-1.5 px-1 items-center justify-between `}>
-                          <div className="flex gap-1.5 items-center">
-                            <span className="relative flex items-center justify-center h-6 w-6">
-                              <Icon iconName="ink_eraser" className="text-sm" />
-                            </span>
-
-                            <span>Clear sorting</span>
-                          </div>
-                        </div>
-                      </CustomMenu.MenuItem>
-                    )}
-                </CustomMenu>
-              )}
-            </div>
-          );
-        }
-      })}
-    </div>
-  );
-};
diff --git a/web/components/core/views/spreadsheet-view/spreadsheet-view.tsx b/web/components/core/views/spreadsheet-view/spreadsheet-view.tsx
index b17ce8d2d..088a4837d 100644
--- a/web/components/core/views/spreadsheet-view/spreadsheet-view.tsx
+++ b/web/components/core/views/spreadsheet-view/spreadsheet-view.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useState } from "react";
+import React, { useCallback, useEffect, useRef, useState } from "react";
 
 // next
 import { useRouter } from "next/router";
@@ -19,13 +19,20 @@ import {
   SpreadsheetStateColumn,
   SpreadsheetUpdatedOnColumn,
 } from "components/core";
-import { CustomMenu, Spinner } from "components/ui";
+import { CustomMenu, Icon, Spinner } from "components/ui";
 import { IssuePeekOverview } from "components/issues";
 // hooks
 import useIssuesProperties from "hooks/use-issue-properties";
+import useLocalStorage from "hooks/use-local-storage";
+import { useWorkspaceView } from "hooks/use-workspace-view";
 // types
-import { ICurrentUserResponse, IIssue, ISubIssueResponse, UserAuth } from "types";
-import useWorkspaceIssuesFilters from "hooks/use-worskpace-issue-filter";
+import {
+  ICurrentUserResponse,
+  IIssue,
+  ISubIssueResponse,
+  TIssueOrderByOptions,
+  UserAuth,
+} from "types";
 import {
   CYCLE_DETAILS,
   CYCLE_ISSUES_WITH_PARAMS,
@@ -39,7 +46,7 @@ import {
 import useSpreadsheetIssuesView from "hooks/use-spreadsheet-issues-view";
 import projectIssuesServices from "services/issues.service";
 // icon
-import { PlusIcon } from "lucide-react";
+import { CheckIcon, ChevronDownIcon, PlusIcon } from "lucide-react";
 
 type Props = {
   spreadsheetIssues: IIssue[];
@@ -70,6 +77,10 @@ export const SpreadsheetView: React.FC<Props> = ({
 
   const [isInlineCreateIssueFormOpen, setIsInlineCreateIssueFormOpen] = useState(false);
 
+  const [isScrolled, setIsScrolled] = useState(false);
+
+  const containerRef = useRef<HTMLDivElement | null>(null);
+
   const router = useRouter();
   const { workspaceSlug, projectId, cycleId, moduleId, viewId, workspaceViewId } = router.query;
 
@@ -77,6 +88,13 @@ export const SpreadsheetView: React.FC<Props> = ({
 
   const [properties] = useIssuesProperties(workspaceSlug as string, projectId as string);
 
+  const { storedValue: selectedMenuItem, setValue: setSelectedMenuItem } = useLocalStorage(
+    "spreadsheetViewSorting",
+    ""
+  );
+  const { storedValue: activeSortingProperty, setValue: setActiveSortingProperty } =
+    useLocalStorage("spreadsheetViewActiveSortingProperty", "");
+
   const workspaceIssuesPath = [
     {
       params: {
@@ -111,12 +129,9 @@ export const SpreadsheetView: React.FC<Props> = ({
     router.pathname.includes(path.path)
   );
 
-  const { params: workspaceViewParams } = useWorkspaceIssuesFilters(
-    workspaceSlug?.toString(),
-    workspaceViewId?.toString()
-  );
+  const { params: workspaceViewParams, handleFilters } = useWorkspaceView();
 
-  const { params } = useSpreadsheetIssuesView();
+  const { params, displayFilters, setDisplayFilters } = useSpreadsheetIssuesView();
 
   const partialUpdateIssue = useCallback(
     (formData: Partial<IIssue>, issue: IIssue) => {
@@ -199,8 +214,8 @@ export const SpreadsheetView: React.FC<Props> = ({
       moduleId,
       viewId,
       workspaceViewId,
-      currentWorkspaceIssuePath,
       workspaceViewParams,
+      currentWorkspaceIssuePath,
       params,
       user,
     ]
@@ -208,10 +223,216 @@ export const SpreadsheetView: React.FC<Props> = ({
 
   const isNotAllowed = userAuth.isGuest || userAuth.isViewer;
 
-  const renderColumn = (header: string, Component: React.ComponentType<any>) => (
-    <div className="relative flex flex-col h-max w-full bg-custom-background-100 rounded-sm">
+  const handleOrderBy = (order: TIssueOrderByOptions, itemKey: string) => {
+    if (!workspaceViewId || !currentWorkspaceIssuePath)
+      handleFilters("display_filters", { order_by: order });
+    else setDisplayFilters({ order_by: order });
+    setSelectedMenuItem(`${order}_${itemKey}`);
+    setActiveSortingProperty(order === "-created_at" ? "" : itemKey);
+  };
+
+  const renderColumn = (
+    header: string,
+    propertyName: string,
+    Component: React.ComponentType<any>,
+    ascendingOrder: TIssueOrderByOptions,
+    descendingOrder: TIssueOrderByOptions
+  ) => (
+    <div className="relative flex flex-col h-max w-full bg-custom-background-100">
       <div className="flex items-center min-w-[9rem] px-4 py-2.5 text-sm font-medium z-[1] h-11 w-full sticky top-0 bg-custom-background-90 border border-l-0 border-custom-border-200">
-        {header}
+        <CustomMenu
+          customButtonClassName="!w-full"
+          className="!w-full"
+          position="left"
+          customButton={
+            <div
+              className={`relative group flex items-center justify-between gap-1.5 cursor-pointer text-sm text-custom-text-200 hover:text-custom-text-100 w-full py-3 px-2 ${
+                activeSortingProperty === propertyName ? "bg-custom-background-80" : ""
+              }`}
+            >
+              {activeSortingProperty === propertyName && (
+                <div className="absolute top-1 right-1.5">
+                  <Icon
+                    iconName="filter_list"
+                    className="flex items-center justify-center h-3.5 w-3.5 rounded-full bg-custom-primary text-xs text-white"
+                  />
+                </div>
+              )}
+
+              {header}
+              <ChevronDownIcon className="h-3 w-3" aria-hidden="true" />
+            </div>
+          }
+          width="xl"
+        >
+          <CustomMenu.MenuItem
+            onClick={() => {
+              handleOrderBy(ascendingOrder, propertyName);
+            }}
+          >
+            <div
+              className={`group flex gap-1.5 px-1 items-center justify-between ${
+                selectedMenuItem === `${ascendingOrder}_${propertyName}`
+                  ? "text-custom-text-100"
+                  : "text-custom-text-200 hover:text-custom-text-100"
+              }`}
+            >
+              <div className="flex gap-2 items-center">
+                {propertyName === "assignee" || propertyName === "labels" ? (
+                  <>
+                    <span className="relative flex items-center h-6 w-6">
+                      <Icon
+                        iconName="east"
+                        className="absolute left-0 rotate-90 text-xs leading-3"
+                      />
+                      <Icon iconName="sort" className="absolute right-0 text-sm" />
+                    </span>
+                    <span>A</span>
+                    <Icon iconName="east" className="text-sm" />
+                    <span>Z</span>
+                  </>
+                ) : propertyName === "due_date" ||
+                  propertyName === "created_on" ||
+                  propertyName === "updated_on" ? (
+                  <>
+                    <span className="relative flex items-center h-6 w-6">
+                      <Icon
+                        iconName="east"
+                        className="absolute left-0 rotate-90 text-xs leading-3"
+                      />
+                      <Icon iconName="sort" className="absolute right-0 text-sm" />
+                    </span>
+                    <span>New</span>
+                    <Icon iconName="east" className="text-sm" />
+                    <span>Old</span>
+                  </>
+                ) : (
+                  <>
+                    <span className="relative flex items-center h-6 w-6">
+                      <Icon
+                        iconName="east"
+                        className="absolute left-0 rotate-90 text-xs leading-3"
+                      />
+                      <Icon iconName="sort" className="absolute right-0 text-sm" />
+                    </span>
+                    <span>First</span>
+                    <Icon iconName="east" className="text-sm" />
+                    <span>Last</span>
+                  </>
+                )}
+              </div>
+
+              <CheckIcon
+                className={`h-3.5 w-3.5 opacity-0 group-hover:opacity-100 ${
+                  selectedMenuItem === `${ascendingOrder}_${propertyName}` ? "opacity-100" : ""
+                }`}
+              />
+            </div>
+          </CustomMenu.MenuItem>
+          <CustomMenu.MenuItem
+            className={`mt-0.5 ${
+              selectedMenuItem === `${descendingOrder}_${propertyName}`
+                ? "bg-custom-background-80"
+                : ""
+            }`}
+            key={propertyName}
+            onClick={() => {
+              handleOrderBy(descendingOrder, propertyName);
+            }}
+          >
+            <div
+              className={`group flex gap-1.5 px-1 items-center justify-between ${
+                selectedMenuItem === `${descendingOrder}_${propertyName}`
+                  ? "text-custom-text-100"
+                  : "text-custom-text-200 hover:text-custom-text-100"
+              }`}
+            >
+              <div className="flex gap-2 items-center">
+                {propertyName === "assignee" || propertyName === "labels" ? (
+                  <>
+                    <span className="relative flex items-center h-6 w-6">
+                      <Icon
+                        iconName="east"
+                        className="absolute left-0 -rotate-90 text-xs leading-3"
+                      />
+                      <Icon
+                        iconName="sort"
+                        className="absolute rotate-180 transform scale-x-[-1] right-0 text-sm"
+                      />
+                    </span>
+                    <span>Z</span>
+                    <Icon iconName="east" className="text-sm" />
+                    <span>A</span>
+                  </>
+                ) : propertyName === "due_date" ? (
+                  <>
+                    <span className="relative flex items-center h-6 w-6">
+                      <Icon
+                        iconName="east"
+                        className="absolute left-0 -rotate-90 text-xs leading-3"
+                      />
+                      <Icon
+                        iconName="sort"
+                        className="absolute rotate-180 transform scale-x-[-1] right-0 text-sm"
+                      />
+                    </span>
+                    <span>Old</span>
+                    <Icon iconName="east" className="text-sm" />
+                    <span>New</span>
+                  </>
+                ) : (
+                  <>
+                    <span className="relative flex items-center h-6 w-6">
+                      <Icon
+                        iconName="east"
+                        className="absolute left-0 -rotate-90 text-xs leading-3"
+                      />
+                      <Icon
+                        iconName="sort"
+                        className="absolute rotate-180 transform scale-x-[-1] right-0 text-sm"
+                      />
+                    </span>
+                    <span>Last</span>
+                    <Icon iconName="east" className="text-sm" />
+                    <span>First</span>
+                  </>
+                )}
+              </div>
+
+              <CheckIcon
+                className={`h-3.5 w-3.5 opacity-0 group-hover:opacity-100 ${
+                  selectedMenuItem === `${descendingOrder}_${propertyName}` ? "opacity-100" : ""
+                }`}
+              />
+            </div>
+          </CustomMenu.MenuItem>
+          {selectedMenuItem &&
+            selectedMenuItem !== "" &&
+            displayFilters?.order_by !== "-created_at" &&
+            selectedMenuItem.includes(propertyName) && (
+              <CustomMenu.MenuItem
+                className={`mt-0.5${
+                  selectedMenuItem === `-created_at_${propertyName}`
+                    ? "bg-custom-background-80"
+                    : ""
+                }`}
+                key={propertyName}
+                onClick={() => {
+                  handleOrderBy("-created_at", propertyName);
+                }}
+              >
+                <div className={`group flex gap-1.5 px-1 items-center justify-between `}>
+                  <div className="flex gap-1.5 items-center">
+                    <span className="relative flex items-center justify-center h-6 w-6">
+                      <Icon iconName="ink_eraser" className="text-sm" />
+                    </span>
+
+                    <span>Clear sorting</span>
+                  </div>
+                </div>
+              </CustomMenu.MenuItem>
+            )}
+        </CustomMenu>
       </div>
       <div className="h-full min-w-[9rem] w-full">
         {spreadsheetIssues.map((issue: IIssue, index) => (
@@ -230,6 +451,27 @@ export const SpreadsheetView: React.FC<Props> = ({
     </div>
   );
 
+  const handleScroll = () => {
+    if (containerRef.current) {
+      const scrollLeft = containerRef.current.scrollLeft;
+      setIsScrolled(scrollLeft > 0);
+    }
+  };
+
+  useEffect(() => {
+    const currentContainerRef = containerRef.current;
+
+    if (currentContainerRef) {
+      currentContainerRef.addEventListener("scroll", handleScroll);
+    }
+
+    return () => {
+      if (currentContainerRef) {
+        currentContainerRef.removeEventListener("scroll", handleScroll);
+      }
+    };
+  }, []);
+
   return (
     <>
       <IssuePeekOverview
@@ -238,15 +480,19 @@ export const SpreadsheetView: React.FC<Props> = ({
         workspaceSlug={workspaceSlug?.toString() ?? ""}
         readOnly={disableUserActions}
       />
-      <div className="relative flex h-full w-full rounded-lg text-custom-text-200 overflow-x-auto whitespace-nowrap bg-custom-background-100">
+      <div className="relative flex h-full w-full rounded-lg text-custom-text-200 overflow-x-auto whitespace-nowrap bg-custom-background-200">
         <div className="h-full w-full flex flex-col">
-          <div className="flex max-h-full overflow-y-auto">
+          <div ref={containerRef} className="flex max-h-full h-full overflow-y-auto">
             {spreadsheetIssues ? (
               <>
                 <div className="sticky left-0 w-[28rem] z-[2]">
-                  <div className="relative flex flex-col h-max w-full bg-custom-background-100 rounded-sm z-[2]">
+                  <div
+                    className={`relative flex flex-col h-max w-full bg-custom-background-100 z-[2] ${
+                      isScrolled ? "shadow-r shadow-custom-shadow-xs" : ""
+                    }`}
+                  >
                     <div className="flex items-center text-sm font-medium z-[2] h-11 w-full sticky top-0 bg-custom-background-90 border border-l-0 border-custom-border-200">
-                      <span className="flex items-center px-4 py-2.5 h-full w-20 flex-shrink-0">
+                      <span className="flex items-center px-4 py-2.5 h-full w-24 flex-shrink-0">
                         ID
                       </span>
                       <span className="flex items-center px-4 py-2.5 h-full w-full flex-grow">
@@ -270,15 +516,69 @@ export const SpreadsheetView: React.FC<Props> = ({
                     ))}
                   </div>
                 </div>
-                {renderColumn("State", SpreadsheetStateColumn)}
-                {renderColumn("Priority", SpreadsheetPriorityColumn)}
-                {renderColumn("Assignees", SpreadsheetAssigneeColumn)}
-                {renderColumn("Label", SpreadsheetLabelColumn)}
-                {renderColumn("Start Date", SpreadsheetStartDateColumn)}
-                {renderColumn("Due Date", SpreadsheetDueDateColumn)}
-                {renderColumn("Estimate", SpreadsheetEstimateColumn)}
-                {renderColumn("Created On", SpreadsheetCreatedOnColumn)}
-                {renderColumn("Updated On", SpreadsheetUpdatedOnColumn)}
+                {renderColumn(
+                  "State",
+                  "state",
+                  SpreadsheetStateColumn,
+                  "state__name",
+                  "-state__name"
+                )}
+                {renderColumn(
+                  "Priority",
+                  "priority",
+                  SpreadsheetPriorityColumn,
+                  "priority",
+                  "-priority"
+                )}
+                {renderColumn(
+                  "Assignees",
+                  "assignee",
+                  SpreadsheetAssigneeColumn,
+                  "assignees__first_name",
+                  "-assignees__first_name"
+                )}
+                {renderColumn(
+                  "Label",
+                  "labels",
+                  SpreadsheetLabelColumn,
+                  "labels__name",
+                  "-labels__name"
+                )}
+                {renderColumn(
+                  "Start Date",
+                  "start_date",
+                  SpreadsheetStartDateColumn,
+                  "-start_date",
+                  "start_date"
+                )}
+                {renderColumn(
+                  "Due Date",
+                  "due_date",
+                  SpreadsheetDueDateColumn,
+                  "-target_date",
+                  "target_date"
+                )}
+                {renderColumn(
+                  "Estimate",
+                  "estimate",
+                  SpreadsheetEstimateColumn,
+                  "estimate_point",
+                  "-estimate_point"
+                )}
+                {renderColumn(
+                  "Created On",
+                  "created_on",
+                  SpreadsheetCreatedOnColumn,
+                  "-created_at",
+                  "created_at"
+                )}
+                {renderColumn(
+                  "Updated On",
+                  "updated_on",
+                  SpreadsheetUpdatedOnColumn,
+                  "-updated_at",
+                  "updated_at"
+                )}
               </>
             ) : (
               <div className="flex flex-col justify-center items-center h-full w-full">
diff --git a/web/components/core/views/spreadsheet-view/state-column/state-column.tsx b/web/components/core/views/spreadsheet-view/state-column/state-column.tsx
index a31345f3d..04c833b1d 100644
--- a/web/components/core/views/spreadsheet-view/state-column/state-column.tsx
+++ b/web/components/core/views/spreadsheet-view/state-column/state-column.tsx
@@ -76,7 +76,7 @@ export const StateColumn: React.FC<Props> = ({
             value={issue.state_detail}
             projectId={projectId}
             onChange={handleStateChange}
-            buttonClassName="!p-0 !rounded-none !shadow-none !border-0"
+            buttonClassName="!shadow-none !border-0"
             hideDropdownArrow
             disabled={isNotAllowed}
           />
diff --git a/web/components/issues/my-issues/my-issues-select-filters.tsx b/web/components/issues/my-issues/my-issues-select-filters.tsx
index 8085b5e78..ce8e03797 100644
--- a/web/components/issues/my-issues/my-issues-select-filters.tsx
+++ b/web/components/issues/my-issues/my-issues-select-filters.tsx
@@ -4,21 +4,18 @@ import { useRouter } from "next/router";
 
 import useSWR from "swr";
 
-// hook
-import useProjects from "hooks/use-projects";
-import useWorkspaceMembers from "hooks/use-workspace-members";
 // services
 import issuesService from "services/issues.service";
 // components
 import { DateFilterModal } from "components/core";
 // ui
-import { Avatar, MultiLevelDropdown } from "components/ui";
+import { MultiLevelDropdown } from "components/ui";
 // icons
 import { PriorityIcon, StateGroupIcon } from "components/icons";
 // helpers
 import { checkIfArraysHaveSameElements } from "helpers/array.helper";
 // types
-import { IIssueFilterOptions, TStateGroups } from "types";
+import { IIssueFilterOptions, IQuery, TStateGroups } from "types";
 // fetch-keys
 import { WORKSPACE_LABELS } from "constants/fetch-keys";
 // constants
@@ -26,7 +23,7 @@ import { GROUP_CHOICES, PRIORITIES } from "constants/project";
 import { DATE_FILTER_OPTIONS } from "constants/filters";
 
 type Props = {
-  filters: Partial<IIssueFilterOptions>;
+  filters: Partial<IIssueFilterOptions> | IQuery;
   onSelect: (option: any) => void;
   direction?: "left" | "right";
   height?: "sm" | "md" | "rg" | "lg";
@@ -58,11 +55,6 @@ export const MyIssuesSelectFilters: React.FC<Props> = ({
       : null
   );
 
-  const { projects: allProjects } = useProjects();
-  const joinedProjects = allProjects?.filter((p) => p.is_member);
-
-  const { workspaceMembers } = useWorkspaceMembers(workspaceSlug?.toString() ?? "");
-
   return (
     <>
       {isDateFilterModalOpen && (
@@ -82,19 +74,25 @@ export const MyIssuesSelectFilters: React.FC<Props> = ({
         height={height}
         options={[
           {
-            id: "project",
-            label: "Project",
-            value: joinedProjects,
+            id: "priority",
+            label: "Priority",
+            value: PRIORITIES,
             hasChildren: true,
-            children: joinedProjects?.map((project) => ({
-              id: project.id,
-              label: <div className="flex items-center gap-2">{project.name}</div>,
-              value: {
-                key: "project",
-                value: project.id,
-              },
-              selected: filters?.project?.includes(project.id),
-            })),
+            children: [
+              ...PRIORITIES.map((priority) => ({
+                id: priority === null ? "null" : priority,
+                label: (
+                  <div className="flex items-center gap-2 capitalize">
+                    <PriorityIcon priority={priority} /> {priority ?? "None"}
+                  </div>
+                ),
+                value: {
+                  key: "priority",
+                  value: priority === null ? "null" : priority,
+                },
+                selected: filters?.priority?.includes(priority === null ? "null" : priority),
+              })),
+            ],
           },
           {
             id: "state_group",
@@ -144,87 +142,6 @@ export const MyIssuesSelectFilters: React.FC<Props> = ({
               selected: filters?.labels?.includes(label.id),
             })),
           },
-          {
-            id: "priority",
-            label: "Priority",
-            value: PRIORITIES,
-            hasChildren: true,
-            children: [
-              ...PRIORITIES.map((priority) => ({
-                id: priority === null ? "null" : priority,
-                label: (
-                  <div className="flex items-center gap-2 capitalize">
-                    <PriorityIcon priority={priority} /> {priority ?? "None"}
-                  </div>
-                ),
-                value: {
-                  key: "priority",
-                  value: priority === null ? "null" : priority,
-                },
-                selected: filters?.priority?.includes(priority === null ? "null" : priority),
-              })),
-            ],
-          },
-          {
-            id: "created_by",
-            label: "Created by",
-            value: workspaceMembers,
-            hasChildren: true,
-            children: workspaceMembers?.map((member) => ({
-              id: member.member.id,
-              label: (
-                <div className="flex items-center gap-2">
-                  <Avatar user={member.member} />
-                  {member.member.display_name}
-                </div>
-              ),
-              value: {
-                key: "created_by",
-                value: member.member.id,
-              },
-              selected: filters?.created_by?.includes(member.member.id),
-            })),
-          },
-          {
-            id: "assignees",
-            label: "Assignees",
-            value: workspaceMembers,
-            hasChildren: true,
-            children: workspaceMembers?.map((member) => ({
-              id: member.member.id,
-              label: (
-                <div className="flex items-center gap-2">
-                  <Avatar user={member.member} />
-                  {member.member.display_name}
-                </div>
-              ),
-              value: {
-                key: "assignees",
-                value: member.member.id,
-              },
-              selected: filters?.assignees?.includes(member.member.id),
-            })),
-          },
-          {
-            id: "subscriber",
-            label: "Subscriber",
-            value: workspaceMembers,
-            hasChildren: true,
-            children: workspaceMembers?.map((member) => ({
-              id: member.member.id,
-              label: (
-                <div className="flex items-center gap-2">
-                  <Avatar user={member.member} />
-                  {member.member.display_name}
-                </div>
-              ),
-              value: {
-                key: "subscriber",
-                value: member.member.id,
-              },
-              selected: filters?.subscriber?.includes(member.member.id),
-            })),
-          },
           {
             id: "start_date",
             label: "Start date",
diff --git a/web/components/issues/workspace-views/workpace-view-issues.tsx b/web/components/issues/workspace-views/workpace-view-issues.tsx
new file mode 100644
index 000000000..708e0eb9f
--- /dev/null
+++ b/web/components/issues/workspace-views/workpace-view-issues.tsx
@@ -0,0 +1,221 @@
+import React, { useCallback, useState } from "react";
+
+import useSWR from "swr";
+
+import { useRouter } from "next/router";
+
+// context
+import { useProjectMyMembership } from "contexts/project-member.context";
+// service
+import projectIssuesServices from "services/issues.service";
+// hooks
+import useProjects from "hooks/use-projects";
+import useUser from "hooks/use-user";
+import { useWorkspaceView } from "hooks/use-workspace-view";
+import useWorkspaceMembers from "hooks/use-workspace-members";
+// components
+import { WorkspaceViewsNavigation } from "components/workspace/views/workpace-view-navigation";
+import { EmptyState, PrimaryButton } from "components/ui";
+import { SpreadsheetView, WorkspaceFiltersList } from "components/core";
+import { CreateUpdateIssueModal, DeleteIssueModal } from "components/issues";
+import { CreateUpdateWorkspaceViewModal } from "components/workspace/views/modal";
+// icon
+import { PlusIcon } from "components/icons";
+// image
+import emptyView from "public/empty-state/view.svg";
+// constants
+import { WORKSPACE_LABELS } from "constants/fetch-keys";
+import { STATE_GROUP } from "constants/project";
+// types
+import { IIssue, IWorkspaceIssueFilterOptions } from "types";
+
+export const WorkspaceViewIssues = () => {
+  const router = useRouter();
+  const { workspaceSlug, workspaceViewId } = router.query;
+
+  const { memberRole } = useProjectMyMembership();
+  const { user } = useUser();
+  const { isGuest, isViewer } = useWorkspaceMembers(
+    workspaceSlug?.toString(),
+    Boolean(workspaceSlug)
+  );
+  const { filters, viewIssues, mutateViewIssues, handleFilters } = useWorkspaceView();
+
+  const [createViewModal, setCreateViewModal] = useState<any>(null);
+
+  // create issue modal
+  const [createIssueModal, setCreateIssueModal] = useState(false);
+  const [preloadedData, setPreloadedData] = useState<
+    (Partial<IIssue> & { actionType: "createIssue" | "edit" | "delete" }) | undefined
+  >(undefined);
+
+  // update issue modal
+  const [editIssueModal, setEditIssueModal] = useState(false);
+  const [issueToEdit, setIssueToEdit] = useState<
+    (IIssue & { actionType: "edit" | "delete" }) | undefined
+  >(undefined);
+
+  // delete issue modal
+  const [deleteIssueModal, setDeleteIssueModal] = useState(false);
+  const [issueToDelete, setIssueToDelete] = useState<IIssue | null>(null);
+
+  const { projects: allProjects } = useProjects();
+  const joinedProjects = allProjects?.filter((p) => p.is_member);
+
+  const { data: workspaceLabels } = useSWR(
+    workspaceSlug ? WORKSPACE_LABELS(workspaceSlug.toString()) : null,
+    workspaceSlug ? () => projectIssuesServices.getWorkspaceLabels(workspaceSlug.toString()) : null
+  );
+
+  const { workspaceMembers } = useWorkspaceMembers(workspaceSlug?.toString() ?? "");
+
+  const makeIssueCopy = useCallback(
+    (issue: IIssue) => {
+      setCreateIssueModal(true);
+
+      setPreloadedData({ ...issue, name: `${issue.name} (Copy)`, actionType: "createIssue" });
+    },
+    [setCreateIssueModal, setPreloadedData]
+  );
+
+  const handleEditIssue = useCallback(
+    (issue: IIssue) => {
+      setEditIssueModal(true);
+      setIssueToEdit({
+        ...issue,
+        actionType: "edit",
+        cycle: issue.issue_cycle ? issue.issue_cycle.cycle : null,
+        module: issue.issue_module ? issue.issue_module.module : null,
+      });
+    },
+    [setEditIssueModal, setIssueToEdit]
+  );
+
+  const handleDeleteIssue = useCallback(
+    (issue: IIssue) => {
+      setDeleteIssueModal(true);
+      setIssueToDelete(issue);
+    },
+    [setDeleteIssueModal, setIssueToDelete]
+  );
+
+  const handleIssueAction = useCallback(
+    (issue: IIssue, action: "copy" | "edit" | "delete" | "updateDraft") => {
+      if (action === "copy") makeIssueCopy(issue);
+      else if (action === "edit") handleEditIssue(issue);
+      else if (action === "delete") handleDeleteIssue(issue);
+    },
+    [makeIssueCopy, handleEditIssue, handleDeleteIssue]
+  );
+
+  const nullFilters =
+    filters.filters &&
+    Object.keys(filters.filters).filter(
+      (key) => filters.filters[key as keyof IWorkspaceIssueFilterOptions] === null
+    );
+
+  const areFiltersApplied =
+    filters.filters &&
+    Object.keys(filters.filters).length > 0 &&
+    nullFilters.length !== Object.keys(filters.filters).length;
+
+  const isNotAllowed = isGuest || isViewer;
+  return (
+    <>
+      <CreateUpdateIssueModal
+        isOpen={createIssueModal && preloadedData?.actionType === "createIssue"}
+        handleClose={() => setCreateIssueModal(false)}
+        prePopulateData={{
+          ...preloadedData,
+        }}
+        onSubmit={async () => mutateViewIssues()}
+      />
+      <CreateUpdateIssueModal
+        isOpen={editIssueModal && issueToEdit?.actionType !== "delete"}
+        handleClose={() => setEditIssueModal(false)}
+        data={issueToEdit}
+        onSubmit={async () => mutateViewIssues()}
+      />
+      <DeleteIssueModal
+        handleClose={() => setDeleteIssueModal(false)}
+        isOpen={deleteIssueModal}
+        data={issueToDelete}
+        user={user}
+        onSubmit={async () => mutateViewIssues()}
+      />
+      <CreateUpdateWorkspaceViewModal
+        isOpen={createViewModal !== null}
+        handleClose={() => setCreateViewModal(null)}
+        preLoadedData={createViewModal}
+      />
+      <div className="h-full flex flex-col overflow-hidden bg-custom-background-100">
+        <div className="h-full w-full border-b border-custom-border-300">
+          <WorkspaceViewsNavigation handleAddView={() => setCreateViewModal(true)} />
+          {false ? (
+            <EmptyState
+              image={emptyView}
+              title="View does not exist"
+              description="The view you are looking for does not exist or has been deleted."
+              primaryButton={{
+                text: "View other views",
+                onClick: () => router.push(`/${workspaceSlug}/workspace-views`),
+              }}
+            />
+          ) : (
+            <div className="h-full w-full flex flex-col">
+              {areFiltersApplied && (
+                <>
+                  <div className="flex items-center justify-between gap-2 px-5 pt-3 pb-0">
+                    <WorkspaceFiltersList
+                      filters={filters.filters}
+                      setFilters={(updatedFilter) => handleFilters("filters", updatedFilter)}
+                      labels={workspaceLabels}
+                      members={workspaceMembers?.map((m) => m.member)}
+                      stateGroup={STATE_GROUP}
+                      project={joinedProjects}
+                      clearAllFilters={() =>
+                        handleFilters("filters", {
+                          assignees: null,
+                          created_by: null,
+                          labels: null,
+                          priority: null,
+                          state_group: null,
+                          start_date: null,
+                          target_date: null,
+                          subscriber: null,
+                          project: null,
+                        })
+                      }
+                    />
+                    <PrimaryButton
+                      onClick={() => {
+                        if (workspaceViewId) handleFilters("filters", filters.filters, true);
+                        else
+                          setCreateViewModal({
+                            query: filters.filters,
+                          });
+                      }}
+                      className="flex items-center gap-2 text-sm"
+                    >
+                      {!workspaceViewId && <PlusIcon className="h-4 w-4" />}
+                      {workspaceViewId ? "Update" : "Save"} view
+                    </PrimaryButton>
+                  </div>
+                  {<div className="mt-3 border-t border-custom-border-200" />}
+                </>
+              )}
+              <SpreadsheetView
+                spreadsheetIssues={viewIssues}
+                mutateIssues={mutateViewIssues}
+                handleIssueAction={handleIssueAction}
+                disableUserActions={isNotAllowed ?? false}
+                user={user}
+                userAuth={memberRole}
+              />
+            </div>
+          )}
+        </div>
+      </div>
+    </>
+  );
+};
diff --git a/web/components/issues/workspace-views/workspace-all-issue.tsx b/web/components/issues/workspace-views/workspace-all-issue.tsx
new file mode 100644
index 000000000..724b9d309
--- /dev/null
+++ b/web/components/issues/workspace-views/workspace-all-issue.tsx
@@ -0,0 +1,234 @@
+import { useCallback, useState } from "react";
+import { useRouter } from "next/router";
+
+import useSWR from "swr";
+
+// hook
+import useUser from "hooks/use-user";
+import useWorkspaceMembers from "hooks/use-workspace-members";
+import useProjects from "hooks/use-projects";
+import { useWorkspaceView } from "hooks/use-workspace-view";
+// context
+import { useProjectMyMembership } from "contexts/project-member.context";
+// services
+import workspaceService from "services/workspace.service";
+import projectIssuesServices from "services/issues.service";
+// components
+import { SpreadsheetView, WorkspaceFiltersList } from "components/core";
+import { WorkspaceViewsNavigation } from "components/workspace/views/workpace-view-navigation";
+import { CreateUpdateIssueModal, DeleteIssueModal } from "components/issues";
+import { CreateUpdateWorkspaceViewModal } from "components/workspace/views/modal";
+// ui
+import { PrimaryButton } from "components/ui";
+// icons
+import { PlusIcon } from "@heroicons/react/24/outline";
+// fetch-keys
+import { WORKSPACE_LABELS, WORKSPACE_VIEW_ISSUES } from "constants/fetch-keys";
+// constants
+import { STATE_GROUP } from "constants/project";
+// types
+import { IIssue, IWorkspaceIssueFilterOptions } from "types";
+
+export const WorkspaceAllIssue = () => {
+  const router = useRouter();
+  const { workspaceSlug, workspaceViewId } = router.query;
+
+  const [createViewModal, setCreateViewModal] = useState<any>(null);
+
+  // create issue modal
+  const [createIssueModal, setCreateIssueModal] = useState(false);
+  const [preloadedData, setPreloadedData] = useState<
+    (Partial<IIssue> & { actionType: "createIssue" | "edit" | "delete" }) | undefined
+  >(undefined);
+
+  // update issue modal
+  const [editIssueModal, setEditIssueModal] = useState(false);
+  const [issueToEdit, setIssueToEdit] = useState<
+    (IIssue & { actionType: "edit" | "delete" }) | undefined
+  >(undefined);
+
+  // delete issue modal
+  const [deleteIssueModal, setDeleteIssueModal] = useState(false);
+  const [issueToDelete, setIssueToDelete] = useState<IIssue | null>(null);
+
+  const { user } = useUser();
+  const { memberRole } = useProjectMyMembership();
+
+  const { workspaceMembers } = useWorkspaceMembers(workspaceSlug?.toString() ?? "");
+
+  const { data: workspaceLabels } = useSWR(
+    workspaceSlug ? WORKSPACE_LABELS(workspaceSlug.toString()) : null,
+    workspaceSlug ? () => projectIssuesServices.getWorkspaceLabels(workspaceSlug.toString()) : null
+  );
+
+  const { filters, handleFilters } = useWorkspaceView();
+
+  const params: any = {
+    assignees: filters?.filters?.assignees ? filters?.filters?.assignees.join(",") : undefined,
+    subscriber: filters?.filters?.subscriber ? filters?.filters?.subscriber.join(",") : undefined,
+    state_group: filters?.filters?.state_group
+      ? filters?.filters?.state_group.join(",")
+      : undefined,
+    priority: filters?.filters?.priority ? filters?.filters?.priority.join(",") : undefined,
+    labels: filters?.filters?.labels ? filters?.filters?.labels.join(",") : undefined,
+    created_by: filters?.filters?.created_by ? filters?.filters?.created_by.join(",") : undefined,
+    start_date: filters?.filters?.start_date ? filters?.filters?.start_date.join(",") : undefined,
+    target_date: filters?.filters?.target_date
+      ? filters?.filters?.target_date.join(",")
+      : undefined,
+    project: filters?.filters?.project ? filters?.filters?.project.join(",") : undefined,
+    sub_issue: false,
+    type: undefined,
+  };
+
+  const { data: viewIssues, mutate: mutateViewIssues } = useSWR(
+    workspaceSlug ? WORKSPACE_VIEW_ISSUES(workspaceSlug.toString(), params) : null,
+    workspaceSlug ? () => workspaceService.getViewIssues(workspaceSlug.toString(), params) : null
+  );
+
+  const makeIssueCopy = useCallback(
+    (issue: IIssue) => {
+      setCreateIssueModal(true);
+
+      setPreloadedData({ ...issue, name: `${issue.name} (Copy)`, actionType: "createIssue" });
+    },
+    [setCreateIssueModal, setPreloadedData]
+  );
+
+  const handleEditIssue = useCallback(
+    (issue: IIssue) => {
+      setEditIssueModal(true);
+      setIssueToEdit({
+        ...issue,
+        actionType: "edit",
+        cycle: issue.issue_cycle ? issue.issue_cycle.cycle : null,
+        module: issue.issue_module ? issue.issue_module.module : null,
+      });
+    },
+    [setEditIssueModal, setIssueToEdit]
+  );
+
+  const handleDeleteIssue = useCallback(
+    (issue: IIssue) => {
+      setDeleteIssueModal(true);
+      setIssueToDelete(issue);
+    },
+    [setDeleteIssueModal, setIssueToDelete]
+  );
+
+  const handleIssueAction = useCallback(
+    (issue: IIssue, action: "copy" | "edit" | "delete" | "updateDraft") => {
+      if (action === "copy") makeIssueCopy(issue);
+      else if (action === "edit") handleEditIssue(issue);
+      else if (action === "delete") handleDeleteIssue(issue);
+    },
+    [makeIssueCopy, handleEditIssue, handleDeleteIssue]
+  );
+
+  const nullFilters =
+    filters.filters &&
+    Object.keys(filters.filters).filter(
+      (key) => filters.filters[key as keyof IWorkspaceIssueFilterOptions] === null
+    );
+
+  const areFiltersApplied =
+    filters.filters &&
+    Object.keys(filters.filters).length > 0 &&
+    nullFilters.length !== Object.keys(filters.filters).length;
+
+  const { projects: allProjects } = useProjects();
+  const joinedProjects = allProjects?.filter((p) => p.is_member);
+
+  return (
+    <>
+      <CreateUpdateIssueModal
+        isOpen={createIssueModal && preloadedData?.actionType === "createIssue"}
+        handleClose={() => setCreateIssueModal(false)}
+        prePopulateData={{
+          ...preloadedData,
+        }}
+        onSubmit={async () => {
+          mutateViewIssues();
+        }}
+      />
+      <CreateUpdateIssueModal
+        isOpen={editIssueModal && issueToEdit?.actionType !== "delete"}
+        handleClose={() => setEditIssueModal(false)}
+        data={issueToEdit}
+        onSubmit={async () => {
+          mutateViewIssues();
+        }}
+      />
+      <DeleteIssueModal
+        handleClose={() => setDeleteIssueModal(false)}
+        isOpen={deleteIssueModal}
+        data={issueToDelete}
+        user={user}
+        onSubmit={async () => {
+          mutateViewIssues();
+        }}
+      />
+      <CreateUpdateWorkspaceViewModal
+        isOpen={createViewModal !== null}
+        handleClose={() => setCreateViewModal(null)}
+        preLoadedData={createViewModal}
+      />
+      <div className="h-full flex flex-col overflow-hidden bg-custom-background-100">
+        <div className="h-full w-full border-b border-custom-border-300">
+          <WorkspaceViewsNavigation handleAddView={() => setCreateViewModal(true)} />
+          <div className="h-full w-full flex flex-col">
+            {areFiltersApplied && (
+              <>
+                <div className="flex items-center justify-between gap-2 px-5 pt-3 pb-0">
+                  <WorkspaceFiltersList
+                    filters={filters.filters}
+                    setFilters={(updatedFilter) => handleFilters("filters", updatedFilter)}
+                    labels={workspaceLabels}
+                    members={workspaceMembers?.map((m) => m.member)}
+                    stateGroup={STATE_GROUP}
+                    project={joinedProjects}
+                    clearAllFilters={() =>
+                      handleFilters("filters", {
+                        assignees: null,
+                        created_by: null,
+                        labels: null,
+                        priority: null,
+                        state_group: null,
+                        start_date: null,
+                        target_date: null,
+                        subscriber: null,
+                        project: null,
+                      })
+                    }
+                  />
+                  <PrimaryButton
+                    onClick={() => {
+                      if (workspaceViewId) handleFilters("filters", filters.filters, true);
+                      else
+                        setCreateViewModal({
+                          query: filters.filters,
+                        });
+                    }}
+                    className="flex items-center gap-2 text-sm"
+                  >
+                    {!workspaceViewId && <PlusIcon className="h-4 w-4" />}
+                    {workspaceViewId ? "Update" : "Save"} view
+                  </PrimaryButton>
+                </div>
+                {<div className="mt-3 border-t border-custom-border-200" />}
+              </>
+            )}
+            <SpreadsheetView
+              spreadsheetIssues={viewIssues}
+              mutateIssues={mutateViewIssues}
+              handleIssueAction={handleIssueAction}
+              disableUserActions={false}
+              user={user}
+              userAuth={memberRole}
+            />
+          </div>
+        </div>
+      </div>
+    </>
+  );
+};
diff --git a/web/components/issues/workspace-views/workspace-assigned-issue.tsx b/web/components/issues/workspace-views/workspace-assigned-issue.tsx
new file mode 100644
index 000000000..ccee9ab84
--- /dev/null
+++ b/web/components/issues/workspace-views/workspace-assigned-issue.tsx
@@ -0,0 +1,155 @@
+import React, { useCallback, useState } from "react";
+import { useRouter } from "next/router";
+
+import useSWR from "swr";
+
+// hook
+import useUser from "hooks/use-user";
+// context
+import { useProjectMyMembership } from "contexts/project-member.context";
+// services
+import workspaceService from "services/workspace.service";
+// components
+import { SpreadsheetView } from "components/core";
+import { WorkspaceViewsNavigation } from "components/workspace/views/workpace-view-navigation";
+import { CreateUpdateIssueModal, DeleteIssueModal } from "components/issues";
+import { CreateUpdateWorkspaceViewModal } from "components/workspace/views/modal";
+// fetch-keys
+import { WORKSPACE_VIEW_ISSUES } from "constants/fetch-keys";
+// types
+import { IIssue } from "types";
+
+export const WorkspaceAssignedIssue = () => {
+  const [createViewModal, setCreateViewModal] = useState<any>(null);
+
+  // create issue modal
+  const [createIssueModal, setCreateIssueModal] = useState(false);
+  const [preloadedData, setPreloadedData] = useState<
+    (Partial<IIssue> & { actionType: "createIssue" | "edit" | "delete" }) | undefined
+  >(undefined);
+
+  // update issue modal
+  const [editIssueModal, setEditIssueModal] = useState(false);
+  const [issueToEdit, setIssueToEdit] = useState<
+    (IIssue & { actionType: "edit" | "delete" }) | undefined
+  >(undefined);
+
+  // delete issue modal
+  const [deleteIssueModal, setDeleteIssueModal] = useState(false);
+  const [issueToDelete, setIssueToDelete] = useState<IIssue | null>(null);
+
+  const router = useRouter();
+  const { workspaceSlug } = router.query;
+
+  const { user } = useUser();
+
+  const { memberRole } = useProjectMyMembership();
+
+  const params: any = {
+    assignees: user?.id ?? undefined,
+    sub_issue: false,
+  };
+
+  //   const { data: viewDetails, error } = useSWR(
+  //     workspaceSlug && workspaceViewId ? WORKSPACE_VIEW_DETAILS(workspaceViewId.toString()) : null,
+  //     workspaceSlug && workspaceViewId
+  //       ? () => workspaceService.getViewDetails(workspaceSlug.toString(), workspaceViewId.toString())
+  //       : null
+  //   );
+
+  const { data: viewIssues, mutate: mutateIssues } = useSWR(
+    workspaceSlug ? WORKSPACE_VIEW_ISSUES(workspaceSlug.toString(), params) : null,
+    workspaceSlug ? () => workspaceService.getViewIssues(workspaceSlug.toString(), params) : null
+  );
+
+  const makeIssueCopy = useCallback(
+    (issue: IIssue) => {
+      setCreateIssueModal(true);
+
+      setPreloadedData({ ...issue, name: `${issue.name} (Copy)`, actionType: "createIssue" });
+    },
+    [setCreateIssueModal, setPreloadedData]
+  );
+
+  const handleEditIssue = useCallback(
+    (issue: IIssue) => {
+      setEditIssueModal(true);
+      setIssueToEdit({
+        ...issue,
+        actionType: "edit",
+        cycle: issue.issue_cycle ? issue.issue_cycle.cycle : null,
+        module: issue.issue_module ? issue.issue_module.module : null,
+      });
+    },
+    [setEditIssueModal, setIssueToEdit]
+  );
+
+  const handleDeleteIssue = useCallback(
+    (issue: IIssue) => {
+      setDeleteIssueModal(true);
+      setIssueToDelete(issue);
+    },
+    [setDeleteIssueModal, setIssueToDelete]
+  );
+
+  const handleIssueAction = useCallback(
+    (issue: IIssue, action: "copy" | "edit" | "delete" | "updateDraft") => {
+      if (action === "copy") makeIssueCopy(issue);
+      else if (action === "edit") handleEditIssue(issue);
+      else if (action === "delete") handleDeleteIssue(issue);
+    },
+    [makeIssueCopy, handleEditIssue, handleDeleteIssue]
+  );
+  return (
+    <>
+      <CreateUpdateIssueModal
+        isOpen={createIssueModal && preloadedData?.actionType === "createIssue"}
+        handleClose={() => setCreateIssueModal(false)}
+        prePopulateData={{
+          ...preloadedData,
+        }}
+        onSubmit={async () => {
+          mutateIssues();
+        }}
+      />
+      <CreateUpdateIssueModal
+        isOpen={editIssueModal && issueToEdit?.actionType !== "delete"}
+        handleClose={() => setEditIssueModal(false)}
+        data={issueToEdit}
+        onSubmit={async () => {
+          mutateIssues();
+        }}
+      />
+      <DeleteIssueModal
+        handleClose={() => setDeleteIssueModal(false)}
+        isOpen={deleteIssueModal}
+        data={issueToDelete}
+        user={user}
+        onSubmit={async () => {
+          mutateIssues();
+        }}
+      />
+      <CreateUpdateWorkspaceViewModal
+        isOpen={createViewModal !== null}
+        handleClose={() => setCreateViewModal(null)}
+        preLoadedData={createViewModal}
+      />
+      <div className="h-full flex flex-col overflow-hidden bg-custom-background-100">
+        <div className="h-full w-full border-b border-custom-border-300">
+          <WorkspaceViewsNavigation handleAddView={() => setCreateViewModal(true)} />
+
+          <div className="h-full w-full flex flex-col">
+            <SpreadsheetView
+              spreadsheetIssues={viewIssues}
+              mutateIssues={mutateIssues}
+              handleIssueAction={handleIssueAction}
+              disableUserActions={false}
+              user={user}
+              userAuth={memberRole}
+            />
+          </div>
+        </div>
+      </div>
+    </>
+  );
+};
diff --git a/web/components/issues/workspace-views/workspace-created-issues.tsx b/web/components/issues/workspace-views/workspace-created-issues.tsx
new file mode 100644
index 000000000..bcc83c38b
--- /dev/null
+++ b/web/components/issues/workspace-views/workspace-created-issues.tsx
@@ -0,0 +1,147 @@
+import React, { useCallback, useState } from "react";
+
+import { useRouter } from "next/router";
+
+import useSWR from "swr";
+
+// hook
+import useUser from "hooks/use-user";
+// context
+import { useProjectMyMembership } from "contexts/project-member.context";
+// services
+import workspaceService from "services/workspace.service";
+// components
+import { SpreadsheetView } from "components/core";
+import { WorkspaceViewsNavigation } from "components/workspace/views/workpace-view-navigation";
+import { CreateUpdateIssueModal, DeleteIssueModal } from "components/issues";
+import { CreateUpdateWorkspaceViewModal } from "components/workspace/views/modal";
+// fetch-keys
+import { WORKSPACE_VIEW_ISSUES } from "constants/fetch-keys";
+// types
+import { IIssue } from "types";
+
+export const WorkspaceCreatedIssues = () => {
+  const [createViewModal, setCreateViewModal] = useState<any>(null);
+
+  // create issue modal
+  const [createIssueModal, setCreateIssueModal] = useState(false);
+  const [preloadedData, setPreloadedData] = useState<
+    (Partial<IIssue> & { actionType: "createIssue" | "edit" | "delete" }) | undefined
+  >(undefined);
+
+  // update issue modal
+  const [editIssueModal, setEditIssueModal] = useState(false);
+  const [issueToEdit, setIssueToEdit] = useState<
+    (IIssue & { actionType: "edit" | "delete" }) | undefined
+  >(undefined);
+
+  // delete issue modal
+  const [deleteIssueModal, setDeleteIssueModal] = useState(false);
+  const [issueToDelete, setIssueToDelete] = useState<IIssue | null>(null);
+
+  const router = useRouter();
+  const { workspaceSlug } = router.query;
+
+  const { user } = useUser();
+  const { memberRole } = useProjectMyMembership();
+
+  const params: any = {
+    created_by: user?.id ?? undefined,
+    sub_issue: false,
+  };
+
+  const { data: viewIssues, mutate: mutateIssues } = useSWR(
+    workspaceSlug ? WORKSPACE_VIEW_ISSUES(workspaceSlug.toString(), params) : null,
+    workspaceSlug ? () => workspaceService.getViewIssues(workspaceSlug.toString(), params) : null
+  );
+
+  const makeIssueCopy = useCallback(
+    (issue: IIssue) => {
+      setCreateIssueModal(true);
+
+      setPreloadedData({ ...issue, name: `${issue.name} (Copy)`, actionType: "createIssue" });
+    },
+    [setCreateIssueModal, setPreloadedData]
+  );
+
+  const handleEditIssue = useCallback(
+    (issue: IIssue) => {
+      setEditIssueModal(true);
+      setIssueToEdit({
+        ...issue,
+        actionType: "edit",
+        cycle: issue.issue_cycle ? issue.issue_cycle.cycle : null,
+        module: issue.issue_module ? issue.issue_module.module : null,
+      });
+    },
+    [setEditIssueModal, setIssueToEdit]
+  );
+
+  const handleDeleteIssue = useCallback(
+    (issue: IIssue) => {
+      setDeleteIssueModal(true);
+      setIssueToDelete(issue);
+    },
+    [setDeleteIssueModal, setIssueToDelete]
+  );
+
+  const handleIssueAction = useCallback(
+    (issue: IIssue, action: "copy" | "edit" | "delete" | "updateDraft") => {
+      if (action === "copy") makeIssueCopy(issue);
+      else if (action === "edit") handleEditIssue(issue);
+      else if (action === "delete") handleDeleteIssue(issue);
+    },
+    [makeIssueCopy, handleEditIssue, handleDeleteIssue]
+  );
+  return (
+    <>
+      <CreateUpdateIssueModal
+        isOpen={createIssueModal && preloadedData?.actionType === "createIssue"}
+        handleClose={() => setCreateIssueModal(false)}
+        prePopulateData={{
+          ...preloadedData,
+        }}
+        onSubmit={async () => {
+          mutateIssues();
+        }}
+      />
+      <CreateUpdateIssueModal
+        isOpen={editIssueModal && issueToEdit?.actionType !== "delete"}
+        handleClose={() => setEditIssueModal(false)}
+        data={issueToEdit}
+        onSubmit={async () => {
+          mutateIssues();
+        }}
+      />
+      <DeleteIssueModal
+        handleClose={() => setDeleteIssueModal(false)}
+        isOpen={deleteIssueModal}
+        data={issueToDelete}
+        user={user}
+        onSubmit={async () => {
+          mutateIssues();
+        }}
+      />
+      <CreateUpdateWorkspaceViewModal
+        isOpen={createViewModal !== null}
+        handleClose={() => setCreateViewModal(null)}
+        preLoadedData={createViewModal}
+      />
+      <div className="h-full flex flex-col overflow-hidden bg-custom-background-100">
+        <div className="h-full w-full border-b border-custom-border-300">
+          <WorkspaceViewsNavigation handleAddView={() => setCreateViewModal(true)} />
+          <div className="h-full w-full flex flex-col">
+            <SpreadsheetView
+              spreadsheetIssues={viewIssues}
+              mutateIssues={mutateIssues}
+              handleIssueAction={handleIssueAction}
+              disableUserActions={false}
+              user={user}
+              userAuth={memberRole}
+            />
+          </div>
+        </div>
+      </div>
+    </>
+  );
+};
diff --git a/web/components/issues/workspace-views/workspace-issue-view-option.tsx b/web/components/issues/workspace-views/workspace-issue-view-option.tsx
index 4e98cce92..b635ff870 100644
--- a/web/components/issues/workspace-views/workspace-issue-view-option.tsx
+++ b/web/components/issues/workspace-views/workspace-issue-view-option.tsx
@@ -3,10 +3,9 @@ import React from "react";
 import { useRouter } from "next/router";
 
 // hooks
-import useMyIssuesFilters from "hooks/my-issues/use-my-issues-filter";
-import useWorkspaceIssuesFilters from "hooks/use-worskpace-issue-filter";
+import { useWorkspaceView } from "hooks/use-workspace-view";
 // components
-import { MyIssuesSelectFilters } from "components/issues";
+import { GlobalSelectFilters } from "components/workspace/views/global-select-filters";
 // ui
 import { Tooltip } from "components/ui";
 // icons
@@ -33,12 +32,7 @@ export const WorkspaceIssuesViewOptions: React.FC = () => {
   const router = useRouter();
   const { workspaceSlug, workspaceViewId } = router.query;
 
-  const { displayFilters, setDisplayFilters } = useMyIssuesFilters(workspaceSlug?.toString());
-
-  const { filters, setFilters } = useWorkspaceIssuesFilters(
-    workspaceSlug?.toString(),
-    workspaceViewId?.toString()
-  );
+  const { filters, handleFilters } = useWorkspaceView();
 
   const isWorkspaceViewPath = router.pathname.includes("workspace-views/all-issues");
 
@@ -58,12 +52,12 @@ export const WorkspaceIssuesViewOptions: React.FC = () => {
             <button
               type="button"
               className={`grid h-7 w-7 place-items-center rounded p-1 outline-none hover:bg-custom-sidebar-background-100 duration-300 ${
-                displayFilters?.layout === option.type
+                filters.display_filters?.layout === option.type
                   ? "bg-custom-sidebar-background-100 shadow-sm"
                   : "text-custom-sidebar-text-200"
               }`}
               onClick={() => {
-                setDisplayFilters({ layout: option.type });
+                handleFilters("display_filters", { layout: option.type }, true);
                 if (option.type === "spreadsheet")
                   router.push(`/${workspaceSlug}/workspace-views/all-issues`);
                 else router.push(`/${workspaceSlug}/workspace-views`);
@@ -82,37 +76,38 @@ export const WorkspaceIssuesViewOptions: React.FC = () => {
 
       {showFilters && (
         <>
-          <MyIssuesSelectFilters
-            filters={filters}
+          <GlobalSelectFilters
+            filters={filters.filters}
             onSelect={(option) => {
-              const key = option.key as keyof typeof filters;
+              const key = option.key as keyof typeof filters.filters;
 
               if (key === "start_date" || key === "target_date") {
                 const valueExists = checkIfArraysHaveSameElements(
-                  filters?.[key] ?? [],
+                  filters.filters?.[key] ?? [],
                   option.value
                 );
 
-                setFilters({
+                handleFilters("filters", {
+                  ...filters,
                   [key]: valueExists ? null : option.value,
                 });
               } else {
-                const valueExists = filters[key]?.includes(option.value);
-
-                if (valueExists)
-                  setFilters({
-                    [option.key]: ((filters[key] ?? []) as any[])?.filter(
-                      (val) => val !== option.value
+                if (!filters?.filters?.[key]?.includes(option.value))
+                  handleFilters("filters", {
+                    ...filters,
+                    [key]: [...((filters?.filters?.[key] as any[]) ?? []), option.value],
+                  });
+                else {
+                  handleFilters("filters", {
+                    ...filters,
+                    [key]: (filters?.filters?.[key] as any[])?.filter(
+                      (item) => item !== option.value
                     ),
                   });
-                else
-                  setFilters({
-                    [option.key]: [...((filters[key] ?? []) as any[]), option.value],
-                  });
+                }
               }
             }}
             direction="left"
-            height="rg"
           />
         </>
       )}
diff --git a/web/components/issues/workspace-views/workspace-subscribed-issue.tsx b/web/components/issues/workspace-views/workspace-subscribed-issue.tsx
new file mode 100644
index 000000000..d9db2f347
--- /dev/null
+++ b/web/components/issues/workspace-views/workspace-subscribed-issue.tsx
@@ -0,0 +1,148 @@
+import React, { useCallback, useState } from "react";
+
+import { useRouter } from "next/router";
+
+import useSWR from "swr";
+
+// hook
+import useUser from "hooks/use-user";
+// context
+import { useProjectMyMembership } from "contexts/project-member.context";
+// services
+import workspaceService from "services/workspace.service";
+// components
+import { SpreadsheetView } from "components/core";
+import { WorkspaceViewsNavigation } from "components/workspace/views/workpace-view-navigation";
+import { CreateUpdateIssueModal, DeleteIssueModal } from "components/issues";
+import { CreateUpdateWorkspaceViewModal } from "components/workspace/views/modal";
+// fetch-keys
+import { WORKSPACE_VIEW_ISSUES } from "constants/fetch-keys";
+// types
+import { IIssue } from "types";
+
+export const WorkspaceSubscribedIssues = () => {
+  const [createViewModal, setCreateViewModal] = useState<any>(null);
+
+  // create issue modal
+  const [createIssueModal, setCreateIssueModal] = useState(false);
+  const [preloadedData, setPreloadedData] = useState<
+    (Partial<IIssue> & { actionType: "createIssue" | "edit" | "delete" }) | undefined
+  >(undefined);
+
+  // update issue modal
+  const [editIssueModal, setEditIssueModal] = useState(false);
+  const [issueToEdit, setIssueToEdit] = useState<
+    (IIssue & { actionType: "edit" | "delete" }) | undefined
+  >(undefined);
+
+  // delete issue modal
+  const [deleteIssueModal, setDeleteIssueModal] = useState(false);
+  const [issueToDelete, setIssueToDelete] = useState<IIssue | null>(null);
+
+  const router = useRouter();
+  const { workspaceSlug } = router.query;
+
+  const { user } = useUser();
+  const { memberRole } = useProjectMyMembership();
+
+  const params: any = {
+    subscriber: user?.id ?? undefined,
+    sub_issue: false,
+  };
+
+  const { data: viewIssues, mutate: mutateIssues } = useSWR(
+    workspaceSlug ? WORKSPACE_VIEW_ISSUES(workspaceSlug.toString(), params) : null,
+    workspaceSlug ? () => workspaceService.getViewIssues(workspaceSlug.toString(), params) : null
+  );
+
+  const makeIssueCopy = useCallback(
+    (issue: IIssue) => {
+      setCreateIssueModal(true);
+
+      setPreloadedData({ ...issue, name: `${issue.name} (Copy)`, actionType: "createIssue" });
+    },
+    [setCreateIssueModal, setPreloadedData]
+  );
+
+  const handleEditIssue = useCallback(
+    (issue: IIssue) => {
+      setEditIssueModal(true);
+      setIssueToEdit({
+        ...issue,
+        actionType: "edit",
+        cycle: issue.issue_cycle ? issue.issue_cycle.cycle : null,
+        module: issue.issue_module ? issue.issue_module.module : null,
+      });
+    },
+    [setEditIssueModal, setIssueToEdit]
+  );
+
+  const handleDeleteIssue = useCallback(
+    (issue: IIssue) => {
+      setDeleteIssueModal(true);
+      setIssueToDelete(issue);
+    },
+    [setDeleteIssueModal, setIssueToDelete]
+  );
+
+  const handleIssueAction = useCallback(
+    (issue: IIssue, action: "copy" | "edit" | "delete" | "updateDraft") => {
+      if (action === "copy") makeIssueCopy(issue);
+      else if (action === "edit") handleEditIssue(issue);
+      else if (action === "delete") handleDeleteIssue(issue);
+    },
+    [makeIssueCopy, handleEditIssue, handleDeleteIssue]
+  );
+  return (
+    <>
+      <CreateUpdateIssueModal
+        isOpen={createIssueModal && preloadedData?.actionType === "createIssue"}
+        handleClose={() => setCreateIssueModal(false)}
+        prePopulateData={{
+          ...preloadedData,
+        }}
+        onSubmit={async () => {
+          mutateIssues();
+        }}
+      />
+      <CreateUpdateIssueModal
+        isOpen={editIssueModal && issueToEdit?.actionType !== "delete"}
+        handleClose={() => setEditIssueModal(false)}
+        data={issueToEdit}
+        onSubmit={async () => {
+          mutateIssues();
+        }}
+      />
+      <DeleteIssueModal
+        handleClose={() => setDeleteIssueModal(false)}
+        isOpen={deleteIssueModal}
+        data={issueToDelete}
+        user={user}
+        onSubmit={async () => {
+          mutateIssues();
+        }}
+      />
+      <CreateUpdateWorkspaceViewModal
+        isOpen={createViewModal !== null}
+        handleClose={() => setCreateViewModal(null)}
+        preLoadedData={createViewModal}
+      />
+      <div className="h-full flex flex-col overflow-hidden bg-custom-background-100">
+        <div className="h-full w-full border-b border-custom-border-300">
+          <WorkspaceViewsNavigation handleAddView={() => setCreateViewModal(true)} />
+
+          <div className="h-full w-full flex flex-col">
+            <SpreadsheetView
+              spreadsheetIssues={viewIssues}
+              mutateIssues={mutateIssues}
+              handleIssueAction={handleIssueAction}
+              disableUserActions={false}
+              user={user}
+              userAuth={memberRole}
+            />
+          </div>
+        </div>
+      </div>
+    </>
+  );
+};
diff --git a/web/components/profile/profile-issues-view-options.tsx b/web/components/profile/profile-issues-view-options.tsx
index c853da530..40b27ec2c 100644
--- a/web/components/profile/profile-issues-view-options.tsx
+++ b/web/components/profile/profile-issues-view-options.tsx
@@ -10,7 +10,7 @@ import useEstimateOption from "hooks/use-estimate-option";
 // components
 import { MyIssuesSelectFilters } from "components/issues";
 // ui
-import { CustomMenu, CustomSearchSelect, ToggleSwitch, Tooltip } from "components/ui";
+import { CustomMenu, ToggleSwitch, Tooltip } from "components/ui";
 // icons
 import { ChevronDownIcon } from "@heroicons/react/24/outline";
 import { FormatListBulletedOutlined, GridViewOutlined } from "@mui/icons-material";
@@ -21,7 +21,6 @@ import { checkIfArraysHaveSameElements } from "helpers/array.helper";
 import { Properties, TIssueViewOptions } from "types";
 // constants
 import { GROUP_BY_OPTIONS, ORDER_BY_OPTIONS, FILTER_ISSUE_OPTIONS } from "constants/issue";
-import useProjects from "hooks/use-projects";
 
 const issueViewOptions: { type: TIssueViewOptions; Icon: any }[] = [
   {
@@ -37,9 +36,6 @@ const issueViewOptions: { type: TIssueViewOptions; Icon: any }[] = [
 export const ProfileIssuesViewOptions: React.FC = () => {
   const router = useRouter();
   const { workspaceSlug, userId } = router.query;
-
-  const { projects } = useProjects();
-
   const {
     displayFilters,
     setDisplayFilters,
@@ -51,28 +47,12 @@ export const ProfileIssuesViewOptions: React.FC = () => {
 
   const { isEstimateActive } = useEstimateOption();
 
-  const options = projects?.map((project) => ({
-    value: project.id,
-    query: project.name + " " + project.identifier,
-    content: project.name,
-  }));
-
   if (
     !router.pathname.includes("assigned") &&
     !router.pathname.includes("created") &&
     !router.pathname.includes("subscribed")
   )
     return null;
-  // return (
-  //   <CustomSearchSelect
-  //     value={projects ?? null}
-  //     onChange={(val: string[] | null) => console.log(val)}
-  //     label="Filters"
-  //     options={options}
-  //     position="right"
-  //     multiple
-  //   />
-  // );
 
   return (
     <div className="flex items-center gap-2">
@@ -287,38 +267,39 @@ export const ProfileIssuesViewOptions: React.FC = () => {
                   <div className="space-y-2 py-3">
                     <h4 className="text-sm text-custom-text-200">Display Properties</h4>
                     <div className="flex flex-wrap items-center gap-2 text-custom-text-200">
-                      {Object.keys(displayProperties).map((key) => {
-                        if (key === "estimate" && !isEstimateActive) return null;
+                      {displayProperties &&
+                        Object.keys(displayProperties).map((key) => {
+                          if (key === "estimate" && !isEstimateActive) return null;
 
-                        if (
-                          displayFilters?.layout === "spreadsheet" &&
-                          (key === "attachment_count" ||
-                            key === "link" ||
-                            key === "sub_issue_count")
-                        )
-                          return null;
+                          if (
+                            displayFilters?.layout === "spreadsheet" &&
+                            (key === "attachment_count" ||
+                              key === "link" ||
+                              key === "sub_issue_count")
+                          )
+                            return null;
 
-                        if (
-                          displayFilters?.layout !== "spreadsheet" &&
-                          (key === "created_on" || key === "updated_on")
-                        )
-                          return null;
+                          if (
+                            displayFilters?.layout !== "spreadsheet" &&
+                            (key === "created_on" || key === "updated_on")
+                          )
+                            return null;
 
-                        return (
-                          <button
-                            key={key}
-                            type="button"
-                            className={`rounded border px-2 py-1 text-xs capitalize ${
-                              displayProperties[key as keyof Properties]
-                                ? "border-custom-primary bg-custom-primary text-white"
-                                : "border-custom-border-200"
-                            }`}
-                            onClick={() => setProperties(key as keyof Properties)}
-                          >
-                            {key === "key" ? "ID" : replaceUnderscoreIfSnakeCase(key)}
-                          </button>
-                        );
-                      })}
+                          return (
+                            <button
+                              key={key}
+                              type="button"
+                              className={`rounded border px-2 py-1 text-xs capitalize ${
+                                displayProperties[key as keyof Properties]
+                                  ? "border-custom-primary bg-custom-primary text-white"
+                                  : "border-custom-border-200"
+                              }`}
+                              onClick={() => setProperties(key as keyof Properties)}
+                            >
+                              {key === "key" ? "ID" : replaceUnderscoreIfSnakeCase(key)}
+                            </button>
+                          );
+                        })}
                     </div>
                   </div>
                 </div>
diff --git a/web/components/ui/dropdowns/custom-menu.tsx b/web/components/ui/dropdowns/custom-menu.tsx
index c451d4432..41450b2b3 100644
--- a/web/components/ui/dropdowns/custom-menu.tsx
+++ b/web/components/ui/dropdowns/custom-menu.tsx
@@ -19,6 +19,7 @@ export type CustomMenuProps = DropdownProps & {
 
 const CustomMenu = ({
   buttonClassName = "",
+  customButtonClassName = "",
   children,
   className = "",
   customButton,
@@ -40,7 +41,12 @@ const CustomMenu = ({
     {({ open }) => (
       <>
         {customButton ? (
-          <Menu.Button as="button" type="button" onClick={menuButtonOnClick}>
+          <Menu.Button
+            as="button"
+            type="button"
+            onClick={menuButtonOnClick}
+            className={customButtonClassName}
+          >
             {customButton}
           </Menu.Button>
         ) : (
diff --git a/web/components/ui/dropdowns/types.d.ts b/web/components/ui/dropdowns/types.d.ts
index aace1858a..b368a7ed8 100644
--- a/web/components/ui/dropdowns/types.d.ts
+++ b/web/components/ui/dropdowns/types.d.ts
@@ -1,5 +1,6 @@
 export type DropdownProps = {
   buttonClassName?: string;
+  customButtonClassName?: string;
   className?: string;
   customButton?: JSX.Element;
   disabled?: boolean;
diff --git a/web/components/views/delete-view-modal.tsx b/web/components/views/delete-view-modal.tsx
index 0d49c62cc..61c627430 100644
--- a/web/components/views/delete-view-modal.tsx
+++ b/web/components/views/delete-view-modal.tsx
@@ -8,7 +8,6 @@ import { mutate } from "swr";
 import { Dialog, Transition } from "@headlessui/react";
 // services
 import viewsService from "services/views.service";
-import workspaceService from "services/workspace.service";
 // hooks
 import useToast from "hooks/use-toast";
 // ui
@@ -18,17 +17,16 @@ import { ExclamationTriangleIcon } from "@heroicons/react/24/outline";
 // types
 import type { ICurrentUserResponse, IView } from "types";
 // fetch-keys
-import { VIEWS_LIST, WORKSPACE_VIEWS_LIST } from "constants/fetch-keys";
+import { VIEWS_LIST } from "constants/fetch-keys";
 
 type Props = {
   isOpen: boolean;
-  viewType: "project" | "workspace";
   setIsOpen: React.Dispatch<React.SetStateAction<boolean>>;
   data: IView | null;
   user: ICurrentUserResponse | undefined;
 };
 
-export const DeleteViewModal: React.FC<Props> = ({ isOpen, data, setIsOpen, viewType, user }) => {
+export const DeleteViewModal: React.FC<Props> = ({ isOpen, data, setIsOpen, user }) => {
   const [isDeleteLoading, setIsDeleteLoading] = useState(false);
 
   const router = useRouter();
@@ -43,64 +41,33 @@ export const DeleteViewModal: React.FC<Props> = ({ isOpen, data, setIsOpen, view
 
   const handleDeletion = async () => {
     setIsDeleteLoading(true);
+    if (!workspaceSlug || !data || !projectId) return;
 
-    if (viewType === "project") {
-      if (!workspaceSlug || !data || !projectId) return;
+    await viewsService
+      .deleteView(workspaceSlug as string, projectId as string, data.id, user)
+      .then(() => {
+        mutate<IView[]>(VIEWS_LIST(projectId as string), (views) =>
+          views?.filter((view) => view.id !== data.id)
+        );
 
-      await viewsService
-        .deleteView(workspaceSlug as string, projectId as string, data.id, user)
-        .then(() => {
-          mutate<IView[]>(VIEWS_LIST(projectId as string), (views) =>
-            views?.filter((view) => view.id !== data.id)
-          );
+        handleClose();
 
-          handleClose();
-
-          setToastAlert({
-            type: "success",
-            title: "Success!",
-            message: "View deleted successfully.",
-          });
-        })
-        .catch(() => {
-          setToastAlert({
-            type: "error",
-            title: "Error!",
-            message: "View could not be deleted. Please try again.",
-          });
-        })
-        .finally(() => {
-          setIsDeleteLoading(false);
+        setToastAlert({
+          type: "success",
+          title: "Success!",
+          message: "View deleted successfully.",
         });
-    } else {
-      if (!workspaceSlug || !data) return;
-
-      await workspaceService
-        .deleteView(workspaceSlug as string, data.id)
-        .then(() => {
-          mutate<IView[]>(WORKSPACE_VIEWS_LIST(workspaceSlug as string), (views) =>
-            views?.filter((view) => view.id !== data.id)
-          );
-
-          handleClose();
-
-          setToastAlert({
-            type: "success",
-            title: "Success!",
-            message: "View deleted successfully.",
-          });
-        })
-        .catch(() => {
-          setToastAlert({
-            type: "error",
-            title: "Error!",
-            message: "View could not be deleted. Please try again.",
-          });
-        })
-        .finally(() => {
-          setIsDeleteLoading(false);
+      })
+      .catch(() => {
+        setToastAlert({
+          type: "error",
+          title: "Error!",
+          message: "View could not be deleted. Please try again.",
         });
-    }
+      })
+      .finally(() => {
+        setIsDeleteLoading(false);
+      });
   };
 
   return (
diff --git a/web/components/views/form.tsx b/web/components/views/form.tsx
index 29d16ca9c..0c57a9542 100644
--- a/web/components/views/form.tsx
+++ b/web/components/views/form.tsx
@@ -10,8 +10,6 @@ import { useForm } from "react-hook-form";
 import stateService from "services/state.service";
 // hooks
 import useProjectMembers from "hooks/use-project-members";
-import useProjects from "hooks/use-projects";
-import useWorkspaceMembers from "hooks/use-workspace-members";
 // components
 import { FiltersList } from "components/core";
 import { SelectFilters } from "components/views";
@@ -24,14 +22,13 @@ import { getStatesList } from "helpers/state.helper";
 import { IQuery, IView } from "types";
 import issuesService from "services/issues.service";
 // fetch-keys
-import { PROJECT_ISSUE_LABELS, STATES_LIST, WORKSPACE_LABELS } from "constants/fetch-keys";
+import { PROJECT_ISSUE_LABELS, STATES_LIST } from "constants/fetch-keys";
 
 type Props = {
   handleFormSubmit: (values: IView) => Promise<void>;
   handleClose: () => void;
   status: boolean;
   data?: IView | null;
-  viewType?: "workspace" | "project";
   preLoadedData?: Partial<IView> | null;
 };
 
@@ -45,7 +42,6 @@ export const ViewForm: React.FC<Props> = ({
   handleClose,
   status,
   data,
-  viewType,
   preLoadedData,
 }) => {
   const router = useRouter();
@@ -81,26 +77,8 @@ export const ViewForm: React.FC<Props> = ({
       ? () => issuesService.getIssueLabels(workspaceSlug.toString(), projectId.toString())
       : null
   );
-
-  const { data: workspaceLabels } = useSWR(
-    workspaceSlug ? WORKSPACE_LABELS(workspaceSlug.toString()) : null,
-    workspaceSlug ? () => issuesService.getWorkspaceLabels(workspaceSlug.toString()) : null
-  );
-
-  const labelOptions = viewType === "workspace" ? workspaceLabels : labels;
-
   const { members } = useProjectMembers(workspaceSlug?.toString(), projectId?.toString());
 
-  const { workspaceMembers } = useWorkspaceMembers(workspaceSlug?.toString() ?? "");
-
-  const memberOptions =
-    viewType === "workspace"
-      ? workspaceMembers?.map((m) => m.member)
-      : members?.map((m) => m.member);
-
-  const { projects: allProjects } = useProjects();
-  const joinedProjects = allProjects?.filter((p) => p.is_member);
-
   const handleCreateUpdateView = async (formData: IView) => {
     await handleFormSubmit(formData);
 
@@ -113,14 +91,12 @@ export const ViewForm: React.FC<Props> = ({
     setValue("query", {
       assignees: null,
       created_by: null,
-      subscriber: null,
       labels: null,
       priority: null,
       state: null,
-      state_group: null,
       start_date: null,
       target_date: null,
-      project: null,
+      type: null,
     });
   };
 
@@ -209,10 +185,9 @@ export const ViewForm: React.FC<Props> = ({
           <div>
             <FiltersList
               filters={filters}
-              labels={labelOptions}
-              members={memberOptions}
+              labels={labels}
+              members={members?.map((m) => m.member)}
               states={states}
-              project={joinedProjects}
               clearAllFilters={clearAllFilters}
               setFilters={(query: any) => {
                 setValue("query", {
diff --git a/web/components/views/modal.tsx b/web/components/views/modal.tsx
index 03f4f0b60..c1ff54231 100644
--- a/web/components/views/modal.tsx
+++ b/web/components/views/modal.tsx
@@ -8,7 +8,6 @@ import { mutate } from "swr";
 import { Dialog, Transition } from "@headlessui/react";
 // services
 import viewsService from "services/views.service";
-import workspaceService from "services/workspace.service";
 // hooks
 import useToast from "hooks/use-toast";
 // components
@@ -16,11 +15,10 @@ import { ViewForm } from "components/views";
 // types
 import { ICurrentUserResponse, IView } from "types";
 // fetch-keys
-import { VIEWS_LIST, WORKSPACE_VIEWS_LIST } from "constants/fetch-keys";
+import { VIEWS_LIST } from "constants/fetch-keys";
 
 type Props = {
   isOpen: boolean;
-  viewType: "project" | "workspace";
   handleClose: () => void;
   data?: IView | null;
   preLoadedData?: Partial<IView> | null;
@@ -29,7 +27,6 @@ type Props = {
 
 export const CreateUpdateViewModal: React.FC<Props> = ({
   isOpen,
-  viewType,
   handleClose,
   data,
   preLoadedData,
@@ -49,48 +46,25 @@ export const CreateUpdateViewModal: React.FC<Props> = ({
       ...payload,
       query_data: payload.query,
     };
+    await viewsService
+      .createView(workspaceSlug as string, projectId as string, payload, user)
+      .then(() => {
+        mutate(VIEWS_LIST(projectId as string));
+        handleClose();
 
-    if (viewType === "project") {
-      await viewsService
-        .createView(workspaceSlug as string, projectId as string, payload, user)
-        .then(() => {
-          mutate(VIEWS_LIST(projectId as string));
-          handleClose();
-
-          setToastAlert({
-            type: "success",
-            title: "Success!",
-            message: "View created successfully.",
-          });
-        })
-        .catch(() => {
-          setToastAlert({
-            type: "error",
-            title: "Error!",
-            message: "View could not be created. Please try again.",
-          });
+        setToastAlert({
+          type: "success",
+          title: "Success!",
+          message: "View created successfully.",
         });
-    } else {
-      await workspaceService
-        .createView(workspaceSlug as string, payload)
-        .then(() => {
-          mutate(WORKSPACE_VIEWS_LIST(workspaceSlug as string));
-          handleClose();
-
-          setToastAlert({
-            type: "success",
-            title: "Success!",
-            message: "View created successfully.",
-          });
-        })
-        .catch(() => {
-          setToastAlert({
-            type: "error",
-            title: "Error!",
-            message: "View could not be created. Please try again.",
-          });
+      })
+      .catch(() => {
+        setToastAlert({
+          type: "error",
+          title: "Error!",
+          message: "View could not be created. Please try again.",
         });
-    }
+      });
   };
 
   const updateView = async (payload: IView) => {
@@ -98,79 +72,41 @@ export const CreateUpdateViewModal: React.FC<Props> = ({
       ...payload,
       query_data: payload.query,
     };
-    if (viewType === "project") {
-      await viewsService
-        .updateView(workspaceSlug as string, projectId as string, data?.id ?? "", payloadData, user)
-        .then((res) => {
-          mutate<IView[]>(
-            VIEWS_LIST(projectId as string),
-            (prevData) =>
-              prevData?.map((p) => {
-                if (p.id === res.id) return { ...p, ...payloadData };
+    await viewsService
+      .updateView(workspaceSlug as string, projectId as string, data?.id ?? "", payloadData, user)
+      .then((res) => {
+        mutate<IView[]>(
+          VIEWS_LIST(projectId as string),
+          (prevData) =>
+            prevData?.map((p) => {
+              if (p.id === res.id) return { ...p, ...payloadData };
 
-                return p;
-              }),
-            false
-          );
-          onClose();
+              return p;
+            }),
+          false
+        );
+        onClose();
 
-          setToastAlert({
-            type: "success",
-            title: "Success!",
-            message: "View updated successfully.",
-          });
-        })
-        .catch(() => {
-          setToastAlert({
-            type: "error",
-            title: "Error!",
-            message: "View could not be updated. Please try again.",
-          });
+        setToastAlert({
+          type: "success",
+          title: "Success!",
+          message: "View updated successfully.",
         });
-    } else {
-      await workspaceService
-        .updateView(workspaceSlug as string, data?.id ?? "", payloadData)
-        .then((res) => {
-          mutate<IView[]>(
-            WORKSPACE_VIEWS_LIST(workspaceSlug as string),
-            (prevData) =>
-              prevData?.map((p) => {
-                if (p.id === res.id) return { ...p, ...payloadData };
-
-                return p;
-              }),
-            false
-          );
-          onClose();
-
-          setToastAlert({
-            type: "success",
-            title: "Success!",
-            message: "View updated successfully.",
-          });
-        })
-        .catch(() => {
-          setToastAlert({
-            type: "error",
-            title: "Error!",
-            message: "View could not be updated. Please try again.",
-          });
+      })
+      .catch(() => {
+        setToastAlert({
+          type: "error",
+          title: "Error!",
+          message: "View could not be updated. Please try again.",
         });
-    }
+      });
   };
 
   const handleFormSubmit = async (formData: IView) => {
-    if (viewType === "project") {
-      if (!workspaceSlug || !projectId) return;
+    if (!workspaceSlug || !projectId) return;
 
-      if (!data) await createView(formData);
-      else await updateView(formData);
-    } else {
-      if (!workspaceSlug) return;
-
-      if (!data) await createView(formData);
-      else await updateView(formData);
-    }
+    if (!data) await createView(formData);
+    else await updateView(formData);
   };
 
   return (
@@ -205,7 +141,6 @@ export const CreateUpdateViewModal: React.FC<Props> = ({
                   handleClose={handleClose}
                   status={data ? true : false}
                   data={data}
-                  viewType={viewType}
                   preLoadedData={preLoadedData}
                 />
               </Dialog.Panel>
diff --git a/web/components/views/select-filters.tsx b/web/components/views/select-filters.tsx
index 7b1324f5f..c3aadc33d 100644
--- a/web/components/views/select-filters.tsx
+++ b/web/components/views/select-filters.tsx
@@ -4,9 +4,6 @@ import { useRouter } from "next/router";
 
 import useSWR from "swr";
 
-// hook
-import useProjects from "hooks/use-projects";
-import useWorkspaceMembers from "hooks/use-workspace-members";
 // services
 import stateService from "services/state.service";
 import projectService from "services/project.service";
@@ -21,16 +18,11 @@ import { PriorityIcon, StateGroupIcon } from "components/icons";
 import { getStatesList } from "helpers/state.helper";
 import { checkIfArraysHaveSameElements } from "helpers/array.helper";
 // types
-import { IIssueFilterOptions, TStateGroups } from "types";
+import { IIssueFilterOptions } from "types";
 // fetch-keys
-import {
-  PROJECT_ISSUE_LABELS,
-  PROJECT_MEMBERS,
-  STATES_LIST,
-  WORKSPACE_LABELS,
-} from "constants/fetch-keys";
+import { PROJECT_ISSUE_LABELS, PROJECT_MEMBERS, STATES_LIST } from "constants/fetch-keys";
 // constants
-import { GROUP_CHOICES, PRIORITIES } from "constants/project";
+import { PRIORITIES } from "constants/project";
 import { DATE_FILTER_OPTIONS } from "constants/filters";
 
 type Props = {
@@ -56,7 +48,7 @@ export const SelectFilters: React.FC<Props> = ({
   });
 
   const router = useRouter();
-  const { workspaceSlug, projectId, workspaceViewId } = router.query;
+  const { workspaceSlug, projectId } = router.query;
 
   const { data: states } = useSWR(
     workspaceSlug && projectId ? STATES_LIST(projectId as string) : null,
@@ -66,20 +58,6 @@ export const SelectFilters: React.FC<Props> = ({
   );
   const statesList = getStatesList(states);
 
-  const workspaceViewPathName = [
-    "workspace-views",
-    "workspace-views/all-issues",
-    "workspace-views/assigned",
-    "workspace-views/created",
-    "workspace-views/subscribed",
-  ];
-
-  const isWorkspaceViewPath = workspaceViewPathName.some((pathname) =>
-    router.pathname.includes(pathname)
-  );
-
-  const isWorkspaceView = isWorkspaceViewPath || workspaceViewId;
-
   const { data: members } = useSWR(
     projectId ? PROJECT_MEMBERS(projectId as string) : null,
     workspaceSlug && projectId
@@ -87,8 +65,6 @@ export const SelectFilters: React.FC<Props> = ({
       : null
   );
 
-  const { workspaceMembers } = useWorkspaceMembers(workspaceSlug?.toString() ?? "");
-
   const { data: issueLabels } = useSWR(
     projectId ? PROJECT_ISSUE_LABELS(projectId.toString()) : null,
     workspaceSlug && projectId
@@ -96,14 +72,6 @@ export const SelectFilters: React.FC<Props> = ({
       : null
   );
 
-  const { data: workspaceLabels } = useSWR(
-    workspaceSlug ? WORKSPACE_LABELS(workspaceSlug.toString()) : null,
-    workspaceSlug ? () => issuesService.getWorkspaceLabels(workspaceSlug.toString()) : null
-  );
-
-  const { projects: allProjects } = useProjects();
-  const joinedProjects = allProjects?.filter((p) => p.is_member);
-
   const projectFilterOption = [
     {
       id: "priority",
@@ -283,226 +251,6 @@ export const SelectFilters: React.FC<Props> = ({
       ],
     },
   ];
-
-  const workspaceFilterOption = [
-    {
-      id: "project",
-      label: "Project",
-      value: joinedProjects,
-      hasChildren: true,
-      children: joinedProjects?.map((project) => ({
-        id: project.id,
-        label: <div className="flex items-center gap-2">{project.name}</div>,
-        value: {
-          key: "project",
-          value: project.id,
-        },
-        selected: filters?.project?.includes(project.id),
-      })),
-    },
-    {
-      id: "state_group",
-      label: "State groups",
-      value: GROUP_CHOICES,
-      hasChildren: true,
-      children: [
-        ...Object.keys(GROUP_CHOICES).map((key) => ({
-          id: key,
-          label: (
-            <div className="flex items-center gap-2">
-              <StateGroupIcon stateGroup={key as TStateGroups} />
-              {GROUP_CHOICES[key as keyof typeof GROUP_CHOICES]}
-            </div>
-          ),
-          value: {
-            key: "state_group",
-            value: key,
-          },
-          selected: filters?.state?.includes(key),
-        })),
-      ],
-    },
-    {
-      id: "labels",
-      label: "Labels",
-      value: workspaceLabels,
-      hasChildren: true,
-      children: workspaceLabels?.map((label) => ({
-        id: label.id,
-        label: (
-          <div className="flex items-center gap-2">
-            <div
-              className="h-2 w-2 rounded-full"
-              style={{
-                backgroundColor: label.color && label.color !== "" ? label.color : "#000000",
-              }}
-            />
-            {label.name}
-          </div>
-        ),
-        value: {
-          key: "labels",
-          value: label.id,
-        },
-        selected: filters?.labels?.includes(label.id),
-      })),
-    },
-    {
-      id: "priority",
-      label: "Priority",
-      value: PRIORITIES,
-      hasChildren: true,
-      children: PRIORITIES.map((priority) => ({
-        id: priority === null ? "null" : priority,
-        label: (
-          <div className="flex items-center gap-2 capitalize">
-            <PriorityIcon priority={priority} />
-            {priority ?? "None"}
-          </div>
-        ),
-        value: {
-          key: "priority",
-          value: priority === null ? "null" : priority,
-        },
-        selected: filters?.priority?.includes(priority === null ? "null" : priority),
-      })),
-    },
-    {
-      id: "created_by",
-      label: "Created by",
-      value: workspaceMembers,
-      hasChildren: true,
-      children: workspaceMembers?.map((member) => ({
-        id: member.member.id,
-        label: (
-          <div className="flex items-center gap-2">
-            <Avatar user={member.member} />
-            {member.member.display_name}
-          </div>
-        ),
-        value: {
-          key: "created_by",
-          value: member.member.id,
-        },
-        selected: filters?.created_by?.includes(member.member.id),
-      })),
-    },
-    {
-      id: "assignees",
-      label: "Assignees",
-      value: workspaceMembers,
-      hasChildren: true,
-      children: workspaceMembers?.map((member) => ({
-        id: member.member.id,
-        label: (
-          <div className="flex items-center gap-2">
-            <Avatar user={member.member} />
-            {member.member.display_name}
-          </div>
-        ),
-        value: {
-          key: "assignees",
-          value: member.member.id,
-        },
-        selected: filters?.assignees?.includes(member.member.id),
-      })),
-    },
-    {
-      id: "subscriber",
-      label: "Subscriber",
-      value: workspaceMembers,
-      hasChildren: true,
-      children: workspaceMembers?.map((member) => ({
-        id: member.member.id,
-        label: (
-          <div className="flex items-center gap-2">
-            <Avatar user={member.member} />
-            {member.member.display_name}
-          </div>
-        ),
-        value: {
-          key: "subscriber",
-          value: member.member.id,
-        },
-        selected: filters?.subscriber?.includes(member.member.id),
-      })),
-    },
-    {
-      id: "start_date",
-      label: "Start date",
-      value: DATE_FILTER_OPTIONS,
-      hasChildren: true,
-      children: [
-        ...DATE_FILTER_OPTIONS.map((option) => ({
-          id: option.name,
-          label: option.name,
-          value: {
-            key: "start_date",
-            value: option.value,
-          },
-          selected: checkIfArraysHaveSameElements(filters?.start_date ?? [], option.value),
-        })),
-        {
-          id: "custom",
-          label: "Custom",
-          value: "custom",
-          element: (
-            <button
-              onClick={() => {
-                setIsDateFilterModalOpen(true);
-                setDateFilterType({
-                  title: "Start date",
-                  type: "start_date",
-                });
-              }}
-              className="w-full rounded px-1 py-1.5 text-left text-custom-text-200 hover:bg-custom-background-80"
-            >
-              Custom
-            </button>
-          ),
-        },
-      ],
-    },
-    {
-      id: "target_date",
-      label: "Due date",
-      value: DATE_FILTER_OPTIONS,
-      hasChildren: true,
-      children: [
-        ...DATE_FILTER_OPTIONS.map((option) => ({
-          id: option.name,
-          label: option.name,
-          value: {
-            key: "target_date",
-            value: option.value,
-          },
-          selected: checkIfArraysHaveSameElements(filters?.target_date ?? [], option.value),
-        })),
-        {
-          id: "custom",
-          label: "Custom",
-          value: "custom",
-          element: (
-            <button
-              onClick={() => {
-                setIsDateFilterModalOpen(true);
-                setDateFilterType({
-                  title: "Due date",
-                  type: "target_date",
-                });
-              }}
-              className="w-full rounded px-1 py-1.5 text-left text-custom-text-200 hover:bg-custom-background-80"
-            >
-              Custom
-            </button>
-          ),
-        },
-      ],
-    },
-  ];
-
-  const filterOption = isWorkspaceView ? workspaceFilterOption : projectFilterOption;
-
   return (
     <>
       {isDateFilterModalOpen && (
@@ -520,7 +268,7 @@ export const SelectFilters: React.FC<Props> = ({
         onSelect={onSelect}
         direction={direction}
         height={height}
-        options={filterOption}
+        options={projectFilterOption}
       />
     </>
   );
diff --git a/web/components/views/single-view-item.tsx b/web/components/views/single-view-item.tsx
index d27eb3cf1..a2e0d213a 100644
--- a/web/components/views/single-view-item.tsx
+++ b/web/components/views/single-view-item.tsx
@@ -12,6 +12,7 @@ import { CustomMenu } from "components/ui";
 import viewsService from "services/views.service";
 // types
 import { IView } from "types";
+import { IWorkspaceView } from "types/workspace-views";
 // fetch keys
 import { VIEWS_LIST } from "constants/fetch-keys";
 // hooks
@@ -20,7 +21,7 @@ import useToast from "hooks/use-toast";
 import { truncateText } from "helpers/string.helper";
 
 type Props = {
-  view: IView;
+  view: IView | IWorkspaceView;
   viewType: "project" | "workspace";
   handleEditView: () => void;
   handleDeleteView: () => void;
diff --git a/web/components/workspace/views/delete-workspace-view-modal.tsx b/web/components/workspace/views/delete-workspace-view-modal.tsx
new file mode 100644
index 000000000..6030f630f
--- /dev/null
+++ b/web/components/workspace/views/delete-workspace-view-modal.tsx
@@ -0,0 +1,141 @@
+import React, { useState } from "react";
+
+import { useRouter } from "next/router";
+
+import { mutate } from "swr";
+
+// headless ui
+import { Dialog, Transition } from "@headlessui/react";
+// services
+import workspaceService from "services/workspace.service";
+// hooks
+import useToast from "hooks/use-toast";
+// ui
+import { DangerButton, SecondaryButton } from "components/ui";
+// icons
+import { ExclamationTriangleIcon } from "@heroicons/react/24/outline";
+// types
+import { IWorkspaceView } from "types/workspace-views";
+// fetch-keys
+import { WORKSPACE_VIEWS_LIST } from "constants/fetch-keys";
+
+type Props = {
+  isOpen: boolean;
+  setIsOpen: React.Dispatch<React.SetStateAction<boolean>>;
+  data: IWorkspaceView | null;
+};
+
+export const DeleteWorkspaceViewModal: React.FC<Props> = ({ isOpen, data, setIsOpen }) => {
+  const [isDeleteLoading, setIsDeleteLoading] = useState(false);
+
+  const router = useRouter();
+  const { workspaceSlug } = router.query;
+
+  const { setToastAlert } = useToast();
+
+  const handleClose = () => {
+    setIsOpen(false);
+    setIsDeleteLoading(false);
+  };
+
+  const handleDeletion = async () => {
+    setIsDeleteLoading(true);
+
+    if (!workspaceSlug || !data) return;
+
+    await workspaceService
+      .deleteView(workspaceSlug as string, data.id)
+      .then(() => {
+        mutate<IWorkspaceView[]>(WORKSPACE_VIEWS_LIST(workspaceSlug as string), (views) =>
+          views?.filter((view) => view.id !== data.id)
+        );
+
+        handleClose();
+
+        setToastAlert({
+          type: "success",
+          title: "Success!",
+          message: "View deleted successfully.",
+        });
+      })
+      .catch(() => {
+        setToastAlert({
+          type: "error",
+          title: "Error!",
+          message: "View could not be deleted. Please try again.",
+        });
+      })
+      .finally(() => {
+        setIsDeleteLoading(false);
+      });
+  };
+
+  return (
+    <Transition.Root show={isOpen} as={React.Fragment}>
+      <Dialog as="div" className="relative z-20" onClose={handleClose}>
+        <Transition.Child
+          as={React.Fragment}
+          enter="ease-out duration-300"
+          enterFrom="opacity-0"
+          enterTo="opacity-100"
+          leave="ease-in duration-200"
+          leaveFrom="opacity-100"
+          leaveTo="opacity-0"
+        >
+          <div className="fixed inset-0 bg-custom-backdrop bg-opacity-50 transition-opacity" />
+        </Transition.Child>
+
+        <div className="fixed inset-0 z-20 overflow-y-auto">
+          <div className="flex min-h-full items-end justify-center p-4 text-center sm:items-center sm:p-0">
+            <Transition.Child
+              as={React.Fragment}
+              enter="ease-out duration-300"
+              enterFrom="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
+              enterTo="opacity-100 translate-y-0 sm:scale-100"
+              leave="ease-in duration-200"
+              leaveFrom="opacity-100 translate-y-0 sm:scale-100"
+              leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
+            >
+              <Dialog.Panel className="relative transform overflow-hidden rounded-lg border border-custom-border-200 bg-custom-background-100 text-left shadow-xl transition-all sm:my-8 sm:w-[40rem]">
+                <div className="px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
+                  <div className="sm:flex sm:items-start">
+                    <div className="mx-auto flex h-12 w-12 flex-shrink-0 items-center justify-center rounded-full bg-red-500/20 sm:mx-0 sm:h-10 sm:w-10">
+                      <ExclamationTriangleIcon
+                        className="h-6 w-6 text-red-600"
+                        aria-hidden="true"
+                      />
+                    </div>
+                    <div className="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left">
+                      <Dialog.Title
+                        as="h3"
+                        className="text-lg font-medium leading-6 text-custom-text-100"
+                      >
+                        Delete View
+                      </Dialog.Title>
+                      <div className="mt-2">
+                        <p className="text-sm text-custom-text-200">
+                          Are you sure you want to delete view-{" "}
+                          <span className="break-words font-medium text-custom-text-100">
+                            {data?.name}
+                          </span>
+                          ? All of the data related to the view will be permanently removed. This
+                          action cannot be undone.
+                        </p>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <div className="flex justify-end gap-2 p-4 sm:px-6">
+                  <SecondaryButton onClick={handleClose}>Cancel</SecondaryButton>
+                  <DangerButton onClick={handleDeletion} loading={isDeleteLoading}>
+                    {isDeleteLoading ? "Deleting..." : "Delete"}
+                  </DangerButton>
+                </div>
+              </Dialog.Panel>
+            </Transition.Child>
+          </div>
+        </div>
+      </Dialog>
+    </Transition.Root>
+  );
+};
diff --git a/web/components/workspace/views/form.tsx b/web/components/workspace/views/form.tsx
new file mode 100644
index 000000000..b16d61399
--- /dev/null
+++ b/web/components/workspace/views/form.tsx
@@ -0,0 +1,213 @@
+import { useEffect } from "react";
+
+import { useRouter } from "next/router";
+
+import useSWR from "swr";
+
+// react-hook-form
+import { useForm } from "react-hook-form";
+// services
+import issuesService from "services/issues.service";
+
+// hooks
+import useProjects from "hooks/use-projects";
+import useWorkspaceMembers from "hooks/use-workspace-members";
+// components
+import { WorkspaceFiltersList } from "components/core";
+import { GlobalSelectFilters } from "components/workspace/views/global-select-filters";
+
+// ui
+import { Input, PrimaryButton, SecondaryButton, TextArea } from "components/ui";
+// helpers
+import { checkIfArraysHaveSameElements } from "helpers/array.helper";
+// types
+import { IQuery } from "types";
+import { IWorkspaceView } from "types/workspace-views";
+// fetch-keys
+import { WORKSPACE_LABELS } from "constants/fetch-keys";
+import { STATE_GROUP } from "constants/project";
+
+type Props = {
+  handleFormSubmit: (values: IWorkspaceView) => Promise<void>;
+  handleClose: () => void;
+  status: boolean;
+  data?: IWorkspaceView | null;
+  preLoadedData?: Partial<IWorkspaceView> | null;
+};
+
+const defaultValues: Partial<IWorkspaceView> = {
+  name: "",
+  description: "",
+};
+
+export const WorkspaceViewForm: React.FC<Props> = ({
+  handleFormSubmit,
+  handleClose,
+  status,
+  data,
+  preLoadedData,
+}) => {
+  const router = useRouter();
+  const { workspaceSlug } = router.query;
+
+  const {
+    register,
+    formState: { errors, isSubmitting },
+    handleSubmit,
+    reset,
+    watch,
+    setValue,
+  } = useForm<any>({
+    defaultValues,
+  });
+  const filters = watch("query");
+
+  const { data: labelOptions } = useSWR(
+    workspaceSlug ? WORKSPACE_LABELS(workspaceSlug.toString()) : null,
+    workspaceSlug ? () => issuesService.getWorkspaceLabels(workspaceSlug.toString()) : null
+  );
+
+  const { workspaceMembers } = useWorkspaceMembers(workspaceSlug?.toString() ?? "");
+
+  const memberOptions = workspaceMembers?.map((m) => m.member);
+
+  const { projects: allProjects } = useProjects();
+  const joinedProjects = allProjects?.filter((p) => p.is_member);
+
+  const handleCreateUpdateView = async (formData: IWorkspaceView) => {
+    await handleFormSubmit(formData);
+
+    reset({
+      ...defaultValues,
+    });
+  };
+
+  const clearAllFilters = () => {
+    setValue("query", {
+      assignees: null,
+      created_by: null,
+      subscriber: null,
+      labels: null,
+      priority: null,
+      state_group: null,
+      start_date: null,
+      target_date: null,
+      project: null,
+    });
+  };
+
+  useEffect(() => {
+    reset({
+      ...defaultValues,
+      ...preLoadedData,
+      ...data,
+    });
+  }, [data, preLoadedData, reset]);
+
+  useEffect(() => {
+    if (status && data) {
+      setValue("query", data.query_data);
+    }
+  }, [data, status, setValue]);
+
+  return (
+    <form onSubmit={handleSubmit(handleCreateUpdateView)}>
+      <div className="space-y-5">
+        <h3 className="text-lg font-medium leading-6 text-custom-text-100">
+          {status ? "Update" : "Create"} View
+        </h3>
+        <div className="space-y-3">
+          <div>
+            <Input
+              id="name"
+              name="name"
+              type="name"
+              placeholder="Title"
+              autoComplete="off"
+              className="resize-none text-xl"
+              error={errors.name}
+              register={register}
+              validations={{
+                required: "Title is required",
+                maxLength: {
+                  value: 255,
+                  message: "Title should be less than 255 characters",
+                },
+              }}
+            />
+          </div>
+          <div>
+            <TextArea
+              id="description"
+              name="description"
+              placeholder="Description"
+              className="h-32 resize-none text-sm"
+              error={errors.description}
+              register={register}
+            />
+          </div>
+          <div>
+            <GlobalSelectFilters
+              filters={filters}
+              onSelect={(option) => {
+                const key = option.key as keyof typeof filters;
+
+                if (key === "start_date" || key === "target_date") {
+                  const valueExists = checkIfArraysHaveSameElements(
+                    filters?.[key] ?? [],
+                    option.value
+                  );
+
+                  setValue("query", {
+                    ...filters,
+                    [key]: valueExists ? null : option.value,
+                  } as IQuery);
+                } else {
+                  if (!filters?.[key]?.includes(option.value))
+                    setValue("query", {
+                      ...filters,
+                      [key]: [...((filters?.[key] as any[]) ?? []), option.value],
+                    });
+                  else {
+                    setValue("query", {
+                      ...filters,
+                      [key]: (filters?.[key] as any[])?.filter((item) => item !== option.value),
+                    });
+                  }
+                }
+              }}
+            />
+          </div>
+          <div>
+            <WorkspaceFiltersList
+              filters={filters}
+              labels={labelOptions}
+              members={memberOptions}
+              project={joinedProjects}
+              stateGroup={STATE_GROUP}
+              clearAllFilters={clearAllFilters}
+              setFilters={(query: any) => {
+                setValue("query", {
+                  ...filters,
+                  ...query,
+                });
+              }}
+            />
+          </div>
+        </div>
+      </div>
+      <div className="mt-5 flex justify-end gap-2">
+        <SecondaryButton onClick={handleClose}>Cancel</SecondaryButton>
+        <PrimaryButton type="submit" loading={isSubmitting}>
+          {status
+            ? isSubmitting
+              ? "Updating View..."
+              : "Update View"
+            : isSubmitting
+            ? "Creating View..."
+            : "Create View"}
+        </PrimaryButton>
+      </div>
+    </form>
+  );
+};
diff --git a/web/components/workspace/views/global-select-filters.tsx b/web/components/workspace/views/global-select-filters.tsx
new file mode 100644
index 000000000..967ee1bf8
--- /dev/null
+++ b/web/components/workspace/views/global-select-filters.tsx
@@ -0,0 +1,301 @@
+import { useState } from "react";
+
+import { useRouter } from "next/router";
+
+import useSWR from "swr";
+
+// hook
+import useProjects from "hooks/use-projects";
+import useWorkspaceMembers from "hooks/use-workspace-members";
+// services
+import issuesService from "services/issues.service";
+// components
+import { DateFilterModal } from "components/core";
+// ui
+import { Avatar, MultiLevelDropdown } from "components/ui";
+// icons
+import { PriorityIcon, StateGroupIcon } from "components/icons";
+// helpers
+import { checkIfArraysHaveSameElements } from "helpers/array.helper";
+// types
+import { IWorkspaceIssueFilterOptions, TStateGroups } from "types";
+// fetch-keys
+import { WORKSPACE_LABELS } from "constants/fetch-keys";
+// constants
+import { GROUP_CHOICES, PRIORITIES } from "constants/project";
+import { DATE_FILTER_OPTIONS } from "constants/filters";
+
+type Props = {
+  filters: Partial<IWorkspaceIssueFilterOptions>;
+  onSelect: (option: any) => void;
+  direction?: "left" | "right";
+  height?: "sm" | "md" | "rg" | "lg";
+};
+
+export const GlobalSelectFilters: React.FC<Props> = ({
+  filters,
+  onSelect,
+  direction = "right",
+  height = "md",
+}) => {
+  const [isDateFilterModalOpen, setIsDateFilterModalOpen] = useState(false);
+  const [dateFilterType, setDateFilterType] = useState<{
+    title: string;
+    type: "start_date" | "target_date";
+  }>({
+    title: "",
+    type: "start_date",
+  });
+
+  const router = useRouter();
+  const { workspaceSlug } = router.query;
+
+  const { workspaceMembers } = useWorkspaceMembers(workspaceSlug?.toString() ?? "");
+
+  const { data: workspaceLabels } = useSWR(
+    workspaceSlug ? WORKSPACE_LABELS(workspaceSlug.toString()) : null,
+    workspaceSlug ? () => issuesService.getWorkspaceLabels(workspaceSlug.toString()) : null
+  );
+
+  const { projects: allProjects } = useProjects();
+  const joinedProjects = allProjects?.filter((p) => p.is_member);
+
+  const workspaceFilterOption = [
+    {
+      id: "project",
+      label: "Project",
+      value: joinedProjects,
+      hasChildren: true,
+      children: joinedProjects?.map((project) => ({
+        id: project.id,
+        label: <div className="flex items-center gap-2">{project.name}</div>,
+        value: {
+          key: "project",
+          value: project.id,
+        },
+        selected: filters?.project?.includes(project.id),
+      })),
+    },
+    {
+      id: "state_group",
+      label: "State groups",
+      value: GROUP_CHOICES,
+      hasChildren: true,
+      children: [
+        ...Object.keys(GROUP_CHOICES).map((key) => ({
+          id: key,
+          label: (
+            <div className="flex items-center gap-2">
+              <StateGroupIcon stateGroup={key as TStateGroups} />
+              {GROUP_CHOICES[key as keyof typeof GROUP_CHOICES]}
+            </div>
+          ),
+          value: {
+            key: "state_group",
+            value: key,
+          },
+          selected: filters?.state_group?.includes(key),
+        })),
+      ],
+    },
+    {
+      id: "labels",
+      label: "Labels",
+      value: workspaceLabels,
+      hasChildren: true,
+      children: workspaceLabels?.map((label) => ({
+        id: label.id,
+        label: (
+          <div className="flex items-center gap-2">
+            <div
+              className="h-2 w-2 rounded-full"
+              style={{
+                backgroundColor: label.color && label.color !== "" ? label.color : "#000000",
+              }}
+            />
+            {label.name}
+          </div>
+        ),
+        value: {
+          key: "labels",
+          value: label.id,
+        },
+        selected: filters?.labels?.includes(label.id),
+      })),
+    },
+    {
+      id: "priority",
+      label: "Priority",
+      value: PRIORITIES,
+      hasChildren: true,
+      children: PRIORITIES.map((priority) => ({
+        id: priority === null ? "null" : priority,
+        label: (
+          <div className="flex items-center gap-2 capitalize">
+            <PriorityIcon priority={priority} />
+            {priority ?? "None"}
+          </div>
+        ),
+        value: {
+          key: "priority",
+          value: priority === null ? "null" : priority,
+        },
+        selected: filters?.priority?.includes(priority === null ? "null" : priority),
+      })),
+    },
+    {
+      id: "created_by",
+      label: "Created by",
+      value: workspaceMembers,
+      hasChildren: true,
+      children: workspaceMembers?.map((member) => ({
+        id: member.member.id,
+        label: (
+          <div className="flex items-center gap-2">
+            <Avatar user={member.member} />
+            {member.member.display_name}
+          </div>
+        ),
+        value: {
+          key: "created_by",
+          value: member.member.id,
+        },
+        selected: filters?.created_by?.includes(member.member.id),
+      })),
+    },
+    {
+      id: "assignees",
+      label: "Assignees",
+      value: workspaceMembers,
+      hasChildren: true,
+      children: workspaceMembers?.map((member) => ({
+        id: member.member.id,
+        label: (
+          <div className="flex items-center gap-2">
+            <Avatar user={member.member} />
+            {member.member.display_name}
+          </div>
+        ),
+        value: {
+          key: "assignees",
+          value: member.member.id,
+        },
+        selected: filters?.assignees?.includes(member.member.id),
+      })),
+    },
+    {
+      id: "subscriber",
+      label: "Subscriber",
+      value: workspaceMembers,
+      hasChildren: true,
+      children: workspaceMembers?.map((member) => ({
+        id: member.member.id,
+        label: (
+          <div className="flex items-center gap-2">
+            <Avatar user={member.member} />
+            {member.member.display_name}
+          </div>
+        ),
+        value: {
+          key: "subscriber",
+          value: member.member.id,
+        },
+        selected: filters?.subscriber?.includes(member.member.id),
+      })),
+    },
+    {
+      id: "start_date",
+      label: "Start date",
+      value: DATE_FILTER_OPTIONS,
+      hasChildren: true,
+      children: [
+        ...DATE_FILTER_OPTIONS.map((option) => ({
+          id: option.name,
+          label: option.name,
+          value: {
+            key: "start_date",
+            value: option.value,
+          },
+          selected: checkIfArraysHaveSameElements(filters?.start_date ?? [], option.value),
+        })),
+        {
+          id: "custom",
+          label: "Custom",
+          value: "custom",
+          element: (
+            <button
+              onClick={() => {
+                setIsDateFilterModalOpen(true);
+                setDateFilterType({
+                  title: "Start date",
+                  type: "start_date",
+                });
+              }}
+              className="w-full rounded px-1 py-1.5 text-left text-custom-text-200 hover:bg-custom-background-80"
+            >
+              Custom
+            </button>
+          ),
+        },
+      ],
+    },
+    {
+      id: "target_date",
+      label: "Due date",
+      value: DATE_FILTER_OPTIONS,
+      hasChildren: true,
+      children: [
+        ...DATE_FILTER_OPTIONS.map((option) => ({
+          id: option.name,
+          label: option.name,
+          value: {
+            key: "target_date",
+            value: option.value,
+          },
+          selected: checkIfArraysHaveSameElements(filters?.target_date ?? [], option.value),
+        })),
+        {
+          id: "custom",
+          label: "Custom",
+          value: "custom",
+          element: (
+            <button
+              onClick={() => {
+                setIsDateFilterModalOpen(true);
+                setDateFilterType({
+                  title: "Due date",
+                  type: "target_date",
+                });
+              }}
+              className="w-full rounded px-1 py-1.5 text-left text-custom-text-200 hover:bg-custom-background-80"
+            >
+              Custom
+            </button>
+          ),
+        },
+      ],
+    },
+  ];
+
+  return (
+    <>
+      {isDateFilterModalOpen && (
+        <DateFilterModal
+          title={dateFilterType.title}
+          field={dateFilterType.type}
+          filters={filters as IWorkspaceIssueFilterOptions}
+          handleClose={() => setIsDateFilterModalOpen(false)}
+          isOpen={isDateFilterModalOpen}
+          onSelect={onSelect}
+        />
+      )}
+      <MultiLevelDropdown
+        label="Filters"
+        onSelect={onSelect}
+        direction={direction}
+        height={height}
+        options={workspaceFilterOption}
+      />
+    </>
+  );
+};
diff --git a/web/components/workspace/views/modal.tsx b/web/components/workspace/views/modal.tsx
new file mode 100644
index 000000000..48c3570cc
--- /dev/null
+++ b/web/components/workspace/views/modal.tsx
@@ -0,0 +1,155 @@
+import React from "react";
+
+import { useRouter } from "next/router";
+
+import { mutate } from "swr";
+
+// headless ui
+import { Dialog, Transition } from "@headlessui/react";
+// services
+import workspaceService from "services/workspace.service";
+// hooks
+import useToast from "hooks/use-toast";
+// components
+import { WorkspaceViewForm } from "components/workspace/views/form";
+// types
+import { IWorkspaceView } from "types/workspace-views";
+// fetch-keys
+import { WORKSPACE_VIEWS_LIST } from "constants/fetch-keys";
+
+type Props = {
+  isOpen: boolean;
+  handleClose: () => void;
+  data?: IWorkspaceView | null;
+  preLoadedData?: Partial<IWorkspaceView> | null;
+};
+
+export const CreateUpdateWorkspaceViewModal: React.FC<Props> = ({
+  isOpen,
+  handleClose,
+  data,
+  preLoadedData,
+}) => {
+  const router = useRouter();
+  const { workspaceSlug } = router.query;
+
+  const { setToastAlert } = useToast();
+
+  const onClose = () => {
+    handleClose();
+  };
+
+  const createView = async (payload: any) => {
+    const payloadData = {
+      ...payload,
+      query_data: {
+        filters: payload.query,
+      },
+    };
+    await workspaceService
+      .createView(workspaceSlug as string, payloadData)
+      .then(() => {
+        mutate(WORKSPACE_VIEWS_LIST(workspaceSlug as string));
+        handleClose();
+
+        setToastAlert({
+          type: "success",
+          title: "Success!",
+          message: "View created successfully.",
+        });
+      })
+      .catch(() => {
+        setToastAlert({
+          type: "error",
+          title: "Error!",
+          message: "View could not be created. Please try again.",
+        });
+      });
+  };
+
+  const updateView = async (payload: any) => {
+    const payloadData = {
+      ...payload,
+      query_data: {
+        filters: payload.query,
+      },
+    };
+    await workspaceService
+      .updateView(workspaceSlug as string, data?.id ?? "", payloadData)
+      .then((res) => {
+        mutate<IWorkspaceView[]>(
+          WORKSPACE_VIEWS_LIST(workspaceSlug as string),
+          (prevData) =>
+            prevData?.map((p) => {
+              if (p.id === res.id) return { ...p, ...payloadData };
+
+              return p;
+            }),
+          false
+        );
+        onClose();
+
+        setToastAlert({
+          type: "success",
+          title: "Success!",
+          message: "View updated successfully.",
+        });
+      })
+      .catch(() => {
+        setToastAlert({
+          type: "error",
+          title: "Error!",
+          message: "View could not be updated. Please try again.",
+        });
+      });
+  };
+
+  const handleFormSubmit = async (formData: any) => {
+    if (!workspaceSlug) return;
+
+    if (!data) await createView(formData);
+    else await updateView(formData);
+  };
+
+  return (
+    <Transition.Root show={isOpen} as={React.Fragment}>
+      <Dialog as="div" className="relative z-20" onClose={handleClose}>
+        <Transition.Child
+          as={React.Fragment}
+          enter="ease-out duration-300"
+          enterFrom="opacity-0"
+          enterTo="opacity-100"
+          leave="ease-in duration-200"
+          leaveFrom="opacity-100"
+          leaveTo="opacity-0"
+        >
+          <div className="fixed inset-0 bg-custom-backdrop bg-opacity-50 transition-opacity" />
+        </Transition.Child>
+
+        <div className="fixed inset-0 z-20 overflow-y-auto">
+          <div className="flex min-h-full items-center justify-center p-4 text-center sm:p-0">
+            <Transition.Child
+              as={React.Fragment}
+              enter="ease-out duration-300"
+              enterFrom="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
+              enterTo="opacity-100 translate-y-0 sm:scale-100"
+              leave="ease-in duration-200"
+              leaveFrom="opacity-100 translate-y-0 sm:scale-100"
+              leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
+            >
+              <Dialog.Panel className="relative transform rounded-lg border border-custom-border-200 bg-custom-background-100 px-5 py-8 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-2xl sm:p-6">
+                <WorkspaceViewForm
+                  handleFormSubmit={handleFormSubmit}
+                  handleClose={handleClose}
+                  status={data ? true : false}
+                  data={data}
+                  preLoadedData={preLoadedData}
+                />
+              </Dialog.Panel>
+            </Transition.Child>
+          </div>
+        </div>
+      </Dialog>
+    </Transition.Root>
+  );
+};
diff --git a/web/constants/fetch-keys.ts b/web/constants/fetch-keys.ts
index a1ead117f..ec6d38d1e 100644
--- a/web/constants/fetch-keys.ts
+++ b/web/constants/fetch-keys.ts
@@ -14,6 +14,7 @@ const paramsToKey = (params: any) => {
     sub_issue,
     start_target_date,
     project,
+    layout,
     subscriber,
   } = params;
 
@@ -31,6 +32,7 @@ const paramsToKey = (params: any) => {
   const type = params.type ? params.type.toUpperCase() : "NULL";
   const groupBy = params.group_by ? params.group_by.toUpperCase() : "NULL";
   const orderBy = params.order_by ? params.order_by.toUpperCase() : "NULL";
+  const layoutKey = layout ? layout.toUpperCase() : "";
 
   // sorting each keys in ascending order
   projectKey = projectKey.sort().join("_");
@@ -42,7 +44,7 @@ const paramsToKey = (params: any) => {
   labelsKey = labelsKey.sort().join("_");
   subscriberKey = subscriberKey.sort().join("_");
 
-  return `${projectKey}_${stateGroupKey}_${stateKey}_${priorityKey}_${assigneesKey}_${createdByKey}_${type}_${groupBy}_${orderBy}_${labelsKey}_${startDateKey}_${targetDateKey}_${sub_issue}_${startTargetDate}_${subscriberKey}`;
+  return `${layoutKey}_${projectKey}_${stateGroupKey}_${stateKey}_${priorityKey}_${assigneesKey}_${createdByKey}_${type}_${groupBy}_${orderBy}_${labelsKey}_${startDateKey}_${targetDateKey}_${sub_issue}_${startTargetDate}_${subscriberKey}`;
 };
 
 const inboxParamsToKey = (params: any) => {
@@ -162,12 +164,11 @@ export const WORKSPACE_VIEWS_LIST = (workspaceSlug: string) =>
   `WORKSPACE_VIEWS_LIST_${workspaceSlug.toUpperCase()}`;
 export const WORKSPACE_VIEW_DETAILS = (workspaceViewId: string) =>
   `WORKSPACE_VIEW_DETAILS_${workspaceViewId.toUpperCase()}`;
-export const WORKSPACE_VIEW_ISSUES = (workspaceViewId: string, params?: any) => {
+export const WORKSPACE_VIEW_ISSUES = (workspaceViewId: string, params: any) => {
   if (!params) return `WORKSPACE_VIEW_ISSUES_${workspaceViewId.toUpperCase()}`;
-
-  const paramsKey = paramsToKey(params);
-
-  return `WORKSPACE_VIEW_ISSUES_${workspaceViewId.toUpperCase()}_${paramsKey.toUpperCase()}`;
+  return `WORKSPACE_VIEW_ISSUES_${workspaceViewId.toUpperCase()}_${paramsToKey(
+    params
+  ).toUpperCase()}`;
 };
 
 export const PROJECT_ISSUES_DETAILS = (issueId: string) =>
diff --git a/web/contexts/profile-issues-context.tsx b/web/contexts/profile-issues-context.tsx
index 44c17b50a..e3f005334 100644
--- a/web/contexts/profile-issues-context.tsx
+++ b/web/contexts/profile-issues-context.tsx
@@ -177,6 +177,7 @@ export const ProfileIssuesContextProvider: React.FC<{ children: React.ReactNode
         type: "SET_PROPERTIES",
         payload: {
           display_properties: {
+            ...state.display_properties,
             [key]: !state.display_properties[key],
           },
         },
diff --git a/web/contexts/workspace-view-context.tsx b/web/contexts/workspace-view-context.tsx
new file mode 100644
index 000000000..2918a94f7
--- /dev/null
+++ b/web/contexts/workspace-view-context.tsx
@@ -0,0 +1,235 @@
+import { createContext, useEffect, useState } from "react";
+// next imports
+import { useRouter } from "next/router";
+// swr
+import useSWR, { KeyedMutator } from "swr";
+// services
+import workspaceService from "services/workspace.service";
+// types
+import { IIssue, IWorkspaceGlobalViewProps } from "types";
+import { IWorkspaceView } from "types/workspace-views";
+// fetch-keys
+import { WORKSPACE_VIEW_DETAILS, WORKSPACE_VIEW_ISSUES } from "constants/fetch-keys";
+
+export interface IWorkspaceViewContext {
+  params: any;
+  view: IWorkspaceView | undefined;
+  viewLoading: boolean;
+  viewIssues: IIssue[];
+  mutateViewIssues: KeyedMutator<any>;
+  viewIssueLoading: boolean;
+  filters: IWorkspaceGlobalViewProps;
+  handleFilters: (
+    filterType: "filters" | "display_filters" | "display_properties",
+    payload: { [key: string]: any },
+    saveFiltersToServer?: boolean
+  ) => void;
+}
+
+export const WorkspaceIssueViewContext = createContext<IWorkspaceViewContext | undefined>(
+  undefined
+);
+
+export const initialState: IWorkspaceGlobalViewProps = {
+  filters: {
+    assignees: null,
+    created_by: null,
+    labels: null,
+    priority: null,
+    state_group: null,
+    subscriber: null,
+    start_date: null,
+    target_date: null,
+    project: null,
+  },
+  display_filters: {
+    order_by: "-created_at",
+    sub_issue: false,
+    type: null,
+    layout: "spreadsheet",
+  },
+  display_properties: {
+    assignee: true,
+    start_date: true,
+    due_date: true,
+    key: true,
+    labels: true,
+    priority: true,
+    state: true,
+    sub_issue_count: true,
+    attachment_count: true,
+    link: true,
+    estimate: true,
+    created_on: true,
+    updated_on: true,
+  },
+};
+
+const saveViewFilters = async (
+  workspaceSlug: string,
+  workspaceViewId: string,
+  state: IWorkspaceGlobalViewProps
+) => {
+  await workspaceService.updateView(workspaceSlug, workspaceViewId, {
+    query_data: state,
+  });
+};
+
+export const WorkspaceViewProvider: React.FC<{ children: React.ReactNode }> = ({ children }) => {
+  const router = useRouter();
+  const { workspaceSlug, workspaceViewId } = router.query as {
+    workspaceSlug: string;
+    workspaceViewId: string;
+  };
+
+  const [filters, setFilters] = useState<IWorkspaceGlobalViewProps>(initialState);
+
+  const handleFilters = (
+    filterType: "filters" | "display_filters" | "display_properties",
+    payload: { [key: string]: any },
+    saveFiltersToServer?: boolean
+  ) => {
+    const updatedFilterPayload = {
+      ...filters,
+      [filterType]: {
+        ...filters[filterType],
+        ...payload,
+      },
+    };
+    setFilters(() => updatedFilterPayload);
+
+    if (saveFiltersToServer) saveViewFilters(workspaceSlug, workspaceViewId, updatedFilterPayload);
+  };
+
+  const computedFilter = (filters: any) => {
+    const computedFilters: any = {};
+    Object.keys(filters).map((key) => {
+      if (filters[key] != undefined)
+        computedFilters[key] =
+          typeof filters[key] === "string" || typeof filters[key] === "boolean"
+            ? filters[key]
+            : filters[key].join(",");
+    });
+    return computedFilters;
+  };
+
+  const computedParams = (filters: any) => {
+    const params: any = {
+      assignees: (filters && filters?.filters?.assignees) || undefined,
+      created_by: (filters && filters?.filters?.created_by) || undefined,
+      labels: (filters && filters?.filters?.labels) || undefined,
+      priority: (filters && filters?.filters?.priority) || undefined,
+      state_group: (filters && filters?.filters?.state_group) || undefined,
+      subscriber: (filters && filters?.filters?.subscriber) || undefined,
+      start_date: (filters && filters?.filters?.start_date) || undefined,
+      target_date: (filters && filters?.filters?.target_date) || undefined,
+      project: (filters && filters?.filters?.project) || undefined,
+      order_by: (filters && filters?.display_filters?.order_by) || "-created_at",
+      sub_issue: (filters && filters?.display_filters?.sub_issue) || false,
+      type: filters && filters?.display_filters?.type,
+    };
+    return params;
+  };
+
+  const params: any = {
+    assignees: filters?.filters.assignees ? filters?.filters?.assignees.join(",") : undefined,
+    created_by: filters?.filters.created_by ? filters?.filters?.created_by.join(",") : undefined,
+    labels: filters?.filters.labels ? filters?.filters?.labels.join(",") : undefined,
+    priority: filters?.filters.priority ? filters?.filters?.priority.join(",") : undefined,
+    state_group: filters?.filters.state_group ? filters?.filters?.state_group.join(",") : undefined,
+    subscriber: filters?.filters.subscriber ? filters?.filters?.subscriber.join(",") : undefined,
+    start_date: filters?.filters.start_date ? filters?.filters?.start_date.join(",") : undefined,
+    target_date: filters?.filters.target_date ? filters?.filters?.target_date.join(",") : undefined,
+    project: filters?.filters.project ? filters?.filters?.project.join(",") : undefined,
+
+    order_by: filters?.display_filters?.order_by
+      ? filters?.display_filters?.order_by
+      : "-created_at",
+    sub_issue: filters?.display_filters?.sub_issue ? filters?.display_filters?.sub_issue : false,
+    type: filters?.display_filters?.type ? filters?.display_filters?.type : undefined,
+    layout: filters?.display_filters?.layout ? filters?.display_filters?.layout : undefined,
+  };
+
+  const { data: view, isLoading: viewLoading } = useSWR(
+    workspaceSlug && workspaceViewId ? WORKSPACE_VIEW_DETAILS(workspaceViewId.toString()) : null,
+    workspaceSlug && workspaceViewId
+      ? () => workspaceService.getViewDetails(workspaceSlug.toString(), workspaceViewId.toString())
+      : null
+  );
+
+  const {
+    data: viewIssues,
+    mutate: mutateViewIssues,
+    isLoading: viewIssueLoading,
+  } = useSWR(
+    workspaceSlug && view && workspaceViewId && filters
+      ? WORKSPACE_VIEW_ISSUES(workspaceViewId.toString(), params)
+      : null,
+    workspaceSlug && view && workspaceViewId
+      ? () =>
+          workspaceService.getViewIssues(
+            workspaceSlug.toString(),
+            computedFilter(computedParams(filters))
+          )
+      : null
+  );
+
+  useEffect(() => {
+    if (view && view?.query_data) {
+      const payload = {
+        filters: {
+          ...view?.query_data?.filters,
+          assignees: view?.query_data?.filters?.assignees || null,
+          created_by: view?.query_data?.filters?.created_by || null,
+          labels: view?.query_data?.filters?.labels || null,
+          priority: view?.query_data?.filters?.priority || null,
+          state_group: view?.query_data?.filters?.state_group || null,
+          subscriber: view?.query_data?.filters?.subscriber || null,
+          start_date: view?.query_data?.filters?.start_date || null,
+          target_date: view?.query_data?.filters?.target_date || null,
+          project: view?.query_data?.filters?.project || null,
+        },
+        display_filters: {
+          ...view?.query_data?.display_filters,
+          order_by: view?.query_data?.display_filters?.order_by || "-created_at",
+          sub_issue: view?.query_data?.display_filters?.sub_issue || true,
+          type: view?.query_data?.display_filters?.type || null,
+        },
+        display_properties: {
+          ...view?.query_data?.display_properties,
+          assignee: view?.query_data?.display_properties?.assignee || true,
+          start_date: view?.query_data?.display_properties?.start_date || true,
+          due_date: view?.query_data?.display_properties?.due_date || true,
+          key: view?.query_data?.display_properties?.key || true,
+          labels: view?.query_data?.display_properties?.labels || true,
+          priority: view?.query_data?.display_properties?.priority || true,
+          state: view?.query_data?.display_properties?.state || true,
+          sub_issue_count: view?.query_data?.display_properties?.sub_issue_count || true,
+          attachment_count: view?.query_data?.display_properties?.attachment_count || true,
+          link: view?.query_data?.display_properties?.link || true,
+          estimate: view?.query_data?.display_properties?.estimate || true,
+          created_on: view?.query_data?.display_properties?.created_on || true,
+          updated_on: view?.query_data?.display_properties?.updated_on || true,
+        },
+      };
+      setFilters(payload);
+    }
+  }, [view, setFilters]);
+
+  return (
+    <WorkspaceIssueViewContext.Provider
+      value={{
+        params,
+        view,
+        viewLoading,
+        viewIssues,
+        mutateViewIssues,
+        viewIssueLoading,
+        filters,
+        handleFilters,
+      }}
+    >
+      {children}
+    </WorkspaceIssueViewContext.Provider>
+  );
+};
diff --git a/web/hooks/my-issues/use-my-issues-filter.tsx b/web/hooks/my-issues/use-my-issues-filter.tsx
index 5bfed634c..bc6a964c3 100644
--- a/web/hooks/my-issues/use-my-issues-filter.tsx
+++ b/web/hooks/my-issues/use-my-issues-filter.tsx
@@ -118,7 +118,7 @@ const useMyIssuesFilters = (workspaceSlug: string | undefined) => {
 
   const setProperty = useCallback(
     (key: keyof Properties) => {
-      if (!myWorkspace) return;
+      if (!myWorkspace?.view_props.display_properties) return;
 
       saveData({
         display_properties: {
diff --git a/web/hooks/use-workspace-view.tsx b/web/hooks/use-workspace-view.tsx
new file mode 100644
index 000000000..e183bc633
--- /dev/null
+++ b/web/hooks/use-workspace-view.tsx
@@ -0,0 +1,11 @@
+import { useContext } from "react";
+// types
+import { IWorkspaceViewContext, WorkspaceIssueViewContext } from "contexts/workspace-view-context";
+
+export const useWorkspaceView = (): IWorkspaceViewContext => {
+  const context = useContext(WorkspaceIssueViewContext);
+
+  if (!context) throw new Error("useWorkspaceView must be used within a WorkspaceIssueViewContext");
+
+  return context;
+};
diff --git a/web/hooks/use-worskpace-issue-filter.tsx b/web/hooks/use-worskpace-issue-filter.tsx
deleted file mode 100644
index 00af0a9f8..000000000
--- a/web/hooks/use-worskpace-issue-filter.tsx
+++ /dev/null
@@ -1,113 +0,0 @@
-import { useEffect, useCallback } from "react";
-
-import useSWR, { mutate } from "swr";
-
-// services
-import workspaceService from "services/workspace.service";
-// types
-import { IIssueFilterOptions, IView } from "types";
-// fetch-keys
-import { WORKSPACE_VIEW_DETAILS } from "constants/fetch-keys";
-
-const initialValues: IIssueFilterOptions = {
-  assignees: null,
-  created_by: null,
-  labels: null,
-  priority: null,
-  state: null,
-  state_group: null,
-  subscriber: null,
-  start_date: null,
-  target_date: null,
-  project: null,
-};
-
-const useWorkspaceIssuesFilters = (
-  workspaceSlug: string | undefined,
-  workspaceViewId: string | undefined
-) => {
-  const { data: workspaceViewDetails } = useSWR(
-    workspaceSlug && workspaceViewId ? WORKSPACE_VIEW_DETAILS(workspaceViewId) : null,
-    workspaceSlug && workspaceViewId
-      ? () => workspaceService.getViewDetails(workspaceSlug, workspaceViewId)
-      : null
-  );
-
-  const saveData = useCallback(
-    (data: Partial<IIssueFilterOptions>) => {
-      if (!workspaceSlug || !workspaceViewId || !workspaceViewDetails) return;
-
-      const oldData = { ...workspaceViewDetails };
-
-      mutate<IView>(
-        WORKSPACE_VIEW_DETAILS(workspaceViewId),
-        (prevData) => {
-          if (!prevData) return;
-          return {
-            ...prevData,
-            query_data: {
-              ...prevData?.query_data,
-              ...data,
-            },
-          };
-        },
-        false
-      );
-
-      workspaceService.updateView(workspaceSlug, workspaceViewId, {
-        query_data: {
-          ...oldData.query_data,
-          ...data,
-        },
-      });
-    },
-    [workspaceViewDetails, workspaceSlug, workspaceViewId]
-  );
-
-  const filters = workspaceViewDetails?.query_data ?? initialValues;
-
-  const setFilters = useCallback(
-    (updatedFilter: Partial<IIssueFilterOptions>) => {
-      if (!workspaceViewDetails) return;
-
-      saveData({
-        ...workspaceViewDetails?.query_data,
-        ...updatedFilter,
-      });
-    },
-    [workspaceViewDetails, saveData]
-  );
-
-  useEffect(() => {
-    if (!workspaceViewDetails || !workspaceSlug || !workspaceViewId) return;
-
-    if (!workspaceViewDetails.query_data) {
-      workspaceService.updateView(workspaceSlug, workspaceViewId, {
-        query_data: { ...initialValues },
-      });
-    }
-  }, [workspaceViewDetails, workspaceViewId, workspaceSlug]);
-
-  const params: any = {
-    assignees: filters?.assignees ? filters?.assignees.join(",") : undefined,
-    subscriber: filters?.subscriber ? filters?.subscriber.join(",") : undefined,
-    state: filters?.state ? filters?.state.join(",") : undefined,
-    state_group: filters?.state_group ? filters?.state_group.join(",") : undefined,
-    priority: filters?.priority ? filters?.priority.join(",") : undefined,
-    labels: filters?.labels ? filters?.labels.join(",") : undefined,
-    created_by: filters?.created_by ? filters?.created_by.join(",") : undefined,
-    start_date: filters?.start_date ? filters?.start_date.join(",") : undefined,
-    target_date: filters?.target_date ? filters?.target_date.join(",") : undefined,
-    project: filters?.project ? filters?.project.join(",") : undefined,
-    sub_issue: false,
-    type: undefined,
-  };
-
-  return {
-    params,
-    filters,
-    setFilters,
-  };
-};
-
-export default useWorkspaceIssuesFilters;
diff --git a/web/layouts/auth-layout/project-authorization-wrapper.tsx b/web/layouts/auth-layout/project-authorization-wrapper.tsx
index 66f4693af..386883736 100644
--- a/web/layouts/auth-layout/project-authorization-wrapper.tsx
+++ b/web/layouts/auth-layout/project-authorization-wrapper.tsx
@@ -5,6 +5,7 @@ import { useRouter } from "next/router";
 
 // contexts
 import { useProjectMyMembership, ProjectMemberProvider } from "contexts/project-member.context";
+import { WorkspaceViewProvider } from "contexts/workspace-view-context";
 // layouts
 import AppHeader from "layouts/app-layout/app-header";
 import AppSidebar from "layouts/app-layout/app-sidebar";
@@ -29,7 +30,9 @@ type Props = {
 
 export const ProjectAuthorizationWrapper: React.FC<Props> = (props) => (
   <ProjectMemberProvider>
-    <ProjectAuthorizationWrapped {...props} />
+    <WorkspaceViewProvider>
+      <ProjectAuthorizationWrapped {...props} />
+    </WorkspaceViewProvider>
   </ProjectMemberProvider>
 );
 
diff --git a/web/layouts/auth-layout/workspace-authorization-wrapper.tsx b/web/layouts/auth-layout/workspace-authorization-wrapper.tsx
index 9d74c9135..c8088a731 100644
--- a/web/layouts/auth-layout/workspace-authorization-wrapper.tsx
+++ b/web/layouts/auth-layout/workspace-authorization-wrapper.tsx
@@ -9,6 +9,7 @@ import useSWR from "swr";
 import workspaceServices from "services/workspace.service";
 // contexts
 import { WorkspaceMemberProvider } from "contexts/workspace-member.context";
+import { WorkspaceViewProvider } from "contexts/workspace-view-context";
 // layouts
 import AppSidebar from "layouts/app-layout/app-sidebar";
 import AppHeader from "layouts/app-layout/app-header";
@@ -81,47 +82,49 @@ export const WorkspaceAuthorizationLayout: React.FC<Props> = ({
   return (
     <UserAuthorizationLayout>
       <WorkspaceMemberProvider>
-        <CommandPalette />
-        <div className="relative flex h-screen w-full overflow-hidden">
-          <AppSidebar toggleSidebar={toggleSidebar} setToggleSidebar={setToggleSidebar} />
-          {settingsLayout && (memberType?.isGuest || memberType?.isViewer) ? (
-            <NotAuthorizedView
-              actionButton={
-                <Link href={`/${workspaceSlug}`}>
-                  <a>
-                    <PrimaryButton className="flex items-center gap-1">
-                      <LayerDiagonalIcon height={16} width={16} color="white" /> Go to workspace
-                    </PrimaryButton>
-                  </a>
-                </Link>
-              }
-              type="workspace"
-            />
-          ) : (
-            <main
-              className={`relative flex h-full w-full flex-col overflow-hidden ${
-                bg === "primary"
-                  ? "bg-custom-background-100"
-                  : bg === "secondary"
-                  ? "bg-custom-background-90"
-                  : "bg-custom-background-80"
-              }`}
-            >
-              <AppHeader
-                breadcrumbs={breadcrumbs}
-                left={left}
-                right={right}
-                setToggleSidebar={setToggleSidebar}
-                noHeader={noHeader}
+        <WorkspaceViewProvider>
+          <CommandPalette />
+          <div className="relative flex h-screen w-full overflow-hidden">
+            <AppSidebar toggleSidebar={toggleSidebar} setToggleSidebar={setToggleSidebar} />
+            {settingsLayout && (memberType?.isGuest || memberType?.isViewer) ? (
+              <NotAuthorizedView
+                actionButton={
+                  <Link href={`/${workspaceSlug}`}>
+                    <a>
+                      <PrimaryButton className="flex items-center gap-1">
+                        <LayerDiagonalIcon height={16} width={16} color="white" /> Go to workspace
+                      </PrimaryButton>
+                    </a>
+                  </Link>
+                }
+                type="workspace"
               />
-              <div className="h-full w-full overflow-hidden">
-                <div className="relative h-full w-full overflow-x-hidden overflow-y-scroll">
-                  {children}
+            ) : (
+              <main
+                className={`relative flex h-full w-full flex-col overflow-hidden ${
+                  bg === "primary"
+                    ? "bg-custom-background-100"
+                    : bg === "secondary"
+                    ? "bg-custom-background-90"
+                    : "bg-custom-background-80"
+                }`}
+              >
+                <AppHeader
+                  breadcrumbs={breadcrumbs}
+                  left={left}
+                  right={right}
+                  setToggleSidebar={setToggleSidebar}
+                  noHeader={noHeader}
+                />
+                <div className="h-full w-full overflow-hidden">
+                  <div className="relative h-full w-full overflow-x-hidden overflow-y-scroll">
+                    {children}
+                  </div>
                 </div>
-              </div>
-            </main>
-          )}
-        </div>
+              </main>
+            )}
+          </div>
+        </WorkspaceViewProvider>
       </WorkspaceMemberProvider>
     </UserAuthorizationLayout>
   );
diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/views/index.tsx b/web/pages/[workspaceSlug]/projects/[projectId]/views/index.tsx
index ea37a777a..c75cdd320 100644
--- a/web/pages/[workspaceSlug]/projects/[projectId]/views/index.tsx
+++ b/web/pages/[workspaceSlug]/projects/[projectId]/views/index.tsx
@@ -88,14 +88,12 @@ const ProjectViews: NextPage = () => {
     >
       <CreateUpdateViewModal
         isOpen={createUpdateViewModal}
-        viewType="project"
         handleClose={() => setCreateUpdateViewModal(false)}
         data={selectedViewToUpdate}
         user={user}
       />
       <DeleteViewModal
         isOpen={deleteViewModal}
-        viewType="project"
         data={selectedViewToDelete}
         setIsOpen={setDeleteViewModal}
         user={user}
diff --git a/web/pages/[workspaceSlug]/workspace-views/[workspaceViewId].tsx b/web/pages/[workspaceSlug]/workspace-views/[workspaceViewId].tsx
index cba4d802b..1f94604c7 100644
--- a/web/pages/[workspaceSlug]/workspace-views/[workspaceViewId].tsx
+++ b/web/pages/[workspaceSlug]/workspace-views/[workspaceViewId].tsx
@@ -1,322 +1,40 @@
-import { useCallback, useState } from "react";
-
-import { useRouter } from "next/router";
-
-import useSWR, { mutate } from "swr";
-
-// hook
-import useToast from "hooks/use-toast";
-import useWorkspaceIssuesFilters from "hooks/use-worskpace-issue-filter";
-import useProjects from "hooks/use-projects";
-import useUser from "hooks/use-user";
-import useWorkspaceMembers from "hooks/use-workspace-members";
-// context
-import { useProjectMyMembership } from "contexts/project-member.context";
-// services
-import workspaceService from "services/workspace.service";
-import projectIssuesServices from "services/issues.service";
 // layouts
 import { WorkspaceAuthorizationLayout } from "layouts/auth-layout";
 // components
-import { FiltersList, SpreadsheetView } from "components/core";
-import { WorkspaceViewsNavigation } from "components/workspace/views/workpace-view-navigation";
 import { WorkspaceIssuesViewOptions } from "components/issues/workspace-views/workspace-issue-view-option";
-import { CreateUpdateViewModal } from "components/views";
-import { CreateUpdateIssueModal, DeleteIssueModal } from "components/issues";
+import { WorkspaceViewIssues } from "components/issues/workspace-views/workpace-view-issues";
 // ui
-import { EmptyState, PrimaryButton } from "components/ui";
+import { PrimaryButton } from "components/ui";
 // icons
 import { PlusIcon } from "@heroicons/react/24/outline";
 import { CheckCircle } from "lucide-react";
-// images
-import emptyView from "public/empty-state/view.svg";
-// fetch-keys
-import {
-  WORKSPACE_LABELS,
-  WORKSPACE_VIEWS_LIST,
-  WORKSPACE_VIEW_DETAILS,
-  WORKSPACE_VIEW_ISSUES,
-} from "constants/fetch-keys";
-// constant
-import { STATE_GROUP } from "constants/project";
-// types
-import { IIssue, IIssueFilterOptions, IView } from "types";
 
-const WorkspaceView: React.FC = () => {
-  const [createViewModal, setCreateViewModal] = useState<any>(null);
-
-  // create issue modal
-  const [createIssueModal, setCreateIssueModal] = useState(false);
-  const [preloadedData, setPreloadedData] = useState<
-    (Partial<IIssue> & { actionType: "createIssue" | "edit" | "delete" }) | undefined
-  >(undefined);
-
-  // update issue modal
-  const [editIssueModal, setEditIssueModal] = useState(false);
-  const [issueToEdit, setIssueToEdit] = useState<
-    (IIssue & { actionType: "edit" | "delete" }) | undefined
-  >(undefined);
-
-  // delete issue modal
-  const [deleteIssueModal, setDeleteIssueModal] = useState(false);
-  const [issueToDelete, setIssueToDelete] = useState<IIssue | null>(null);
-
-  const router = useRouter();
-  const { workspaceSlug, workspaceViewId } = router.query;
-
-  const { memberRole } = useProjectMyMembership();
-
-  const { user } = useUser();
-  const { setToastAlert } = useToast();
-
-  const { data: viewDetails, error } = useSWR(
-    workspaceSlug && workspaceViewId ? WORKSPACE_VIEW_DETAILS(workspaceViewId.toString()) : null,
-    workspaceSlug && workspaceViewId
-      ? () => workspaceService.getViewDetails(workspaceSlug.toString(), workspaceViewId.toString())
-      : null
-  );
-
-  const { params, filters, setFilters } = useWorkspaceIssuesFilters(
-    workspaceSlug?.toString(),
-    workspaceViewId?.toString()
-  );
-
-  const { isGuest, isViewer } = useWorkspaceMembers(
-    workspaceSlug?.toString(),
-    Boolean(workspaceSlug)
-  );
-
-  const { data: viewIssues, mutate: mutateIssues } = useSWR(
-    workspaceSlug && viewDetails ? WORKSPACE_VIEW_ISSUES(workspaceSlug.toString(), params) : null,
-    workspaceSlug && viewDetails
-      ? () => workspaceService.getViewIssues(workspaceSlug.toString(), params)
-      : null
-  );
-
-  const { projects: allProjects } = useProjects();
-  const joinedProjects = allProjects?.filter((p) => p.is_member);
-
-  const { data: workspaceLabels } = useSWR(
-    workspaceSlug ? WORKSPACE_LABELS(workspaceSlug.toString()) : null,
-    workspaceSlug ? () => projectIssuesServices.getWorkspaceLabels(workspaceSlug.toString()) : null
-  );
-
-  const { workspaceMembers } = useWorkspaceMembers(workspaceSlug?.toString() ?? "");
-
-  const updateView = async (payload: IIssueFilterOptions) => {
-    const payloadData = {
-      query_data: payload,
-    };
-
-    await workspaceService
-      .updateView(workspaceSlug as string, workspaceViewId as string, payloadData)
-      .then((res) => {
-        mutate<IView[]>(
-          WORKSPACE_VIEWS_LIST(workspaceSlug as string),
-          (prevData) =>
-            prevData?.map((p) => {
-              if (p.id === res.id) return { ...p, ...payloadData };
-
-              return p;
-            }),
-          false
-        );
-        setToastAlert({
-          type: "success",
-          title: "Success!",
-          message: "View updated successfully.",
-        });
-      })
-      .catch(() => {
-        setToastAlert({
-          type: "error",
-          title: "Error!",
-          message: "View could not be updated. Please try again.",
-        });
-      });
-  };
-
-  const makeIssueCopy = useCallback(
-    (issue: IIssue) => {
-      setCreateIssueModal(true);
-
-      setPreloadedData({ ...issue, name: `${issue.name} (Copy)`, actionType: "createIssue" });
-    },
-    [setCreateIssueModal, setPreloadedData]
-  );
-
-  const handleEditIssue = useCallback(
-    (issue: IIssue) => {
-      setEditIssueModal(true);
-      setIssueToEdit({
-        ...issue,
-        actionType: "edit",
-        cycle: issue.issue_cycle ? issue.issue_cycle.cycle : null,
-        module: issue.issue_module ? issue.issue_module.module : null,
-      });
-    },
-    [setEditIssueModal, setIssueToEdit]
-  );
-
-  const handleDeleteIssue = useCallback(
-    (issue: IIssue) => {
-      setDeleteIssueModal(true);
-      setIssueToDelete(issue);
-    },
-    [setDeleteIssueModal, setIssueToDelete]
-  );
-
-  const handleIssueAction = useCallback(
-    (issue: IIssue, action: "copy" | "edit" | "delete" | "updateDraft") => {
-      if (action === "copy") makeIssueCopy(issue);
-      else if (action === "edit") handleEditIssue(issue);
-      else if (action === "delete") handleDeleteIssue(issue);
-    },
-    [makeIssueCopy, handleEditIssue, handleDeleteIssue]
-  );
-
-  const nullFilters =
-    filters &&
-    Object.keys(filters).filter((key) => filters[key as keyof IIssueFilterOptions] === null);
-
-  const areFiltersApplied =
-    filters &&
-    Object.keys(filters).length > 0 &&
-    nullFilters.length !== Object.keys(filters).length;
-
-  const isNotAllowed = isGuest || isViewer;
-
-  return (
-    <WorkspaceAuthorizationLayout
-      breadcrumbs={
-        <div className="flex gap-2 items-center">
-          <CheckCircle className="h-[18px] w-[18px] stroke-[1.5]" />
-          <span className="text-sm font-medium">
-            {viewDetails ? `${viewDetails.name} Issues` : "Workspace Issues"}
-          </span>
-        </div>
-      }
-      right={
-        <div className="flex items-center gap-2">
-          <WorkspaceIssuesViewOptions />
-          <PrimaryButton
-            className="flex items-center gap-2"
-            onClick={() => {
-              const e = new KeyboardEvent("keydown", { key: "c" });
-              document.dispatchEvent(e);
-            }}
-          >
-            <PlusIcon className="h-4 w-4" />
-            Add Issue
-          </PrimaryButton>
-        </div>
-      }
-    >
-      <CreateUpdateIssueModal
-        isOpen={createIssueModal && preloadedData?.actionType === "createIssue"}
-        handleClose={() => setCreateIssueModal(false)}
-        prePopulateData={{
-          ...preloadedData,
-        }}
-        onSubmit={async () => {
-          mutateIssues();
-        }}
-      />
-      <CreateUpdateIssueModal
-        isOpen={editIssueModal && issueToEdit?.actionType !== "delete"}
-        handleClose={() => setEditIssueModal(false)}
-        data={issueToEdit}
-        onSubmit={async () => {
-          mutateIssues();
-        }}
-      />
-      <DeleteIssueModal
-        handleClose={() => setDeleteIssueModal(false)}
-        isOpen={deleteIssueModal}
-        data={issueToDelete}
-        user={user}
-        onSubmit={async () => {
-          mutateIssues();
-        }}
-      />
-      <CreateUpdateViewModal
-        isOpen={createViewModal !== null}
-        handleClose={() => setCreateViewModal(null)}
-        viewType="workspace"
-        preLoadedData={createViewModal}
-        user={user}
-      />
-      <div className="h-full flex flex-col overflow-hidden bg-custom-background-100">
-        <div className="h-full w-full border-b border-custom-border-300">
-          <WorkspaceViewsNavigation handleAddView={() => setCreateViewModal(true)} />
-          {error ? (
-            <EmptyState
-              image={emptyView}
-              title="View does not exist"
-              description="The view you are looking for does not exist or has been deleted."
-              primaryButton={{
-                text: "View other views",
-                onClick: () => router.push(`/${workspaceSlug}/workspace-views`),
-              }}
-            />
-          ) : (
-            <div className="h-full w-full flex flex-col">
-              {areFiltersApplied && (
-                <>
-                  <div className="flex items-center justify-between gap-2 px-5 pt-3 pb-0">
-                    <FiltersList
-                      filters={filters}
-                      setFilters={(updatedFilter) => setFilters(updatedFilter)}
-                      labels={workspaceLabels}
-                      members={workspaceMembers?.map((m) => m.member)}
-                      stateGroup={STATE_GROUP}
-                      project={joinedProjects}
-                      clearAllFilters={() =>
-                        setFilters({
-                          assignees: null,
-                          created_by: null,
-                          labels: null,
-                          priority: null,
-                          state_group: null,
-                          start_date: null,
-                          target_date: null,
-                          subscriber: null,
-                          project: null,
-                        })
-                      }
-                    />
-                    <PrimaryButton
-                      onClick={() => {
-                        if (workspaceViewId) {
-                          updateView(filters);
-                        } else
-                          setCreateViewModal({
-                            query: filters,
-                          });
-                      }}
-                      className="flex items-center gap-2 text-sm"
-                    >
-                      {!workspaceViewId && <PlusIcon className="h-4 w-4" />}
-                      {workspaceViewId ? "Update" : "Save"} view
-                    </PrimaryButton>
-                  </div>
-                  {<div className="mt-3 border-t border-custom-border-200" />}
-                </>
-              )}
-              <SpreadsheetView
-                spreadsheetIssues={viewIssues}
-                mutateIssues={mutateIssues}
-                handleIssueAction={handleIssueAction}
-                disableUserActions={isNotAllowed ?? false}
-                user={user}
-                userAuth={memberRole}
-              />
-            </div>
-          )}
-        </div>
+const WorkspaceView = () => (
+  <WorkspaceAuthorizationLayout
+    breadcrumbs={
+      <div className="flex gap-2 items-center">
+        <CheckCircle className="h-[18px] w-[18px] stroke-[1.5]" />
+        <span className="text-sm font-medium">Workspace issues</span>
       </div>
-    </WorkspaceAuthorizationLayout>
-  );
-};
+    }
+    right={
+      <div className="flex items-center gap-2">
+        <WorkspaceIssuesViewOptions />
+        <PrimaryButton
+          className="flex items-center gap-2"
+          onClick={() => {
+            const e = new KeyboardEvent("keydown", { key: "c" });
+            document.dispatchEvent(e);
+          }}
+        >
+          <PlusIcon className="h-4 w-4" />
+          Add Issue
+        </PrimaryButton>
+      </div>
+    }
+  >
+    <WorkspaceViewIssues />
+  </WorkspaceAuthorizationLayout>
+);
 
 export default WorkspaceView;
diff --git a/web/pages/[workspaceSlug]/workspace-views/all-issues.tsx b/web/pages/[workspaceSlug]/workspace-views/all-issues.tsx
index 763784b8e..af3ad964f 100644
--- a/web/pages/[workspaceSlug]/workspace-views/all-issues.tsx
+++ b/web/pages/[workspaceSlug]/workspace-views/all-issues.tsx
@@ -1,283 +1,41 @@
-import { useCallback, useState } from "react";
-import { useRouter } from "next/router";
-
-import useSWR from "swr";
-
-// hook
-import useUser from "hooks/use-user";
-import useWorkspaceMembers from "hooks/use-workspace-members";
-import useProjects from "hooks/use-projects";
-import useMyIssuesFilters from "hooks/my-issues/use-my-issues-filter";
-// context
-import { useProjectMyMembership } from "contexts/project-member.context";
-// services
-import workspaceService from "services/workspace.service";
-import projectIssuesServices from "services/issues.service";
 // layouts
 import { WorkspaceAuthorizationLayout } from "layouts/auth-layout";
-// components
-import { FiltersList, SpreadsheetView } from "components/core";
-import { WorkspaceViewsNavigation } from "components/workspace/views/workpace-view-navigation";
-import { CreateUpdateViewModal } from "components/views";
-import { CreateUpdateIssueModal, DeleteIssueModal, MyIssuesViewOptions } from "components/issues";
-// ui
-import { EmptyState, PrimaryButton } from "components/ui";
+import { PrimaryButton } from "components/ui";
+// component
+import { WorkspaceIssuesViewOptions } from "components/issues/workspace-views/workspace-issue-view-option";
+import { WorkspaceAllIssue } from "components/issues/workspace-views/workspace-all-issue";
 // icons
 import { PlusIcon } from "@heroicons/react/24/outline";
 import { CheckCircle } from "lucide-react";
-// images
-import emptyView from "public/empty-state/view.svg";
-// fetch-keys
-import {
-  WORKSPACE_LABELS,
-  WORKSPACE_VIEW_DETAILS,
-  WORKSPACE_VIEW_ISSUES,
-} from "constants/fetch-keys";
-// constants
-import { STATE_GROUP } from "constants/project";
-// types
-import { IIssue, IIssueFilterOptions } from "types";
 
-const WorkspaceViewAllIssue: React.FC = () => {
-  const [createViewModal, setCreateViewModal] = useState<any>(null);
-
-  // create issue modal
-  const [createIssueModal, setCreateIssueModal] = useState(false);
-  const [preloadedData, setPreloadedData] = useState<
-    (Partial<IIssue> & { actionType: "createIssue" | "edit" | "delete" }) | undefined
-  >(undefined);
-
-  // update issue modal
-  const [editIssueModal, setEditIssueModal] = useState(false);
-  const [issueToEdit, setIssueToEdit] = useState<
-    (IIssue & { actionType: "edit" | "delete" }) | undefined
-  >(undefined);
-
-  // delete issue modal
-  const [deleteIssueModal, setDeleteIssueModal] = useState(false);
-  const [issueToDelete, setIssueToDelete] = useState<IIssue | null>(null);
-
-  const router = useRouter();
-  const { workspaceSlug, workspaceViewId } = router.query;
-
-  const { filters, setFilters } = useMyIssuesFilters(workspaceSlug?.toString());
-
-  const { user } = useUser();
-  const { memberRole } = useProjectMyMembership();
-
-  const { workspaceMembers } = useWorkspaceMembers(workspaceSlug?.toString() ?? "");
-
-  const { data: viewDetails, error } = useSWR(
-    workspaceSlug && workspaceViewId ? WORKSPACE_VIEW_DETAILS(workspaceViewId.toString()) : null,
-    workspaceSlug && workspaceViewId
-      ? () => workspaceService.getViewDetails(workspaceSlug.toString(), workspaceViewId.toString())
-      : null
-  );
-
-  const params: any = {
-    assignees: filters?.assignees ? filters?.assignees.join(",") : undefined,
-    subscriber: filters?.subscriber ? filters?.subscriber.join(",") : undefined,
-    state: filters?.state ? filters?.state.join(",") : undefined,
-    state_group: filters?.state_group ? filters?.state_group.join(",") : undefined,
-    priority: filters?.priority ? filters?.priority.join(",") : undefined,
-    labels: filters?.labels ? filters?.labels.join(",") : undefined,
-    created_by: filters?.created_by ? filters?.created_by.join(",") : undefined,
-    start_date: filters?.start_date ? filters?.start_date.join(",") : undefined,
-    target_date: filters?.target_date ? filters?.target_date.join(",") : undefined,
-    project: filters?.project ? filters?.project.join(",") : undefined,
-    sub_issue: false,
-    type: undefined,
-  };
-
-  const { data: viewIssues, mutate: mutateIssues } = useSWR(
-    workspaceSlug ? WORKSPACE_VIEW_ISSUES(workspaceSlug.toString(), params) : null,
-    workspaceSlug ? () => workspaceService.getViewIssues(workspaceSlug.toString(), params) : null
-  );
-
-  const makeIssueCopy = useCallback(
-    (issue: IIssue) => {
-      setCreateIssueModal(true);
-
-      setPreloadedData({ ...issue, name: `${issue.name} (Copy)`, actionType: "createIssue" });
-    },
-    [setCreateIssueModal, setPreloadedData]
-  );
-
-  const handleEditIssue = useCallback(
-    (issue: IIssue) => {
-      setEditIssueModal(true);
-      setIssueToEdit({
-        ...issue,
-        actionType: "edit",
-        cycle: issue.issue_cycle ? issue.issue_cycle.cycle : null,
-        module: issue.issue_module ? issue.issue_module.module : null,
-      });
-    },
-    [setEditIssueModal, setIssueToEdit]
-  );
-
-  const handleDeleteIssue = useCallback(
-    (issue: IIssue) => {
-      setDeleteIssueModal(true);
-      setIssueToDelete(issue);
-    },
-    [setDeleteIssueModal, setIssueToDelete]
-  );
-
-  const handleIssueAction = useCallback(
-    (issue: IIssue, action: "copy" | "edit" | "delete" | "updateDraft") => {
-      if (action === "copy") makeIssueCopy(issue);
-      else if (action === "edit") handleEditIssue(issue);
-      else if (action === "delete") handleDeleteIssue(issue);
-    },
-    [makeIssueCopy, handleEditIssue, handleDeleteIssue]
-  );
-
-  const nullFilters =
-    filters &&
-    Object.keys(filters).filter((key) => filters[key as keyof IIssueFilterOptions] === null);
-
-  const areFiltersApplied =
-    filters &&
-    Object.keys(filters).length > 0 &&
-    nullFilters.length !== Object.keys(filters).length;
-
-  const { projects: allProjects } = useProjects();
-  const joinedProjects = allProjects?.filter((p) => p.is_member);
-
-  const { data: workspaceLabels } = useSWR(
-    workspaceSlug ? WORKSPACE_LABELS(workspaceSlug.toString()) : null,
-    workspaceSlug ? () => projectIssuesServices.getWorkspaceLabels(workspaceSlug.toString()) : null
-  );
-
-  return (
-    <WorkspaceAuthorizationLayout
-      breadcrumbs={
-        <div className="flex gap-2 items-center">
-          <CheckCircle className="h-[18px] w-[18px] stroke-[1.5]" />
-          <span className="text-sm font-medium">
-            {viewDetails ? `${viewDetails.name} Issues` : "Workspace Issues"}
-          </span>
-        </div>
-      }
-      right={
-        <div className="flex items-center gap-2">
-          <MyIssuesViewOptions />
-          <PrimaryButton
-            className="flex items-center gap-2"
-            onClick={() => {
-              const e = new KeyboardEvent("keydown", { key: "c" });
-              document.dispatchEvent(e);
-            }}
-          >
-            <PlusIcon className="h-4 w-4" />
-            Add Issue
-          </PrimaryButton>
-        </div>
-      }
-    >
-      <CreateUpdateIssueModal
-        isOpen={createIssueModal && preloadedData?.actionType === "createIssue"}
-        handleClose={() => setCreateIssueModal(false)}
-        prePopulateData={{
-          ...preloadedData,
-        }}
-        onSubmit={async () => {
-          mutateIssues();
-        }}
-      />
-      <CreateUpdateIssueModal
-        isOpen={editIssueModal && issueToEdit?.actionType !== "delete"}
-        handleClose={() => setEditIssueModal(false)}
-        data={issueToEdit}
-        onSubmit={async () => {
-          mutateIssues();
-        }}
-      />
-      <DeleteIssueModal
-        handleClose={() => setDeleteIssueModal(false)}
-        isOpen={deleteIssueModal}
-        data={issueToDelete}
-        user={user}
-        onSubmit={async () => {
-          mutateIssues();
-        }}
-      />
-      <CreateUpdateViewModal
-        isOpen={createViewModal !== null}
-        handleClose={() => setCreateViewModal(null)}
-        viewType="workspace"
-        preLoadedData={createViewModal}
-        user={user}
-      />
-      <div className="h-full flex flex-col overflow-hidden bg-custom-background-100">
-        <div className="h-full w-full border-b border-custom-border-300">
-          <WorkspaceViewsNavigation handleAddView={() => setCreateViewModal(true)} />
-          {error ? (
-            <EmptyState
-              image={emptyView}
-              title="View does not exist"
-              description="The view you are looking for does not exist or has been deleted."
-              primaryButton={{
-                text: "View other views",
-                onClick: () => router.push(`/${workspaceSlug}/workspace-views`),
-              }}
-            />
-          ) : (
-            <div className="h-full w-full flex flex-col">
-              {areFiltersApplied && (
-                <>
-                  <div className="flex items-center justify-between gap-2 px-5 pt-3 pb-0">
-                    <FiltersList
-                      filters={filters}
-                      setFilters={(updatedFilter) => setFilters(updatedFilter)}
-                      labels={workspaceLabels}
-                      members={workspaceMembers?.map((m) => m.member)}
-                      stateGroup={STATE_GROUP}
-                      project={joinedProjects}
-                      clearAllFilters={() =>
-                        setFilters({
-                          assignees: null,
-                          created_by: null,
-                          labels: null,
-                          priority: null,
-                          state_group: null,
-                          start_date: null,
-                          target_date: null,
-                          subscriber: null,
-                          project: null,
-                        })
-                      }
-                    />
-                    <PrimaryButton
-                      onClick={() => {
-                        setCreateViewModal({
-                          query: filters,
-                        });
-                      }}
-                      className="flex items-center gap-2 text-sm"
-                    >
-                      {!workspaceViewId && <PlusIcon className="h-4 w-4" />}
-                      {workspaceViewId ? "Update" : "Save"} view
-                    </PrimaryButton>
-                  </div>
-                  {<div className="mt-3 border-t border-custom-border-200" />}
-                </>
-              )}
-              <SpreadsheetView
-                spreadsheetIssues={viewIssues}
-                mutateIssues={mutateIssues}
-                handleIssueAction={handleIssueAction}
-                disableUserActions={false}
-                user={user}
-                userAuth={memberRole}
-              />
-            </div>
-          )}
-        </div>
+const WorkspaceViewAllIssue = () => (
+  <WorkspaceAuthorizationLayout
+    breadcrumbs={
+      <div className="flex gap-2 items-center">
+        <CheckCircle className="h-[18px] w-[18px] stroke-[1.5]" />
+        <span className="text-sm font-medium">Workspace issues</span>
       </div>
-    </WorkspaceAuthorizationLayout>
-  );
-};
+    }
+    right={
+      <div className="flex items-center gap-2">
+        {/* <MyIssuesViewOptions /> */}
+        <WorkspaceIssuesViewOptions />
+
+        <PrimaryButton
+          className="flex items-center gap-2"
+          onClick={() => {
+            const e = new KeyboardEvent("keydown", { key: "c" });
+            document.dispatchEvent(e);
+          }}
+        >
+          <PlusIcon className="h-4 w-4" />
+          Add Issue
+        </PrimaryButton>
+      </div>
+    }
+  >
+    <WorkspaceAllIssue />
+  </WorkspaceAuthorizationLayout>
+);
 
 export default WorkspaceViewAllIssue;
diff --git a/web/pages/[workspaceSlug]/workspace-views/assigned.tsx b/web/pages/[workspaceSlug]/workspace-views/assigned.tsx
index 0cfd5a534..0edef4d81 100644
--- a/web/pages/[workspaceSlug]/workspace-views/assigned.tsx
+++ b/web/pages/[workspaceSlug]/workspace-views/assigned.tsx
@@ -1,205 +1,40 @@
-import { useCallback, useState } from "react";
-import { useRouter } from "next/router";
-
-import useSWR from "swr";
-
-// hook
-import useUser from "hooks/use-user";
-// context
-import { useProjectMyMembership } from "contexts/project-member.context";
-// services
-import workspaceService from "services/workspace.service";
 // layouts
 import { WorkspaceAuthorizationLayout } from "layouts/auth-layout";
 // components
-import { SpreadsheetView } from "components/core";
-import { WorkspaceViewsNavigation } from "components/workspace/views/workpace-view-navigation";
 import { WorkspaceIssuesViewOptions } from "components/issues/workspace-views/workspace-issue-view-option";
-import { CreateUpdateViewModal } from "components/views";
-import { CreateUpdateIssueModal, DeleteIssueModal } from "components/issues";
+import { WorkspaceAssignedIssue } from "components/issues/workspace-views/workspace-assigned-issue";
 // ui
-import { EmptyState, PrimaryButton } from "components/ui";
+import { PrimaryButton } from "components/ui";
 // icons
 import { PlusIcon } from "@heroicons/react/24/outline";
 import { CheckCircle } from "lucide-react";
-// images
-import emptyView from "public/empty-state/view.svg";
-// fetch-keys
-import { WORKSPACE_VIEW_DETAILS, WORKSPACE_VIEW_ISSUES } from "constants/fetch-keys";
-// types
-import { IIssue } from "types";
 
-const WorkspaceViewAssignedIssue: React.FC = () => {
-  const [createViewModal, setCreateViewModal] = useState<any>(null);
-
-  // create issue modal
-  const [createIssueModal, setCreateIssueModal] = useState(false);
-  const [preloadedData, setPreloadedData] = useState<
-    (Partial<IIssue> & { actionType: "createIssue" | "edit" | "delete" }) | undefined
-  >(undefined);
-
-  // update issue modal
-  const [editIssueModal, setEditIssueModal] = useState(false);
-  const [issueToEdit, setIssueToEdit] = useState<
-    (IIssue & { actionType: "edit" | "delete" }) | undefined
-  >(undefined);
-
-  // delete issue modal
-  const [deleteIssueModal, setDeleteIssueModal] = useState(false);
-  const [issueToDelete, setIssueToDelete] = useState<IIssue | null>(null);
-
-  const router = useRouter();
-  const { workspaceSlug, workspaceViewId } = router.query;
-
-  const { user } = useUser();
-
-  const { memberRole } = useProjectMyMembership();
-
-  const params: any = {
-    assignees: user?.id ?? undefined,
-    sub_issue: false,
-  };
-
-  const { data: viewDetails, error } = useSWR(
-    workspaceSlug && workspaceViewId ? WORKSPACE_VIEW_DETAILS(workspaceViewId.toString()) : null,
-    workspaceSlug && workspaceViewId
-      ? () => workspaceService.getViewDetails(workspaceSlug.toString(), workspaceViewId.toString())
-      : null
-  );
-
-  const { data: viewIssues, mutate: mutateIssues } = useSWR(
-    workspaceSlug ? WORKSPACE_VIEW_ISSUES(workspaceSlug.toString(), params) : null,
-    workspaceSlug ? () => workspaceService.getViewIssues(workspaceSlug.toString(), params) : null
-  );
-
-  const makeIssueCopy = useCallback(
-    (issue: IIssue) => {
-      setCreateIssueModal(true);
-
-      setPreloadedData({ ...issue, name: `${issue.name} (Copy)`, actionType: "createIssue" });
-    },
-    [setCreateIssueModal, setPreloadedData]
-  );
-
-  const handleEditIssue = useCallback(
-    (issue: IIssue) => {
-      setEditIssueModal(true);
-      setIssueToEdit({
-        ...issue,
-        actionType: "edit",
-        cycle: issue.issue_cycle ? issue.issue_cycle.cycle : null,
-        module: issue.issue_module ? issue.issue_module.module : null,
-      });
-    },
-    [setEditIssueModal, setIssueToEdit]
-  );
-
-  const handleDeleteIssue = useCallback(
-    (issue: IIssue) => {
-      setDeleteIssueModal(true);
-      setIssueToDelete(issue);
-    },
-    [setDeleteIssueModal, setIssueToDelete]
-  );
-
-  const handleIssueAction = useCallback(
-    (issue: IIssue, action: "copy" | "edit" | "delete" | "updateDraft") => {
-      if (action === "copy") makeIssueCopy(issue);
-      else if (action === "edit") handleEditIssue(issue);
-      else if (action === "delete") handleDeleteIssue(issue);
-    },
-    [makeIssueCopy, handleEditIssue, handleDeleteIssue]
-  );
-
-  return (
-    <WorkspaceAuthorizationLayout
-      breadcrumbs={
-        <div className="flex gap-2 items-center">
-          <CheckCircle className="h-[18px] w-[18px] stroke-[1.5]" />
-          <span className="text-sm font-medium">
-            {viewDetails ? `${viewDetails.name} Issues` : "Workspace Issues"}
-          </span>
-        </div>
-      }
-      right={
-        <div className="flex items-center gap-2">
-          <WorkspaceIssuesViewOptions />
-          <PrimaryButton
-            className="flex items-center gap-2"
-            onClick={() => {
-              const e = new KeyboardEvent("keydown", { key: "c" });
-              document.dispatchEvent(e);
-            }}
-          >
-            <PlusIcon className="h-4 w-4" />
-            Add Issue
-          </PrimaryButton>
-        </div>
-      }
-    >
-      <CreateUpdateIssueModal
-        isOpen={createIssueModal && preloadedData?.actionType === "createIssue"}
-        handleClose={() => setCreateIssueModal(false)}
-        prePopulateData={{
-          ...preloadedData,
-        }}
-        onSubmit={async () => {
-          mutateIssues();
-        }}
-      />
-      <CreateUpdateIssueModal
-        isOpen={editIssueModal && issueToEdit?.actionType !== "delete"}
-        handleClose={() => setEditIssueModal(false)}
-        data={issueToEdit}
-        onSubmit={async () => {
-          mutateIssues();
-        }}
-      />
-      <DeleteIssueModal
-        handleClose={() => setDeleteIssueModal(false)}
-        isOpen={deleteIssueModal}
-        data={issueToDelete}
-        user={user}
-        onSubmit={async () => {
-          mutateIssues();
-        }}
-      />
-      <CreateUpdateViewModal
-        isOpen={createViewModal !== null}
-        handleClose={() => setCreateViewModal(null)}
-        viewType="workspace"
-        preLoadedData={createViewModal}
-        user={user}
-      />
-      <div className="h-full flex flex-col overflow-hidden bg-custom-background-100">
-        <div className="h-full w-full border-b border-custom-border-300">
-          <WorkspaceViewsNavigation handleAddView={() => setCreateViewModal(true)} />
-          {error ? (
-            <EmptyState
-              image={emptyView}
-              title="View does not exist"
-              description="The view you are looking for does not exist or has been deleted."
-              primaryButton={{
-                text: "View other views",
-                onClick: () => router.push(`/${workspaceSlug}/workspace-views`),
-              }}
-            />
-          ) : (
-            <div className="h-full w-full flex flex-col">
-              <SpreadsheetView
-                spreadsheetIssues={viewIssues}
-                mutateIssues={mutateIssues}
-                handleIssueAction={handleIssueAction}
-                disableUserActions={false}
-                user={user}
-                userAuth={memberRole}
-              />
-            </div>
-          )}
-        </div>
+const WorkspaceViewAssignedIssue: React.FC = () => (
+  <WorkspaceAuthorizationLayout
+    breadcrumbs={
+      <div className="flex gap-2 items-center">
+        <CheckCircle className="h-[18px] w-[18px] stroke-[1.5]" />
+        <span className="text-sm font-medium">Workspace Issues</span>
       </div>
-    </WorkspaceAuthorizationLayout>
-  );
-};
+    }
+    right={
+      <div className="flex items-center gap-2">
+        <WorkspaceIssuesViewOptions />
+        <PrimaryButton
+          className="flex items-center gap-2"
+          onClick={() => {
+            const e = new KeyboardEvent("keydown", { key: "c" });
+            document.dispatchEvent(e);
+          }}
+        >
+          <PlusIcon className="h-4 w-4" />
+          Add Issue
+        </PrimaryButton>
+      </div>
+    }
+  >
+    <WorkspaceAssignedIssue />
+  </WorkspaceAuthorizationLayout>
+);
 
 export default WorkspaceViewAssignedIssue;
diff --git a/web/pages/[workspaceSlug]/workspace-views/created.tsx b/web/pages/[workspaceSlug]/workspace-views/created.tsx
index d41db871f..07ddbbae9 100644
--- a/web/pages/[workspaceSlug]/workspace-views/created.tsx
+++ b/web/pages/[workspaceSlug]/workspace-views/created.tsx
@@ -1,205 +1,40 @@
-import { useCallback, useState } from "react";
-
-import { useRouter } from "next/router";
-
-import useSWR from "swr";
-
-// hook
-import useUser from "hooks/use-user";
-// context
-import { useProjectMyMembership } from "contexts/project-member.context";
-// services
-import workspaceService from "services/workspace.service";
 // layouts
 import { WorkspaceAuthorizationLayout } from "layouts/auth-layout";
 // components
-import { SpreadsheetView } from "components/core";
-import { WorkspaceViewsNavigation } from "components/workspace/views/workpace-view-navigation";
 import { WorkspaceIssuesViewOptions } from "components/issues/workspace-views/workspace-issue-view-option";
-import { CreateUpdateViewModal } from "components/views";
-import { CreateUpdateIssueModal, DeleteIssueModal } from "components/issues";
+import { WorkspaceCreatedIssues } from "components/issues/workspace-views/workspace-created-issues";
 // ui
-import { EmptyState, PrimaryButton } from "components/ui";
+import { PrimaryButton } from "components/ui";
 // icons
 import { PlusIcon } from "@heroicons/react/24/outline";
 import { CheckCircle } from "lucide-react";
-// images
-import emptyView from "public/empty-state/view.svg";
-// fetch-keys
-import { WORKSPACE_VIEW_DETAILS, WORKSPACE_VIEW_ISSUES } from "constants/fetch-keys";
-// types
-import { IIssue } from "types";
 
-const WorkspaceViewCreatedIssue: React.FC = () => {
-  const [createViewModal, setCreateViewModal] = useState<any>(null);
-
-  // create issue modal
-  const [createIssueModal, setCreateIssueModal] = useState(false);
-  const [preloadedData, setPreloadedData] = useState<
-    (Partial<IIssue> & { actionType: "createIssue" | "edit" | "delete" }) | undefined
-  >(undefined);
-
-  // update issue modal
-  const [editIssueModal, setEditIssueModal] = useState(false);
-  const [issueToEdit, setIssueToEdit] = useState<
-    (IIssue & { actionType: "edit" | "delete" }) | undefined
-  >(undefined);
-
-  // delete issue modal
-  const [deleteIssueModal, setDeleteIssueModal] = useState(false);
-  const [issueToDelete, setIssueToDelete] = useState<IIssue | null>(null);
-
-  const router = useRouter();
-  const { workspaceSlug, workspaceViewId } = router.query;
-
-  const { user } = useUser();
-  const { memberRole } = useProjectMyMembership();
-
-  const params: any = {
-    created_by: user?.id ?? undefined,
-    sub_issue: false,
-  };
-
-  const { data: viewDetails, error } = useSWR(
-    workspaceSlug && workspaceViewId ? WORKSPACE_VIEW_DETAILS(workspaceViewId.toString()) : null,
-    workspaceSlug && workspaceViewId
-      ? () => workspaceService.getViewDetails(workspaceSlug.toString(), workspaceViewId.toString())
-      : null
-  );
-
-  const { data: viewIssues, mutate: mutateIssues } = useSWR(
-    workspaceSlug ? WORKSPACE_VIEW_ISSUES(workspaceSlug.toString(), params) : null,
-    workspaceSlug ? () => workspaceService.getViewIssues(workspaceSlug.toString(), params) : null
-  );
-
-  const makeIssueCopy = useCallback(
-    (issue: IIssue) => {
-      setCreateIssueModal(true);
-
-      setPreloadedData({ ...issue, name: `${issue.name} (Copy)`, actionType: "createIssue" });
-    },
-    [setCreateIssueModal, setPreloadedData]
-  );
-
-  const handleEditIssue = useCallback(
-    (issue: IIssue) => {
-      setEditIssueModal(true);
-      setIssueToEdit({
-        ...issue,
-        actionType: "edit",
-        cycle: issue.issue_cycle ? issue.issue_cycle.cycle : null,
-        module: issue.issue_module ? issue.issue_module.module : null,
-      });
-    },
-    [setEditIssueModal, setIssueToEdit]
-  );
-
-  const handleDeleteIssue = useCallback(
-    (issue: IIssue) => {
-      setDeleteIssueModal(true);
-      setIssueToDelete(issue);
-    },
-    [setDeleteIssueModal, setIssueToDelete]
-  );
-
-  const handleIssueAction = useCallback(
-    (issue: IIssue, action: "copy" | "edit" | "delete" | "updateDraft") => {
-      if (action === "copy") makeIssueCopy(issue);
-      else if (action === "edit") handleEditIssue(issue);
-      else if (action === "delete") handleDeleteIssue(issue);
-    },
-    [makeIssueCopy, handleEditIssue, handleDeleteIssue]
-  );
-
-  return (
-    <WorkspaceAuthorizationLayout
-      breadcrumbs={
-        <div className="flex gap-2 items-center">
-          <CheckCircle className="h-[18px] w-[18px] stroke-[1.5]" />
-          <span className="text-sm font-medium">
-            {viewDetails ? `${viewDetails.name} Issues` : "Workspace Issues"}
-          </span>
-        </div>
-      }
-      right={
-        <div className="flex items-center gap-2">
-          <WorkspaceIssuesViewOptions />
-          <PrimaryButton
-            className="flex items-center gap-2"
-            onClick={() => {
-              const e = new KeyboardEvent("keydown", { key: "c" });
-              document.dispatchEvent(e);
-            }}
-          >
-            <PlusIcon className="h-4 w-4" />
-            Add Issue
-          </PrimaryButton>
-        </div>
-      }
-    >
-      <CreateUpdateIssueModal
-        isOpen={createIssueModal && preloadedData?.actionType === "createIssue"}
-        handleClose={() => setCreateIssueModal(false)}
-        prePopulateData={{
-          ...preloadedData,
-        }}
-        onSubmit={async () => {
-          mutateIssues();
-        }}
-      />
-      <CreateUpdateIssueModal
-        isOpen={editIssueModal && issueToEdit?.actionType !== "delete"}
-        handleClose={() => setEditIssueModal(false)}
-        data={issueToEdit}
-        onSubmit={async () => {
-          mutateIssues();
-        }}
-      />
-      <DeleteIssueModal
-        handleClose={() => setDeleteIssueModal(false)}
-        isOpen={deleteIssueModal}
-        data={issueToDelete}
-        user={user}
-        onSubmit={async () => {
-          mutateIssues();
-        }}
-      />
-      <CreateUpdateViewModal
-        isOpen={createViewModal !== null}
-        handleClose={() => setCreateViewModal(null)}
-        viewType="workspace"
-        preLoadedData={createViewModal}
-        user={user}
-      />
-      <div className="h-full flex flex-col overflow-hidden bg-custom-background-100">
-        <div className="h-full w-full border-b border-custom-border-300">
-          <WorkspaceViewsNavigation handleAddView={() => setCreateViewModal(true)} />
-          {error ? (
-            <EmptyState
-              image={emptyView}
-              title="View does not exist"
-              description="The view you are looking for does not exist or has been deleted."
-              primaryButton={{
-                text: "View other views",
-                onClick: () => router.push(`/${workspaceSlug}/workspace-views`),
-              }}
-            />
-          ) : (
-            <div className="h-full w-full flex flex-col">
-              <SpreadsheetView
-                spreadsheetIssues={viewIssues}
-                mutateIssues={mutateIssues}
-                handleIssueAction={handleIssueAction}
-                disableUserActions={false}
-                user={user}
-                userAuth={memberRole}
-              />
-            </div>
-          )}
-        </div>
+const WorkspaceViewCreatedIssue: React.FC = () => (
+  <WorkspaceAuthorizationLayout
+    breadcrumbs={
+      <div className="flex gap-2 items-center">
+        <CheckCircle className="h-[18px] w-[18px] stroke-[1.5]" />
+        <span className="text-sm font-medium">Workspace Issues</span>
       </div>
-    </WorkspaceAuthorizationLayout>
-  );
-};
+    }
+    right={
+      <div className="flex items-center gap-2">
+        <WorkspaceIssuesViewOptions />
+        <PrimaryButton
+          className="flex items-center gap-2"
+          onClick={() => {
+            const e = new KeyboardEvent("keydown", { key: "c" });
+            document.dispatchEvent(e);
+          }}
+        >
+          <PlusIcon className="h-4 w-4" />
+          Add Issue
+        </PrimaryButton>
+      </div>
+    }
+  >
+    <WorkspaceCreatedIssues />
+  </WorkspaceAuthorizationLayout>
+);
 
 export default WorkspaceViewCreatedIssue;
diff --git a/web/pages/[workspaceSlug]/workspace-views/index.tsx b/web/pages/[workspaceSlug]/workspace-views/index.tsx
index 30d8925b6..a03393e1d 100644
--- a/web/pages/[workspaceSlug]/workspace-views/index.tsx
+++ b/web/pages/[workspaceSlug]/workspace-views/index.tsx
@@ -8,13 +8,13 @@ import useSWR from "swr";
 
 // services
 import workspaceService from "services/workspace.service";
-// hooks
-import useUser from "hooks/use-user";
 // layouts
 import { WorkspaceAuthorizationLayout } from "layouts/auth-layout";
 // components
-import { CreateUpdateViewModal, DeleteViewModal, SingleViewItem } from "components/views";
+import { SingleViewItem } from "components/views";
 import { WorkspaceIssuesViewOptions } from "components/issues/workspace-views/workspace-issue-view-option";
+import { CreateUpdateWorkspaceViewModal } from "components/workspace/views/modal";
+import { DeleteWorkspaceViewModal } from "components/workspace/views/delete-workspace-view-modal";
 // ui
 import { EmptyState, Input, Loader, PrimaryButton } from "components/ui";
 // icons
@@ -25,7 +25,7 @@ import { PhotoFilterOutlined } from "@mui/icons-material";
 import emptyView from "public/empty-state/view.svg";
 // types
 import type { NextPage } from "next";
-import { IView } from "types";
+import { IWorkspaceView } from "types/workspace-views";
 // constants
 import { WORKSPACE_VIEWS_LIST } from "constants/fetch-keys";
 // helper
@@ -35,16 +35,14 @@ const WorkspaceViews: NextPage = () => {
   const [query, setQuery] = useState("");
 
   const [createUpdateViewModal, setCreateUpdateViewModal] = useState(false);
-  const [selectedViewToUpdate, setSelectedViewToUpdate] = useState<IView | null>(null);
+  const [selectedViewToUpdate, setSelectedViewToUpdate] = useState<IWorkspaceView | null>(null);
 
   const [deleteViewModal, setDeleteViewModal] = useState(false);
-  const [selectedViewToDelete, setSelectedViewToDelete] = useState<IView | null>(null);
+  const [selectedViewToDelete, setSelectedViewToDelete] = useState<IWorkspaceView | null>(null);
 
   const router = useRouter();
   const { workspaceSlug } = router.query;
 
-  const { user } = useUser();
-
   const { data: workspaceViews } = useSWR(
     workspaceSlug ? WORKSPACE_VIEWS_LIST(workspaceSlug as string) : null,
     workspaceSlug ? () => workspaceService.getAllViews(workspaceSlug as string) : null
@@ -85,12 +83,12 @@ const WorkspaceViews: NextPage = () => {
       ? workspaceViews
       : workspaceViews?.filter((option) => option.name.toLowerCase().includes(query.toLowerCase()));
 
-  const handleEditView = (view: IView) => {
+  const handleEditView = (view: IWorkspaceView) => {
     setSelectedViewToUpdate(view);
     setCreateUpdateViewModal(true);
   };
 
-  const handleDeleteView = (view: IView) => {
+  const handleDeleteView = (view: IWorkspaceView) => {
     setSelectedViewToDelete(view);
     setDeleteViewModal(true);
   };
@@ -116,22 +114,18 @@ const WorkspaceViews: NextPage = () => {
         </div>
       }
     >
-      <CreateUpdateViewModal
+      <CreateUpdateWorkspaceViewModal
         isOpen={createUpdateViewModal}
         handleClose={() => {
           setCreateUpdateViewModal(false);
           setSelectedViewToUpdate(null);
         }}
         data={selectedViewToUpdate}
-        viewType="workspace"
-        user={user}
       />
-      <DeleteViewModal
+      <DeleteWorkspaceViewModal
         isOpen={deleteViewModal}
         data={selectedViewToDelete}
         setIsOpen={setDeleteViewModal}
-        viewType="workspace"
-        user={user}
       />
       <div className="flex flex-col">
         <div className="h-full w-full flex flex-col overflow-hidden">
diff --git a/web/pages/[workspaceSlug]/workspace-views/subscribed.tsx b/web/pages/[workspaceSlug]/workspace-views/subscribed.tsx
index 7a96b41ed..50da24a82 100644
--- a/web/pages/[workspaceSlug]/workspace-views/subscribed.tsx
+++ b/web/pages/[workspaceSlug]/workspace-views/subscribed.tsx
@@ -1,205 +1,40 @@
-import { useCallback, useState } from "react";
-
-import { useRouter } from "next/router";
-
-import useSWR from "swr";
-
-// hook
-import useUser from "hooks/use-user";
-// context
-import { useProjectMyMembership } from "contexts/project-member.context";
-// services
-import workspaceService from "services/workspace.service";
 // layouts
 import { WorkspaceAuthorizationLayout } from "layouts/auth-layout";
 // components
-import { SpreadsheetView } from "components/core";
-import { WorkspaceViewsNavigation } from "components/workspace/views/workpace-view-navigation";
 import { WorkspaceIssuesViewOptions } from "components/issues/workspace-views/workspace-issue-view-option";
-import { CreateUpdateViewModal } from "components/views";
-import { CreateUpdateIssueModal, DeleteIssueModal } from "components/issues";
+import { WorkspaceSubscribedIssues } from "components/issues/workspace-views/workspace-subscribed-issue";
 // ui
-import { EmptyState, PrimaryButton } from "components/ui";
+import { PrimaryButton } from "components/ui";
 // icons
 import { PlusIcon } from "@heroicons/react/24/outline";
 import { CheckCircle } from "lucide-react";
-// images
-import emptyView from "public/empty-state/view.svg";
-// fetch-keys
-import { WORKSPACE_VIEW_DETAILS, WORKSPACE_VIEW_ISSUES } from "constants/fetch-keys";
-// types
-import { IIssue } from "types";
 
-const WorkspaceViewSubscribedIssue: React.FC = () => {
-  const [createViewModal, setCreateViewModal] = useState<any>(null);
-
-  // create issue modal
-  const [createIssueModal, setCreateIssueModal] = useState(false);
-  const [preloadedData, setPreloadedData] = useState<
-    (Partial<IIssue> & { actionType: "createIssue" | "edit" | "delete" }) | undefined
-  >(undefined);
-
-  // update issue modal
-  const [editIssueModal, setEditIssueModal] = useState(false);
-  const [issueToEdit, setIssueToEdit] = useState<
-    (IIssue & { actionType: "edit" | "delete" }) | undefined
-  >(undefined);
-
-  // delete issue modal
-  const [deleteIssueModal, setDeleteIssueModal] = useState(false);
-  const [issueToDelete, setIssueToDelete] = useState<IIssue | null>(null);
-
-  const router = useRouter();
-  const { workspaceSlug, workspaceViewId } = router.query;
-
-  const { user } = useUser();
-  const { memberRole } = useProjectMyMembership();
-
-  const params: any = {
-    subscriber: user?.id ?? undefined,
-    sub_issue: false,
-  };
-
-  const { data: viewDetails, error } = useSWR(
-    workspaceSlug && workspaceViewId ? WORKSPACE_VIEW_DETAILS(workspaceViewId.toString()) : null,
-    workspaceSlug && workspaceViewId
-      ? () => workspaceService.getViewDetails(workspaceSlug.toString(), workspaceViewId.toString())
-      : null
-  );
-
-  const { data: viewIssues, mutate: mutateIssues } = useSWR(
-    workspaceSlug ? WORKSPACE_VIEW_ISSUES(workspaceSlug.toString(), params) : null,
-    workspaceSlug ? () => workspaceService.getViewIssues(workspaceSlug.toString(), params) : null
-  );
-
-  const makeIssueCopy = useCallback(
-    (issue: IIssue) => {
-      setCreateIssueModal(true);
-
-      setPreloadedData({ ...issue, name: `${issue.name} (Copy)`, actionType: "createIssue" });
-    },
-    [setCreateIssueModal, setPreloadedData]
-  );
-
-  const handleEditIssue = useCallback(
-    (issue: IIssue) => {
-      setEditIssueModal(true);
-      setIssueToEdit({
-        ...issue,
-        actionType: "edit",
-        cycle: issue.issue_cycle ? issue.issue_cycle.cycle : null,
-        module: issue.issue_module ? issue.issue_module.module : null,
-      });
-    },
-    [setEditIssueModal, setIssueToEdit]
-  );
-
-  const handleDeleteIssue = useCallback(
-    (issue: IIssue) => {
-      setDeleteIssueModal(true);
-      setIssueToDelete(issue);
-    },
-    [setDeleteIssueModal, setIssueToDelete]
-  );
-
-  const handleIssueAction = useCallback(
-    (issue: IIssue, action: "copy" | "edit" | "delete" | "updateDraft") => {
-      if (action === "copy") makeIssueCopy(issue);
-      else if (action === "edit") handleEditIssue(issue);
-      else if (action === "delete") handleDeleteIssue(issue);
-    },
-    [makeIssueCopy, handleEditIssue, handleDeleteIssue]
-  );
-
-  return (
-    <WorkspaceAuthorizationLayout
-      breadcrumbs={
-        <div className="flex gap-2 items-center">
-          <CheckCircle className="h-[18px] w-[18px] stroke-[1.5]" />
-          <span className="text-sm font-medium">
-            {viewDetails ? `${viewDetails.name} Issues` : "Workspace Issues"}
-          </span>
-        </div>
-      }
-      right={
-        <div className="flex items-center gap-2">
-          <WorkspaceIssuesViewOptions />
-          <PrimaryButton
-            className="flex items-center gap-2"
-            onClick={() => {
-              const e = new KeyboardEvent("keydown", { key: "c" });
-              document.dispatchEvent(e);
-            }}
-          >
-            <PlusIcon className="h-4 w-4" />
-            Add Issue
-          </PrimaryButton>
-        </div>
-      }
-    >
-      <CreateUpdateIssueModal
-        isOpen={createIssueModal && preloadedData?.actionType === "createIssue"}
-        handleClose={() => setCreateIssueModal(false)}
-        prePopulateData={{
-          ...preloadedData,
-        }}
-        onSubmit={async () => {
-          mutateIssues();
-        }}
-      />
-      <CreateUpdateIssueModal
-        isOpen={editIssueModal && issueToEdit?.actionType !== "delete"}
-        handleClose={() => setEditIssueModal(false)}
-        data={issueToEdit}
-        onSubmit={async () => {
-          mutateIssues();
-        }}
-      />
-      <DeleteIssueModal
-        handleClose={() => setDeleteIssueModal(false)}
-        isOpen={deleteIssueModal}
-        data={issueToDelete}
-        user={user}
-        onSubmit={async () => {
-          mutateIssues();
-        }}
-      />
-      <CreateUpdateViewModal
-        isOpen={createViewModal !== null}
-        handleClose={() => setCreateViewModal(null)}
-        viewType="workspace"
-        preLoadedData={createViewModal}
-        user={user}
-      />
-      <div className="h-full flex flex-col overflow-hidden bg-custom-background-100">
-        <div className="h-full w-full border-b border-custom-border-300">
-          <WorkspaceViewsNavigation handleAddView={() => setCreateViewModal(true)} />
-          {error ? (
-            <EmptyState
-              image={emptyView}
-              title="View does not exist"
-              description="The view you are looking for does not exist or has been deleted."
-              primaryButton={{
-                text: "View other views",
-                onClick: () => router.push(`/${workspaceSlug}/workspace-views`),
-              }}
-            />
-          ) : (
-            <div className="h-full w-full flex flex-col">
-              <SpreadsheetView
-                spreadsheetIssues={viewIssues}
-                mutateIssues={mutateIssues}
-                handleIssueAction={handleIssueAction}
-                disableUserActions={false}
-                user={user}
-                userAuth={memberRole}
-              />
-            </div>
-          )}
-        </div>
+const WorkspaceViewSubscribedIssue: React.FC = () => (
+  <WorkspaceAuthorizationLayout
+    breadcrumbs={
+      <div className="flex gap-2 items-center">
+        <CheckCircle className="h-[18px] w-[18px] stroke-[1.5]" />
+        <span className="text-sm font-medium">Workspace Issue</span>
       </div>
-    </WorkspaceAuthorizationLayout>
-  );
-};
+    }
+    right={
+      <div className="flex items-center gap-2">
+        <WorkspaceIssuesViewOptions />
+        <PrimaryButton
+          className="flex items-center gap-2"
+          onClick={() => {
+            const e = new KeyboardEvent("keydown", { key: "c" });
+            document.dispatchEvent(e);
+          }}
+        >
+          <PlusIcon className="h-4 w-4" />
+          Add Issue
+        </PrimaryButton>
+      </div>
+    }
+  >
+    <WorkspaceSubscribedIssues />
+  </WorkspaceAuthorizationLayout>
+);
 
 export default WorkspaceViewSubscribedIssue;
diff --git a/web/services/workspace.service.ts b/web/services/workspace.service.ts
index a3aa56507..f9859d3b3 100644
--- a/web/services/workspace.service.ts
+++ b/web/services/workspace.service.ts
@@ -14,9 +14,9 @@ import {
   ICurrentUserResponse,
   IWorkspaceBulkInviteFormData,
   IWorkspaceViewProps,
-  IView,
-  IIssueFilterOptions,
+  IWorkspaceViewIssuesParams,
 } from "types";
+import { IWorkspaceView } from "types/workspace-views";
 
 class WorkspaceService extends APIService {
   constructor() {
@@ -264,7 +264,7 @@ class WorkspaceService extends APIService {
       });
   }
 
-  async createView(workspaceSlug: string, data: IView): Promise<any> {
+  async createView(workspaceSlug: string, data: IWorkspaceView): Promise<any> {
     return this.post(`/api/workspaces/${workspaceSlug}/views/`, data)
       .then((response) => response?.data)
       .catch((error) => {
@@ -272,7 +272,11 @@ class WorkspaceService extends APIService {
       });
   }
 
-  async updateView(workspaceSlug: string, viewId: string, data: Partial<IView>): Promise<any> {
+  async updateView(
+    workspaceSlug: string,
+    viewId: string,
+    data: Partial<IWorkspaceView>
+  ): Promise<any> {
     return this.patch(`/api/workspaces/${workspaceSlug}/views/${viewId}/`, data)
       .then((response) => response?.data)
       .catch((error) => {
@@ -288,7 +292,7 @@ class WorkspaceService extends APIService {
       });
   }
 
-  async getAllViews(workspaceSlug: string): Promise<IView[]> {
+  async getAllViews(workspaceSlug: string): Promise<IWorkspaceView[]> {
     return this.get(`/api/workspaces/${workspaceSlug}/views/`)
       .then((response) => response?.data)
       .catch((error) => {
@@ -296,7 +300,7 @@ class WorkspaceService extends APIService {
       });
   }
 
-  async getViewDetails(workspaceSlug: string, viewId: string): Promise<IView> {
+  async getViewDetails(workspaceSlug: string, viewId: string): Promise<IWorkspaceView> {
     return this.get(`/api/workspaces/${workspaceSlug}/views/${viewId}/`)
       .then((response) => response?.data)
       .catch((error) => {
@@ -304,7 +308,7 @@ class WorkspaceService extends APIService {
       });
   }
 
-  async getViewIssues(workspaceSlug: string, params: IIssueFilterOptions): Promise<any> {
+  async getViewIssues(workspaceSlug: string, params: IWorkspaceViewIssuesParams): Promise<any> {
     return this.get(`/api/workspaces/${workspaceSlug}/issues/`, {
       params,
     })
diff --git a/web/types/view-props.d.ts b/web/types/view-props.d.ts
index 4cd6d63fd..ccc0270ec 100644
--- a/web/types/view-props.d.ts
+++ b/web/types/view-props.d.ts
@@ -1,3 +1,5 @@
+import { Properties } from "./workspace";
+
 export type TIssueViewOptions = "list" | "kanban" | "calendar" | "spreadsheet" | "gantt_chart";
 
 export type TIssueGroupByOptions =
@@ -12,19 +14,22 @@ export type TIssueGroupByOptions =
 
 export type TIssueOrderByOptions =
   | "-created_at"
+  | "created_at"
+  | "updated_at"
   | "-updated_at"
   | "priority"
+  | "-priority"
   | "sort_order"
   | "state__name"
   | "-state__name"
-  | "assignees__name"
-  | "-assignees__name"
+  | "assignees__first_name"
+  | "-assignees__first_name"
   | "labels__name"
   | "-labels__name"
   | "target_date"
   | "-target_date"
-  | "estimate__point"
-  | "-estimate__point"
+  | "estimate_point"
+  | "-estimate_point"
   | "start_date"
   | "-start_date";
 
@@ -33,12 +38,11 @@ export interface IIssueFilterOptions {
   created_by?: string[] | null;
   labels?: string[] | null;
   priority?: string[] | null;
-  start_date?: string[] | null;
+  start_date?: TStateGroups[] | null;
   state?: string[] | null;
-  state_group?: string[] | null;
+  state_group?: TStateGroups[] | null;
   subscriber?: string[] | null;
   target_date?: string[] | null;
-  project?: string[] | null;
 }
 
 export interface IIssueDisplayFilterOptions {
@@ -51,13 +55,53 @@ export interface IIssueDisplayFilterOptions {
   type?: "active" | "backlog" | null;
 }
 
+export interface IWorkspaceIssueFilterOptions {
+  assignees?: string[] | null;
+  created_by?: string[] | null;
+  labels?: string[] | null;
+  priority?: string[] | null;
+  state_group?: string[] | null;
+  subscriber?: string[] | null;
+  start_date?: string[] | null;
+  target_date?: string[] | null;
+  project?: string[] | null;
+}
+
+export interface IWorkspaceGlobalViewDisplayFilterOptions {
+  order_by?: string | undefined;
+  type?: "active" | "backlog" | null;
+  sub_issue?: boolean;
+  layout?: TIssueViewOptions;
+}
+
+export interface IWorkspaceViewIssuesParams {
+  assignees?: string | undefined;
+  created_by?: string | undefined;
+  labels?: string | undefined;
+  priority?: string | undefined;
+  start_date?: string | undefined;
+  state?: string | undefined;
+  state_group?: string | undefined;
+  subscriber?: string | undefined;
+  target_date?: string | undefined;
+  project?: string | undefined;
+  order_by?: string | undefined;
+  type?: "active" | "backlog" | undefined;
+  sub_issue?: boolean;
+}
+
 export interface IProjectViewProps {
   display_filters: IIssueDisplayFilterOptions | undefined;
   filters: IIssueFilterOptions;
 }
 
 export interface IWorkspaceViewProps {
-  display_filters: IIssueDisplayFilterOptions | undefined;
-  display_properties: Properties | undefined;
   filters: IIssueFilterOptions;
+  display_filters: IIssueDisplayFilterOptions | undefined;
+  display_properties: Properties;
+}
+export interface IWorkspaceGlobalViewProps {
+  filters: IWorkspaceIssueFilterOptions;
+  display_filters: IWorkspaceIssueDisplayFilterOptions | undefined;
+  display_properties: Properties | undefined;
 }
diff --git a/web/types/views.d.ts b/web/types/views.d.ts
index e9741a270..e1246af5a 100644
--- a/web/types/views.d.ts
+++ b/web/types/views.d.ts
@@ -1,5 +1,3 @@
-import { IIssueFilterOptions } from "./view-props";
-
 export interface IView {
   id: string;
   access: string;
@@ -10,15 +8,10 @@ export interface IView {
   updated_by: string;
   name: string;
   description: string;
-  query: IIssueFilterOptions;
-  query_data: IIssueFilterOptions;
+  query: IQuery;
+  query_data: IQuery;
   project: string;
   workspace: string;
-  workspace_detail: {
-    id: string;
-    name: string;
-    slug: string;
-  };
 }
 
 export interface IQuery {
@@ -30,5 +23,4 @@ export interface IQuery {
   start_date: string[] | null;
   target_date: string[] | null;
   type: "active" | "backlog" | null;
-  project: string[] | null;
 }
diff --git a/web/types/workspace-views.d.ts b/web/types/workspace-views.d.ts
new file mode 100644
index 000000000..0796e5cae
--- /dev/null
+++ b/web/types/workspace-views.d.ts
@@ -0,0 +1,22 @@
+import { IWorkspaceGlobalViewProps } from "./view-props";
+
+export interface IWorkspaceView {
+  id: string;
+  access: string;
+  created_at: Date;
+  updated_at: Date;
+  is_favorite: boolean;
+  created_by: string;
+  updated_by: string;
+  name: string;
+  description: string;
+  query: IWorkspaceGlobalViewProps;
+  query_data: IWorkspaceGlobalViewProps;
+  project: string;
+  workspace: string;
+  workspace_detail?: {
+    id: string;
+    name: string;
+    slug: string;
+  };
+}

From 6cb4b222d06d4705a0386b0798c728b5bb3ec1c0 Mon Sep 17 00:00:00 2001
From: Nikhil <118773738+pablohashescobar@users.noreply.github.com>
Date: Fri, 29 Sep 2023 12:27:19 +0530
Subject: [PATCH 10/11] chore: label create error (#2299)

---
 apiserver/plane/api/views/issue.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/apiserver/plane/api/views/issue.py b/apiserver/plane/api/views/issue.py
index 29f14e437..b5a62dd5d 100644
--- a/apiserver/plane/api/views/issue.py
+++ b/apiserver/plane/api/views/issue.py
@@ -712,10 +712,18 @@ class LabelViewSet(BaseViewSet):
         ProjectMemberPermission,
     ]
 
-    def perform_create(self, serializer):
-        serializer.save(
-            project_id=self.kwargs.get("project_id"),
-        )
+    def create(self, request, slug, project_id):
+        try:
+            serializer = LabelSerializer(data=request.data)
+            if serializer.is_valid():
+                serializer.save(project_id=project_id)
+                return Response(serializer.data, status=status.HTTP_201_CREATED)
+            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+        except IntegrityError:
+            return Response({"error": "Label with the same name already exists in the project"}, status=status.HTTP_400_BAD_REQUEST)
+        except Exception as e:
+            capture_exception(e)
+            return Response({"error": "Something went wrong please try again later"}, status=status.HTTP_400_BAD_REQUEST)
 
     def get_queryset(self):
         return self.filter_queryset(

From 459999e8c9b7b99183b823868b9f64d402eb5375 Mon Sep 17 00:00:00 2001
From: Anmol Singh Bhatia <121005188+anmolsinghbhatia@users.noreply.github.com>
Date: Fri, 29 Sep 2023 12:36:38 +0530
Subject: [PATCH 11/11] chore: global issues ui improvement and bug fixes
 (#2300)

---
 .../issue-column/issue-column.tsx             |  4 +-
 .../spreadsheet-view/spreadsheet-view.tsx     |  4 +-
 .../workspace-views/workpace-view-issues.tsx  |  8 +-
 .../workspace-views/workspace-all-issue.tsx   |  8 +-
 web/components/views/single-view-item.tsx     |  2 +-
 web/components/workspace/sidebar-menu.tsx     |  2 +-
 web/components/workspace/views/modal.tsx      |  4 +-
 .../views/workpace-view-navigation.tsx        | 41 ++++++---
 web/contexts/workspace-view-context.tsx       | 22 ++---
 web/pages/[workspaceSlug]/settings/index.tsx  | 87 ++++++++++---------
 .../{[workspaceViewId].tsx => issues.tsx}     |  0
 11 files changed, 99 insertions(+), 83 deletions(-)
 rename web/pages/[workspaceSlug]/workspace-views/{[workspaceViewId].tsx => issues.tsx} (100%)

diff --git a/web/components/core/views/spreadsheet-view/issue-column/issue-column.tsx b/web/components/core/views/spreadsheet-view/issue-column/issue-column.tsx
index 1afcda5e1..d75df7343 100644
--- a/web/components/core/views/spreadsheet-view/issue-column/issue-column.tsx
+++ b/web/components/core/views/spreadsheet-view/issue-column/issue-column.tsx
@@ -82,7 +82,7 @@ export const IssueColumn: React.FC<Props> = ({
   const isNotAllowed = userAuth.isGuest || userAuth.isViewer;
 
   return (
-    <div className="group flex items-center w-[28rem] text-sm h-11 sticky top-0 bg-custom-background-100 truncate border-b border-r border-custom-border-200">
+    <div className="group flex items-center w-[28rem] text-sm h-11 sticky top-0 bg-custom-background-100 truncate border-b border-r border-custom-border-100">
       <div
         className="flex gap-1.5 px-4 pr-0 py-2.5 items-center w-24"
         style={issue.parent && nestingLevel !== 0 ? { paddingLeft } : {}}
@@ -101,7 +101,7 @@ export const IssueColumn: React.FC<Props> = ({
                 onInteraction={(nextOpenState) => setIsOpen(nextOpenState)}
                 content={
                   <div
-                    className={`flex flex-col gap-1.5 overflow-y-scroll whitespace-nowrap rounded-md border p-1 text-xs shadow-lg focus:outline-none max-h-44 min-w-full border-custom-border-200 bg-custom-background-90`}
+                    className={`flex flex-col gap-1.5 overflow-y-scroll whitespace-nowrap rounded-md border p-1 text-xs shadow-lg focus:outline-none max-h-44 min-w-full border-custom-border-100 bg-custom-background-90`}
                   >
                     <button
                       type="button"
diff --git a/web/components/core/views/spreadsheet-view/spreadsheet-view.tsx b/web/components/core/views/spreadsheet-view/spreadsheet-view.tsx
index 088a4837d..690865808 100644
--- a/web/components/core/views/spreadsheet-view/spreadsheet-view.tsx
+++ b/web/components/core/views/spreadsheet-view/spreadsheet-view.tsx
@@ -239,7 +239,7 @@ export const SpreadsheetView: React.FC<Props> = ({
     descendingOrder: TIssueOrderByOptions
   ) => (
     <div className="relative flex flex-col h-max w-full bg-custom-background-100">
-      <div className="flex items-center min-w-[9rem] px-4 py-2.5 text-sm font-medium z-[1] h-11 w-full sticky top-0 bg-custom-background-90 border border-l-0 border-custom-border-200">
+      <div className="flex items-center min-w-[9rem] px-4 py-2.5 text-sm font-medium z-[1] h-11 w-full sticky top-0 bg-custom-background-90 border border-l-0 border-custom-border-100">
         <CustomMenu
           customButtonClassName="!w-full"
           className="!w-full"
@@ -491,7 +491,7 @@ export const SpreadsheetView: React.FC<Props> = ({
                       isScrolled ? "shadow-r shadow-custom-shadow-xs" : ""
                     }`}
                   >
-                    <div className="flex items-center text-sm font-medium z-[2] h-11 w-full sticky top-0 bg-custom-background-90 border border-l-0 border-custom-border-200">
+                    <div className="flex items-center text-sm font-medium z-[2] h-11 w-full sticky top-0 bg-custom-background-90 border border-l-0 border-custom-border-100">
                       <span className="flex items-center px-4 py-2.5 h-full w-24 flex-shrink-0">
                         ID
                       </span>
diff --git a/web/components/issues/workspace-views/workpace-view-issues.tsx b/web/components/issues/workspace-views/workpace-view-issues.tsx
index 708e0eb9f..be9a4f838 100644
--- a/web/components/issues/workspace-views/workpace-view-issues.tsx
+++ b/web/components/issues/workspace-views/workpace-view-issues.tsx
@@ -31,7 +31,7 @@ import { IIssue, IWorkspaceIssueFilterOptions } from "types";
 
 export const WorkspaceViewIssues = () => {
   const router = useRouter();
-  const { workspaceSlug, workspaceViewId } = router.query;
+  const { workspaceSlug, viewId } = router.query;
 
   const { memberRole } = useProjectMyMembership();
   const { user } = useUser();
@@ -189,7 +189,7 @@ export const WorkspaceViewIssues = () => {
                     />
                     <PrimaryButton
                       onClick={() => {
-                        if (workspaceViewId) handleFilters("filters", filters.filters, true);
+                        if (viewId) handleFilters("filters", filters.filters, true);
                         else
                           setCreateViewModal({
                             query: filters.filters,
@@ -197,8 +197,8 @@ export const WorkspaceViewIssues = () => {
                       }}
                       className="flex items-center gap-2 text-sm"
                     >
-                      {!workspaceViewId && <PlusIcon className="h-4 w-4" />}
-                      {workspaceViewId ? "Update" : "Save"} view
+                      {!viewId && <PlusIcon className="h-4 w-4" />}
+                      {viewId ? "Update" : "Save"} view
                     </PrimaryButton>
                   </div>
                   {<div className="mt-3 border-t border-custom-border-200" />}
diff --git a/web/components/issues/workspace-views/workspace-all-issue.tsx b/web/components/issues/workspace-views/workspace-all-issue.tsx
index 724b9d309..f256e4a3e 100644
--- a/web/components/issues/workspace-views/workspace-all-issue.tsx
+++ b/web/components/issues/workspace-views/workspace-all-issue.tsx
@@ -31,7 +31,7 @@ import { IIssue, IWorkspaceIssueFilterOptions } from "types";
 
 export const WorkspaceAllIssue = () => {
   const router = useRouter();
-  const { workspaceSlug, workspaceViewId } = router.query;
+  const { workspaceSlug, viewId } = router.query;
 
   const [createViewModal, setCreateViewModal] = useState<any>(null);
 
@@ -203,7 +203,7 @@ export const WorkspaceAllIssue = () => {
                   />
                   <PrimaryButton
                     onClick={() => {
-                      if (workspaceViewId) handleFilters("filters", filters.filters, true);
+                      if (viewId) handleFilters("filters", filters.filters, true);
                       else
                         setCreateViewModal({
                           query: filters.filters,
@@ -211,8 +211,8 @@ export const WorkspaceAllIssue = () => {
                     }}
                     className="flex items-center gap-2 text-sm"
                   >
-                    {!workspaceViewId && <PlusIcon className="h-4 w-4" />}
-                    {workspaceViewId ? "Update" : "Save"} view
+                    {!viewId && <PlusIcon className="h-4 w-4" />}
+                    {viewId ? "Update" : "Save"} view
                   </PrimaryButton>
                 </div>
                 {<div className="mt-3 border-t border-custom-border-200" />}
diff --git a/web/components/views/single-view-item.tsx b/web/components/views/single-view-item.tsx
index a2e0d213a..4e5312229 100644
--- a/web/components/views/single-view-item.tsx
+++ b/web/components/views/single-view-item.tsx
@@ -91,7 +91,7 @@ export const SingleViewItem: React.FC<Props> = ({
   const viewRedirectionUrl =
     viewType === "project"
       ? `/${workspaceSlug}/projects/${projectId}/views/${view.id}`
-      : `/${workspaceSlug}/workspace-views/${view.id}`;
+      : `/${workspaceSlug}/workspace-views/issues?viewId=${view.id}`;
 
   return (
     <div className="group hover:bg-custom-background-90 border-b border-custom-border-200">
diff --git a/web/components/workspace/sidebar-menu.tsx b/web/components/workspace/sidebar-menu.tsx
index df38ea8af..d6c6ee3f9 100644
--- a/web/components/workspace/sidebar-menu.tsx
+++ b/web/components/workspace/sidebar-menu.tsx
@@ -34,7 +34,7 @@ const workspaceLinks = (workspaceSlug: string) => [
   },
   {
     Icon: TaskAltOutlined,
-    name: "Issues",
+    name: "All Issues",
     href: `/${workspaceSlug}/workspace-views/all-issues`,
   },
 ];
diff --git a/web/components/workspace/views/modal.tsx b/web/components/workspace/views/modal.tsx
index 48c3570cc..7d8f679b5 100644
--- a/web/components/workspace/views/modal.tsx
+++ b/web/components/workspace/views/modal.tsx
@@ -48,10 +48,12 @@ export const CreateUpdateWorkspaceViewModal: React.FC<Props> = ({
     };
     await workspaceService
       .createView(workspaceSlug as string, payloadData)
-      .then(() => {
+      .then((res) => {
         mutate(WORKSPACE_VIEWS_LIST(workspaceSlug as string));
         handleClose();
 
+        router.replace(`/${workspaceSlug}/workspace-views/issues?viewId=${res.id}`);
+
         setToastAlert({
           type: "success",
           title: "Success!",
diff --git a/web/components/workspace/views/workpace-view-navigation.tsx b/web/components/workspace/views/workpace-view-navigation.tsx
index c15943e8a..4e6a762b6 100644
--- a/web/components/workspace/views/workpace-view-navigation.tsx
+++ b/web/components/workspace/views/workpace-view-navigation.tsx
@@ -17,7 +17,7 @@ type Props = {
 
 export const WorkspaceViewsNavigation: React.FC<Props> = ({ handleAddView }) => {
   const router = useRouter();
-  const { workspaceSlug, workspaceViewId } = router.query;
+  const { workspaceSlug, viewId } = router.query;
 
   const { data: workspaceViews } = useSWR(
     workspaceSlug ? WORKSPACE_VIEWS_LIST(workspaceSlug.toString()) : null,
@@ -25,67 +25,80 @@ export const WorkspaceViewsNavigation: React.FC<Props> = ({ handleAddView }) =>
   );
 
   const isSelected = (pathName: string) => router.pathname.includes(pathName);
+  React.useEffect(() => {
+    const activeTabElement = document.getElementById("active-tab-global-view");
+    if (activeTabElement) activeTabElement.scrollIntoView({ behavior: "smooth", inline: "center" });
+  }, [viewId, workspaceViews]);
 
   const tabsList = [
     {
       key: "all",
       label: "All Issues",
       selected: isSelected("workspace-views/all-issues"),
-      onClick: () => router.push(`/${workspaceSlug}/workspace-views/all-issues`),
+      onClick: () => router.replace(`/${workspaceSlug}/workspace-views/all-issues`),
     },
     {
       key: "assigned",
       label: "Assigned",
       selected: isSelected("workspace-views/assigned"),
-      onClick: () => router.push(`/${workspaceSlug}/workspace-views/assigned`),
+      onClick: () => router.replace(`/${workspaceSlug}/workspace-views/assigned`),
     },
     {
       key: "created",
       label: "Created",
       selected: isSelected("workspace-views/created"),
-      onClick: () => router.push(`/${workspaceSlug}/workspace-views/created`),
+      onClick: () => router.replace(`/${workspaceSlug}/workspace-views/created`),
     },
     {
       key: "subscribed",
       label: "Subscribed",
       selected: isSelected("workspace-views/subscribed"),
-      onClick: () => router.push(`/${workspaceSlug}/workspace-views/subscribed`),
+      onClick: () => router.replace(`/${workspaceSlug}/workspace-views/subscribed`),
     },
   ];
 
   return (
-    <div className="group flex items-center overflow-x-scroll">
+    <div className="group flex items-center gap-x-1 overflow-x-scroll relative">
       {tabsList.map((tab) => (
         <button
           key={tab.key}
           type="button"
           onClick={tab.onClick}
-          className={`border-b-2 min-w-[96px] p-4 text-sm font-medium outline-none whitespace-nowrap ${
+          className={`border-b-2 min-w-min p-3 text-sm font-medium outline-none whitespace-nowrap flex-shrink-0 ${
             tab.selected
               ? "border-custom-primary-100 text-custom-primary-100"
-              : "border-transparent hover:border-custom-primary-100 hover:text-custom-primary-100"
+              : "border-transparent hover:border-custom-border-200 hover:text-custom-text-400"
           }`}
+          id={tab.selected ? `active-tab-global-view` : ``}
         >
           {tab.label}
         </button>
       ))}
+
       {workspaceViews &&
         workspaceViews.length > 0 &&
         workspaceViews?.map((view) => (
           <button
-            className={`border-b-2 min-w-[96px] p-4 text-sm font-medium outline-none whitespace-nowrap ${
-              view.id === workspaceViewId
+            className={`border-b-2 min-w-min p-3 text-sm font-medium outline-none whitespace-nowrap flex-shrink-0 ${
+              view.id === viewId
                 ? "border-custom-primary-100 text-custom-primary-100"
-                : "border-transparent hover:border-custom-primary-100 hover:text-custom-primary-100"
+                : "border-transparent hover:border-custom-border-200 hover:text-custom-text-400"
             }`}
-            onClick={() => router.push(`/${workspaceSlug}/workspace-views/${view.id}`)}
+            id={view.id === viewId ? `active-tab-global-view` : ``}
+            onClick={() =>
+              router.replace(`/${workspaceSlug}/workspace-views/issues?viewId=${view.id}`)
+            }
           >
             {view.name}
           </button>
         ))}
 
-      <button type="button" className="min-w-[96px] " onClick={handleAddView}>
-        <PlusIcon className="h-4 w-4 text-custom-primary-200 hover:text-current" />
+      <button
+        type="button"
+        className="flex items-center justify-center flex-shrink-0 sticky right-0 w-12 py-3 border-transparent bg-custom-background-100 hover:border-custom-border-200 hover:text-custom-text-400"
+        onClick={handleAddView}
+      >
+        <PlusIcon className="h-4 w-4 text-custom-primary-200" />
       </button>
     </div>
   );
diff --git a/web/contexts/workspace-view-context.tsx b/web/contexts/workspace-view-context.tsx
index 2918a94f7..3fc3dfa86 100644
--- a/web/contexts/workspace-view-context.tsx
+++ b/web/contexts/workspace-view-context.tsx
@@ -67,19 +67,19 @@ export const initialState: IWorkspaceGlobalViewProps = {
 
 const saveViewFilters = async (
   workspaceSlug: string,
-  workspaceViewId: string,
+  viewId: string,
   state: IWorkspaceGlobalViewProps
 ) => {
-  await workspaceService.updateView(workspaceSlug, workspaceViewId, {
+  await workspaceService.updateView(workspaceSlug, viewId, {
     query_data: state,
   });
 };
 
 export const WorkspaceViewProvider: React.FC<{ children: React.ReactNode }> = ({ children }) => {
   const router = useRouter();
-  const { workspaceSlug, workspaceViewId } = router.query as {
+  const { workspaceSlug, viewId } = router.query as {
     workspaceSlug: string;
-    workspaceViewId: string;
+    viewId: string;
   };
 
   const [filters, setFilters] = useState<IWorkspaceGlobalViewProps>(initialState);
@@ -98,7 +98,7 @@ export const WorkspaceViewProvider: React.FC<{ children: React.ReactNode }> = ({
     };
     setFilters(() => updatedFilterPayload);
 
-    if (saveFiltersToServer) saveViewFilters(workspaceSlug, workspaceViewId, updatedFilterPayload);
+    if (saveFiltersToServer) saveViewFilters(workspaceSlug, viewId, updatedFilterPayload);
   };
 
   const computedFilter = (filters: any) => {
@@ -151,9 +151,9 @@ export const WorkspaceViewProvider: React.FC<{ children: React.ReactNode }> = ({
   };
 
   const { data: view, isLoading: viewLoading } = useSWR(
-    workspaceSlug && workspaceViewId ? WORKSPACE_VIEW_DETAILS(workspaceViewId.toString()) : null,
-    workspaceSlug && workspaceViewId
-      ? () => workspaceService.getViewDetails(workspaceSlug.toString(), workspaceViewId.toString())
+    workspaceSlug && viewId ? WORKSPACE_VIEW_DETAILS(viewId.toString()) : null,
+    workspaceSlug && viewId
+      ? () => workspaceService.getViewDetails(workspaceSlug.toString(), viewId.toString())
       : null
   );
 
@@ -162,10 +162,10 @@ export const WorkspaceViewProvider: React.FC<{ children: React.ReactNode }> = ({
     mutate: mutateViewIssues,
     isLoading: viewIssueLoading,
   } = useSWR(
-    workspaceSlug && view && workspaceViewId && filters
-      ? WORKSPACE_VIEW_ISSUES(workspaceViewId.toString(), params)
+    workspaceSlug && view && viewId && filters
+      ? WORKSPACE_VIEW_ISSUES(viewId.toString(), params)
       : null,
-    workspaceSlug && view && workspaceViewId
+    workspaceSlug && view && viewId
       ? () =>
           workspaceService.getViewIssues(
             workspaceSlug.toString(),
diff --git a/web/pages/[workspaceSlug]/settings/index.tsx b/web/pages/[workspaceSlug]/settings/index.tsx
index 7d0d8b1b6..4a2986dfa 100644
--- a/web/pages/[workspaceSlug]/settings/index.tsx
+++ b/web/pages/[workspaceSlug]/settings/index.tsx
@@ -312,51 +312,52 @@ const WorkspaceSettings: NextPage = () => {
                 </PrimaryButton>
               </div>
             </div>
+            {isAdmin && (
+              <Disclosure as="div" className="border-t border-custom-border-400">
+                {({ open }) => (
+                  <div className="w-full">
+                    <Disclosure.Button
+                      as="button"
+                      type="button"
+                      className="flex items-center justify-between w-full py-4"
+                    >
+                      <span className="text-xl tracking-tight">Delete Workspace</span>
+                      <Icon iconName={open ? "expand_less" : "expand_more"} className="!text-2xl" />
+                    </Disclosure.Button>
 
-            <Disclosure as="div" className="border-t border-custom-border-400">
-              {({ open }) => (
-                <div className="w-full">
-                  <Disclosure.Button
-                    as="button"
-                    type="button"
-                    className="flex items-center justify-between w-full py-4"
-                  >
-                    <span className="text-xl tracking-tight">Delete Workspace</span>
-                    <Icon iconName={open ? "expand_less" : "expand_more"} className="!text-2xl" />
-                  </Disclosure.Button>
-
-                  <Transition
-                    show={open}
-                    enter="transition duration-100 ease-out"
-                    enterFrom="transform opacity-0"
-                    enterTo="transform opacity-100"
-                    leave="transition duration-75 ease-out"
-                    leaveFrom="transform opacity-100"
-                    leaveTo="transform opacity-0"
-                  >
-                    <Disclosure.Panel>
-                      <div className="flex flex-col gap-8">
-                        <span className="text-sm tracking-tight">
-                          The danger zone of the workspace delete page is a critical area that
-                          requires careful consideration and attention. When deleting a workspace,
-                          all of the data and resources within that workspace will be permanently
-                          removed and cannot be recovered.
-                        </span>
-                        <div>
-                          <DangerButton
-                            onClick={() => setIsOpen(true)}
-                            className="!text-sm"
-                            outline
-                          >
-                            Delete my workspace
-                          </DangerButton>
+                    <Transition
+                      show={open}
+                      enter="transition duration-100 ease-out"
+                      enterFrom="transform opacity-0"
+                      enterTo="transform opacity-100"
+                      leave="transition duration-75 ease-out"
+                      leaveFrom="transform opacity-100"
+                      leaveTo="transform opacity-0"
+                    >
+                      <Disclosure.Panel>
+                        <div className="flex flex-col gap-8">
+                          <span className="text-sm tracking-tight">
+                            The danger zone of the workspace delete page is a critical area that
+                            requires careful consideration and attention. When deleting a workspace,
+                            all of the data and resources within that workspace will be permanently
+                            removed and cannot be recovered.
+                          </span>
+                          <div>
+                            <DangerButton
+                              onClick={() => setIsOpen(true)}
+                              className="!text-sm"
+                              outline
+                            >
+                              Delete my workspace
+                            </DangerButton>
+                          </div>
                         </div>
-                      </div>
-                    </Disclosure.Panel>
-                  </Transition>
-                </div>
-              )}
-            </Disclosure>
+                      </Disclosure.Panel>
+                    </Transition>
+                  </div>
+                )}
+              </Disclosure>
+            )}
           </div>
         ) : (
           <div className="flex items-center justify-center h-full w-full px-4 sm:px-0">
diff --git a/web/pages/[workspaceSlug]/workspace-views/[workspaceViewId].tsx b/web/pages/[workspaceSlug]/workspace-views/issues.tsx
similarity index 100%
rename from web/pages/[workspaceSlug]/workspace-views/[workspaceViewId].tsx
rename to web/pages/[workspaceSlug]/workspace-views/issues.tsx