feat: redirecting to same protected route after signin, fix: id showing up in kanban view

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 {

apps/app/components/project/issues/BoardView/SingleBoard.tsx

@@ -42,8 +42,8 @@ type Props = {
     >
   >;
   bgColor?: string;
-  stateId?: string;
+  stateId: string | null;
-  createdBy?: string;
+  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",
                         });

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
+                            selectedGroup === "created_by"
-                              ? members?.find((m) => m.member.id === singleGroup)?.member.first_name
+                              ? members?.find((m) => m.member.id === singleGroup)?.member
-                              : undefined
+                                  .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
+                              ? states?.find((s) => s.name === singleGroup)?.id ?? null
-                              : undefined
+                              : null
                           }
                           bgColor={
                             selectedGroup === "state_detail.name"

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;
+export default ListView;

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 =

apps/app/lib/hooks/useIssuesFilter.tsx

@@ -78,6 +78,10 @@ const useIssuesFilter = (projectIssues?: IssueResponse) => {
     }
   }
 
+  if (groupByProperty === "priority" && orderBy === "priority") {
+    setOrderBy(null);
+  }
+
   return {
     groupedByIssues,
     issueView,

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,
 };
 

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">

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,

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;
+export default ProjectSettings;

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("/");
+      const nextLocation = router.asPath.split("?next=")[1];
-      else router.push("/invitations");
+
+      if (nextLocation) {
+        router.push(nextLocation as string);
+      } else {
+        if (res.user.is_onboarded) router.push("/");
+        else router.push("/invitations");
+      }
     },
     [mutateUser, mutateWorkspaces, router]
   );

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;
 };