Merge branch 'develop' of github.com:makeplane/plane into stage/dev-release-0-13

apiserver/plane/api/views/issue.py

@@ -2400,27 +2400,6 @@ class IssueDraftViewSet(BaseViewSet):
     ]
     serializer_class = IssueFlatSerializer
     model = Issue
-
-
-    def perform_update(self, serializer):
-        requested_data = json.dumps(self.request.data, cls=DjangoJSONEncoder)
-        current_instance = (
-            self.get_queryset().filter(pk=self.kwargs.get("pk", None)).first()
-        )
-        if current_instance is not None:
-            issue_activity.delay(
-                type="issue_draft.activity.updated",
-                requested_data=requested_data,
-                actor_id=str(self.request.user.id),
-                issue_id=str(self.kwargs.get("pk", None)),
-                project_id=str(self.kwargs.get("project_id", None)),
-                current_instance=json.dumps(
-                    IssueSerializer(current_instance).data, cls=DjangoJSONEncoder
-                ),
-                epoch=int(timezone.now().timestamp())
-            )
-
-        return super().perform_update(serializer)
     
 
     def perform_destroy(self, instance):
@@ -2614,6 +2593,47 @@ class IssueDraftViewSet(BaseViewSet):
             )
 
 
+    def partial_update(self, request, slug, project_id, pk):
+        try:
+            issue = Issue.objects.get(
+                workspace__slug=slug, project_id=project_id, pk=pk
+            )
+            serializer = IssueSerializer(
+                issue, data=request.data, partial=True
+            )
+
+            if serializer.is_valid():
+                if(request.data.get("is_draft") is not None and not request.data.get("is_draft")):
+                    serializer.save(created_at=timezone.now(), updated_at=timezone.now())
+                else:
+                    serializer.save()
+                issue_activity.delay(
+                    type="issue_draft.activity.updated",
+                    requested_data=json.dumps(request.data, cls=DjangoJSONEncoder),
+                    actor_id=str(self.request.user.id),
+                    issue_id=str(self.kwargs.get("pk", None)),
+                    project_id=str(self.kwargs.get("project_id", None)),
+                    current_instance=json.dumps(
+                        IssueSerializer(issue).data,
+                        cls=DjangoJSONEncoder,
+                    ),
+                    epoch=int(timezone.now().timestamp())
+                )
+                return Response(serializer.data, status=status.HTTP_200_OK)
+            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+        except Issue.DoesNotExist:
+            return Response(
+                {"error": "Issue does not exists"},
+                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 retrieve(self, request, slug, project_id, pk=None):
         try:
             issue = Issue.objects.get(

apiserver/plane/utils/issue_filters.py

@@ -163,17 +163,17 @@ def filter_target_date(params, filter, method):
             for query in target_dates:
                 target_date_query = query.split(";")
                 if len(target_date_query) == 2 and "after" in target_date_query:
-                    filter["target_date__gt"] = target_date_query[0]
+                    filter["target_date__gte"] = target_date_query[0]
                 else:
-                    filter["target_date__lt"] = target_date_query[0]
+                    filter["target_date__lte"] = target_date_query[0]
     else:
         if params.get("target_date", None) and len(params.get("target_date")):
             for query in params.get("target_date"):
                 target_date_query = query.split(";")
                 if len(target_date_query) == 2 and "after" in target_date_query:
-                    filter["target_date__gt"] = target_date_query[0]
+                    filter["target_date__gte"] = target_date_query[0]
                 else:
-                    filter["target_date__lt"] = target_date_query[0]
+                    filter["target_date__lte"] = target_date_query[0]
 
     return filter
 

web/components/command-palette/command-pallette.tsx

@@ -161,6 +161,7 @@ export const CommandPalette: React.FC = observer(() => {
           />
           <CreateUpdateViewModal
             handleClose={() => setIsCreateViewModalOpen(false)}
+            viewType="project"
             isOpen={isCreateViewModalOpen}
             user={user}
           />

web/components/core/filters/filters-list.tsx

@@ -10,7 +10,14 @@ import { replaceUnderscoreIfSnakeCase } from "helpers/string.helper";
 // helpers
 import { renderShortDateWithYearFormat } from "helpers/date-time.helper";
 // types
-import { IIssueFilterOptions, IIssueLabels, IState, IUserLite, TStateGroups } from "types";
+import {
+  IIssueFilterOptions,
+  IIssueLabels,
+  IProject,
+  IState,
+  IUserLite,
+  TStateGroups,
+} from "types";
 // constants
 import { STATE_GROUP_COLORS } from "constants/state";
 
@@ -20,7 +27,9 @@ type Props = {
   clearAllFilters: (...args: any) => void;
   labels: IIssueLabels[] | undefined;
   members: IUserLite[] | undefined;
-  states: IState[] | undefined;
+  states?: IState[] | undefined;
+  stateGroup?: string[] | undefined;
+  project?: IProject[] | undefined;
 };
 
 export const FiltersList: React.FC<Props> = ({
@@ -30,6 +39,7 @@ export const FiltersList: React.FC<Props> = ({
   labels,
   members,
   states,
+  project,
 }) => {
   if (!filters) return <></>;
 
@@ -155,6 +165,29 @@ 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
@@ -298,6 +331,30 @@ 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"

web/components/core/filters/issues-view-filter.tsx

@@ -67,7 +67,7 @@ export const IssuesFilterView: React.FC = () => {
   const router = useRouter();
   const { workspaceSlug, projectId, viewId } = router.query;
   const isArchivedIssues = router.pathname.includes("archived-issues");
-  const isDraftIssues = router.pathname.includes("draft-issues");
+  const isDraftIssues = router.pathname?.split("/")?.[4] === "draft-issues";
 
   const {
     displayFilters,
@@ -230,6 +230,9 @@ export const IssuesFilterView: React.FC = () => {
                                   return null;
                                 if (option.key === "project") return null;
 
+                                if (isDraftIssues && option.key === "state_detail.group")
+                                  return null;
+
                                 return (
                                   <CustomMenu.MenuItem
                                     key={option.key}

web/components/core/views/all-views.tsx

@@ -12,6 +12,7 @@ import stateService from "services/state.service";
 // hooks
 import useUser from "hooks/use-user";
 import { useProjectMyMembership } from "contexts/project-member.context";
+import useSpreadsheetIssuesView from "hooks/use-spreadsheet-issues-view";
 // components
 import {
   AllLists,
@@ -86,6 +87,8 @@ export const AllViews: React.FC<Props> = ({
 
   const { groupedIssues, isEmpty, displayFilters } = viewProps;
 
+  const { spreadsheetIssues, mutateIssues } = useSpreadsheetIssuesView();
+
   const { data: stateGroups } = useSWR(
     workspaceSlug && projectId ? STATES_LIST(projectId as string) : null,
     workspaceSlug
@@ -174,6 +177,8 @@ export const AllViews: React.FC<Props> = ({
             ) : displayFilters?.layout === "spreadsheet" ? (
               <SpreadsheetView
                 handleIssueAction={handleIssueAction}
+                spreadsheetIssues={spreadsheetIssues}
+                mutateIssues={mutateIssues}
                 openIssuesListModal={cycleId || moduleId ? openIssuesListModal : null}
                 disableUserActions={disableUserActions}
                 user={user}

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"
+      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"
       {...props}
     >
       <InlineInput />

web/components/core/views/board-view/single-board.tsx

@@ -75,9 +75,7 @@ export const SingleBoard: React.FC<Props> = (props) => {
 
   const isNotAllowed = userAuth.isGuest || userAuth.isViewer || disableUserActions;
 
-  const onCreateClick = () => {
-    setIsInlineCreateIssueFormOpen(true);
-
+  const scrollToBottom = () => {
     const boardListElement = document.getElementById(`board-list-${groupTitle}`);
 
     // timeout is needed because the animation
@@ -93,6 +91,11 @@ export const SingleBoard: React.FC<Props> = (props) => {
     }, 10);
   };
 
+  const onCreateClick = () => {
+    setIsInlineCreateIssueFormOpen(true);
+    scrollToBottom();
+  };
+
   return (
     <div className={`flex-shrink-0 ${!isCollapsed ? "" : "flex h-full flex-col w-96"}`}>
       <BoardHeader
@@ -201,6 +204,7 @@ export const SingleBoard: React.FC<Props> = (props) => {
                 <BoardInlineCreateIssueForm
                   isOpen={isInlineCreateIssueFormOpen}
                   handleClose={() => setIsInlineCreateIssueFormOpen(false)}
+                  onSuccess={() => scrollToBottom()}
                   prePopulatedData={{
                     ...(cycleId && { cycle: cycleId.toString() }),
                     ...(moduleId && { module: moduleId.toString() }),

web/components/core/views/calendar-view/calendar-header.tsx

@@ -5,25 +5,12 @@ import { Popover, Transition } from "@headlessui/react";
 // ui
 import { CustomMenu, ToggleSwitch } from "components/ui";
 // icons
-import {
-  CheckIcon,
-  ChevronDownIcon,
-  ChevronLeftIcon,
-  ChevronRightIcon,
-} from "@heroicons/react/24/outline";
+import { ChevronDownIcon, ChevronLeftIcon, ChevronRightIcon } from "@heroicons/react/24/outline";
 // helpers
 import {
-  addMonths,
-  addSevenDaysToDate,
   formatDate,
-  getCurrentWeekEndDate,
-  getCurrentWeekStartDate,
   isSameMonth,
   isSameYear,
-  lastDayOfWeek,
-  startOfWeek,
-  subtract7DaysToDate,
-  subtractMonths,
   updateDateWithMonth,
   updateDateWithYear,
 } from "helpers/calendar.helper";
@@ -31,190 +18,136 @@ import {
 import { MONTHS_LIST, YEARS_LIST } from "constants/calendar";
 
 type Props = {
-  isMonthlyView: boolean;
-  setIsMonthlyView: React.Dispatch<React.SetStateAction<boolean>>;
   currentDate: Date;
   setCurrentDate: React.Dispatch<React.SetStateAction<Date>>;
   showWeekEnds: boolean;
   setShowWeekEnds: React.Dispatch<React.SetStateAction<boolean>>;
-  changeDateRange: (startDate: Date, endDate: Date) => void;
 };
 
 export const CalendarHeader: React.FC<Props> = ({
-  setIsMonthlyView,
-  isMonthlyView,
   currentDate,
   setCurrentDate,
   showWeekEnds,
   setShowWeekEnds,
-  changeDateRange,
-}) => {
-  const updateDate = (date: Date) => {
-    setCurrentDate(date);
+}) => (
+  <div className="mb-4 flex items-center justify-between">
+    <div className="relative flex h-full w-full items-center justify-start gap-2 text-sm ">
+      <Popover className="flex h-full items-center justify-start rounded-lg">
+        {({ open }) => (
+          <>
+            <Popover.Button>
+              <div className="flex items-center justify-center gap-2 text-2xl font-semibold text-custom-text-100">
+                <span>{formatDate(currentDate, "Month")}</span>{" "}
+                <span>{formatDate(currentDate, "yyyy")}</span>
+              </div>
+            </Popover.Button>
 
-    changeDateRange(startOfWeek(date), lastDayOfWeek(date));
-  };
-
-  return (
-    <div className="mb-4 flex items-center justify-between">
-      <div className="relative flex h-full w-full items-center justify-start gap-2 text-sm ">
-        <Popover className="flex h-full items-center justify-start rounded-lg">
-          {({ open }) => (
-            <>
-              <Popover.Button>
-                <div className="flex items-center justify-center gap-2 text-2xl font-semibold text-custom-text-100">
-                  <span>{formatDate(currentDate, "Month")}</span>{" "}
-                  <span>{formatDate(currentDate, "yyyy")}</span>
+            <Transition
+              as={React.Fragment}
+              enter="transition ease-out duration-200"
+              enterFrom="opacity-0 translate-y-1"
+              enterTo="opacity-100 translate-y-0"
+              leave="transition ease-in duration-150"
+              leaveFrom="opacity-100 translate-y-0"
+              leaveTo="opacity-0 translate-y-1"
+            >
+              <Popover.Panel className="absolute top-10 left-0 z-20 flex w-full max-w-xs transform flex-col overflow-hidden rounded-[10px] bg-custom-background-80 shadow-lg">
+                <div className="flex items-center justify-center gap-5 px-2 py-2 text-sm">
+                  {YEARS_LIST.map((year) => (
+                    <button
+                      onClick={() => setCurrentDate(updateDateWithYear(year.label, currentDate))}
+                      className={` ${
+                        isSameYear(year.value, currentDate)
+                          ? "text-sm font-medium text-custom-text-100"
+                          : "text-xs text-custom-text-200 "
+                      } hover:text-sm hover:font-medium hover:text-custom-text-100`}
+                    >
+                      {year.label}
+                    </button>
+                  ))}
                 </div>
-              </Popover.Button>
+                <div className="grid grid-cols-4  border-t border-custom-border-200 px-2">
+                  {MONTHS_LIST.map((month) => (
+                    <button
+                      onClick={() =>
+                        setCurrentDate(updateDateWithMonth(`${month.value}`, currentDate))
+                      }
+                      className={`px-2 py-2 text-xs text-custom-text-200 hover:font-medium hover:text-custom-text-100 ${
+                        isSameMonth(`${month.value}`, currentDate)
+                          ? "font-medium text-custom-text-100"
+                          : ""
+                      }`}
+                    >
+                      {month.label}
+                    </button>
+                  ))}
+                </div>
+              </Popover.Panel>
+            </Transition>
+          </>
+        )}
+      </Popover>
 
-              <Transition
-                as={React.Fragment}
-                enter="transition ease-out duration-200"
-                enterFrom="opacity-0 translate-y-1"
-                enterTo="opacity-100 translate-y-0"
-                leave="transition ease-in duration-150"
-                leaveFrom="opacity-100 translate-y-0"
-                leaveTo="opacity-0 translate-y-1"
-              >
-                <Popover.Panel className="absolute top-10 left-0 z-20 flex w-full max-w-xs transform flex-col overflow-hidden rounded-[10px] bg-custom-background-80 shadow-lg">
-                  <div className="flex items-center justify-center gap-5 px-2 py-2 text-sm">
-                    {YEARS_LIST.map((year) => (
-                      <button
-                        onClick={() => updateDate(updateDateWithYear(year.label, currentDate))}
-                        className={` ${
-                          isSameYear(year.value, currentDate)
-                            ? "text-sm font-medium text-custom-text-100"
-                            : "text-xs text-custom-text-200 "
-                        } hover:text-sm hover:font-medium hover:text-custom-text-100`}
-                      >
-                        {year.label}
-                      </button>
-                    ))}
-                  </div>
-                  <div className="grid grid-cols-4  border-t border-custom-border-200 px-2">
-                    {MONTHS_LIST.map((month) => (
-                      <button
-                        onClick={() =>
-                          updateDate(updateDateWithMonth(`${month.value}`, currentDate))
-                        }
-                        className={`px-2 py-2 text-xs text-custom-text-200 hover:font-medium hover:text-custom-text-100 ${
-                          isSameMonth(`${month.value}`, currentDate)
-                            ? "font-medium text-custom-text-100"
-                            : ""
-                        }`}
-                      >
-                        {month.label}
-                      </button>
-                    ))}
-                  </div>
-                </Popover.Panel>
-              </Transition>
-            </>
-          )}
-        </Popover>
-
-        <div className="flex items-center gap-2">
-          <button
-            className="cursor-pointer"
-            onClick={() => {
-              if (isMonthlyView) {
-                updateDate(subtractMonths(currentDate, 1));
-              } else {
-                setCurrentDate(subtract7DaysToDate(currentDate));
-                changeDateRange(
-                  getCurrentWeekStartDate(subtract7DaysToDate(currentDate)),
-                  getCurrentWeekEndDate(subtract7DaysToDate(currentDate))
-                );
-              }
-            }}
-          >
-            <ChevronLeftIcon className="h-4 w-4" />
-          </button>
-          <button
-            className="cursor-pointer"
-            onClick={() => {
-              if (isMonthlyView) {
-                updateDate(addMonths(currentDate, 1));
-              } else {
-                setCurrentDate(addSevenDaysToDate(currentDate));
-                changeDateRange(
-                  getCurrentWeekStartDate(addSevenDaysToDate(currentDate)),
-                  getCurrentWeekEndDate(addSevenDaysToDate(currentDate))
-                );
-              }
-            }}
-          >
-            <ChevronRightIcon className="h-4 w-4" />
-          </button>
-        </div>
-      </div>
-
-      <div className="flex w-full items-center justify-end gap-2">
+      <div className="flex items-center gap-2">
         <button
-          className="group flex cursor-pointer items-center gap-2 rounded-md border border-custom-border-200 px-3 py-1 text-sm hover:bg-custom-background-80 hover:text-custom-text-100 focus:outline-none"
+          className="cursor-pointer"
           onClick={() => {
-            if (isMonthlyView) {
-              updateDate(new Date());
-            } else {
-              setCurrentDate(new Date());
-              changeDateRange(
-                getCurrentWeekStartDate(new Date()),
-                getCurrentWeekEndDate(new Date())
-              );
-            }
+            const previousMonthYear =
+              currentDate.getMonth() === 0
+                ? currentDate.getFullYear() - 1
+                : currentDate.getFullYear();
+            const previousMonthMonth =
+              currentDate.getMonth() === 0 ? 11 : currentDate.getMonth() - 1;
+
+            const previousMonthFirstDate = new Date(previousMonthYear, previousMonthMonth, 1);
+
+            setCurrentDate(previousMonthFirstDate);
           }}
         >
-          Today
+          <ChevronLeftIcon className="h-4 w-4" />
         </button>
+        <button
+          className="cursor-pointer"
+          onClick={() => {
+            const nextMonthYear =
+              currentDate.getMonth() === 11
+                ? currentDate.getFullYear() + 1
+                : currentDate.getFullYear();
+            const nextMonthMonth = (currentDate.getMonth() + 1) % 12;
 
-        <CustomMenu
-          customButton={
-            <div className="group flex cursor-pointer items-center gap-2 rounded-md border border-custom-border-200 px-3 py-1 text-sm hover:bg-custom-background-80 hover:text-custom-text-100 focus:outline-none ">
-              {isMonthlyView ? "Monthly" : "Weekly"}
-              <ChevronDownIcon className="h-3 w-3" aria-hidden="true" />
-            </div>
-          }
+            const nextMonthFirstDate = new Date(nextMonthYear, nextMonthMonth, 1);
+
+            setCurrentDate(nextMonthFirstDate);
+          }}
         >
-          <CustomMenu.MenuItem
-            onClick={() => {
-              setIsMonthlyView(true);
-              changeDateRange(startOfWeek(currentDate), lastDayOfWeek(currentDate));
-            }}
-            className="w-52 text-sm text-custom-text-200"
-          >
-            <div className="flex w-full max-w-[260px] items-center justify-between gap-2">
-              <span className="flex items-center gap-2">Monthly View</span>
-              <CheckIcon
-                className={`h-4 w-4 flex-shrink-0 ${isMonthlyView ? "opacity-100" : "opacity-0"}`}
-              />
-            </div>
-          </CustomMenu.MenuItem>
-          <CustomMenu.MenuItem
-            onClick={() => {
-              setIsMonthlyView(false);
-              changeDateRange(
-                getCurrentWeekStartDate(currentDate),
-                getCurrentWeekEndDate(currentDate)
-              );
-            }}
-            className="w-52 text-sm text-custom-text-200"
-          >
-            <div className="flex w-full items-center justify-between gap-2">
-              <span className="flex items-center gap-2">Weekly View</span>
-              <CheckIcon
-                className={`h-4 w-4 flex-shrink-0 ${isMonthlyView ? "opacity-0" : "opacity-100"}`}
-              />
-            </div>
-          </CustomMenu.MenuItem>
-          <div className="mt-1 flex w-52 items-center justify-between border-t border-custom-border-200 py-2 px-1  text-sm text-custom-text-200">
-            <h4>Show weekends</h4>
-            <ToggleSwitch value={showWeekEnds} onChange={() => setShowWeekEnds(!showWeekEnds)} />
-          </div>
-        </CustomMenu>
+          <ChevronRightIcon className="h-4 w-4" />
+        </button>
       </div>
     </div>
-  );
-};
+
+    <div className="flex w-full items-center justify-end gap-2">
+      <button
+        className="group flex cursor-pointer items-center gap-2 rounded-md border border-custom-border-200 px-3 py-1 text-sm hover:bg-custom-background-80 hover:text-custom-text-100 focus:outline-none"
+        onClick={() => setCurrentDate(new Date())}
+      >
+        Today
+      </button>
+
+      <CustomMenu
+        customButton={
+          <div className="group flex cursor-pointer items-center gap-2 rounded-md border border-custom-border-200 px-3 py-1 text-sm hover:bg-custom-background-80 hover:text-custom-text-100 focus:outline-none">
+            Options
+            <ChevronDownIcon className="h-3 w-3" aria-hidden="true" />
+          </div>
+        }
+      >
+        <div className="flex w-52 items-center justify-between px-1 text-sm text-custom-text-200">
+          <h4>Show weekends</h4>
+          <ToggleSwitch value={showWeekEnds} onChange={() => setShowWeekEnds(!showWeekEnds)} />
+        </div>
+      </CustomMenu>
+    </div>
+  </div>
+);
 
 export default CalendarHeader;

web/components/core/views/calendar-view/calendar.tsx

@@ -1,10 +1,6 @@
 import React, { useEffect, useState } from "react";
-
 import { useRouter } from "next/router";
-
 import { mutate } from "swr";
-
-// react-beautiful-dnd
 import { DragDropContext, DropResult } from "react-beautiful-dnd";
 // services
 import issuesService from "services/issues.service";
@@ -50,31 +46,27 @@ export const CalendarView: React.FC<Props> = ({
   userAuth,
 }) => {
   const [showWeekEnds, setShowWeekEnds] = useState(false);
-  const [currentDate, setCurrentDate] = useState(new Date());
-  const [isMonthlyView, setIsMonthlyView] = useState(true);
+
+  const { calendarIssues, mutateIssues, params, activeMonthDate, setActiveMonthDate } =
+    useCalendarIssuesView();
 
   const [calendarDates, setCalendarDates] = useState<ICalendarRange>({
-    startDate: startOfWeek(currentDate),
-    endDate: lastDayOfWeek(currentDate),
+    startDate: startOfWeek(activeMonthDate),
+    endDate: lastDayOfWeek(activeMonthDate),
   });
 
   const router = useRouter();
   const { workspaceSlug, projectId, cycleId, moduleId, viewId } = router.query;
 
-  const { calendarIssues, mutateIssues, params, displayFilters, setDisplayFilters } =
-    useCalendarIssuesView();
-
-  const totalDate = eachDayOfInterval({
-    start: calendarDates.startDate,
-    end: calendarDates.endDate,
-  });
-
-  const onlyWeekDays = weekDayInterval({
-    start: calendarDates.startDate,
-    end: calendarDates.endDate,
-  });
-
-  const currentViewDays = showWeekEnds ? totalDate : onlyWeekDays;
+  const currentViewDays = showWeekEnds
+    ? eachDayOfInterval({
+        start: calendarDates.startDate,
+        end: calendarDates.endDate,
+      })
+    : weekDayInterval({
+        start: calendarDates.startDate,
+        end: calendarDates.endDate,
+      });
 
   const currentViewDaysData = currentViewDays.map((date: Date) => {
     const filterIssue =
@@ -148,27 +140,12 @@ export const CalendarView: React.FC<Props> = ({
       .then(() => mutate(fetchKey));
   };
 
-  const changeDateRange = (startDate: Date, endDate: Date) => {
-    setCalendarDates({
-      startDate,
-      endDate,
-    });
-
-    setDisplayFilters({
-      calendar_date_range: `${renderDateFormat(startDate)};after,${renderDateFormat(
-        endDate
-      )};before`,
-    });
-  };
-
   useEffect(() => {
-    if (!displayFilters || displayFilters.calendar_date_range === "")
-      setDisplayFilters({
-        calendar_date_range: `${renderDateFormat(
-          startOfWeek(currentDate)
-        )};after,${renderDateFormat(lastDayOfWeek(currentDate))};before`,
-      });
-  }, [currentDate, displayFilters, setDisplayFilters]);
+    setCalendarDates({
+      startDate: startOfWeek(activeMonthDate),
+      endDate: lastDayOfWeek(activeMonthDate),
+    });
+  }, [activeMonthDate]);
 
   const isNotAllowed = userAuth.isGuest || userAuth.isViewer || disableUserActions;
 
@@ -184,17 +161,14 @@ export const CalendarView: React.FC<Props> = ({
         <div className="h-full overflow-y-auto">
           <DragDropContext onDragEnd={onDragEnd}>
             <div
-              id={`calendar-view-${cycleId ?? moduleId ?? viewId}`}
+              id={`calendar-view-${cycleId ?? moduleId ?? viewId ?? ""}`}
               className="h-full rounded-lg p-8 text-custom-text-200"
             >
               <CalendarHeader
-                isMonthlyView={isMonthlyView}
-                setIsMonthlyView={setIsMonthlyView}
                 showWeekEnds={showWeekEnds}
                 setShowWeekEnds={setShowWeekEnds}
-                currentDate={currentDate}
-                setCurrentDate={setCurrentDate}
-                changeDateRange={changeDateRange}
+                currentDate={activeMonthDate}
+                setCurrentDate={setActiveMonthDate}
               />
 
               <div
@@ -205,30 +179,15 @@ export const CalendarView: React.FC<Props> = ({
                 {weeks.map((date, index) => (
                   <div
                     key={index}
-                    className={`flex  items-center justify-start gap-2 border-custom-border-200 bg-custom-background-90 p-1.5 text-base font-medium text-custom-text-200 ${
-                      !isMonthlyView
-                        ? showWeekEnds
-                          ? (index + 1) % 7 === 0
-                            ? ""
-                            : "border-r"
-                          : (index + 1) % 5 === 0
-                          ? ""
-                          : "border-r"
-                        : ""
-                    }`}
+                    className={`flex  items-center justify-start gap-2 border-custom-border-200 bg-custom-background-90 p-1.5 text-base font-medium text-custom-text-200`}
                   >
-                    <span>
-                      {isMonthlyView
-                        ? formatDate(date, "eee").substring(0, 3)
-                        : formatDate(date, "eee")}
-                    </span>
-                    {!isMonthlyView && <span>{formatDate(date, "d")}</span>}
+                    <span>{formatDate(date, "eee").substring(0, 3)}</span>
                   </div>
                 ))}
               </div>
 
               <div
-                className={`grid h-full ${isMonthlyView ? "auto-rows-min" : ""} ${
+                className={`grid h-full auto-rows-min ${
                   showWeekEnds ? "grid-cols-7" : "grid-cols-5"
                 } `}
               >
@@ -239,7 +198,6 @@ export const CalendarView: React.FC<Props> = ({
                     date={date}
                     handleIssueAction={handleIssueAction}
                     addIssueToDate={addIssueToDate}
-                    isMonthlyView={isMonthlyView}
                     showWeekEnds={showWeekEnds}
                     user={user}
                     isNotAllowed={isNotAllowed}

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 px-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-1.5 rounded-md bg-transparent text-sm font-medium leading-5 text-custom-text-200 outline-none"
       />
     </>
   );
@@ -84,13 +84,13 @@ export const CalendarInlineCreateIssueForm: React.FC<Props> = (props) => {
     <>
       <div
         ref={ref}
-        className={`absolute -translate-x-1 top-5 transition-all z-20 ${
+        className={`absolute top-10 transition-all z-20 w-full max-w-[calc(100%-1.25rem)] ${
           isOpen ? "opacity-100 scale-100" : "opacity-0 pointer-events-none scale-95"
-        } ${isSpaceOnRight ? "left-full" : "right-0"}`}
+        } right-2.5`}
       >
         <InlineCreateIssueFormWrapper
           {...props}
-          className="flex w-60 p-1 px-1.5 rounded items-center gap-x-3 bg-custom-background-100 shadow-custom-shadow-md transition-opacity"
+          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"
         >
           <InlineInput />
         </InlineCreateIssueFormWrapper>

web/components/core/views/calendar-view/single-date.tsx

@@ -24,14 +24,13 @@ type Props = {
     issues: IIssue[];
   };
   addIssueToDate: (date: string) => void;
-  isMonthlyView: boolean;
   showWeekEnds: boolean;
   user: ICurrentUserResponse | undefined;
   isNotAllowed: boolean;
 };
 
 export const SingleCalendarDate: React.FC<Props> = (props) => {
-  const { handleIssueAction, date, index, isMonthlyView, showWeekEnds, user, isNotAllowed } = props;
+  const { handleIssueAction, date, index, showWeekEnds, user, isNotAllowed } = props;
 
   const router = useRouter();
   const { cycleId, moduleId } = router.query;
@@ -39,6 +38,8 @@ export const SingleCalendarDate: React.FC<Props> = (props) => {
   const [showAllIssues, setShowAllIssues] = useState(false);
   const [isCreateIssueFormOpen, setIsCreateIssueFormOpen] = useState(false);
 
+  const [formPosition, setFormPosition] = useState({ x: 0, y: 0 });
+
   const totalIssues = date.issues.length;
 
   return (
@@ -49,8 +50,6 @@ export const SingleCalendarDate: React.FC<Props> = (props) => {
           ref={provided.innerRef}
           {...provided.droppableProps}
           className={`group relative flex min-h-[150px] flex-col gap-1.5 border-t border-custom-border-200 p-2.5 text-left text-sm font-medium hover:bg-custom-background-90 ${
-            isMonthlyView ? "" : "pt-9"
-          } ${
             showWeekEnds
               ? (index + 1) % 7 === 0
                 ? ""
@@ -60,61 +59,66 @@ export const SingleCalendarDate: React.FC<Props> = (props) => {
               : "border-r"
           }`}
         >
-          {isMonthlyView && <span>{formatDate(new Date(date.date), "d")}</span>}
-          {totalIssues > 0 &&
-            date.issues.slice(0, showAllIssues ? totalIssues : 4).map((issue: IIssue, index) => (
-              <Draggable key={issue.id} draggableId={issue.id} index={index}>
-                {(provided, snapshot) => (
-                  <SingleCalendarIssue
-                    key={index}
-                    index={index}
-                    provided={provided}
-                    snapshot={snapshot}
-                    issue={issue}
-                    projectId={issue.project_detail.id}
-                    handleEditIssue={() => handleIssueAction(issue, "edit")}
-                    handleDeleteIssue={() => handleIssueAction(issue, "delete")}
-                    user={user}
-                    isNotAllowed={isNotAllowed}
-                  />
-                )}
-              </Draggable>
-            ))}
+          <>
+            <span>{formatDate(new Date(date.date), "d")}</span>
+            {totalIssues > 0 &&
+              date.issues.slice(0, showAllIssues ? totalIssues : 4).map((issue: IIssue, index) => (
+                <Draggable key={issue.id} draggableId={issue.id} index={index}>
+                  {(provided, snapshot) => (
+                    <SingleCalendarIssue
+                      key={index}
+                      index={index}
+                      provided={provided}
+                      snapshot={snapshot}
+                      issue={issue}
+                      projectId={issue.project_detail.id}
+                      handleEditIssue={() => handleIssueAction(issue, "edit")}
+                      handleDeleteIssue={() => handleIssueAction(issue, "delete")}
+                      user={user}
+                      isNotAllowed={isNotAllowed}
+                    />
+                  )}
+                </Draggable>
+              ))}
 
-          <CalendarInlineCreateIssueForm
-            isOpen={isCreateIssueFormOpen}
-            dependencies={[showWeekEnds]}
-            handleClose={() => setIsCreateIssueFormOpen(false)}
-            prePopulatedData={{
-              target_date: date.date,
-              ...(cycleId && { cycle: cycleId.toString() }),
-              ...(moduleId && { module: moduleId.toString() }),
-            }}
-          />
+            <CalendarInlineCreateIssueForm
+              isOpen={isCreateIssueFormOpen}
+              dependencies={[showWeekEnds]}
+              handleClose={() => setIsCreateIssueFormOpen(false)}
+              prePopulatedData={{
+                target_date: date.date,
+                ...(cycleId && { cycle: cycleId.toString() }),
+                ...(moduleId && { module: moduleId.toString() }),
+              }}
+            />
 
-          {totalIssues > 4 && (
-            <button
-              type="button"
-              className="w-min whitespace-nowrap rounded-md border border-custom-border-200 bg-custom-background-80 px-1.5 py-1 text-xs"
-              onClick={() => setShowAllIssues((prevData) => !prevData)}
+            {totalIssues > 4 && (
+              <button
+                type="button"
+                className="w-min whitespace-nowrap rounded-md border border-custom-border-200 bg-custom-background-80 px-1.5 py-1 text-xs"
+                onClick={() => setShowAllIssues((prevData) => !prevData)}
+              >
+                {showAllIssues ? "Hide" : totalIssues - 4 + " more"}
+              </button>
+            )}
+
+            <div
+              className={`absolute top-2 right-2 flex items-center justify-center rounded-md bg-custom-background-80 p-1 text-xs text-custom-text-200 opacity-0 group-hover:opacity-100`}
             >
-              {showAllIssues ? "Hide" : totalIssues - 4 + " more"}
-            </button>
-          )}
+              <button
+                onClick={(e) => {
+                  setIsCreateIssueFormOpen(true);
+                  setFormPosition({ x: e.clientX, y: e.clientY });
+                }}
+                className="flex items-center justify-center gap-1 text-center"
+              >
+                <PlusSmallIcon className="h-4 w-4 text-custom-text-200" />
+                Add issue
+              </button>
+            </div>
 
-          <div
-            className={`absolute top-2 right-2 flex items-center justify-center rounded-md bg-custom-background-80 p-1 text-xs text-custom-text-200 opacity-0 group-hover:opacity-100`}
-          >
-            <button
-              className="flex items-center justify-center gap-1 text-center"
-              onClick={() => setIsCreateIssueFormOpen(true)}
-            >
-              <PlusSmallIcon className="h-4 w-4 text-custom-text-200" />
-              Add issue
-            </button>
-          </div>
-
-          {provided.placeholder}
+            {provided.placeholder}
+          </>
         </div>
       )}
     </StrictModeDroppable>

web/components/core/views/gantt-chart-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 rounded-md bg-transparent text-sm font-medium leading-5 text-custom-text-200 outline-none"
       />
     </>
   );

web/components/core/views/inline-issue-create-wrapper.tsx

@@ -197,7 +197,7 @@ export const InlineCreateIssueFormWrapper: React.FC<Props> = (props) => {
         )
     )
       .then(async (res) => {
-        mutate(PROJECT_ISSUES_LIST_WITH_PARAMS(projectId.toString(), params));
+        await mutate(PROJECT_ISSUES_LIST_WITH_PARAMS(projectId.toString(), params));
         if (formData.cycle && formData.cycle !== "")
           await addIssueToCycle(
             workspaceSlug.toString(),

web/components/core/views/issues-view.tsx

@@ -481,6 +481,7 @@ export const IssuesView: React.FC<Props> = ({
       <CreateUpdateViewModal
         isOpen={createViewModal !== null}
         handleClose={() => setCreateViewModal(null)}
+        viewType="project"
         preLoadedData={createViewModal}
         user={user}
       />

web/components/core/views/list-view/inline-create-issue-form.tsx

@@ -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-md"
+      className="flex py-3 px-4 items-center gap-x-5 bg-custom-background-100 shadow-custom-shadow-sm z-10"
       {...props}
     >
       <InlineInput />

web/components/core/views/list-view/single-list.tsx

@@ -240,7 +240,11 @@ export const SingleList: React.FC<Props> = (props) => {
                 <button
                   type="button"
                   className="p-1  text-custom-text-200 hover:bg-custom-background-80"
-                  onClick={() => setIsCreateIssueFormOpen(true)}
+                  onClick={() => {
+                    if (isDraftIssuesPage || isMyIssuesPage || isProfileIssuesPage) {
+                      addIssueToGroup();
+                    } else setIsCreateIssueFormOpen(true);
+                  }}
                 >
                   <PlusIcon className="h-4 w-4" />
                 </button>

web/components/core/views/spreadsheet-view/assignee-column/assignee-column.tsx

@@ -0,0 +1,72 @@
+import React from "react";
+
+import { useRouter } from "next/router";
+
+// components
+import { MembersSelect } from "components/project";
+// services
+import trackEventServices from "services/track-event.service";
+// types
+import { ICurrentUserResponse, IIssue, Properties } from "types";
+
+type Props = {
+  issue: IIssue;
+  projectId: string;
+  partialUpdateIssue: (formData: Partial<IIssue>, issue: IIssue) => void;
+  properties: Properties;
+  user: ICurrentUserResponse | undefined;
+  isNotAllowed: boolean;
+};
+
+export const AssigneeColumn: React.FC<Props> = ({
+  issue,
+  projectId,
+  partialUpdateIssue,
+  properties,
+  user,
+  isNotAllowed,
+}) => {
+  const router = useRouter();
+
+  const { workspaceSlug } = router.query;
+
+  const handleAssigneeChange = (data: any) => {
+    const newData = issue.assignees ?? [];
+
+    if (newData.includes(data)) newData.splice(newData.indexOf(data), 1);
+    else newData.push(data);
+
+    partialUpdateIssue({ assignees_list: data }, issue);
+
+    trackEventServices.trackIssuePartialPropertyUpdateEvent(
+      {
+        workspaceSlug,
+        workspaceId: issue.workspace,
+        projectId: issue.project_detail.id,
+        projectIdentifier: issue.project_detail.identifier,
+        projectName: issue.project_detail.name,
+        issueId: issue.id,
+      },
+      "ISSUE_PROPERTY_UPDATE_ASSIGNEE",
+      user
+    );
+  };
+
+  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">
+        {properties.assignee && (
+          <MembersSelect
+            value={issue.assignees}
+            projectId={projectId}
+            onChange={handleAssigneeChange}
+            membersDetails={issue.assignee_details}
+            buttonClassName="!p-0 !rounded-none !shadow-none !border-0"
+            hideDropdownArrow
+            disabled={isNotAllowed}
+          />
+        )}
+      </span>
+    </div>
+  );
+};

web/components/core/views/spreadsheet-view/assignee-column/index.ts

@@ -0,0 +1,2 @@
+export * from "./spreadsheet-assignee-column";
+export * from "./assignee-column";

web/components/core/views/spreadsheet-view/assignee-column/spreadsheet-assignee-column.tsx

@@ -0,0 +1,62 @@
+import React from "react";
+
+// components
+import { AssigneeColumn } from "components/core";
+// hooks
+import useSubIssue from "hooks/use-sub-issue";
+// types
+import { ICurrentUserResponse, IIssue, Properties } from "types";
+
+type Props = {
+  issue: IIssue;
+  projectId: string;
+  partialUpdateIssue: (formData: Partial<IIssue>, issue: IIssue) => void;
+  expandedIssues: string[];
+  properties: Properties;
+  user: ICurrentUserResponse | undefined;
+  isNotAllowed: boolean;
+};
+
+export const SpreadsheetAssigneeColumn: React.FC<Props> = ({
+  issue,
+  projectId,
+  partialUpdateIssue,
+  expandedIssues,
+  properties,
+  user,
+  isNotAllowed,
+}) => {
+  const isExpanded = expandedIssues.indexOf(issue.id) > -1;
+
+  const { subIssues, isLoading } = useSubIssue(issue.project_detail.id, issue.id, isExpanded);
+
+  return (
+    <div>
+      <AssigneeColumn
+        issue={issue}
+        projectId={projectId}
+        properties={properties}
+        partialUpdateIssue={partialUpdateIssue}
+        user={user}
+        isNotAllowed={isNotAllowed}
+      />
+
+      {isExpanded &&
+        !isLoading &&
+        subIssues &&
+        subIssues.length > 0 &&
+        subIssues.map((subIssue: IIssue) => (
+          <SpreadsheetAssigneeColumn
+            key={subIssue.id}
+            issue={subIssue}
+            projectId={subIssue.project_detail.id}
+            partialUpdateIssue={partialUpdateIssue}
+            expandedIssues={expandedIssues}
+            properties={properties}
+            user={user}
+            isNotAllowed={isNotAllowed}
+          />
+        ))}
+    </div>
+  );
+};

web/components/core/views/spreadsheet-view/created-on-column/created-on-column.tsx

@@ -0,0 +1,34 @@
+import React from "react";
+
+// types
+import { ICurrentUserResponse, IIssue, Properties } from "types";
+// helper
+import { renderLongDetailDateFormat } from "helpers/date-time.helper";
+
+type Props = {
+  issue: IIssue;
+  projectId: string;
+  partialUpdateIssue: (formData: Partial<IIssue>, issue: IIssue) => void;
+  properties: Properties;
+  user: ICurrentUserResponse | undefined;
+  isNotAllowed: boolean;
+};
+
+export const CreatedOnColumn: React.FC<Props> = ({
+  issue,
+  projectId,
+  partialUpdateIssue,
+  properties,
+  user,
+  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">
+      {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)}
+        </div>
+      )}
+    </span>
+  </div>
+);

web/components/core/views/spreadsheet-view/created-on-column/index.ts

@@ -0,0 +1,2 @@
+export * from "./spreadsheet-created-on-column";
+export * from "./created-on-column";

web/components/core/views/spreadsheet-view/created-on-column/spreadsheet-created-on-column.tsx

@@ -0,0 +1,62 @@
+import React from "react";
+
+// components
+import { CreatedOnColumn } from "components/core";
+// hooks
+import useSubIssue from "hooks/use-sub-issue";
+// types
+import { ICurrentUserResponse, IIssue, Properties } from "types";
+
+type Props = {
+  issue: IIssue;
+  projectId: string;
+  partialUpdateIssue: (formData: Partial<IIssue>, issue: IIssue) => void;
+  expandedIssues: string[];
+  properties: Properties;
+  user: ICurrentUserResponse | undefined;
+  isNotAllowed: boolean;
+};
+
+export const SpreadsheetCreatedOnColumn: React.FC<Props> = ({
+  issue,
+  projectId,
+  partialUpdateIssue,
+  expandedIssues,
+  properties,
+  user,
+  isNotAllowed,
+}) => {
+  const isExpanded = expandedIssues.indexOf(issue.id) > -1;
+
+  const { subIssues, isLoading } = useSubIssue(issue.project_detail.id, issue.id, isExpanded);
+
+  return (
+    <div>
+      <CreatedOnColumn
+        issue={issue}
+        projectId={projectId}
+        properties={properties}
+        partialUpdateIssue={partialUpdateIssue}
+        user={user}
+        isNotAllowed={isNotAllowed}
+      />
+
+      {isExpanded &&
+        !isLoading &&
+        subIssues &&
+        subIssues.length > 0 &&
+        subIssues.map((subIssue: IIssue) => (
+          <SpreadsheetCreatedOnColumn
+            key={subIssue.id}
+            issue={subIssue}
+            projectId={subIssue.project_detail.id}
+            partialUpdateIssue={partialUpdateIssue}
+            expandedIssues={expandedIssues}
+            properties={properties}
+            user={user}
+            isNotAllowed={isNotAllowed}
+          />
+        ))}
+    </div>
+  );
+};

web/components/core/views/spreadsheet-view/due-date-column/due-date-column.tsx

@@ -0,0 +1,38 @@
+import React from "react";
+
+// components
+import { ViewDueDateSelect } from "components/issues";
+// types
+import { ICurrentUserResponse, IIssue, Properties } from "types";
+
+type Props = {
+  issue: IIssue;
+  projectId: string;
+  partialUpdateIssue: (formData: Partial<IIssue>, issue: IIssue) => void;
+  properties: Properties;
+  user: ICurrentUserResponse | undefined;
+  isNotAllowed: boolean;
+};
+
+export const DueDateColumn: React.FC<Props> = ({
+  issue,
+  projectId,
+  partialUpdateIssue,
+  properties,
+  user,
+  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">
+      {properties.due_date && (
+        <ViewDueDateSelect
+          issue={issue}
+          partialUpdateIssue={partialUpdateIssue}
+          noBorder
+          user={user}
+          isNotAllowed={isNotAllowed}
+        />
+      )}
+    </span>
+  </div>
+);

web/components/core/views/spreadsheet-view/due-date-column/index.ts

@@ -0,0 +1,2 @@
+export * from "./spreadsheet-due-date-column";
+export * from "./due-date-column";

web/components/core/views/spreadsheet-view/due-date-column/spreadsheet-due-date-column.tsx

@@ -0,0 +1,62 @@
+import React from "react";
+
+// components
+import { DueDateColumn } from "components/core";
+// hooks
+import useSubIssue from "hooks/use-sub-issue";
+// types
+import { ICurrentUserResponse, IIssue, Properties } from "types";
+
+type Props = {
+  issue: IIssue;
+  projectId: string;
+  partialUpdateIssue: (formData: Partial<IIssue>, issue: IIssue) => void;
+  expandedIssues: string[];
+  properties: Properties;
+  user: ICurrentUserResponse | undefined;
+  isNotAllowed: boolean;
+};
+
+export const SpreadsheetDueDateColumn: React.FC<Props> = ({
+  issue,
+  projectId,
+  partialUpdateIssue,
+  expandedIssues,
+  properties,
+  user,
+  isNotAllowed,
+}) => {
+  const isExpanded = expandedIssues.indexOf(issue.id) > -1;
+
+  const { subIssues, isLoading } = useSubIssue(issue.project_detail.id, issue.id, isExpanded);
+
+  return (
+    <div>
+      <DueDateColumn
+        issue={issue}
+        projectId={projectId}
+        properties={properties}
+        partialUpdateIssue={partialUpdateIssue}
+        user={user}
+        isNotAllowed={isNotAllowed}
+      />
+
+      {isExpanded &&
+        !isLoading &&
+        subIssues &&
+        subIssues.length > 0 &&
+        subIssues.map((subIssue: IIssue) => (
+          <SpreadsheetDueDateColumn
+            key={subIssue.id}
+            issue={subIssue}
+            projectId={subIssue.project_detail.id}
+            partialUpdateIssue={partialUpdateIssue}
+            expandedIssues={expandedIssues}
+            properties={properties}
+            user={user}
+            isNotAllowed={isNotAllowed}
+          />
+        ))}
+    </div>
+  );
+};

web/components/core/views/spreadsheet-view/estimate-column/estimate-column.tsx

@@ -0,0 +1,38 @@
+import React from "react";
+
+// components
+import { ViewEstimateSelect } from "components/issues";
+// types
+import { ICurrentUserResponse, IIssue, Properties } from "types";
+
+type Props = {
+  issue: IIssue;
+  projectId: string;
+  partialUpdateIssue: (formData: Partial<IIssue>, issue: IIssue) => void;
+  properties: Properties;
+  user: ICurrentUserResponse | undefined;
+  isNotAllowed: boolean;
+};
+
+export const EstimateColumn: React.FC<Props> = ({
+  issue,
+  projectId,
+  partialUpdateIssue,
+  properties,
+  user,
+  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">
+      {properties.estimate && (
+        <ViewEstimateSelect
+          issue={issue}
+          partialUpdateIssue={partialUpdateIssue}
+          position="left"
+          user={user}
+          isNotAllowed={isNotAllowed}
+        />
+      )}
+    </span>
+  </div>
+);

web/components/core/views/spreadsheet-view/estimate-column/index.ts

@@ -0,0 +1,2 @@
+export * from "./spreadsheet-estimate-column";
+export * from "./estimate-column";

web/components/core/views/spreadsheet-view/estimate-column/spreadsheet-estimate-column.tsx

@@ -0,0 +1,62 @@
+import React from "react";
+
+// components
+import { EstimateColumn } from "components/core";
+// hooks
+import useSubIssue from "hooks/use-sub-issue";
+// types
+import { ICurrentUserResponse, IIssue, Properties } from "types";
+
+type Props = {
+  issue: IIssue;
+  projectId: string;
+  partialUpdateIssue: (formData: Partial<IIssue>, issue: IIssue) => void;
+  expandedIssues: string[];
+  properties: Properties;
+  user: ICurrentUserResponse | undefined;
+  isNotAllowed: boolean;
+};
+
+export const SpreadsheetEstimateColumn: React.FC<Props> = ({
+  issue,
+  projectId,
+  partialUpdateIssue,
+  expandedIssues,
+  properties,
+  user,
+  isNotAllowed,
+}) => {
+  const isExpanded = expandedIssues.indexOf(issue.id) > -1;
+
+  const { subIssues, isLoading } = useSubIssue(issue.project_detail.id, issue.id, isExpanded);
+
+  return (
+    <div>
+      <EstimateColumn
+        issue={issue}
+        projectId={projectId}
+        properties={properties}
+        partialUpdateIssue={partialUpdateIssue}
+        user={user}
+        isNotAllowed={isNotAllowed}
+      />
+
+      {isExpanded &&
+        !isLoading &&
+        subIssues &&
+        subIssues.length > 0 &&
+        subIssues.map((subIssue: IIssue) => (
+          <SpreadsheetEstimateColumn
+            key={subIssue.id}
+            issue={subIssue}
+            projectId={subIssue.project_detail.id}
+            partialUpdateIssue={partialUpdateIssue}
+            expandedIssues={expandedIssues}
+            properties={properties}
+            user={user}
+            isNotAllowed={isNotAllowed}
+          />
+        ))}
+    </div>
+  );
+};

web/components/core/views/spreadsheet-view/index.ts

@@ -1,4 +1,14 @@
+export * from "./assignee-column";
+export * from "./created-on-column";
+export * from "./due-date-column";
+export * from "./estimate-column";
+export * from "./issue-column";
+export * from "./label-column";
+export * from "./priority-column";
+export * from "./start-date-column";
+export * from "./state-column";
+export * from "./updated-on-column";
 export * from "./spreadsheet-view";
-export * from "./single-issue";
+export * from "./issue-column/issue-column";
 export * from "./spreadsheet-columns";
-export * from "./spreadsheet-issues";
+export * from "./issue-column/spreadsheet-issue-column";

web/components/core/views/spreadsheet-view/issue-column/index.ts

@@ -0,0 +1,2 @@
+export * from "./spreadsheet-issue-column";
+export * from "./issue-column";

web/components/core/views/spreadsheet-view/issue-column/issue-column.tsx

@@ -0,0 +1,179 @@
+import React, { useState } from "react";
+
+import { useRouter } from "next/router";
+
+// components
+import { Popover2 } from "@blueprintjs/popover2";
+// icons
+import { Icon } from "components/ui";
+import {
+  EllipsisHorizontalIcon,
+  LinkIcon,
+  PencilIcon,
+  TrashIcon,
+} from "@heroicons/react/24/outline";
+// hooks
+import useToast from "hooks/use-toast";
+// types
+import { IIssue, Properties, UserAuth } from "types";
+// helper
+import { copyTextToClipboard } from "helpers/string.helper";
+
+type Props = {
+  issue: IIssue;
+  projectId: string;
+  expanded: boolean;
+  handleToggleExpand: (issueId: string) => void;
+  properties: Properties;
+  handleEditIssue: (issue: IIssue) => void;
+  handleDeleteIssue: (issue: IIssue) => void;
+  setCurrentProjectId: React.Dispatch<React.SetStateAction<string | null>>;
+  disableUserActions: boolean;
+  userAuth: UserAuth;
+  nestingLevel: number;
+};
+
+export const IssueColumn: React.FC<Props> = ({
+  issue,
+  projectId,
+  expanded,
+  handleToggleExpand,
+  properties,
+  handleEditIssue,
+  handleDeleteIssue,
+  setCurrentProjectId,
+  disableUserActions,
+  userAuth,
+  nestingLevel,
+}) => {
+  const [isOpen, setIsOpen] = useState(false);
+
+  const router = useRouter();
+
+  const { workspaceSlug } = router.query;
+
+  const { setToastAlert } = useToast();
+
+  const openPeekOverview = () => {
+    const { query } = router;
+    setCurrentProjectId(issue.project_detail.id);
+    router.push({
+      pathname: router.pathname,
+      query: { ...query, peekIssue: issue.id },
+    });
+  };
+
+  const handleCopyText = () => {
+    const originURL =
+      typeof window !== "undefined" && window.location.origin ? window.location.origin : "";
+    copyTextToClipboard(
+      `${originURL}/${workspaceSlug}/projects/${projectId}/issues/${issue.id}`
+    ).then(() => {
+      setToastAlert({
+        type: "success",
+        title: "Link Copied!",
+        message: "Issue link copied to clipboard.",
+      });
+    });
+  };
+
+  const paddingLeft = `${nestingLevel * 54}px`;
+
+  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="flex gap-1.5 px-4 pr-0 py-2.5 items-center"
+        style={issue.parent ? { paddingLeft } : {}}
+      >
+        <div className="relative flex items-center cursor-pointer text-xs text-center hover:text-custom-text-100">
+          {properties.key && (
+            <span className="flex items-center justify-center font-medium opacity-100 group-hover:opacity-0">
+              {issue.project_detail?.identifier}-{issue.sequence_id}
+            </span>
+          )}
+          {!isNotAllowed && !disableUserActions && (
+            <div className="absolute top-0 left-2.5 opacity-0 group-hover:opacity-100">
+              <Popover2
+                isOpen={isOpen}
+                canEscapeKeyClose
+                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`}
+                  >
+                    <button
+                      type="button"
+                      className="hover:text-custom-text-200 w-full select-none gap-2 truncate rounded px-1 py-1.5 text-left text-custom-text-200 hover:bg-custom-background-80"
+                      onClick={() => {
+                        handleEditIssue(issue);
+                        setIsOpen(false);
+                      }}
+                    >
+                      <div className="flex items-center justify-start gap-2">
+                        <PencilIcon className="h-4 w-4" />
+                        <span>Edit issue</span>
+                      </div>
+                    </button>
+
+                    <button
+                      type="button"
+                      className="hover:text-custom-text-200 w-full select-none gap-2 truncate rounded px-1 py-1.5 text-left text-custom-text-200 hover:bg-custom-background-80"
+                      onClick={() => {
+                        handleDeleteIssue(issue);
+                        setIsOpen(false);
+                      }}
+                    >
+                      <div className="flex items-center justify-start gap-2">
+                        <TrashIcon className="h-4 w-4" />
+                        <span>Delete issue</span>
+                      </div>
+                    </button>
+
+                    <button
+                      type="button"
+                      className="hover:text-custom-text-200 w-full select-none gap-2 truncate rounded px-1 py-1.5 text-left text-custom-text-200 hover:bg-custom-background-80"
+                      onClick={() => {
+                        handleCopyText();
+                        setIsOpen(false);
+                      }}
+                    >
+                      <div className="flex items-center justify-start gap-2">
+                        <LinkIcon className="h-4 w-4" />
+                        <span>Copy issue link</span>
+                      </div>
+                    </button>
+                  </div>
+                }
+                placement="bottom-start"
+              >
+                <EllipsisHorizontalIcon className="h-5 w-5 text-custom-text-200" />
+              </Popover2>
+            </div>
+          )}
+        </div>
+
+        {issue.sub_issues_count > 0 && (
+          <div className="h-6 w-6 flex justify-center items-center">
+            <button
+              className="h-5 w-5 hover:bg-custom-background-90 hover:text-custom-text-100 rounded-sm cursor-pointer"
+              onClick={() => handleToggleExpand(issue.id)}
+            >
+              <Icon iconName="chevron_right" className={`${expanded ? "rotate-90" : ""}`} />
+            </button>
+          </div>
+        )}
+      </div>
+      <span className="flex items-center px-4 py-2.5 h-full  truncate flex-grow">
+        <button
+          type="button"
+          className="truncate text-custom-text-100 text-left cursor-pointer w-full text-[0.825rem]"
+          onClick={openPeekOverview}
+        >
+          {issue.name}
+        </button>
+      </span>
+    </div>
+  );
+};

web/components/core/views/spreadsheet-view/issue-column/spreadsheet-issue-column.tsx

@@ -1,36 +1,34 @@
-import React, { useState } from "react";
+import React from "react";
 
 // components
-import { SingleSpreadsheetIssue } from "components/core";
+import { IssueColumn } from "components/core";
 // hooks
 import useSubIssue from "hooks/use-sub-issue";
 // types
-import { ICurrentUserResponse, IIssue, Properties, UserAuth } from "types";
+import { IIssue, Properties, UserAuth } from "types";
 
 type Props = {
   issue: IIssue;
-  index: number;
+  projectId: string;
   expandedIssues: string[];
   setExpandedIssues: React.Dispatch<React.SetStateAction<string[]>>;
   properties: Properties;
   handleIssueAction: (issue: IIssue, action: "copy" | "delete" | "edit") => void;
-  gridTemplateColumns: string;
+  setCurrentProjectId: React.Dispatch<React.SetStateAction<string | null>>;
   disableUserActions: boolean;
-  user: ICurrentUserResponse | undefined;
   userAuth: UserAuth;
   nestingLevel?: number;
 };
 
-export const SpreadsheetIssues: React.FC<Props> = ({
-  index,
+export const SpreadsheetIssuesColumn: React.FC<Props> = ({
   issue,
+  projectId,
   expandedIssues,
   setExpandedIssues,
-  gridTemplateColumns,
   properties,
   handleIssueAction,
+  setCurrentProjectId,
   disableUserActions,
-  user,
   userAuth,
   nestingLevel = 0,
 }) => {
@@ -49,22 +47,20 @@ export const SpreadsheetIssues: React.FC<Props> = ({
 
   const isExpanded = expandedIssues.indexOf(issue.id) > -1;
 
-  const { subIssues, isLoading } = useSubIssue(issue.id, isExpanded);
+  const { subIssues, isLoading } = useSubIssue(issue.project_detail.id, issue.id, isExpanded);
 
   return (
     <div>
-      <SingleSpreadsheetIssue
+      <IssueColumn
         issue={issue}
-        projectId={issue.project_detail.id}
-        index={index}
+        projectId={projectId}
         expanded={isExpanded}
         handleToggleExpand={handleToggleExpand}
-        gridTemplateColumns={gridTemplateColumns}
         properties={properties}
         handleEditIssue={() => handleIssueAction(issue, "edit")}
         handleDeleteIssue={() => handleIssueAction(issue, "delete")}
+        setCurrentProjectId={setCurrentProjectId}
         disableUserActions={disableUserActions}
-        user={user}
         userAuth={userAuth}
         nestingLevel={nestingLevel}
       />
@@ -74,17 +70,16 @@ export const SpreadsheetIssues: React.FC<Props> = ({
         subIssues &&
         subIssues.length > 0 &&
         subIssues.map((subIssue: IIssue) => (
-          <SpreadsheetIssues
+          <SpreadsheetIssuesColumn
             key={subIssue.id}
             issue={subIssue}
-            index={index}
+            projectId={subIssue.project_detail.id}
             expandedIssues={expandedIssues}
             setExpandedIssues={setExpandedIssues}
-            gridTemplateColumns={gridTemplateColumns}
             properties={properties}
             handleIssueAction={handleIssueAction}
+            setCurrentProjectId={setCurrentProjectId}
             disableUserActions={disableUserActions}
-            user={user}
             userAuth={userAuth}
             nestingLevel={nestingLevel + 1}
           />

web/components/core/views/spreadsheet-view/label-column/index.ts

@@ -0,0 +1,2 @@
+export * from "./spreadsheet-label-column";
+export * from "./label-column";

web/components/core/views/spreadsheet-view/label-column/label-column.tsx

@@ -0,0 +1,47 @@
+import React from "react";
+
+// components
+import { LabelSelect } from "components/project";
+// types
+import { ICurrentUserResponse, IIssue, Properties } from "types";
+
+type Props = {
+  issue: IIssue;
+  projectId: string;
+  partialUpdateIssue: (formData: Partial<IIssue>, issue: IIssue) => void;
+  properties: Properties;
+  user: ICurrentUserResponse | undefined;
+  isNotAllowed: boolean;
+};
+
+export const LabelColumn: React.FC<Props> = ({
+  issue,
+  projectId,
+  partialUpdateIssue,
+  properties,
+  user,
+  isNotAllowed,
+}) => {
+  const handleLabelChange = (data: any) => {
+    partialUpdateIssue({ labels_list: data }, issue);
+  };
+
+  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">
+        {properties.labels && (
+          <LabelSelect
+            value={issue.labels}
+            projectId={projectId}
+            onChange={handleLabelChange}
+            labelsDetails={issue.label_details}
+            hideDropdownArrow
+            maxRender={1}
+            user={user}
+            disabled={isNotAllowed}
+          />
+        )}
+      </span>
+    </div>
+  );
+};

web/components/core/views/spreadsheet-view/label-column/spreadsheet-label-column.tsx

@@ -0,0 +1,62 @@
+import React from "react";
+
+// components
+import { LabelColumn } from "components/core";
+// hooks
+import useSubIssue from "hooks/use-sub-issue";
+// types
+import { ICurrentUserResponse, IIssue, Properties } from "types";
+
+type Props = {
+  issue: IIssue;
+  projectId: string;
+  partialUpdateIssue: (formData: Partial<IIssue>, issue: IIssue) => void;
+  expandedIssues: string[];
+  properties: Properties;
+  user: ICurrentUserResponse | undefined;
+  isNotAllowed: boolean;
+};
+
+export const SpreadsheetLabelColumn: React.FC<Props> = ({
+  issue,
+  projectId,
+  partialUpdateIssue,
+  expandedIssues,
+  properties,
+  user,
+  isNotAllowed,
+}) => {
+  const isExpanded = expandedIssues.indexOf(issue.id) > -1;
+
+  const { subIssues, isLoading } = useSubIssue(issue.project_detail.id, issue.id, isExpanded);
+
+  return (
+    <div>
+      <LabelColumn
+        issue={issue}
+        projectId={projectId}
+        properties={properties}
+        partialUpdateIssue={partialUpdateIssue}
+        user={user}
+        isNotAllowed={isNotAllowed}
+      />
+
+      {isExpanded &&
+        !isLoading &&
+        subIssues &&
+        subIssues.length > 0 &&
+        subIssues.map((subIssue: IIssue) => (
+          <SpreadsheetLabelColumn
+            key={subIssue.id}
+            issue={subIssue}
+            projectId={subIssue.project_detail.id}
+            partialUpdateIssue={partialUpdateIssue}
+            expandedIssues={expandedIssues}
+            properties={properties}
+            user={user}
+            isNotAllowed={isNotAllowed}
+          />
+        ))}
+    </div>
+  );
+};

web/components/core/views/spreadsheet-view/priority-column/index.ts

@@ -0,0 +1,2 @@
+export * from "./spreadsheet-priority-column";
+export * from "./priority-column";

web/components/core/views/spreadsheet-view/priority-column/priority-column.tsx

@@ -0,0 +1,64 @@
+import React from "react";
+
+import { useRouter } from "next/router";
+
+// components
+import { PrioritySelect } from "components/project";
+// services
+import trackEventServices from "services/track-event.service";
+// types
+import { ICurrentUserResponse, IIssue, Properties, TIssuePriorities } from "types";
+
+type Props = {
+  issue: IIssue;
+  projectId: string;
+  partialUpdateIssue: (formData: Partial<IIssue>, issue: IIssue) => void;
+  properties: Properties;
+  user: ICurrentUserResponse | undefined;
+  isNotAllowed: boolean;
+};
+
+export const PriorityColumn: React.FC<Props> = ({
+  issue,
+  projectId,
+  partialUpdateIssue,
+  properties,
+  user,
+  isNotAllowed,
+}) => {
+  const router = useRouter();
+
+  const { workspaceSlug } = router.query;
+
+  const handlePriorityChange = (data: TIssuePriorities) => {
+    partialUpdateIssue({ priority: data }, issue);
+    trackEventServices.trackIssuePartialPropertyUpdateEvent(
+      {
+        workspaceSlug,
+        workspaceId: issue.workspace,
+        projectId: issue.project_detail.id,
+        projectIdentifier: issue.project_detail.identifier,
+        projectName: issue.project_detail.name,
+        issueId: issue.id,
+      },
+      "ISSUE_PROPERTY_UPDATE_PRIORITY",
+      user
+    );
+  };
+
+  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">
+        {properties.priority && (
+          <PrioritySelect
+            value={issue.priority}
+            onChange={handlePriorityChange}
+            buttonClassName="!p-0 !rounded-none !shadow-none !border-0"
+            hideDropdownArrow
+            disabled={isNotAllowed}
+          />
+        )}
+      </span>
+    </div>
+  );
+};

web/components/core/views/spreadsheet-view/priority-column/spreadsheet-priority-column.tsx

@@ -0,0 +1,62 @@
+import React from "react";
+
+// components
+import { PriorityColumn } from "components/core";
+// hooks
+import useSubIssue from "hooks/use-sub-issue";
+// types
+import { ICurrentUserResponse, IIssue, Properties } from "types";
+
+type Props = {
+  issue: IIssue;
+  projectId: string;
+  partialUpdateIssue: (formData: Partial<IIssue>, issue: IIssue) => void;
+  expandedIssues: string[];
+  properties: Properties;
+  user: ICurrentUserResponse | undefined;
+  isNotAllowed: boolean;
+};
+
+export const SpreadsheetPriorityColumn: React.FC<Props> = ({
+  issue,
+  projectId,
+  partialUpdateIssue,
+  expandedIssues,
+  properties,
+  user,
+  isNotAllowed,
+}) => {
+  const isExpanded = expandedIssues.indexOf(issue.id) > -1;
+
+  const { subIssues, isLoading } = useSubIssue(issue.project_detail.id, issue.id, isExpanded);
+
+  return (
+    <div>
+      <PriorityColumn
+        issue={issue}
+        projectId={projectId}
+        properties={properties}
+        partialUpdateIssue={partialUpdateIssue}
+        user={user}
+        isNotAllowed={isNotAllowed}
+      />
+
+      {isExpanded &&
+        !isLoading &&
+        subIssues &&
+        subIssues.length > 0 &&
+        subIssues.map((subIssue: IIssue) => (
+          <SpreadsheetPriorityColumn
+            key={subIssue.id}
+            issue={subIssue}
+            projectId={subIssue.project_detail.id}
+            partialUpdateIssue={partialUpdateIssue}
+            expandedIssues={expandedIssues}
+            properties={properties}
+            user={user}
+            isNotAllowed={isNotAllowed}
+          />
+        ))}
+    </div>
+  );
+};

web/components/core/views/spreadsheet-view/spreadsheet-view.tsx

@@ -1,23 +1,54 @@
-import React, { useState } from "react";
+import React, { useCallback, useState } from "react";
 
 // next
 import { useRouter } from "next/router";
 
+import { KeyedMutator, mutate } from "swr";
+
 // components
-import { SpreadsheetColumns, SpreadsheetIssues, ListInlineCreateIssueForm } from "components/core";
+import {
+  ListInlineCreateIssueForm,
+  SpreadsheetAssigneeColumn,
+  SpreadsheetCreatedOnColumn,
+  SpreadsheetDueDateColumn,
+  SpreadsheetEstimateColumn,
+  SpreadsheetIssuesColumn,
+  SpreadsheetLabelColumn,
+  SpreadsheetPriorityColumn,
+  SpreadsheetStartDateColumn,
+  SpreadsheetStateColumn,
+  SpreadsheetUpdatedOnColumn,
+} from "components/core";
 import { CustomMenu, Spinner } from "components/ui";
 import { IssuePeekOverview } from "components/issues";
 // hooks
 import useIssuesProperties from "hooks/use-issue-properties";
-import useSpreadsheetIssuesView from "hooks/use-spreadsheet-issues-view";
 // types
-import { ICurrentUserResponse, IIssue, Properties, UserAuth } from "types";
-// constants
-import { SPREADSHEET_COLUMN } from "constants/spreadsheet";
+import { ICurrentUserResponse, IIssue, ISubIssueResponse, UserAuth } from "types";
+import useWorkspaceIssuesFilters from "hooks/use-worskpace-issue-filter";
+import {
+  CYCLE_DETAILS,
+  CYCLE_ISSUES_WITH_PARAMS,
+  MODULE_DETAILS,
+  MODULE_ISSUES_WITH_PARAMS,
+  PROJECT_ISSUES_LIST_WITH_PARAMS,
+  SUB_ISSUES,
+  VIEW_ISSUES,
+  WORKSPACE_VIEW_ISSUES,
+} from "constants/fetch-keys";
+import useSpreadsheetIssuesView from "hooks/use-spreadsheet-issues-view";
+import projectIssuesServices from "services/issues.service";
 // icon
-import { PlusIcon } from "@heroicons/react/24/outline";
+import { PlusIcon } from "lucide-react";
 
 type Props = {
+  spreadsheetIssues: IIssue[];
+  mutateIssues: KeyedMutator<
+    | IIssue[]
+    | {
+        [key: string]: IIssue[];
+      }
+  >;
   handleIssueAction: (issue: IIssue, action: "copy" | "delete" | "edit") => void;
   openIssuesListModal?: (() => void) | null;
   disableUserActions: boolean;
@@ -26,6 +57,8 @@ type Props = {
 };
 
 export const SpreadsheetView: React.FC<Props> = ({
+  spreadsheetIssues,
+  mutateIssues,
   handleIssueAction,
   openIssuesListModal,
   disableUserActions,
@@ -33,125 +66,280 @@ export const SpreadsheetView: React.FC<Props> = ({
   userAuth,
 }) => {
   const [expandedIssues, setExpandedIssues] = useState<string[]>([]);
+  const [currentProjectId, setCurrentProjectId] = useState<string | null>(null);
+
   const [isInlineCreateIssueFormOpen, setIsInlineCreateIssueFormOpen] = useState(false);
 
   const router = useRouter();
-  const { workspaceSlug, projectId, cycleId, moduleId } = router.query;
+  const { workspaceSlug, projectId, cycleId, moduleId, viewId, workspaceViewId } = router.query;
 
   const type = cycleId ? "cycle" : moduleId ? "module" : "issue";
 
-  const { spreadsheetIssues, mutateIssues } = useSpreadsheetIssuesView();
-
   const [properties] = useIssuesProperties(workspaceSlug as string, projectId as string);
 
-  const columnData = SPREADSHEET_COLUMN.map((column) => ({
-    ...column,
-    isActive: properties
-      ? column.propertyName === "labels"
-        ? properties[column.propertyName as keyof Properties]
-        : column.propertyName === "title"
-        ? true
-        : properties[column.propertyName as keyof Properties]
-      : false,
-  }));
+  const workspaceIssuesPath = [
+    {
+      params: {
+        sub_issue: false,
+      },
+      path: "workspace-views/all-issues",
+    },
+    {
+      params: {
+        assignees: user?.id ?? undefined,
+        sub_issue: false,
+      },
+      path: "workspace-views/assigned",
+    },
+    {
+      params: {
+        created_by: user?.id ?? undefined,
+        sub_issue: false,
+      },
+      path: "workspace-views/created",
+    },
+    {
+      params: {
+        subscriber: user?.id ?? undefined,
+        sub_issue: false,
+      },
+      path: "workspace-views/subscribed",
+    },
+  ];
 
-  const gridTemplateColumns = columnData
-    .filter((column) => column.isActive)
-    .map((column) => column.colSize)
-    .join(" ");
+  const currentWorkspaceIssuePath = workspaceIssuesPath.find((path) =>
+    router.pathname.includes(path.path)
+  );
+
+  const { params: workspaceViewParams } = useWorkspaceIssuesFilters(
+    workspaceSlug?.toString(),
+    workspaceViewId?.toString()
+  );
+
+  const { params } = useSpreadsheetIssuesView();
+
+  const partialUpdateIssue = useCallback(
+    (formData: Partial<IIssue>, issue: IIssue) => {
+      if (!workspaceSlug || !issue) return;
+
+      const fetchKey = cycleId
+        ? CYCLE_ISSUES_WITH_PARAMS(cycleId.toString(), params)
+        : moduleId
+        ? MODULE_ISSUES_WITH_PARAMS(moduleId.toString(), params)
+        : viewId
+        ? VIEW_ISSUES(viewId.toString(), params)
+        : workspaceViewId
+        ? WORKSPACE_VIEW_ISSUES(workspaceSlug.toString(), workspaceViewParams)
+        : currentWorkspaceIssuePath
+        ? WORKSPACE_VIEW_ISSUES(workspaceSlug.toString(), currentWorkspaceIssuePath?.params)
+        : PROJECT_ISSUES_LIST_WITH_PARAMS(issue.project_detail.id, params);
+
+      if (issue.parent)
+        mutate<ISubIssueResponse>(
+          SUB_ISSUES(issue.parent.toString()),
+          (prevData) => {
+            if (!prevData) return prevData;
+
+            return {
+              ...prevData,
+              sub_issues: (prevData.sub_issues ?? []).map((i) => {
+                if (i.id === issue.id) {
+                  return {
+                    ...i,
+                    ...formData,
+                  };
+                }
+                return i;
+              }),
+            };
+          },
+          false
+        );
+      else
+        mutate<IIssue[]>(
+          fetchKey,
+          (prevData) =>
+            (prevData ?? []).map((p) => {
+              if (p.id === issue.id) {
+                return {
+                  ...p,
+                  ...formData,
+                };
+              }
+              return p;
+            }),
+          false
+        );
+
+      projectIssuesServices
+        .patchIssue(
+          workspaceSlug as string,
+          issue.project_detail.id,
+          issue.id as string,
+          formData,
+          user
+        )
+        .then(() => {
+          if (issue.parent) {
+            mutate(SUB_ISSUES(issue.parent as string));
+          } else {
+            mutate(fetchKey);
+
+            if (cycleId) mutate(CYCLE_DETAILS(cycleId as string));
+            if (moduleId) mutate(MODULE_DETAILS(moduleId as string));
+          }
+        })
+        .catch((error) => {
+          console.log(error);
+        });
+    },
+    [
+      workspaceSlug,
+      cycleId,
+      moduleId,
+      viewId,
+      workspaceViewId,
+      currentWorkspaceIssuePath,
+      workspaceViewParams,
+      params,
+      user,
+    ]
+  );
+
+  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">
+      <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}
+      </div>
+      <div className="h-full min-w-[9rem] w-full">
+        {spreadsheetIssues.map((issue: IIssue, index) => (
+          <Component
+            key={`${issue.id}_${index}`}
+            issue={issue}
+            projectId={issue.project_detail.id}
+            partialUpdateIssue={partialUpdateIssue}
+            expandedIssues={expandedIssues}
+            properties={properties}
+            user={user}
+            isNotAllowed={isNotAllowed}
+          />
+        ))}
+      </div>
+    </div>
+  );
 
   return (
     <>
       <IssuePeekOverview
         handleMutation={() => mutateIssues()}
-        projectId={projectId?.toString() ?? ""}
+        projectId={currentProjectId ?? ""}
         workspaceSlug={workspaceSlug?.toString() ?? ""}
         readOnly={disableUserActions}
       />
-      <div
-        className={`h-full rounded-lg text-custom-text-200 overflow-x-auto whitespace-nowrap bg-custom-background-100 ${
-          isInlineCreateIssueFormOpen ? "mb-24" : "mb-12"
-        }`}
-      >
-        <div className="sticky z-[2] top-0 border-b border-custom-border-200 bg-custom-background-90 w-full min-w-max">
-          <SpreadsheetColumns columnData={columnData} gridTemplateColumns={gridTemplateColumns} />
-        </div>
-        {spreadsheetIssues ? (
-          <div className="flex flex-col h-full w-full bg-custom-background-100 rounded-sm">
-            {spreadsheetIssues.map((issue: IIssue, index) => (
-              <SpreadsheetIssues
-                key={`${issue.id}_${index}`}
-                index={index}
-                issue={issue}
-                expandedIssues={expandedIssues}
-                setExpandedIssues={setExpandedIssues}
-                gridTemplateColumns={gridTemplateColumns}
-                properties={properties}
-                handleIssueAction={handleIssueAction}
-                disableUserActions={disableUserActions}
-                user={user}
-                userAuth={userAuth}
-              />
-            ))}
+      <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="h-full w-full flex flex-col">
+          <div className="flex max-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="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">
+                        ID
+                      </span>
+                      <span className="flex items-center px-4 py-2.5 h-full w-full flex-grow">
+                        Issue
+                      </span>
+                    </div>
+
+                    {spreadsheetIssues.map((issue: IIssue, index) => (
+                      <SpreadsheetIssuesColumn
+                        key={`${issue.id}_${index}`}
+                        issue={issue}
+                        projectId={issue.project_detail.id}
+                        expandedIssues={expandedIssues}
+                        setExpandedIssues={setExpandedIssues}
+                        setCurrentProjectId={setCurrentProjectId}
+                        properties={properties}
+                        handleIssueAction={handleIssueAction}
+                        disableUserActions={disableUserActions}
+                        userAuth={userAuth}
+                      />
+                    ))}
+                  </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)}
+              </>
+            ) : (
+              <div className="flex flex-col justify-center items-center h-full w-full">
+                <Spinner />
+              </div>
+            )}
           </div>
-        ) : (
-          <Spinner />
-        )}
-      </div>
 
-      <div
-        className={`absolute bottom-0 left-0 z-10 group hover:rounded-sm bg-custom-background-100 hover:bg-custom-background-80 border-b border-custom-border-200 w-full min-w-max ${
-          isInlineCreateIssueFormOpen ? "pb-2" : ""
-        }`}
-      >
-        <ListInlineCreateIssueForm
-          isOpen={isInlineCreateIssueFormOpen}
-          handleClose={() => setIsInlineCreateIssueFormOpen(false)}
-          prePopulatedData={{
-            ...(cycleId && { cycle: cycleId.toString() }),
-            ...(moduleId && { module: moduleId.toString() }),
-          }}
-        />
+          <div>
+            <div className="mb-3 z-50 sticky bottom-0 left-0">
+              <ListInlineCreateIssueForm
+                isOpen={isInlineCreateIssueFormOpen}
+                handleClose={() => setIsInlineCreateIssueFormOpen(false)}
+                prePopulatedData={{
+                  ...(cycleId && { cycle: cycleId.toString() }),
+                  ...(moduleId && { module: moduleId.toString() }),
+                }}
+              />
+            </div>
 
-        {type === "issue"
-          ? !disableUserActions &&
-            !isInlineCreateIssueFormOpen && (
-              <button
-                className="flex gap-1.5 items-center pl-7 py-2.5 text-sm sticky left-0 z-[1] text-custom-text-200 border-custom-border-200 w-full"
-                onClick={() => setIsInlineCreateIssueFormOpen(true)}
-              >
-                <PlusIcon className="h-4 w-4" />
-                Add Issue
-              </button>
-            )
-          : !disableUserActions &&
-            !isInlineCreateIssueFormOpen && (
-              <CustomMenu
-                className="sticky left-0 z-[1] !w-full"
-                customButton={
+            {type === "issue"
+              ? !disableUserActions &&
+                !isInlineCreateIssueFormOpen && (
                   <button
-                    className="flex gap-1.5 items-center pl-7 py-2.5 text-sm sticky left-0 z-[1] text-custom-text-200 border-custom-border-200 w-full"
-                    type="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"
+                    onClick={() => setIsInlineCreateIssueFormOpen(true)}
                   >
                     <PlusIcon className="h-4 w-4" />
                     Add Issue
                   </button>
-                }
-                position="left"
-                verticalPosition="top"
-                optionsClassName="left-5 !w-36"
-                noBorder
-              >
-                <CustomMenu.MenuItem onClick={() => setIsInlineCreateIssueFormOpen(true)}>
-                  Create new
-                </CustomMenu.MenuItem>
-                {openIssuesListModal && (
-                  <CustomMenu.MenuItem onClick={openIssuesListModal}>
-                    Add an existing issue
-                  </CustomMenu.MenuItem>
+                )
+              : !disableUserActions &&
+                !isInlineCreateIssueFormOpen && (
+                  <CustomMenu
+                    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"
+                        type="button"
+                      >
+                        <PlusIcon className="h-4 w-4" />
+                        Add Issue
+                      </button>
+                    }
+                    position="left"
+                    verticalPosition="top"
+                    optionsClassName="left-5 !w-36"
+                    noBorder
+                  >
+                    <CustomMenu.MenuItem onClick={() => setIsInlineCreateIssueFormOpen(true)}>
+                      Create new
+                    </CustomMenu.MenuItem>
+                    {openIssuesListModal && (
+                      <CustomMenu.MenuItem onClick={openIssuesListModal}>
+                        Add an existing issue
+                      </CustomMenu.MenuItem>
+                    )}
+                  </CustomMenu>
                 )}
-              </CustomMenu>
-            )}
+          </div>
+        </div>
       </div>
     </>
   );

web/components/core/views/spreadsheet-view/start-date-column/index.ts

@@ -0,0 +1,2 @@
+export * from "./spreadsheet-start-date-column";
+export * from "./start-date-column";

web/components/core/views/spreadsheet-view/start-date-column/spreadsheet-start-date-column.tsx

@@ -0,0 +1,62 @@
+import React from "react";
+
+// components
+import { StartDateColumn } from "components/core";
+// hooks
+import useSubIssue from "hooks/use-sub-issue";
+// types
+import { ICurrentUserResponse, IIssue, Properties } from "types";
+
+type Props = {
+  issue: IIssue;
+  projectId: string;
+  partialUpdateIssue: (formData: Partial<IIssue>, issue: IIssue) => void;
+  expandedIssues: string[];
+  properties: Properties;
+  user: ICurrentUserResponse | undefined;
+  isNotAllowed: boolean;
+};
+
+export const SpreadsheetStartDateColumn: React.FC<Props> = ({
+  issue,
+  projectId,
+  partialUpdateIssue,
+  expandedIssues,
+  properties,
+  user,
+  isNotAllowed,
+}) => {
+  const isExpanded = expandedIssues.indexOf(issue.id) > -1;
+
+  const { subIssues, isLoading } = useSubIssue(issue.project_detail.id, issue.id, isExpanded);
+
+  return (
+    <div>
+      <StartDateColumn
+        issue={issue}
+        projectId={projectId}
+        properties={properties}
+        partialUpdateIssue={partialUpdateIssue}
+        user={user}
+        isNotAllowed={isNotAllowed}
+      />
+
+      {isExpanded &&
+        !isLoading &&
+        subIssues &&
+        subIssues.length > 0 &&
+        subIssues.map((subIssue: IIssue) => (
+          <SpreadsheetStartDateColumn
+            key={subIssue.id}
+            issue={subIssue}
+            projectId={subIssue.project_detail.id}
+            partialUpdateIssue={partialUpdateIssue}
+            expandedIssues={expandedIssues}
+            properties={properties}
+            user={user}
+            isNotAllowed={isNotAllowed}
+          />
+        ))}
+    </div>
+  );
+};

web/components/core/views/spreadsheet-view/start-date-column/start-date-column.tsx

@@ -0,0 +1,38 @@
+import React from "react";
+
+// components
+import { ViewStartDateSelect } from "components/issues";
+// types
+import { ICurrentUserResponse, IIssue, Properties } from "types";
+
+type Props = {
+  issue: IIssue;
+  projectId: string;
+  partialUpdateIssue: (formData: Partial<IIssue>, issue: IIssue) => void;
+  properties: Properties;
+  user: ICurrentUserResponse | undefined;
+  isNotAllowed: boolean;
+};
+
+export const StartDateColumn: React.FC<Props> = ({
+  issue,
+  projectId,
+  partialUpdateIssue,
+  properties,
+  user,
+  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">
+      {properties.due_date && (
+        <ViewStartDateSelect
+          issue={issue}
+          partialUpdateIssue={partialUpdateIssue}
+          noBorder
+          user={user}
+          isNotAllowed={isNotAllowed}
+        />
+      )}
+    </span>
+  </div>
+);

web/components/core/views/spreadsheet-view/state-column/index.ts

@@ -0,0 +1,2 @@
+export * from "./spreadsheet-state-column";
+export * from "./state-column";

web/components/core/views/spreadsheet-view/state-column/spreadsheet-state-column.tsx

@@ -0,0 +1,62 @@
+import React from "react";
+
+// components
+import { StateColumn } from "components/core";
+// hooks
+import useSubIssue from "hooks/use-sub-issue";
+// types
+import { ICurrentUserResponse, IIssue, Properties } from "types";
+
+type Props = {
+  issue: IIssue;
+  projectId: string;
+  partialUpdateIssue: (formData: Partial<IIssue>, issue: IIssue) => void;
+  expandedIssues: string[];
+  properties: Properties;
+  user: ICurrentUserResponse | undefined;
+  isNotAllowed: boolean;
+};
+
+export const SpreadsheetStateColumn: React.FC<Props> = ({
+  issue,
+  projectId,
+  partialUpdateIssue,
+  expandedIssues,
+  properties,
+  user,
+  isNotAllowed,
+}) => {
+  const isExpanded = expandedIssues.indexOf(issue.id) > -1;
+
+  const { subIssues, isLoading } = useSubIssue(issue.project_detail.id, issue.id, isExpanded);
+
+  return (
+    <div>
+      <StateColumn
+        issue={issue}
+        projectId={projectId}
+        properties={properties}
+        partialUpdateIssue={partialUpdateIssue}
+        user={user}
+        isNotAllowed={isNotAllowed}
+      />
+
+      {isExpanded &&
+        !isLoading &&
+        subIssues &&
+        subIssues.length > 0 &&
+        subIssues.map((subIssue: IIssue) => (
+          <SpreadsheetStateColumn
+            key={subIssue.id}
+            issue={subIssue}
+            projectId={subIssue.project_detail.id}
+            partialUpdateIssue={partialUpdateIssue}
+            expandedIssues={expandedIssues}
+            properties={properties}
+            user={user}
+            isNotAllowed={isNotAllowed}
+          />
+        ))}
+    </div>
+  );
+};

web/components/core/views/spreadsheet-view/state-column/state-column.tsx

@@ -0,0 +1,87 @@
+import React from "react";
+
+import { useRouter } from "next/router";
+
+// components
+import { StateSelect } from "components/states";
+// services
+import trackEventServices from "services/track-event.service";
+// types
+import { ICurrentUserResponse, IIssue, IState, Properties } from "types";
+
+type Props = {
+  issue: IIssue;
+  projectId: string;
+  partialUpdateIssue: (formData: Partial<IIssue>, issue: IIssue) => void;
+  properties: Properties;
+  user: ICurrentUserResponse | undefined;
+  isNotAllowed: boolean;
+};
+
+export const StateColumn: React.FC<Props> = ({
+  issue,
+  projectId,
+  partialUpdateIssue,
+  properties,
+  user,
+  isNotAllowed,
+}) => {
+  const router = useRouter();
+
+  const { workspaceSlug } = router.query;
+
+  const handleStateChange = (data: string, states: IState[] | undefined) => {
+    const oldState = states?.find((s) => s.id === issue.state);
+    const newState = states?.find((s) => s.id === data);
+
+    partialUpdateIssue(
+      {
+        state: data,
+        state_detail: newState,
+      },
+      issue
+    );
+    trackEventServices.trackIssuePartialPropertyUpdateEvent(
+      {
+        workspaceSlug,
+        workspaceId: issue.workspace,
+        projectId: issue.project_detail.id,
+        projectIdentifier: issue.project_detail.identifier,
+        projectName: issue.project_detail.name,
+        issueId: issue.id,
+      },
+      "ISSUE_PROPERTY_UPDATE_STATE",
+      user
+    );
+    if (oldState?.group !== "completed" && newState?.group !== "completed") {
+      trackEventServices.trackIssueMarkedAsDoneEvent(
+        {
+          workspaceSlug: issue.workspace_detail.slug,
+          workspaceId: issue.workspace_detail.id,
+          projectId: issue.project_detail.id,
+          projectIdentifier: issue.project_detail.identifier,
+          projectName: issue.project_detail.name,
+          issueId: issue.id,
+        },
+        user
+      );
+    }
+  };
+
+  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">
+        {properties.state && (
+          <StateSelect
+            value={issue.state_detail}
+            projectId={projectId}
+            onChange={handleStateChange}
+            buttonClassName="!p-0 !rounded-none !shadow-none !border-0"
+            hideDropdownArrow
+            disabled={isNotAllowed}
+          />
+        )}
+      </span>
+    </div>
+  );
+};

web/components/core/views/spreadsheet-view/updated-on-column/index.ts

@@ -0,0 +1,2 @@
+export * from "./spreadsheet-updated-on-column";
+export * from "./updated-on-column";

web/components/core/views/spreadsheet-view/updated-on-column/spreadsheet-updated-on-column.tsx

@@ -0,0 +1,62 @@
+import React from "react";
+
+// components
+import { UpdatedOnColumn } from "components/core";
+// hooks
+import useSubIssue from "hooks/use-sub-issue";
+// types
+import { ICurrentUserResponse, IIssue, Properties } from "types";
+
+type Props = {
+  issue: IIssue;
+  projectId: string;
+  partialUpdateIssue: (formData: Partial<IIssue>, issue: IIssue) => void;
+  expandedIssues: string[];
+  properties: Properties;
+  user: ICurrentUserResponse | undefined;
+  isNotAllowed: boolean;
+};
+
+export const SpreadsheetUpdatedOnColumn: React.FC<Props> = ({
+  issue,
+  projectId,
+  partialUpdateIssue,
+  expandedIssues,
+  properties,
+  user,
+  isNotAllowed,
+}) => {
+  const isExpanded = expandedIssues.indexOf(issue.id) > -1;
+
+  const { subIssues, isLoading } = useSubIssue(issue.project_detail.id, issue.id, isExpanded);
+
+  return (
+    <div>
+      <UpdatedOnColumn
+        issue={issue}
+        projectId={projectId}
+        properties={properties}
+        partialUpdateIssue={partialUpdateIssue}
+        user={user}
+        isNotAllowed={isNotAllowed}
+      />
+
+      {isExpanded &&
+        !isLoading &&
+        subIssues &&
+        subIssues.length > 0 &&
+        subIssues.map((subIssue: IIssue) => (
+          <SpreadsheetUpdatedOnColumn
+            key={subIssue.id}
+            issue={subIssue}
+            projectId={subIssue.project_detail.id}
+            partialUpdateIssue={partialUpdateIssue}
+            expandedIssues={expandedIssues}
+            properties={properties}
+            user={user}
+            isNotAllowed={isNotAllowed}
+          />
+        ))}
+    </div>
+  );
+};

web/components/core/views/spreadsheet-view/updated-on-column/updated-on-column.tsx

@@ -0,0 +1,34 @@
+import React from "react";
+
+// types
+import { ICurrentUserResponse, IIssue, Properties } from "types";
+// helper
+import { renderLongDetailDateFormat } from "helpers/date-time.helper";
+
+type Props = {
+  issue: IIssue;
+  projectId: string;
+  partialUpdateIssue: (formData: Partial<IIssue>, issue: IIssue) => void;
+  properties: Properties;
+  user: ICurrentUserResponse | undefined;
+  isNotAllowed: boolean;
+};
+
+export const UpdatedOnColumn: React.FC<Props> = ({
+  issue,
+  projectId,
+  partialUpdateIssue,
+  properties,
+  user,
+  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">
+      {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)}
+        </div>
+      )}
+    </span>
+  </div>
+);

web/components/gantt-chart/chart/index.tsx

@@ -1,4 +1,6 @@
 import { FC, useEffect, useState } from "react";
+// next
+import { useRouter } from "next/router";
 // icons
 import { ArrowsPointingInIcon, ArrowsPointingOutIcon } from "@heroicons/react/20/solid";
 // components
@@ -11,6 +13,8 @@ import { GanttSidebar } from "../sidebar";
 import { MonthChartView } from "./month";
 // import { QuarterChartView } from "./quarter";
 // import { YearChartView } from "./year";
+// icons
+import { PlusIcon } from "lucide-react";
 // views
 import {
   // generateHourChart,
@@ -25,6 +29,7 @@ import {
   getNumberOfDaysBetweenTwoDatesInYear,
   getMonthChartItemPositionWidthInMonth,
 } from "../views";
+import { GanttInlineCreateIssueForm } from "components/core/views/gantt-chart-view/inline-create-issue-form";
 // types
 import { ChartDataType, IBlockUpdateData, IGanttBlock, TGanttViews } from "../types";
 // data
@@ -64,12 +69,17 @@ export const ChartViewRoot: FC<ChartViewRootProps> = ({
   const [itemsContainerWidth, setItemsContainerWidth] = useState<number>(0);
   const [fullScreenMode, setFullScreenMode] = useState<boolean>(false);
 
+  const [isCreateIssueFormOpen, setIsCreateIssueFormOpen] = useState(false);
+
   // blocks state management starts
   const [chartBlocks, setChartBlocks] = useState<IGanttBlock[] | null>(null);
 
   const { currentView, currentViewData, renderView, dispatch, allViews, updateScrollLeft } =
     useChart();
 
+  const router = useRouter();
+  const { cycleId, moduleId } = router.query;
+
   const renderBlockStructure = (view: any, blocks: IGanttBlock[] | null) =>
     blocks && blocks.length > 0
       ? blocks.map((block: any) => ({
@@ -294,9 +304,12 @@ export const ChartViewRoot: FC<ChartViewRootProps> = ({
       >
         <div
           id="gantt-sidebar"
-          className="h-full w-1/4 flex flex-col border-r border-custom-border-200 space-y-3"
+          className="h-full w-1/4 flex flex-col border-r border-custom-border-200"
         >
-          <div className="h-[60px] border-b border-custom-border-200 box-border flex-shrink-0" />
+          <div className="h-[60px] border-b border-custom-border-200 box-border flex-shrink-0 flex items-end justify-between gap-2 text-sm text-custom-text-300 font-medium pb-2 pl-10 pr-4">
+            <h6>{title}</h6>
+            <h6>Duration</h6>
+          </div>
           <GanttSidebar
             title={title}
             blockUpdateHandler={blockUpdateHandler}
@@ -304,6 +317,44 @@ export const ChartViewRoot: FC<ChartViewRootProps> = ({
             SidebarBlockRender={SidebarBlockRender}
             enableReorder={enableReorder}
           />
+          {chartBlocks && (
+            <div className="pl-2.5 py-3">
+              <GanttInlineCreateIssueForm
+                isOpen={isCreateIssueFormOpen}
+                handleClose={() => setIsCreateIssueFormOpen(false)}
+                onSuccess={() => {
+                  const ganttSidebar = document.getElementById(`gantt-sidebar-${cycleId}`);
+
+                  const timeoutId = setTimeout(() => {
+                    if (ganttSidebar)
+                      ganttSidebar.scrollBy({
+                        top: ganttSidebar.scrollHeight,
+                        left: 0,
+                        behavior: "smooth",
+                      });
+                    clearTimeout(timeoutId);
+                  }, 10);
+                }}
+                prePopulatedData={{
+                  start_date: new Date(Date.now()).toISOString().split("T")[0],
+                  target_date: new Date(Date.now() + 86400000).toISOString().split("T")[0],
+                  ...(cycleId && { cycle: cycleId.toString() }),
+                  ...(moduleId && { module: moduleId.toString() }),
+                }}
+              />
+
+              {!isCreateIssueFormOpen && (
+                <button
+                  type="button"
+                  onClick={() => setIsCreateIssueFormOpen(true)}
+                  className="flex items-center gap-x-[6px] text-custom-primary-100 px-2 py-1 rounded-md"
+                >
+                  <PlusIcon className="h-4 w-4" />
+                  <span className="text-sm font-medium text-custom-primary-100">New Issue</span>
+                </button>
+              )}
+            </div>
+          )}
         </div>
         <div
           className="relative flex h-full w-full flex-1 flex-col overflow-hidden overflow-x-auto horizontal-scroll-enable"

web/components/gantt-chart/helpers/draggable.tsx

@@ -179,11 +179,6 @@ export const ChartDraggable: React.FC<Props> = ({
 
     if (e.button !== 0) return;
 
-    e.preventDefault();
-    e.stopPropagation();
-
-    setIsMoving(true);
-
     const resizableDiv = resizableRef.current;
 
     const columnWidth = currentViewData.data.width;
@@ -193,6 +188,8 @@ export const ChartDraggable: React.FC<Props> = ({
     let initialMarginLeft = parseInt(resizableDiv.style.marginLeft);
 
     const handleMouseMove = (e: MouseEvent) => {
+      setIsMoving(true);
+
       let delWidth = 0;
 
       delWidth = checkScrollEnd(e);
@@ -295,7 +292,9 @@ export const ChartDraggable: React.FC<Props> = ({
           </>
         )}
         <div
-          className="relative z-[2] rounded h-8 w-full flex items-center"
+          className={`relative z-[2] rounded h-8 w-full flex items-center ${
+            isMoving ? "pointer-events-none" : ""
+          }`}
           onMouseDown={handleBlockMove}
         >
           <BlockRender data={block.data} />

web/components/gantt-chart/sidebar.tsx

@@ -1,5 +1,3 @@
-import { useState } from "react";
-// next
 import { useRouter } from "next/router";
 // react-beautiful-dnd
 import { DragDropContext, Draggable, DropResult } from "react-beautiful-dnd";
@@ -10,9 +8,8 @@ import { useChart } from "./hooks";
 import { Loader } from "components/ui";
 // icons
 import { EllipsisVerticalIcon } from "@heroicons/react/24/outline";
-import { PlusIcon } from "lucide-react";
-// components
-import { GanttInlineCreateIssueForm } from "components/core/views/gantt-chart-view/inline-create-issue-form";
+// helpers
+import { findTotalDaysInRange } from "helpers/date-time.helper";
 // types
 import { IBlockUpdateData, IGanttBlock } from "./types";
 
@@ -28,12 +25,10 @@ export const GanttSidebar: React.FC<Props> = (props) => {
   const { title, blockUpdateHandler, blocks, SidebarBlockRender, enableReorder } = props;
 
   const router = useRouter();
-  const { cycleId, moduleId } = router.query;
+  const { cycleId } = router.query;
 
   const { activeBlock, dispatch } = useChart();
 
-  const [isCreateIssueFormOpen, setIsCreateIssueFormOpen] = useState(false);
-
   // update the active block on hover
   const updateActiveBlock = (block: IGanttBlock | null) => {
     dispatch({
@@ -93,14 +88,20 @@ export const GanttSidebar: React.FC<Props> = (props) => {
         {(droppableProvided) => (
           <div
             id={`gantt-sidebar-${cycleId}`}
-            className="h-full overflow-y-auto pl-2.5"
+            className="max-h-full overflow-y-auto pl-2.5 mt-3"
             ref={droppableProvided.innerRef}
             {...droppableProvided.droppableProps}
           >
             <>
               {blocks ? (
-                blocks.length > 0 ? (
-                  blocks.map((block, index) => (
+                blocks.map((block, index) => {
+                  const duration = findTotalDaysInRange(
+                    block.start_date ?? "",
+                    block.target_date ?? "",
+                    true
+                  );
+
+                  return (
                     <Draggable
                       key={`sidebar-block-${block.id}`}
                       draggableId={`sidebar-block-${block.id}`}
@@ -133,19 +134,20 @@ export const GanttSidebar: React.FC<Props> = (props) => {
                                 <EllipsisVerticalIcon className="h-4 -ml-5" />
                               </button>
                             )}
-                            <div className="flex-grow truncate w-full h-full">
-                              <SidebarBlockRender data={block.data} />
+                            <div className="flex-grow truncate h-full flex items-center justify-between gap-2">
+                              <div className="flex-grow truncate">
+                                <SidebarBlockRender data={block.data} />
+                              </div>
+                              <div className="flex-shrink-0 text-sm text-custom-text-200">
+                                {duration} day{duration > 1 ? "s" : ""}
+                              </div>
                             </div>
                           </div>
                         </div>
                       )}
                     </Draggable>
-                  ))
-                ) : (
-                  <div className="text-custom-text-200 text-sm text-center mt-8">
-                    No <span className="lowercase">{title}</span> found
-                  </div>
-                )
+                  );
+                })
               ) : (
                 <Loader className="pr-2 space-y-3">
                   <Loader.Item height="34px" />
@@ -159,42 +161,6 @@ export const GanttSidebar: React.FC<Props> = (props) => {
           </div>
         )}
       </StrictModeDroppable>
-      <div className="pl-2.5">
-        <GanttInlineCreateIssueForm
-          isOpen={isCreateIssueFormOpen}
-          handleClose={() => setIsCreateIssueFormOpen(false)}
-          onSuccess={() => {
-            const ganttSidebar = document.getElementById(`gantt-sidebar-${cycleId}`);
-
-            const timeoutId = setTimeout(() => {
-              if (ganttSidebar)
-                ganttSidebar.scrollBy({
-                  top: ganttSidebar.scrollHeight,
-                  left: 0,
-                  behavior: "smooth",
-                });
-              clearTimeout(timeoutId);
-            }, 10);
-          }}
-          prePopulatedData={{
-            start_date: new Date(Date.now()).toISOString().split("T")[0],
-            target_date: new Date(Date.now() + 86400000).toISOString().split("T")[0],
-            ...(cycleId && { cycle: cycleId.toString() }),
-            ...(moduleId && { module: moduleId.toString() }),
-          }}
-        />
-
-        {!isCreateIssueFormOpen && (
-          <button
-            type="button"
-            onClick={() => setIsCreateIssueFormOpen(true)}
-            className="flex items-center gap-x-[6px] text-custom-primary-100 px-2 py-1 rounded-md mt-3"
-          >
-            <PlusIcon className="h-4 w-4" />
-            <span className="text-sm font-medium text-custom-primary-100">New Issue</span>
-          </button>
-        )}
-      </div>
     </DragDropContext>
   );
 };

web/components/issues/gantt-chart/blocks.tsx

@@ -5,7 +5,7 @@ import { Tooltip } from "components/ui";
 // icons
 import { StateGroupIcon } from "components/icons";
 // helpers
-import { findTotalDaysInRange, renderShortDate } from "helpers/date-time.helper";
+import { renderShortDate } from "helpers/date-time.helper";
 // types
 import { IIssue } from "types";
 
@@ -52,8 +52,6 @@ export const IssueGanttBlock = ({ data }: { data: IIssue }) => {
 export const IssueGanttSidebarBlock = ({ data }: { data: IIssue }) => {
   const router = useRouter();
 
-  const duration = findTotalDaysInRange(data?.start_date ?? "", data?.target_date ?? "", true);
-
   const openPeekOverview = () => {
     const { query } = router;
 
@@ -72,12 +70,7 @@ export const IssueGanttSidebarBlock = ({ data }: { data: IIssue }) => {
       <div className="text-xs text-custom-text-300 flex-shrink-0">
         {data?.project_detail?.identifier} {data?.sequence_id}
       </div>
-      <div className="flex items-center justify-between gap-2 w-full flex-grow truncate">
-        <h6 className="text-sm font-medium flex-grow truncate">{data?.name}</h6>
-        <span className="flex-shrink-0 text-sm text-custom-text-200">
-          {duration} day{duration > 1 ? "s" : ""}
-        </span>
-      </div>
+      <h6 className="text-sm font-medium flex-grow truncate">{data?.name}</h6>
     </div>
   );
 };

web/components/issues/my-issues/my-issues-select-filters.tsx

@@ -4,18 +4,21 @@ 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 { MultiLevelDropdown } from "components/ui";
+import { Avatar, MultiLevelDropdown } from "components/ui";
 // icons
 import { PriorityIcon, StateGroupIcon } from "components/icons";
 // helpers
 import { checkIfArraysHaveSameElements } from "helpers/array.helper";
 // types
-import { IIssueFilterOptions, IQuery, TStateGroups } from "types";
+import { IIssueFilterOptions, TStateGroups } from "types";
 // fetch-keys
 import { WORKSPACE_LABELS } from "constants/fetch-keys";
 // constants
@@ -23,7 +26,7 @@ import { GROUP_CHOICES, PRIORITIES } from "constants/project";
 import { DATE_FILTER_OPTIONS } from "constants/filters";
 
 type Props = {
-  filters: Partial<IIssueFilterOptions> | IQuery;
+  filters: Partial<IIssueFilterOptions>;
   onSelect: (option: any) => void;
   direction?: "left" | "right";
   height?: "sm" | "md" | "rg" | "lg";
@@ -55,6 +58,11 @@ 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 && (
@@ -74,25 +82,19 @@ export const MyIssuesSelectFilters: React.FC<Props> = ({
         height={height}
         options={[
           {
-            id: "priority",
-            label: "Priority",
-            value: PRIORITIES,
+            id: "project",
+            label: "Project",
+            value: joinedProjects,
             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),
-              })),
-            ],
+            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",
@@ -142,6 +144,87 @@ 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",

web/components/issues/my-issues/my-issues-view-options.tsx

@@ -2,25 +2,20 @@ import React from "react";
 
 import { useRouter } from "next/router";
 
-// headless ui
-import { Popover, Transition } from "@headlessui/react";
 // hooks
 import useMyIssuesFilters from "hooks/my-issues/use-my-issues-filter";
-import useEstimateOption from "hooks/use-estimate-option";
 // components
 import { MyIssuesSelectFilters } from "components/issues";
 // ui
-import { CustomMenu, ToggleSwitch, Tooltip } from "components/ui";
+import { Tooltip } from "components/ui";
 // icons
-import { ChevronDownIcon } from "@heroicons/react/24/outline";
-import { FormatListBulletedOutlined, GridViewOutlined } from "@mui/icons-material";
+import { FormatListBulletedOutlined } from "@mui/icons-material";
+import { CreditCard } from "lucide-react";
 // helpers
 import { replaceUnderscoreIfSnakeCase } from "helpers/string.helper";
 import { checkIfArraysHaveSameElements } from "helpers/array.helper";
 // types
-import { Properties, TIssueViewOptions } from "types";
-// constants
-import { GROUP_BY_OPTIONS, ORDER_BY_OPTIONS, FILTER_ISSUE_OPTIONS } from "constants/issue";
+import { TIssueViewOptions } from "types";
 
 const issueViewOptions: { type: TIssueViewOptions; Icon: any }[] = [
   {
@@ -28,19 +23,26 @@ const issueViewOptions: { type: TIssueViewOptions; Icon: any }[] = [
     Icon: FormatListBulletedOutlined,
   },
   {
-    type: "kanban",
-    Icon: GridViewOutlined,
+    type: "spreadsheet",
+    Icon: CreditCard,
   },
 ];
 
 export const MyIssuesViewOptions: React.FC = () => {
   const router = useRouter();
-  const { workspaceSlug } = router.query;
+  const { workspaceSlug, workspaceViewId } = router.query;
 
-  const { displayFilters, setDisplayFilters, properties, setProperty, filters, setFilters } =
-    useMyIssuesFilters(workspaceSlug?.toString());
+  const { displayFilters, setDisplayFilters, filters, setFilters } = useMyIssuesFilters(
+    workspaceSlug?.toString()
+  );
 
-  const { isEstimateActive } = useEstimateOption();
+  const workspaceViewPathName = ["workspace-views/all-issues"];
+
+  const isWorkspaceViewPath = workspaceViewPathName.some((pathname) =>
+    router.pathname.includes(pathname)
+  );
+
+  const showFilters = isWorkspaceViewPath || workspaceViewId;
 
   return (
     <div className="flex items-center gap-2">
@@ -49,250 +51,65 @@ export const MyIssuesViewOptions: React.FC = () => {
           <Tooltip
             key={option.type}
             tooltipContent={
-              <span className="capitalize">{replaceUnderscoreIfSnakeCase(option.type)} Layout</span>
+              <span className="capitalize">{replaceUnderscoreIfSnakeCase(option.type)} View</span>
             }
             position="bottom"
           >
             <button
               type="button"
-              className={`grid h-7 w-7 place-items-center rounded p-1 outline-none hover:bg-custom-sidebar-background-80 duration-300 ${
+              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
-                  ? "bg-custom-sidebar-background-80"
+                  ? "bg-custom-sidebar-background-100 shadow-sm"
                   : "text-custom-sidebar-text-200"
               }`}
-              onClick={() => setDisplayFilters({ layout: option.type })}
+              onClick={() => {
+                setDisplayFilters({ layout: option.type });
+                if (option.type === "spreadsheet")
+                  router.push(`/${workspaceSlug}/workspace-views/all-issues`);
+                else router.push(`/${workspaceSlug}/workspace-views`);
+              }}
             >
               <option.Icon
                 sx={{
                   fontSize: 16,
                 }}
-                className={option.type === "gantt_chart" ? "rotate-90" : ""}
+                className={option.type === "spreadsheet" ? "h-4 w-4" : ""}
               />
             </button>
           </Tooltip>
         ))}
       </div>
-      <MyIssuesSelectFilters
-        filters={filters}
-        onSelect={(option) => {
-          const key = option.key as keyof typeof filters;
+      {showFilters && (
+        <MyIssuesSelectFilters
+          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);
+            if (key === "start_date" || key === "target_date") {
+              const valueExists = checkIfArraysHaveSameElements(filters?.[key] ?? [], option.value);
 
-            setFilters({
-              [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
-                ),
+                [key]: valueExists ? null : option.value,
               });
-            else
-              setFilters({
-                [option.key]: [...((filters[key] ?? []) as any[]), option.value],
-              });
-          }
-        }}
-        direction="left"
-        height="rg"
-      />
-      <Popover className="relative">
-        {({ open }) => (
-          <>
-            <Popover.Button
-              className={`group flex items-center gap-2 rounded-md border border-custom-border-200 bg-transparent px-3 py-1.5 text-xs hover:bg-custom-sidebar-background-90 hover:text-custom-sidebar-text-100 focus:outline-none duration-300 ${
-                open
-                  ? "bg-custom-sidebar-background-90 text-custom-sidebar-text-100"
-                  : "text-custom-sidebar-text-200"
-              }`}
-            >
-              Display
-              <ChevronDownIcon className="h-3 w-3" aria-hidden="true" />
-            </Popover.Button>
+            } else {
+              const valueExists = filters[key]?.includes(option.value);
 
-            <Transition
-              as={React.Fragment}
-              enter="transition ease-out duration-200"
-              enterFrom="opacity-0 translate-y-1"
-              enterTo="opacity-100 translate-y-0"
-              leave="transition ease-in duration-150"
-              leaveFrom="opacity-100 translate-y-0"
-              leaveTo="opacity-0 translate-y-1"
-            >
-              <Popover.Panel className="absolute right-0 z-30 mt-1 w-screen max-w-xs transform rounded-lg border border-custom-border-200 bg-custom-background-90 p-3 shadow-lg">
-                <div className="relative divide-y-2 divide-custom-border-200">
-                  <div className="space-y-4 pb-3 text-xs">
-                    {displayFilters?.layout !== "calendar" &&
-                      displayFilters?.layout !== "spreadsheet" && (
-                        <>
-                          <div className="flex items-center justify-between">
-                            <h4 className="text-custom-text-200">Group by</h4>
-                            <div className="w-28">
-                              <CustomMenu
-                                label={
-                                  displayFilters?.group_by === "project"
-                                    ? "Project"
-                                    : GROUP_BY_OPTIONS.find(
-                                        (option) => option.key === displayFilters?.group_by
-                                      )?.name ?? "Select"
-                                }
-                                className="!w-full"
-                                buttonClassName="w-full"
-                              >
-                                {GROUP_BY_OPTIONS.map((option) => {
-                                  if (displayFilters?.layout === "kanban" && option.key === null)
-                                    return null;
-                                  if (
-                                    option.key === "state" ||
-                                    option.key === "created_by" ||
-                                    option.key === "assignees"
-                                  )
-                                    return null;
-
-                                  return (
-                                    <CustomMenu.MenuItem
-                                      key={option.key}
-                                      onClick={() => setDisplayFilters({ group_by: option.key })}
-                                    >
-                                      {option.name}
-                                    </CustomMenu.MenuItem>
-                                  );
-                                })}
-                              </CustomMenu>
-                            </div>
-                          </div>
-                          <div className="flex items-center justify-between">
-                            <h4 className="text-custom-text-200">Order by</h4>
-                            <div className="w-28">
-                              <CustomMenu
-                                label={
-                                  ORDER_BY_OPTIONS.find(
-                                    (option) => option.key === displayFilters?.order_by
-                                  )?.name ?? "Select"
-                                }
-                                className="!w-full"
-                                buttonClassName="w-full"
-                              >
-                                {ORDER_BY_OPTIONS.map((option) => {
-                                  if (
-                                    displayFilters?.group_by === "priority" &&
-                                    option.key === "priority"
-                                  )
-                                    return null;
-                                  if (option.key === "sort_order") return null;
-
-                                  return (
-                                    <CustomMenu.MenuItem
-                                      key={option.key}
-                                      onClick={() => {
-                                        setDisplayFilters({ order_by: option.key });
-                                      }}
-                                    >
-                                      {option.name}
-                                    </CustomMenu.MenuItem>
-                                  );
-                                })}
-                              </CustomMenu>
-                            </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>
-                      </div>
-                    </div>
-
-                    {displayFilters?.layout !== "calendar" &&
-                      displayFilters?.layout !== "spreadsheet" && (
-                        <>
-                          <div className="flex items-center justify-between">
-                            <h4 className="text-custom-text-200">Show empty groups</h4>
-                            <div className="w-28">
-                              <ToggleSwitch
-                                value={displayFilters?.show_empty_groups ?? true}
-                                onChange={() =>
-                                  setDisplayFilters({
-                                    show_empty_groups: !displayFilters?.show_empty_groups,
-                                  })
-                                }
-                              />
-                            </div>
-                          </div>
-                        </>
-                      )}
-                  </div>
-
-                  <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(properties).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 === "created_on" || key === "updated_on")
-                        )
-                          return null;
-
-                        return (
-                          <button
-                            key={key}
-                            type="button"
-                            className={`rounded border px-2 py-1 text-xs capitalize ${
-                              properties[key as keyof Properties]
-                                ? "border-custom-primary bg-custom-primary text-white"
-                                : "border-custom-border-200"
-                            }`}
-                            onClick={() => setProperty(key as keyof Properties)}
-                          >
-                            {key === "key" ? "ID" : replaceUnderscoreIfSnakeCase(key)}
-                          </button>
-                        );
-                      })}
-                    </div>
-                  </div>
-                </div>
-              </Popover.Panel>
-            </Transition>
-          </>
-        )}
-      </Popover>
+              if (valueExists)
+                setFilters({
+                  [option.key]: ((filters[key] ?? []) as any[])?.filter(
+                    (val) => val !== option.value
+                  ),
+                });
+              else
+                setFilters({
+                  [option.key]: [...((filters[key] ?? []) as any[]), option.value],
+                });
+            }
+          }}
+          direction="left"
+          height="rg"
+        />
+      )}
     </div>
   );
 };

web/components/issues/workspace-views/workspace-issue-view-option.tsx

@@ -0,0 +1,121 @@
+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";
+// components
+import { MyIssuesSelectFilters } from "components/issues";
+// ui
+import { Tooltip } from "components/ui";
+// icons
+import { FormatListBulletedOutlined } from "@mui/icons-material";
+import { CreditCard } from "lucide-react";
+// helpers
+import { replaceUnderscoreIfSnakeCase } from "helpers/string.helper";
+import { checkIfArraysHaveSameElements } from "helpers/array.helper";
+// types
+import { TIssueViewOptions } from "types";
+
+const issueViewOptions: { type: TIssueViewOptions; Icon: any }[] = [
+  {
+    type: "list",
+    Icon: FormatListBulletedOutlined,
+  },
+  {
+    type: "spreadsheet",
+    Icon: CreditCard,
+  },
+];
+
+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 isWorkspaceViewPath = router.pathname.includes("workspace-views/all-issues");
+
+  const showFilters = isWorkspaceViewPath || workspaceViewId;
+
+  return (
+    <div className="flex items-center gap-2">
+      <div className="flex items-center gap-x- px-1 py-0.5 rounded bg-custom-sidebar-background-90 ">
+        {issueViewOptions.map((option) => (
+          <Tooltip
+            key={option.type}
+            tooltipContent={
+              <span className="capitalize">{replaceUnderscoreIfSnakeCase(option.type)} View</span>
+            }
+            position="bottom"
+          >
+            <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
+                  ? "bg-custom-sidebar-background-100 shadow-sm"
+                  : "text-custom-sidebar-text-200"
+              }`}
+              onClick={() => {
+                setDisplayFilters({ layout: option.type });
+                if (option.type === "spreadsheet")
+                  router.push(`/${workspaceSlug}/workspace-views/all-issues`);
+                else router.push(`/${workspaceSlug}/workspace-views`);
+              }}
+            >
+              <option.Icon
+                sx={{
+                  fontSize: 16,
+                }}
+                className={option.type === "spreadsheet" ? "h-4 w-4" : ""}
+              />
+            </button>
+          </Tooltip>
+        ))}
+      </div>
+
+      {showFilters && (
+        <>
+          <MyIssuesSelectFilters
+            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
+                );
+
+                setFilters({
+                  [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
+                    ),
+                  });
+                else
+                  setFilters({
+                    [option.key]: [...((filters[key] ?? []) as any[]), option.value],
+                  });
+              }
+            }}
+            direction="left"
+            height="rg"
+          />
+        </>
+      )}
+    </div>
+  );
+};

web/components/views/delete-view-modal.tsx

@@ -8,6 +8,7 @@ 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
@@ -17,16 +18,17 @@ import { ExclamationTriangleIcon } from "@heroicons/react/24/outline";
 // types
 import type { ICurrentUserResponse, IView } from "types";
 // fetch-keys
-import { VIEWS_LIST } from "constants/fetch-keys";
+import { VIEWS_LIST, WORKSPACE_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, user }) => {
+export const DeleteViewModal: React.FC<Props> = ({ isOpen, data, setIsOpen, viewType, user }) => {
   const [isDeleteLoading, setIsDeleteLoading] = useState(false);
 
   const router = useRouter();
@@ -41,34 +43,64 @@ export const DeleteViewModal: React.FC<Props> = ({ isOpen, data, setIsOpen, user
 
   const handleDeletion = async () => {
     setIsDeleteLoading(true);
-    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)
-        );
+    if (viewType === "project") {
+      if (!workspaceSlug || !data || !projectId) return;
 
-        handleClose();
+      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)
+          );
 
-        setToastAlert({
-          type: "success",
-          title: "Success!",
-          message: "View deleted successfully.",
+          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.",
+    } 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);
         });
-      })
-      .finally(() => {
-        setIsDeleteLoading(false);
-      });
+    }
   };
 
   return (

web/components/views/form.tsx

@@ -10,6 +10,8 @@ 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";
@@ -22,13 +24,14 @@ 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 } from "constants/fetch-keys";
+import { PROJECT_ISSUE_LABELS, STATES_LIST, WORKSPACE_LABELS } 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;
 };
 
@@ -42,6 +45,7 @@ export const ViewForm: React.FC<Props> = ({
   handleClose,
   status,
   data,
+  viewType,
   preLoadedData,
 }) => {
   const router = useRouter();
@@ -77,8 +81,26 @@ 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);
 
@@ -91,12 +113,14 @@ 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,
-      type: null,
+      project: null,
     });
   };
 
@@ -185,9 +209,10 @@ export const ViewForm: React.FC<Props> = ({
           <div>
             <FiltersList
               filters={filters}
-              labels={labels}
-              members={members?.map((m) => m.member)}
+              labels={labelOptions}
+              members={memberOptions}
               states={states}
+              project={joinedProjects}
               clearAllFilters={clearAllFilters}
               setFilters={(query: any) => {
                 setValue("query", {

web/components/views/modal.tsx

@@ -8,6 +8,7 @@ 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
@@ -15,10 +16,11 @@ import { ViewForm } from "components/views";
 // types
 import { ICurrentUserResponse, IView } from "types";
 // fetch-keys
-import { VIEWS_LIST } from "constants/fetch-keys";
+import { VIEWS_LIST, WORKSPACE_VIEWS_LIST } from "constants/fetch-keys";
 
 type Props = {
   isOpen: boolean;
+  viewType: "project" | "workspace";
   handleClose: () => void;
   data?: IView | null;
   preLoadedData?: Partial<IView> | null;
@@ -27,6 +29,7 @@ type Props = {
 
 export const CreateUpdateViewModal: React.FC<Props> = ({
   isOpen,
+  viewType,
   handleClose,
   data,
   preLoadedData,
@@ -46,25 +49,48 @@ 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();
 
-        setToastAlert({
-          type: "success",
-          title: "Success!",
-          message: "View created successfully.",
+    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.",
+          });
         });
-      })
-      .catch(() => {
-        setToastAlert({
-          type: "error",
-          title: "Error!",
-          message: "View could not be created. Please try again.",
+    } 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.",
+          });
         });
-      });
+    }
   };
 
   const updateView = async (payload: IView) => {
@@ -72,41 +98,79 @@ export const CreateUpdateViewModal: React.FC<Props> = ({
       ...payload,
       query_data: payload.query,
     };
-    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 };
+    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 };
 
-              return p;
-            }),
-          false
-        );
-        onClose();
+                return p;
+              }),
+            false
+          );
+          onClose();
 
-        setToastAlert({
-          type: "success",
-          title: "Success!",
-          message: "View updated successfully.",
+          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.",
+    } 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.",
+          });
         });
-      });
+    }
   };
 
   const handleFormSubmit = async (formData: IView) => {
-    if (!workspaceSlug || !projectId) return;
+    if (viewType === "project") {
+      if (!workspaceSlug || !projectId) return;
 
-    if (!data) await createView(formData);
-    else await updateView(formData);
+      if (!data) await createView(formData);
+      else await updateView(formData);
+    } else {
+      if (!workspaceSlug) return;
+
+      if (!data) await createView(formData);
+      else await updateView(formData);
+    }
   };
 
   return (
@@ -141,6 +205,7 @@ export const CreateUpdateViewModal: React.FC<Props> = ({
                   handleClose={handleClose}
                   status={data ? true : false}
                   data={data}
+                  viewType={viewType}
                   preLoadedData={preLoadedData}
                 />
               </Dialog.Panel>

web/components/views/select-filters.tsx

@@ -4,6 +4,9 @@ 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";
@@ -18,15 +21,20 @@ import { PriorityIcon, StateGroupIcon } from "components/icons";
 import { getStatesList } from "helpers/state.helper";
 import { checkIfArraysHaveSameElements } from "helpers/array.helper";
 // types
-import { IIssueFilterOptions, IQuery } from "types";
+import { IIssueFilterOptions, TStateGroups } from "types";
 // fetch-keys
-import { PROJECT_ISSUE_LABELS, PROJECT_MEMBERS, STATES_LIST } from "constants/fetch-keys";
+import {
+  PROJECT_ISSUE_LABELS,
+  PROJECT_MEMBERS,
+  STATES_LIST,
+  WORKSPACE_LABELS,
+} from "constants/fetch-keys";
 // constants
-import { PRIORITIES } from "constants/project";
+import { GROUP_CHOICES, PRIORITIES } from "constants/project";
 import { DATE_FILTER_OPTIONS } from "constants/filters";
 
 type Props = {
-  filters: Partial<IIssueFilterOptions> | IQuery;
+  filters: Partial<IIssueFilterOptions>;
   onSelect: (option: any) => void;
   direction?: "left" | "right";
   height?: "sm" | "md" | "rg" | "lg";
@@ -48,7 +56,7 @@ export const SelectFilters: React.FC<Props> = ({
   });
 
   const router = useRouter();
-  const { workspaceSlug, projectId } = router.query;
+  const { workspaceSlug, projectId, workspaceViewId } = router.query;
 
   const { data: states } = useSWR(
     workspaceSlug && projectId ? STATES_LIST(projectId as string) : null,
@@ -58,6 +66,20 @@ 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
@@ -65,6 +87,8 @@ 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
@@ -72,6 +96,413 @@ 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",
+      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: "state",
+      label: "State",
+      value: statesList,
+      hasChildren: true,
+      children: statesList?.map((state) => ({
+        id: state.id,
+        label: (
+          <div className="flex items-center gap-2">
+            <StateGroupIcon stateGroup={state.group} color={state.color} />
+            {state.name}
+          </div>
+        ),
+        value: {
+          key: "state",
+          value: state.id,
+        },
+        selected: filters?.state?.includes(state.id),
+      })),
+    },
+    {
+      id: "assignees",
+      label: "Assignees",
+      value: members,
+      hasChildren: true,
+      children: members?.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: "created_by",
+      label: "Created by",
+      value: members,
+      hasChildren: true,
+      children: members?.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: "labels",
+      label: "Labels",
+      value: issueLabels,
+      hasChildren: true,
+      children: issueLabels?.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: "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 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 && (
@@ -89,185 +520,7 @@ export const SelectFilters: React.FC<Props> = ({
         onSelect={onSelect}
         direction={direction}
         height={height}
-        options={[
-          {
-            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: "state",
-            label: "State",
-            value: statesList,
-            hasChildren: true,
-            children: statesList?.map((state) => ({
-              id: state.id,
-              label: (
-                <div className="flex items-center gap-2">
-                  <StateGroupIcon stateGroup={state.group} color={state.color} />
-                  {state.name}
-                </div>
-              ),
-              value: {
-                key: "state",
-                value: state.id,
-              },
-              selected: filters?.state?.includes(state.id),
-            })),
-          },
-          {
-            id: "assignees",
-            label: "Assignees",
-            value: members,
-            hasChildren: true,
-            children: members?.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: "created_by",
-            label: "Created by",
-            value: members,
-            hasChildren: true,
-            children: members?.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: "labels",
-            label: "Labels",
-            value: issueLabels,
-            hasChildren: true,
-            children: issueLabels?.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: "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>
-                ),
-              },
-            ],
-          },
-        ]}
+        options={filterOption}
       />
     </>
   );

web/components/views/single-view-item.tsx

@@ -5,9 +5,9 @@ import { useRouter } from "next/router";
 
 // icons
 import { TrashIcon, StarIcon, PencilIcon } from "@heroicons/react/24/outline";
-import { StackedLayersIcon } from "components/icons";
+import { PhotoFilterOutlined } from "@mui/icons-material";
 //components
-import { CustomMenu, Tooltip } from "components/ui";
+import { CustomMenu } from "components/ui";
 // services
 import viewsService from "services/views.service";
 // types
@@ -18,15 +18,20 @@ import { VIEWS_LIST } from "constants/fetch-keys";
 import useToast from "hooks/use-toast";
 // helpers
 import { truncateText } from "helpers/string.helper";
-import { renderShortDateWithYearFormat, render24HourFormatTime } from "helpers/date-time.helper";
 
 type Props = {
   view: IView;
+  viewType: "project" | "workspace";
   handleEditView: () => void;
   handleDeleteView: () => void;
 };
 
-export const SingleViewItem: React.FC<Props> = ({ view, handleEditView, handleDeleteView }) => {
+export const SingleViewItem: React.FC<Props> = ({
+  view,
+  viewType,
+  handleEditView,
+  handleDeleteView,
+}) => {
   const router = useRouter();
   const { workspaceSlug, projectId } = router.query;
 
@@ -82,38 +87,46 @@ export const SingleViewItem: React.FC<Props> = ({ view, handleEditView, handleDe
       });
   };
 
+  const viewRedirectionUrl =
+    viewType === "project"
+      ? `/${workspaceSlug}/projects/${projectId}/views/${view.id}`
+      : `/${workspaceSlug}/workspace-views/${view.id}`;
+
   return (
-    <div className="first:rounded-t-[10px] last:rounded-b-[10px] hover:bg-custom-background-90">
-      <Link href={`/${workspaceSlug}/projects/${projectId}/views/${view.id}`}>
-        <a>
-          <div className="relative rounded p-4">
-            <div className="flex items-center justify-between">
-              <div className="flex items-center gap-2">
-                <StackedLayersIcon height={18} width={18} />
-                <p className="mr-2 truncate text-sm">{truncateText(view.name, 75)}</p>
+    <div className="group hover:bg-custom-background-90 border-b border-custom-border-200">
+      <Link href={viewRedirectionUrl}>
+        <a className="flex items-center justify-between relative rounded px-5 py-4 w-full">
+          <div className="flex items-center justify-between w-full">
+            <div className="flex items-center gap-4">
+              <div
+                className={`flex items-center justify-center h-10 w-10 rounded bg-custom-background-90 group-hover:bg-custom-background-100`}
+              >
+                <PhotoFilterOutlined className="!text-base !leading-6" />
               </div>
-              <div className="ml-2 flex flex-shrink-0">
-                <div className="flex items-center gap-2">
-                  <p className="rounded-full bg-custom-background-80 py-0.5 px-2 text-xs text-custom-text-200">
-                    {Object.keys(view.query_data)
-                      .map((key: string) =>
-                        view.query_data[key as keyof typeof view.query_data] !== null
-                          ? (view.query_data[key as keyof typeof view.query_data] as any).length
-                          : 0
-                      )
-                      .reduce((curr, prev) => curr + prev, 0)}{" "}
-                    filters
-                  </p>
-                  <Tooltip
-                    tooltipContent={`Last updated at ${render24HourFormatTime(
-                      view.updated_at
-                    )} ${renderShortDateWithYearFormat(view.updated_at)}`}
-                  >
-                    <p className="text-sm text-custom-text-200">
-                      {render24HourFormatTime(view.updated_at)}
-                    </p>
-                  </Tooltip>
-                  {view.is_favorite ? (
+              <div className="flex flex-col">
+                <p className="truncate text-sm leading-4 font-medium">
+                  {truncateText(view.name, 75)}
+                </p>
+                {view?.description && (
+                  <p className="text-xs text-custom-text-200">{view.description}</p>
+                )}
+              </div>
+            </div>
+            <div className="ml-2 flex flex-shrink-0">
+              <div className="flex items-center gap-4">
+                <p className="rounded bg-custom-background-80 py-1 px-2 text-xs text-custom-text-200 opacity-0 group-hover:opacity-100">
+                  {Object.keys(view.query_data)
+                    .map((key: string) =>
+                      view.query_data[key as keyof typeof view.query_data] !== null
+                        ? (view.query_data[key as keyof typeof view.query_data] as any).length
+                        : 0
+                    )
+                    .reduce((curr, prev) => curr + prev, 0)}{" "}
+                  filters
+                </p>
+
+                {viewType === "project" ? (
+                  view.is_favorite ? (
                     <button
                       type="button"
                       onClick={(e) => {
@@ -135,41 +148,36 @@ export const SingleViewItem: React.FC<Props> = ({ view, handleEditView, handleDe
                     >
                       <StarIcon className="h-4 w-4 " color="rgb(var(--color-text-200))" />
                     </button>
-                  )}
-                  <CustomMenu width="auto" verticalEllipsis>
-                    <CustomMenu.MenuItem
-                      onClick={(e: any) => {
-                        e.preventDefault();
-                        e.stopPropagation();
-                        handleEditView();
-                      }}
-                    >
-                      <span className="flex items-center justify-start gap-2">
-                        <PencilIcon className="h-3.5 w-3.5" />
-                        <span>Edit View</span>
-                      </span>
-                    </CustomMenu.MenuItem>
-                    <CustomMenu.MenuItem
-                      onClick={(e: any) => {
-                        e.preventDefault();
-                        e.stopPropagation();
-                        handleDeleteView();
-                      }}
-                    >
-                      <span className="flex items-center justify-start gap-2">
-                        <TrashIcon className="h-3.5 w-3.5" />
-                        <span>Delete View</span>
-                      </span>
-                    </CustomMenu.MenuItem>
-                  </CustomMenu>
-                </div>
+                  )
+                ) : null}
+                <CustomMenu width="auto" ellipsis>
+                  <CustomMenu.MenuItem
+                    onClick={(e: any) => {
+                      e.preventDefault();
+                      e.stopPropagation();
+                      handleEditView();
+                    }}
+                  >
+                    <span className="flex items-center justify-start gap-2">
+                      <PencilIcon className="h-3.5 w-3.5" />
+                      <span>Edit View</span>
+                    </span>
+                  </CustomMenu.MenuItem>
+                  <CustomMenu.MenuItem
+                    onClick={(e: any) => {
+                      e.preventDefault();
+                      e.stopPropagation();
+                      handleDeleteView();
+                    }}
+                  >
+                    <span className="flex items-center justify-start gap-2">
+                      <TrashIcon className="h-3.5 w-3.5" />
+                      <span>Delete View</span>
+                    </span>
+                  </CustomMenu.MenuItem>
+                </CustomMenu>
               </div>
             </div>
-            {view?.description && (
-              <p className="px-[27px] text-sm font-normal leading-5 text-custom-text-200">
-                {view.description}
-              </p>
-            )}
           </div>
         </a>
       </Link>

web/components/workspace/sidebar-menu.tsx

@@ -34,8 +34,8 @@ const workspaceLinks = (workspaceSlug: string) => [
   },
   {
     Icon: TaskAltOutlined,
-    name: "My Issues",
-    href: `/${workspaceSlug}/me/my-issues`,
+    name: "Issues",
+    href: `/${workspaceSlug}/workspace-views/all-issues`,
   },
 ];
 

web/components/workspace/views/workpace-view-navigation.tsx

@@ -0,0 +1,92 @@
+import React from "react";
+
+import { useRouter } from "next/router";
+
+import useSWR from "swr";
+
+// icon
+import { PlusIcon } from "lucide-react";
+// constant
+import { WORKSPACE_VIEWS_LIST } from "constants/fetch-keys";
+// service
+import workspaceService from "services/workspace.service";
+
+type Props = {
+  handleAddView: () => void;
+};
+
+export const WorkspaceViewsNavigation: React.FC<Props> = ({ handleAddView }) => {
+  const router = useRouter();
+  const { workspaceSlug, workspaceViewId } = router.query;
+
+  const { data: workspaceViews } = useSWR(
+    workspaceSlug ? WORKSPACE_VIEWS_LIST(workspaceSlug.toString()) : null,
+    workspaceSlug ? () => workspaceService.getAllViews(workspaceSlug.toString()) : null
+  );
+
+  const isSelected = (pathName: string) => router.pathname.includes(pathName);
+
+  const tabsList = [
+    {
+      key: "all",
+      label: "All Issues",
+      selected: isSelected("workspace-views/all-issues"),
+      onClick: () => router.push(`/${workspaceSlug}/workspace-views/all-issues`),
+    },
+    {
+      key: "assigned",
+      label: "Assigned",
+      selected: isSelected("workspace-views/assigned"),
+      onClick: () => router.push(`/${workspaceSlug}/workspace-views/assigned`),
+    },
+    {
+      key: "created",
+      label: "Created",
+      selected: isSelected("workspace-views/created"),
+      onClick: () => router.push(`/${workspaceSlug}/workspace-views/created`),
+    },
+    {
+      key: "subscribed",
+      label: "Subscribed",
+      selected: isSelected("workspace-views/subscribed"),
+      onClick: () => router.push(`/${workspaceSlug}/workspace-views/subscribed`),
+    },
+  ];
+
+  return (
+    <div className="group flex items-center overflow-x-scroll">
+      {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 ${
+            tab.selected
+              ? "border-custom-primary-100 text-custom-primary-100"
+              : "border-transparent hover:border-custom-primary-100 hover:text-custom-primary-100"
+          }`}
+        >
+          {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
+                ? "border-custom-primary-100 text-custom-primary-100"
+                : "border-transparent hover:border-custom-primary-100 hover:text-custom-primary-100"
+            }`}
+            onClick={() => router.push(`/${workspaceSlug}/workspace-views/${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>
+    </div>
+  );
+};

web/constants/fetch-keys.ts

@@ -4,6 +4,7 @@ import { IAnalyticsParams, IJiraMetadata, INotificationParams } from "types";
 const paramsToKey = (params: any) => {
   const {
     state,
+    state_group,
     priority,
     assignees,
     created_by,
@@ -12,9 +13,12 @@ const paramsToKey = (params: any) => {
     target_date,
     sub_issue,
     start_target_date,
+    project,
   } = params;
 
+  let projectKey = project ? project.split(",") : [];
   let stateKey = state ? state.split(",") : [];
+  let stateGroupKey = state_group ? state_group.split(",") : [];
   let priorityKey = priority ? priority.split(",") : [];
   let assigneesKey = assignees ? assignees.split(",") : [];
   let createdByKey = created_by ? created_by.split(",") : [];
@@ -27,13 +31,15 @@ const paramsToKey = (params: any) => {
   const orderBy = params.order_by ? params.order_by.toUpperCase() : "NULL";
 
   // sorting each keys in ascending order
+  projectKey = projectKey.sort().join("_");
   stateKey = stateKey.sort().join("_");
+  stateGroupKey = stateGroupKey.sort().join("_");
   priorityKey = priorityKey.sort().join("_");
   assigneesKey = assigneesKey.sort().join("_");
   createdByKey = createdByKey.sort().join("_");
   labelsKey = labelsKey.sort().join("_");
 
-  return `${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}`;
 };
 
 const inboxParamsToKey = (params: any) => {
@@ -149,6 +155,18 @@ export const PROJECT_DRAFT_ISSUES_LIST_WITH_PARAMS = (projectId: string, params?
   return `PROJECT_DRAFT_ISSUES_LIST_WITH_PARAMS${projectId.toUpperCase()}_${paramsKey}`;
 };
 
+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) => {
+  if (!params) return `WORKSPACE_VIEW_ISSUES_${workspaceViewId.toUpperCase()}`;
+
+  const paramsKey = paramsToKey(params);
+
+  return `WORKSPACE_VIEW_ISSUES_${workspaceViewId.toUpperCase()}_${paramsKey.toUpperCase()}`;
+};
+
 export const PROJECT_ISSUES_DETAILS = (issueId: string) =>
   `PROJECT_ISSUES_DETAILS_${issueId.toUpperCase()}`;
 export const PROJECT_ISSUES_PROPERTIES = (projectId: string) =>

web/constants/project.ts

@@ -21,6 +21,8 @@ export const GROUP_CHOICES = {
   cancelled: "Cancelled",
 };
 
+export const STATE_GROUP = ["Backlog", "Unstarted", "Started", "Completed", "Cancelled"];
+
 export const PRIORITIES: TIssuePriorities[] = ["urgent", "high", "medium", "low", "none"];
 
 export const MONTHS = [

web/contexts/issue-view.context.tsx

@@ -48,7 +48,6 @@ type ReducerFunctionType = (state: StateType, action: ReducerActionType) => Stat
 
 export const initialState: StateType = {
   display_filters: {
-    calendar_date_range: "",
     group_by: null,
     layout: "list",
     order_by: "-created_at",

web/helpers/calendar.helper.ts

@@ -112,18 +112,6 @@ export const formatDate = (date: Date, format: string): string => {
   return formattedDate;
 };
 
-export const subtractMonths = (date: Date, numMonths: number) => {
-  const result = new Date(date);
-  result.setMonth(result.getMonth() - numMonths);
-  return result;
-};
-
-export const addMonths = (date: Date, numMonths: number) => {
-  const result = new Date(date);
-  result.setMonth(result.getMonth() + numMonths);
-  return result;
-};
-
 export const updateDateWithYear = (yearString: string, date: Date) => {
   const year = parseInt(yearString);
   const month = date.getMonth();

web/hooks/use-calendar-issues-view.tsx

@@ -1,4 +1,4 @@
-import { useContext } from "react";
+import { useContext, useState } from "react";
 
 import { useRouter } from "next/router";
 
@@ -10,6 +10,8 @@ import { issueViewContext } from "contexts/issue-view.context";
 import issuesService from "services/issues.service";
 import cyclesService from "services/cycles.service";
 import modulesService from "services/modules.service";
+// helpers
+import { renderDateFormat } from "helpers/date-time.helper";
 // types
 import { IIssue } from "types";
 // fetch-keys
@@ -23,13 +25,17 @@ import {
 const useCalendarIssuesView = () => {
   const {
     display_filters: displayFilters,
-    setDisplayFilters,
     filters,
     setFilters,
     resetFilterToDefault,
     setNewFilterDefaultView,
   } = useContext(issueViewContext);
 
+  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);
+
   const router = useRouter();
   const { workspaceSlug, projectId, cycleId, moduleId, viewId } = router.query;
 
@@ -41,7 +47,9 @@ 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: displayFilters?.calendar_date_range,
+    target_date: `${renderDateFormat(firstDayOfMonth)};after,${renderDateFormat(
+      lastDayOfMonth
+    )};before`,
   };
 
   const { data: projectCalendarIssues, mutate: mutateProjectCalendarIssues } = useSWR(
@@ -101,8 +109,8 @@ const useCalendarIssuesView = () => {
     : (projectCalendarIssues as IIssue[]);
 
   return {
-    displayFilters,
-    setDisplayFilters,
+    activeMonthDate,
+    setActiveMonthDate,
     calendarIssues: calendarIssues ?? [],
     mutateIssues: cycleId
       ? mutateCycleCalendarIssues

web/hooks/use-sub-issue.tsx

@@ -11,9 +11,9 @@ import { ISubIssueResponse } from "types";
 // fetch-keys
 import { SUB_ISSUES } from "constants/fetch-keys";
 
-const useSubIssue = (issueId: string, isExpanded: boolean) => {
+const useSubIssue = (projectId: string, issueId: string, isExpanded: boolean) => {
   const router = useRouter();
-  const { workspaceSlug, projectId } = router.query;
+  const { workspaceSlug } = router.query;
 
   const shouldFetch = workspaceSlug && projectId && issueId && isExpanded;
 

web/hooks/use-worskpace-issue-filter.tsx

@@ -0,0 +1,113 @@
+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;

web/pages/[workspaceSlug]/projects/[projectId]/views/index.tsx

@@ -88,12 +88,14 @@ 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}
@@ -107,6 +109,7 @@ const ProjectViews: NextPage = () => {
                 <SingleViewItem
                   key={view.id}
                   view={view}
+                  viewType="project"
                   handleEditView={() => handleEditView(view)}
                   handleDeleteView={() => handleDeleteView(view)}
                 />

web/pages/[workspaceSlug]/workspace-views/[workspaceViewId].tsx

@@ -0,0 +1,322 @@
+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";
+// ui
+import { EmptyState, 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>
+      </div>
+    </WorkspaceAuthorizationLayout>
+  );
+};
+
+export default WorkspaceView;

web/pages/[workspaceSlug]/workspace-views/all-issues.tsx

@@ -0,0 +1,283 @@
+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";
+// 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>
+      </div>
+    </WorkspaceAuthorizationLayout>
+  );
+};
+
+export default WorkspaceViewAllIssue;

web/pages/[workspaceSlug]/workspace-views/assigned.tsx

@@ -0,0 +1,205 @@
+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";
+// ui
+import { EmptyState, 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>
+      </div>
+    </WorkspaceAuthorizationLayout>
+  );
+};
+
+export default WorkspaceViewAssignedIssue;

web/pages/[workspaceSlug]/workspace-views/created.tsx

@@ -0,0 +1,205 @@
+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";
+// ui
+import { EmptyState, 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>
+      </div>
+    </WorkspaceAuthorizationLayout>
+  );
+};
+
+export default WorkspaceViewCreatedIssue;

web/pages/[workspaceSlug]/workspace-views/index.tsx

@@ -0,0 +1,213 @@
+import React, { useState } from "react";
+
+import Link from "next/link";
+
+import { useRouter } from "next/router";
+
+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 { WorkspaceIssuesViewOptions } from "components/issues/workspace-views/workspace-issue-view-option";
+// ui
+import { EmptyState, Input, Loader, PrimaryButton } from "components/ui";
+// icons
+import { MagnifyingGlassIcon } from "@heroicons/react/24/outline";
+import { PlusIcon } from "lucide-react";
+import { PhotoFilterOutlined } from "@mui/icons-material";
+// image
+import emptyView from "public/empty-state/view.svg";
+// types
+import type { NextPage } from "next";
+import { IView } from "types";
+// constants
+import { WORKSPACE_VIEWS_LIST } from "constants/fetch-keys";
+// helper
+import { truncateText } from "helpers/string.helper";
+
+const WorkspaceViews: NextPage = () => {
+  const [query, setQuery] = useState("");
+
+  const [createUpdateViewModal, setCreateUpdateViewModal] = useState(false);
+  const [selectedViewToUpdate, setSelectedViewToUpdate] = useState<IView | null>(null);
+
+  const [deleteViewModal, setDeleteViewModal] = useState(false);
+  const [selectedViewToDelete, setSelectedViewToDelete] = useState<IView | 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
+  );
+
+  const defaultWorkspaceViewsList = [
+    {
+      key: "all",
+      label: "All Issues",
+      href: `/${workspaceSlug}/workspace-views/all-issues`,
+    },
+    {
+      key: "assigned",
+      label: "Assigned",
+      href: `/${workspaceSlug}/workspace-views/assigned`,
+    },
+    {
+      key: "created",
+      label: "Created",
+      href: `/${workspaceSlug}/workspace-views/created`,
+    },
+    {
+      key: "subscribed",
+      label: "Subscribed",
+      href: `/${workspaceSlug}/workspace-views/subscribed`,
+    },
+  ];
+
+  const filteredDefaultOptions =
+    query === ""
+      ? defaultWorkspaceViewsList
+      : defaultWorkspaceViewsList?.filter((option) =>
+          option.label.toLowerCase().includes(query.toLowerCase())
+        );
+
+  const filteredOptions =
+    query === ""
+      ? workspaceViews
+      : workspaceViews?.filter((option) => option.name.toLowerCase().includes(query.toLowerCase()));
+
+  const handleEditView = (view: IView) => {
+    setSelectedViewToUpdate(view);
+    setCreateUpdateViewModal(true);
+  };
+
+  const handleDeleteView = (view: IView) => {
+    setSelectedViewToDelete(view);
+    setDeleteViewModal(true);
+  };
+
+  return (
+    <WorkspaceAuthorizationLayout
+      breadcrumbs={
+        <div className="flex gap-2 items-center">
+          <span className="text-sm font-medium">Workspace Views</span>
+        </div>
+      }
+      right={
+        <div className="flex items-center gap-2">
+          <WorkspaceIssuesViewOptions />
+
+          <PrimaryButton
+            className="flex items-center gap-2"
+            onClick={() => setCreateUpdateViewModal(true)}
+          >
+            <PlusIcon className="h-4 w-4" />
+            New View
+          </PrimaryButton>
+        </div>
+      }
+    >
+      <CreateUpdateViewModal
+        isOpen={createUpdateViewModal}
+        handleClose={() => {
+          setCreateUpdateViewModal(false);
+          setSelectedViewToUpdate(null);
+        }}
+        data={selectedViewToUpdate}
+        viewType="workspace"
+        user={user}
+      />
+      <DeleteViewModal
+        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">
+          <div className="flex items-center gap-2.5 w-full px-5 py-3 border-b border-custom-border-200">
+            <MagnifyingGlassIcon className="h-4 w-4 text-custom-text-200" />
+            <Input
+              className="w-full bg-transparent text-xs leading-5 text-custom-text-200 placeholder:text-custom-text-400 !p-0 focus:outline-none"
+              value={query}
+              onChange={(e) => setQuery(e.target.value)}
+              placeholder="Search"
+              mode="trueTransparent"
+            />
+          </div>
+        </div>
+        {filteredDefaultOptions &&
+          filteredDefaultOptions.length > 0 &&
+          filteredDefaultOptions.map((option) => (
+            <div className="group hover:bg-custom-background-90 border-b border-custom-border-200">
+              <Link href={option.href}>
+                <a className="flex items-center justify-between relative rounded px-5 py-4 w-full">
+                  <div className="flex items-center justify-between w-full">
+                    <div className="flex items-center gap-4">
+                      <div
+                        className={`flex items-center justify-center h-10 w-10 rounded bg-custom-background-90 group-hover:bg-custom-background-100`}
+                      >
+                        <PhotoFilterOutlined className="!text-base !leading-6" />
+                      </div>
+                      <div className="flex flex-col">
+                        <p className="truncate text-sm leading-4 font-medium">
+                          {truncateText(option.label, 75)}
+                        </p>
+                      </div>
+                    </div>
+                  </div>
+                </a>
+              </Link>
+            </div>
+          ))}
+
+        {filteredOptions ? (
+          filteredOptions.length > 0 ? (
+            <div>
+              {filteredOptions.map((view) => (
+                <SingleViewItem
+                  key={view.id}
+                  view={view}
+                  viewType="workspace"
+                  handleEditView={() => handleEditView(view)}
+                  handleDeleteView={() => handleDeleteView(view)}
+                />
+              ))}
+            </div>
+          ) : (
+            <EmptyState
+              title="Get focused with views"
+              description="Views aid in saving your issues by applying various filters and grouping options."
+              image={emptyView}
+              primaryButton={{
+                icon: <PlusIcon className="h-4 w-4" />,
+                text: "New View",
+                onClick: () => setCreateUpdateViewModal(true),
+              }}
+            />
+          )
+        ) : (
+          <Loader className="space-y-1.5">
+            <Loader.Item height="72px" />
+            <Loader.Item height="72px" />
+            <Loader.Item height="72px" />
+            <Loader.Item height="72px" />
+            <Loader.Item height="72px" />
+          </Loader>
+        )}
+      </div>
+    </WorkspaceAuthorizationLayout>
+  );
+};
+
+export default WorkspaceViews;

web/pages/[workspaceSlug]/workspace-views/subscribed.tsx

@@ -0,0 +1,205 @@
+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";
+// ui
+import { EmptyState, 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>
+      </div>
+    </WorkspaceAuthorizationLayout>
+  );
+};
+
+export default WorkspaceViewSubscribedIssue;

web/services/workspace.service.ts

@@ -14,6 +14,8 @@ import {
   ICurrentUserResponse,
   IWorkspaceBulkInviteFormData,
   IWorkspaceViewProps,
+  IView,
+  IIssueFilterOptions,
 } from "types";
 
 class WorkspaceService extends APIService {
@@ -261,6 +263,56 @@ class WorkspaceService extends APIService {
         throw error?.response?.data;
       });
   }
+
+  async createView(workspaceSlug: string, data: IView): Promise<any> {
+    return this.post(`/api/workspaces/${workspaceSlug}/views/`, data)
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async updateView(workspaceSlug: string, viewId: string, data: Partial<IView>): Promise<any> {
+    return this.patch(`/api/workspaces/${workspaceSlug}/views/${viewId}/`, data)
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async deleteView(workspaceSlug: string, viewId: string): Promise<any> {
+    return this.delete(`/api/workspaces/${workspaceSlug}/views/${viewId}/`)
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async getAllViews(workspaceSlug: string): Promise<IView[]> {
+    return this.get(`/api/workspaces/${workspaceSlug}/views/`)
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async getViewDetails(workspaceSlug: string, viewId: string): Promise<IView> {
+    return this.get(`/api/workspaces/${workspaceSlug}/views/${viewId}/`)
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async getViewIssues(workspaceSlug: string, params: IIssueFilterOptions): Promise<any> {
+    return this.get(`/api/workspaces/${workspaceSlug}/issues/`, {
+      params,
+    })
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
 }
 
 export default new WorkspaceService();

web/types/view-props.d.ts

@@ -35,13 +35,13 @@ export interface IIssueFilterOptions {
   priority?: string[] | null;
   start_date?: string[] | null;
   state?: string[] | null;
-  state_group?: TStateGroups[] | null;
+  state_group?: string[] | null;
   subscriber?: string[] | null;
   target_date?: string[] | null;
+  project?: string[] | null;
 }
 
 export interface IIssueDisplayFilterOptions {
-  calendar_date_range?: string;
   group_by?: TIssueGroupByOptions;
   layout?: TIssueViewOptions;
   order_by?: TIssueOrderByOptions;

web/types/views.d.ts

@@ -1,3 +1,5 @@
+import { IIssueFilterOptions } from "./view-props";
+
 export interface IView {
   id: string;
   access: string;
@@ -8,10 +10,15 @@ export interface IView {
   updated_by: string;
   name: string;
   description: string;
-  query: IQuery;
-  query_data: IQuery;
+  query: IIssueFilterOptions;
+  query_data: IIssueFilterOptions;
   project: string;
   workspace: string;
+  workspace_detail: {
+    id: string;
+    name: string;
+    slug: string;
+  };
 }
 
 export interface IQuery {
@@ -23,4 +30,5 @@ export interface IQuery {
   start_date: string[] | null;
   target_date: string[] | null;
   type: "active" | "backlog" | null;
+  project: string[] | null;
 }

web/types/workspace.d.ts

@@ -1,13 +1,4 @@
-import type {
-  IIssueFilterOptions,
-  IProjectMember,
-  IUser,
-  IUserMemberLite,
-  IWorkspaceViewProps,
-  TIssueGroupByOptions,
-  TIssueOrderByOptions,
-  TIssueViewOptions,
-} from "types";
+import type { IProjectMember, IUser, IUserMemberLite, IWorkspaceViewProps } from "types";
 
 export interface IWorkspace {
   readonly id: string;