From e4de5e62c9630ed609c94b2cdee51ceb8f1dda4b Mon Sep 17 00:00:00 2001
From: Dakshesh Jain <dakshesh.jain14@gmail.com>
Date: Wed, 7 Dec 2022 10:15:57 +0530
Subject: [PATCH 1/2] fix: projects page flickering, mutation of workspace
 members

---
 .../components/project/CreateProjectModal.tsx | 55 +++++++++++++++++--
 .../project/SendProjectInvitationModal.tsx    |  2 +-
 .../issue-detail/IssueDetailSidebar.tsx       |  2 +-
 .../components/project/memberInvitations.tsx  | 34 +++++++++---
 apps/app/constants/fetch-keys.ts              |  2 +-
 apps/app/layouts/Navbar/Sidebar.tsx           | 17 +++++-
 apps/app/lib/services/project.service.ts      |  2 +-
 .../pages/projects/[projectId]/members.tsx    |  6 +-
 .../pages/projects/[projectId]/settings.tsx   |  2 +-
 apps/app/pages/workspace/members.tsx          |  6 +-
 10 files changed, 101 insertions(+), 27 deletions(-)

diff --git a/apps/app/components/project/CreateProjectModal.tsx b/apps/app/components/project/CreateProjectModal.tsx
index 2010170c7..6402829dc 100644
--- a/apps/app/components/project/CreateProjectModal.tsx
+++ b/apps/app/components/project/CreateProjectModal.tsx
@@ -1,14 +1,15 @@
 import React, { useState, useEffect, useCallback } from "react";
 // swr
-import { mutate } from "swr";
+import useSWR, { mutate } from "swr";
 // react hook form
 import { useForm } from "react-hook-form";
 // headless
 import { Dialog, Transition } from "@headlessui/react";
 // services
 import projectServices from "lib/services/project.service";
+import workspaceService from "lib/services/workspace.service";
 // fetch keys
-import { PROJECTS_LIST } from "constants/fetch-keys";
+import { PROJECTS_LIST, WORKSPACE_MEMBERS } from "constants/fetch-keys";
 // hooks
 import useUser from "lib/hooks/useUser";
 import useToast from "lib/hooks/useToast";
@@ -17,7 +18,7 @@ import { Button, Input, TextArea, Select } from "ui";
 // common
 import { debounce } from "constants/common";
 // types
-import { IProject } from "types";
+import { IProject, WorkspaceMember } from "types";
 
 type Props = {
   isOpen: boolean;
@@ -31,6 +32,23 @@ const defaultValues: Partial<IProject> = {
   description: "",
 };
 
+const IsGuestCondition: React.FC<{
+  setIsOpen: React.Dispatch<React.SetStateAction<boolean>>;
+}> = ({ setIsOpen }) => {
+  const { setToastAlert } = useToast();
+
+  useEffect(() => {
+    setIsOpen(false);
+    setToastAlert({
+      title: "Error",
+      type: "error",
+      message: "You don't have permission to create project.",
+    });
+  }, []);
+
+  return null;
+};
+
 const CreateProjectModal: React.FC<Props> = ({ isOpen, setIsOpen }) => {
   const handleClose = () => {
     setIsOpen(false);
@@ -40,7 +58,12 @@ const CreateProjectModal: React.FC<Props> = ({ isOpen, setIsOpen }) => {
     }, 500);
   };
 
-  const { activeWorkspace } = useUser();
+  const { activeWorkspace, user } = useUser();
+
+  const { data: workspaceMembers } = useSWR<WorkspaceMember[]>(
+    activeWorkspace ? WORKSPACE_MEMBERS(activeWorkspace.slug) : null,
+    activeWorkspace ? () => workspaceService.workspaceMembers(activeWorkspace.slug) : null
+  );
 
   const { setToastAlert } = useToast();
 
@@ -56,6 +79,8 @@ const CreateProjectModal: React.FC<Props> = ({ isOpen, setIsOpen }) => {
     setValue,
   } = useForm<IProject>({
     defaultValues,
+    reValidateMode: "onChange",
+    mode: "all",
   });
 
   const onSubmit = async (formData: IProject) => {
@@ -77,6 +102,15 @@ const CreateProjectModal: React.FC<Props> = ({ isOpen, setIsOpen }) => {
         handleClose();
       })
       .catch((err) => {
+        if (err.status === 403) {
+          setToastAlert({
+            title: "Error",
+            type: "error",
+            message: "You don't have permission to create project.",
+          });
+          handleClose();
+          return;
+        }
         Object.keys(err).map((key) => {
           const errorMessages = err[key];
           setError(key as keyof IProject, {
@@ -105,6 +139,15 @@ const CreateProjectModal: React.FC<Props> = ({ isOpen, setIsOpen }) => {
     }
   }, [projectName, projectIdentifier, setValue, isChangeIdentifierRequired]);
 
+  if (workspaceMembers) {
+    const isMember = workspaceMembers.find((member) => member.member.id === user?.id);
+    const isGuest = workspaceMembers.find(
+      (member) => member.member.id === user?.id && member.role === 5
+    );
+
+    if ((!isMember || isGuest) && isOpen) return <IsGuestCondition setIsOpen={setIsOpen} />;
+  }
+
   return (
     <Transition.Root show={isOpen} as={React.Fragment}>
       <Dialog as="div" className="relative z-10" onClose={handleClose}>
@@ -203,8 +246,8 @@ const CreateProjectModal: React.FC<Props> = ({ isOpen, setIsOpen }) => {
                               message: "Identifier must at least be of 1 character",
                             },
                             maxLength: {
-                              value: 9,
-                              message: "Identifier must at most be of 9 characters",
+                              value: 5,
+                              message: "Identifier must at most be of 5 characters",
                             },
                           }}
                         />
diff --git a/apps/app/components/project/SendProjectInvitationModal.tsx b/apps/app/components/project/SendProjectInvitationModal.tsx
index a01d36658..7bac94fa2 100644
--- a/apps/app/components/project/SendProjectInvitationModal.tsx
+++ b/apps/app/components/project/SendProjectInvitationModal.tsx
@@ -50,7 +50,7 @@ const SendProjectInvitationModal: React.FC<Props> = ({ isOpen, setIsOpen, member
   const { setToastAlert } = useToast();
 
   const { data: people } = useSWR<WorkspaceMember[]>(
-    activeWorkspace ? WORKSPACE_MEMBERS : null,
+    activeWorkspace ? WORKSPACE_MEMBERS(activeWorkspace.slug) : null,
     activeWorkspace ? () => workspaceService.workspaceMembers(activeWorkspace.slug) : null
   );
 
diff --git a/apps/app/components/project/issues/issue-detail/IssueDetailSidebar.tsx b/apps/app/components/project/issues/issue-detail/IssueDetailSidebar.tsx
index 68f2f91eb..9516c4238 100644
--- a/apps/app/components/project/issues/issue-detail/IssueDetailSidebar.tsx
+++ b/apps/app/components/project/issues/issue-detail/IssueDetailSidebar.tsx
@@ -68,7 +68,7 @@ const IssueDetailSidebar: React.FC<Props> = ({ control, submitChanges, issueDeta
   );
 
   const { data: people } = useSWR<WorkspaceMember[]>(
-    activeWorkspace ? WORKSPACE_MEMBERS : null,
+    activeWorkspace ? WORKSPACE_MEMBERS(activeWorkspace.slug) : null,
     activeWorkspace ? () => workspaceService.workspaceMembers(activeWorkspace.slug) : null
   );
 
diff --git a/apps/app/components/project/memberInvitations.tsx b/apps/app/components/project/memberInvitations.tsx
index dc7f3af69..46804695f 100644
--- a/apps/app/components/project/memberInvitations.tsx
+++ b/apps/app/components/project/memberInvitations.tsx
@@ -3,10 +3,14 @@ import React, { useState } from "react";
 // next
 import Link from "next/link";
 import useSWR from "swr";
-import _ from "lodash";
+// hooks
 import useUser from "lib/hooks/useUser";
 // Services
 import projectService from "lib/services/project.service";
+// fetch keys
+import { PROJECT_MEMBERS } from "constants/fetch-keys";
+// commons
+import { renderShortNumericDateFormat } from "constants/common";
 // icons
 import {
   CalendarDaysIcon,
@@ -17,25 +21,41 @@ import {
   PlusIcon,
   TrashIcon,
 } from "@heroicons/react/24/outline";
-import { renderShortNumericDateFormat } from "constants/common";
+// types
+import type { IProject } from "types";
+type Props = {
+  project: IProject;
+  slug: string;
+  invitationsRespond: string[];
+  handleInvitation: (project_invitation: any, action: "accepted" | "withdraw") => void;
+  setDeleteProject: React.Dispatch<React.SetStateAction<IProject | undefined>>;
+};
 
-const ProjectMemberInvitations = ({
+const ProjectMemberInvitations: React.FC<Props> = ({
   project,
   slug,
   invitationsRespond,
   handleInvitation,
   setDeleteProject,
-}: any) => {
+}) => {
   const { user } = useUser();
-  const { data: members } = useSWR("PROJECT_MEMBERS", () =>
+
+  const { data: members } = useSWR<any[]>(PROJECT_MEMBERS(project.id), () =>
     projectService.projectMembers(slug, project.id)
   );
 
-  const isMember =
-    _.filter(members, (item: any) => item.member.id === (user as any).id).length === 1;
+  const isMember = members?.some((item: any) => item.member.id === (user as any)?.id);
 
   const [selected, setSelected] = useState<any>(false);
 
+  if (!members) {
+    return (
+      <div className="w-full h-36 flex flex-col px-4 py-3 rounded-md bg-white">
+        <div className="w-full h-full bg-gray-50 animate-pulse" />
+      </div>
+    );
+  }
+
   return (
     <>
       <div
diff --git a/apps/app/constants/fetch-keys.ts b/apps/app/constants/fetch-keys.ts
index 96ae1d1f5..b8dfa5618 100644
--- a/apps/app/constants/fetch-keys.ts
+++ b/apps/app/constants/fetch-keys.ts
@@ -2,7 +2,7 @@ export const CURRENT_USER = "CURRENT_USER";
 export const USER_WORKSPACE_INVITATIONS = "USER_WORKSPACE_INVITATIONS";
 export const USER_WORKSPACES = "USER_WORKSPACES";
 
-export const WORKSPACE_MEMBERS = "WORKSPACE_MEMBERS";
+export const WORKSPACE_MEMBERS = (workspaceSlug: string) => `WORKSPACE_MEMBERS_${workspaceSlug}`;
 export const WORKSPACE_INVITATIONS = "WORKSPACE_INVITATIONS";
 export const WORKSPACE_INVITATION = "WORKSPACE_INVITATION";
 
diff --git a/apps/app/layouts/Navbar/Sidebar.tsx b/apps/app/layouts/Navbar/Sidebar.tsx
index eb90d65bc..0c299860e 100644
--- a/apps/app/layouts/Navbar/Sidebar.tsx
+++ b/apps/app/layouts/Navbar/Sidebar.tsx
@@ -9,6 +9,7 @@ import authenticationService from "lib/services/authentication.service";
 // hooks
 import useUser from "lib/hooks/useUser";
 import useTheme from "lib/hooks/useTheme";
+import useToast from "lib/hooks/useToast";
 // components
 import CreateProjectModal from "components/project/CreateProjectModal";
 // headless ui
@@ -119,6 +120,8 @@ const Sidebar: React.FC = () => {
 
   const { collapsed: sidebarCollapse, toggleCollapsed } = useTheme();
 
+  const { setToastAlert } = useToast();
+
   return (
     <nav className="h-full">
       <CreateProjectModal isOpen={isCreateProjectModal} setIsOpen={setCreateProjectModal} />
@@ -282,9 +285,11 @@ const Sidebar: React.FC = () => {
                                             last_workspace_id: workspace?.id,
                                           })
                                           .then((res) => {
-                                            router.push("/workspace");
+                                            const isInProject =
+                                              router.pathname.includes("/[projectId]/");
+                                            if (isInProject) router.push("/workspace");
                                           })
-                                          .catch((err) => console.log);
+                                          .catch((err) => console.error(err));
                                       }}
                                       className={`${
                                         active ? "bg-theme text-white" : "text-gray-900"
@@ -479,7 +484,13 @@ const Sidebar: React.FC = () => {
                                               onClick={() =>
                                                 copyTextToClipboard(
                                                   `https://app.plane.so/projects/${project?.id}/issues/`
-                                                )
+                                                ).then(() => {
+                                                  setToastAlert({
+                                                    title: "Link Copied",
+                                                    message: "Link copied to clipboard",
+                                                    type: "success",
+                                                  });
+                                                })
                                               }
                                             >
                                               <ClipboardDocumentIcon className="h-3 w-3" />
diff --git a/apps/app/lib/services/project.service.ts b/apps/app/lib/services/project.service.ts
index 107bca15f..9d0ab3d04 100644
--- a/apps/app/lib/services/project.service.ts
+++ b/apps/app/lib/services/project.service.ts
@@ -27,7 +27,7 @@ class ProjectServices extends APIService {
         return response?.data;
       })
       .catch((error) => {
-        throw error?.response?.data;
+        throw error?.response;
       });
   }
 
diff --git a/apps/app/pages/projects/[projectId]/members.tsx b/apps/app/pages/projects/[projectId]/members.tsx
index 5352b39eb..9d80d0ab1 100644
--- a/apps/app/pages/projects/[projectId]/members.tsx
+++ b/apps/app/pages/projects/[projectId]/members.tsx
@@ -235,7 +235,7 @@ const ProjectMembers: NextPage = () => {
                       )}
                     </td>
                     <td className="whitespace-nowrap px-3 py-4 text-sm text-gray-500 sm:pl-6">
-                      {member.status ? (
+                      {member.member ? (
                         <span className="p-0.5 px-2 text-sm bg-green-700 text-white rounded-full">
                           Active
                         </span>
@@ -261,7 +261,7 @@ const ProjectMembers: NextPage = () => {
                                 className="w-full text-left py-2 pl-2"
                                 type="button"
                                 onClick={() => {
-                                  if (!member.status) {
+                                  if (!member.member) {
                                     setToastAlert({
                                       type: "error",
                                       message: "You can't edit a pending invitation.",
@@ -282,7 +282,7 @@ const ProjectMembers: NextPage = () => {
                                 className="w-full text-left py-2 pl-2"
                                 type="button"
                                 onClick={() => {
-                                  if (member.status) {
+                                  if (member.member) {
                                     setSelectedRemoveMember(member.id);
                                   } else {
                                     setSelectedInviteRemoveMember(member.id);
diff --git a/apps/app/pages/projects/[projectId]/settings.tsx b/apps/app/pages/projects/[projectId]/settings.tsx
index b81dc29d8..5eeeffe36 100644
--- a/apps/app/pages/projects/[projectId]/settings.tsx
+++ b/apps/app/pages/projects/[projectId]/settings.tsx
@@ -78,7 +78,7 @@ const ProjectSettings: NextPage = () => {
   );
 
   const { data: people } = useSWR<WorkspaceMember[]>(
-    activeWorkspace ? WORKSPACE_MEMBERS : null,
+    activeWorkspace ? WORKSPACE_MEMBERS(activeWorkspace.slug) : null,
     activeWorkspace ? () => workspaceService.workspaceMembers(activeWorkspace.slug) : null
   );
 
diff --git a/apps/app/pages/workspace/members.tsx b/apps/app/pages/workspace/members.tsx
index dbca98178..417bbb8ca 100644
--- a/apps/app/pages/workspace/members.tsx
+++ b/apps/app/pages/workspace/members.tsx
@@ -41,7 +41,7 @@ const WorkspaceInvite: NextPage = () => {
   const { setToastAlert } = useToast();
 
   const { data: workspaceMembers, mutate: mutateMembers } = useSWR<any[]>(
-    activeWorkspace ? WORKSPACE_MEMBERS : null,
+    activeWorkspace ? WORKSPACE_MEMBERS(activeWorkspace.slug) : null,
     activeWorkspace ? () => workspaceService.workspaceMembers(activeWorkspace.slug) : null
   );
   const { data: workspaceInvitations, mutate: mutateInvitations } = useSWR<any[]>(
@@ -229,7 +229,7 @@ const WorkspaceInvite: NextPage = () => {
                         )}
                       </td>
                       <td className="whitespace-nowrap px-3 py-4 text-sm text-gray-500 sm:pl-6">
-                        {member.status ? (
+                        {member.member ? (
                           <span className="p-0.5 px-2 text-sm bg-green-700 text-white rounded-full">
                             Active
                           </span>
@@ -277,7 +277,7 @@ const WorkspaceInvite: NextPage = () => {
                                   className="w-full text-left py-2 pl-2"
                                   type="button"
                                   onClick={() => {
-                                    if (member.status) {
+                                    if (member.member) {
                                       setSelectedRemoveMember(member.id);
                                     } else {
                                       setSelectedInviteRemoveMember(member.id);

From 0d35845995f169ff8fccee294fc8c9620fef97eb Mon Sep 17 00:00:00 2001
From: Dakshesh Jain <dakshesh.jain14@gmail.com>
Date: Wed, 7 Dec 2022 20:05:12 +0530
Subject: [PATCH 2/2] feat: redirecting to same protected route after signin,
 fix: id showing up in kanban view

---
 .../project/SendProjectInvitationModal.tsx     |  8 +++++++-
 .../project/issues/BoardView/SingleBoard.tsx   | 18 ++++++++++--------
 .../project/issues/BoardView/index.tsx         | 11 ++++++-----
 .../project/issues/ListView/index.tsx          |  4 ++--
 apps/app/lib/hoc/withAuthWrapper.tsx           |  5 +++--
 apps/app/lib/hooks/useIssuesFilter.tsx         |  4 ++++
 apps/app/lib/hooks/useIssuesProperties.tsx     |  2 +-
 .../projects/[projectId]/issues/index.tsx      | 16 ++++++++++++----
 .../app/pages/projects/[projectId]/members.tsx |  8 +++++++-
 .../pages/projects/[projectId]/settings.tsx    | 10 ++++++++--
 apps/app/pages/signin.tsx                      | 10 ++++++++--
 apps/app/types/issues.d.ts                     |  2 +-
 12 files changed, 69 insertions(+), 29 deletions(-)

diff --git a/apps/app/components/project/SendProjectInvitationModal.tsx b/apps/app/components/project/SendProjectInvitationModal.tsx
index 7bac94fa2..0c0485803 100644
--- a/apps/app/components/project/SendProjectInvitationModal.tsx
+++ b/apps/app/components/project/SendProjectInvitationModal.tsx
@@ -51,7 +51,13 @@ const SendProjectInvitationModal: React.FC<Props> = ({ isOpen, setIsOpen, member
 
   const { data: people } = useSWR<WorkspaceMember[]>(
     activeWorkspace ? WORKSPACE_MEMBERS(activeWorkspace.slug) : null,
-    activeWorkspace ? () => workspaceService.workspaceMembers(activeWorkspace.slug) : null
+    activeWorkspace ? () => workspaceService.workspaceMembers(activeWorkspace.slug) : null,
+    {
+      onErrorRetry(err, _, __, revalidate, revalidateOpts) {
+        if (err?.status === 403) return;
+        setTimeout(() => revalidate(revalidateOpts), 5000);
+      },
+    }
   );
 
   const {
diff --git a/apps/app/components/project/issues/BoardView/SingleBoard.tsx b/apps/app/components/project/issues/BoardView/SingleBoard.tsx
index d3fca633e..6a55a761d 100644
--- a/apps/app/components/project/issues/BoardView/SingleBoard.tsx
+++ b/apps/app/components/project/issues/BoardView/SingleBoard.tsx
@@ -42,8 +42,8 @@ type Props = {
     >
   >;
   bgColor?: string;
-  stateId?: string;
-  createdBy?: string;
+  stateId: string | null;
+  createdBy: string | null;
 };
 
 const SingleBoard: React.FC<Props> = ({
@@ -109,7 +109,7 @@ const SingleBoard: React.FC<Props> = ({
                   <span
                     className={`w-3 h-3 block rounded-full ${!show ? "" : "mr-1"}`}
                     style={{
-                      backgroundColor: bgColor,
+                      backgroundColor: Boolean(bgColor) ? bgColor : undefined,
                     }}
                   />
                   <h2
@@ -151,7 +151,7 @@ const SingleBoard: React.FC<Props> = ({
                     setIsIssueOpen(true);
                     if (selectedGroup !== null)
                       setPreloadedData({
-                        state: stateId,
+                        state: stateId !== null ? stateId : undefined,
                         [selectedGroup]: groupTitle,
                         actionType: "createIssue",
                       });
@@ -201,10 +201,12 @@ const SingleBoard: React.FC<Props> = ({
                                           ? "text-xs text-black"
                                           : key === "priority"
                                           ? `text-xs bg-gray-200 px-2 py-1 mt-2 flex items-center gap-x-1 rounded w-min whitespace-nowrap capitalize font-medium ${
-                                              childIssue.priority === "high"
+                                              childIssue.priority === "urgent"
                                                 ? "bg-red-100 text-red-600"
+                                                : childIssue.priority === "high"
+                                                ? "bg-orange-100 text-orange-600"
                                                 : childIssue.priority === "medium"
-                                                ? "bg-orange-100 text-orange-500"
+                                                ? "bg-yellow-100 text-yellow-500"
                                                 : childIssue.priority === "low"
                                                 ? "bg-green-100 text-green-500"
                                                 : "hidden"
@@ -224,7 +226,7 @@ const SingleBoard: React.FC<Props> = ({
                                             : "None"}
                                         </span>
                                       )}
-                                      {key === "target_date" && (
+                                      {key === "due_date" && (
                                         <>
                                           <span
                                             className={`flex items-center gap-x-1 group ${
@@ -320,7 +322,7 @@ const SingleBoard: React.FC<Props> = ({
                       setIsIssueOpen(true);
                       if (selectedGroup !== null) {
                         setPreloadedData({
-                          state: stateId,
+                          state: stateId !== null ? stateId : undefined,
                           [selectedGroup]: groupTitle,
                           actionType: "createIssue",
                         });
diff --git a/apps/app/components/project/issues/BoardView/index.tsx b/apps/app/components/project/issues/BoardView/index.tsx
index 010b9cbdc..fe69a091e 100644
--- a/apps/app/components/project/issues/BoardView/index.tsx
+++ b/apps/app/components/project/issues/BoardView/index.tsx
@@ -197,9 +197,10 @@ const BoardView: React.FC<Props> = ({ properties, selectedGroup, groupedByIssues
                           selectedGroup={selectedGroup}
                           groupTitle={singleGroup}
                           createdBy={
-                            members
-                              ? members?.find((m) => m.member.id === singleGroup)?.member.first_name
-                              : undefined
+                            selectedGroup === "created_by"
+                              ? members?.find((m) => m.member.id === singleGroup)?.member
+                                  .first_name ?? "loading..."
+                              : null
                           }
                           groupedByIssues={groupedByIssues}
                           index={index}
@@ -208,8 +209,8 @@ const BoardView: React.FC<Props> = ({ properties, selectedGroup, groupedByIssues
                           setPreloadedData={setPreloadedData}
                           stateId={
                             selectedGroup === "state_detail.name"
-                              ? states?.find((s) => s.name === singleGroup)?.id
-                              : undefined
+                              ? states?.find((s) => s.name === singleGroup)?.id ?? null
+                              : null
                           }
                           bgColor={
                             selectedGroup === "state_detail.name"
diff --git a/apps/app/components/project/issues/ListView/index.tsx b/apps/app/components/project/issues/ListView/index.tsx
index 5bbe2ea84..625fd0689 100644
--- a/apps/app/components/project/issues/ListView/index.tsx
+++ b/apps/app/components/project/issues/ListView/index.tsx
@@ -384,7 +384,7 @@ const ListView: React.FC<Props> = ({
                                             )}
                                           </Listbox>
                                         </td>
-                                      ) : (key as keyof Properties) === "target_date" ? (
+                                      ) : (key as keyof Properties) === "due_date" ? (
                                         <td className="px-3 py-4 text-sm font-medium text-gray-900 whitespace-nowrap">
                                           {issue.target_date
                                             ? renderShortNumericDateFormat(issue.target_date)
@@ -440,4 +440,4 @@ const ListView: React.FC<Props> = ({
   );
 };
 
-export default ListView;
\ No newline at end of file
+export default ListView;
diff --git a/apps/app/lib/hoc/withAuthWrapper.tsx b/apps/app/lib/hoc/withAuthWrapper.tsx
index e14b63b7b..50e56c2ec 100644
--- a/apps/app/lib/hoc/withAuthWrapper.tsx
+++ b/apps/app/lib/hoc/withAuthWrapper.tsx
@@ -4,7 +4,7 @@ import type { NextPage } from "next";
 // redirect
 import redirect from "lib/redirect";
 
-const withAuth = (WrappedComponent: NextPage) => {
+const withAuth = (WrappedComponent: NextPage, getBackToSameRoute: boolean = true) => {
   const Wrapper: NextPage<any> = (props) => {
     return <WrappedComponent {...props} />;
   };
@@ -17,7 +17,8 @@ const withAuth = (WrappedComponent: NextPage) => {
     const token = cookies?.split("accessToken=")?.[1]?.split(";")?.[0];
 
     if (!token) {
-      redirect(ctx, "/signin");
+      if (getBackToSameRoute) redirect(ctx, "/signin?next=" + ctx?.asPath);
+      else redirect(ctx, "/signin");
     }
 
     const pageProps =
diff --git a/apps/app/lib/hooks/useIssuesFilter.tsx b/apps/app/lib/hooks/useIssuesFilter.tsx
index 4573f0214..3ebf1a2c7 100644
--- a/apps/app/lib/hooks/useIssuesFilter.tsx
+++ b/apps/app/lib/hooks/useIssuesFilter.tsx
@@ -78,6 +78,10 @@ const useIssuesFilter = (projectIssues?: IssueResponse) => {
     }
   }
 
+  if (groupByProperty === "priority" && orderBy === "priority") {
+    setOrderBy(null);
+  }
+
   return {
     groupedByIssues,
     issueView,
diff --git a/apps/app/lib/hooks/useIssuesProperties.tsx b/apps/app/lib/hooks/useIssuesProperties.tsx
index 068af7a79..518b204a6 100644
--- a/apps/app/lib/hooks/useIssuesProperties.tsx
+++ b/apps/app/lib/hooks/useIssuesProperties.tsx
@@ -16,7 +16,7 @@ const initialValues: Properties = {
   assignee: true,
   priority: false,
   start_date: false,
-  target_date: false,
+  due_date: false,
   cycle: false,
 };
 
diff --git a/apps/app/pages/projects/[projectId]/issues/index.tsx b/apps/app/pages/projects/[projectId]/issues/index.tsx
index 62cd3cab6..ce153b4db 100644
--- a/apps/app/pages/projects/[projectId]/issues/index.tsx
+++ b/apps/app/pages/projects/[projectId]/issues/index.tsx
@@ -87,10 +87,18 @@ const ProjectIssues: NextPage = () => {
   );
 
   const { data: members } = useSWR<ProjectMember[]>(
-    activeWorkspace && activeProject ? PROJECT_MEMBERS : null,
+    activeWorkspace && activeProject
+      ? PROJECT_MEMBERS(activeWorkspace.slug, activeProject.id)
+      : null,
     activeWorkspace && activeProject
       ? () => projectService.projectMembers(activeWorkspace.slug, activeProject.id)
-      : null
+      : null,
+    {
+      onErrorRetry(err, _, __, revalidate, revalidateOpts) {
+        if (err?.status === 403) return;
+        setTimeout(() => revalidate(revalidateOpts), 5000);
+      },
+    }
   );
 
   const {
@@ -173,7 +181,7 @@ const ProjectIssues: NextPage = () => {
                       <Popover.Button
                         className={classNames(
                           open ? "text-gray-900" : "text-gray-500",
-                          "group inline-flex items-center rounded-md bg-transparent text-base font-medium hover:text-gray-900 focus:outline-none border border-gray-300 px-3 py-1"
+                          "group inline-flex items-center rounded-md bg-transparent text-xs font-medium hover:text-gray-900 focus:outline-none border border-gray-300 px-2 py-2"
                         )}
                       >
                         <span>View</span>
@@ -195,7 +203,7 @@ const ProjectIssues: NextPage = () => {
                         leaveFrom="opacity-100 translate-y-0"
                         leaveTo="opacity-0 translate-y-1"
                       >
-                        <Popover.Panel className="absolute mr-5 right-1/2 z-10 mt-3 w-screen max-w-xs translate-x-1/2 transform px-2 sm:px-0 bg-gray-0 backdrop-filter backdrop-blur-xl bg-opacity-100 rounded-lg shadow-lg overflow-hidden">
+                        <Popover.Panel className="absolute mr-5 right-1/2 z-10 mt-3 w-screen max-w-xs translate-x-1/2 transform px-2 sm:px-0 bg-white rounded-lg shadow-lg overflow-hidden">
                           <div className="overflow-hidden py-8 px-4">
                             <div className="relative flex flex-col gap-1 gap-y-4">
                               <div className="flex justify-between">
diff --git a/apps/app/pages/projects/[projectId]/members.tsx b/apps/app/pages/projects/[projectId]/members.tsx
index 9d80d0ab1..f6d0ec9b4 100644
--- a/apps/app/pages/projects/[projectId]/members.tsx
+++ b/apps/app/pages/projects/[projectId]/members.tsx
@@ -53,7 +53,13 @@ const ProjectMembers: NextPage = () => {
     activeWorkspace && projectId ? PROJECT_MEMBERS(projectId as string) : null,
     activeWorkspace && projectId
       ? () => projectService.projectMembers(activeWorkspace.slug, projectId as any)
-      : null
+      : null,
+    {
+      onErrorRetry(err, _, __, revalidate, revalidateOpts) {
+        if (err?.status === 403) return;
+        setTimeout(() => revalidate(revalidateOpts), 5000);
+      },
+    }
   );
   const { data: projectInvitations, mutate: mutateInvitations } = useSWR(
     activeWorkspace && projectId ? PROJECT_INVITATIONS : null,
diff --git a/apps/app/pages/projects/[projectId]/settings.tsx b/apps/app/pages/projects/[projectId]/settings.tsx
index 0e205348f..264ec1b3a 100644
--- a/apps/app/pages/projects/[projectId]/settings.tsx
+++ b/apps/app/pages/projects/[projectId]/settings.tsx
@@ -79,7 +79,13 @@ const ProjectSettings: NextPage = () => {
 
   const { data: people } = useSWR<WorkspaceMember[]>(
     activeWorkspace ? WORKSPACE_MEMBERS(activeWorkspace.slug) : null,
-    activeWorkspace ? () => workspaceService.workspaceMembers(activeWorkspace.slug) : null
+    activeWorkspace ? () => workspaceService.workspaceMembers(activeWorkspace.slug) : null,
+    {
+      onErrorRetry(err, _, __, revalidate, revalidateOpts) {
+        if (err?.status === 403) return;
+        setTimeout(() => revalidate(revalidateOpts), 5000);
+      },
+    }
   );
 
   useEffect(() => {
@@ -541,4 +547,4 @@ const ProjectSettings: NextPage = () => {
   );
 };
 
-export default ProjectSettings;
\ No newline at end of file
+export default ProjectSettings;
diff --git a/apps/app/pages/signin.tsx b/apps/app/pages/signin.tsx
index 1d3a33a98..79fe5bff2 100644
--- a/apps/app/pages/signin.tsx
+++ b/apps/app/pages/signin.tsx
@@ -43,8 +43,14 @@ const SignIn: NextPage = () => {
     async (res: any) => {
       await mutateUser();
       await mutateWorkspaces();
-      if (res.user.is_onboarded) router.push("/");
-      else router.push("/invitations");
+      const nextLocation = router.asPath.split("?next=")[1];
+
+      if (nextLocation) {
+        router.push(nextLocation as string);
+      } else {
+        if (res.user.is_onboarded) router.push("/");
+        else router.push("/invitations");
+      }
     },
     [mutateUser, mutateWorkspaces, router]
   );
diff --git a/apps/app/types/issues.d.ts b/apps/app/types/issues.d.ts
index 5d174dde2..19f05e680 100644
--- a/apps/app/types/issues.d.ts
+++ b/apps/app/types/issues.d.ts
@@ -102,7 +102,7 @@ export type Properties = {
   assignee: boolean;
   priority: boolean;
   start_date: boolean;
-  target_date: boolean;
+  due_date: boolean;
   cycle: boolean;
 };