chore: handled ui and preloading in init page (#4491)

space/components/issues/navbar/controls.tsx

@@ -118,7 +118,9 @@ export const NavbarControls: FC<NavbarControlsProps> = observer((props) => {
       {user?.id ? (
         <div className="flex items-center gap-2 rounded border border-custom-border-200 p-2">
           <Avatar name={user?.display_name} src={user?.avatar ?? undefined} shape="square" size="sm" />
-          <h6 className="text-xs font-medium">{user.display_name}</h6>
+          <h6 className="text-xs font-medium">
+            {user?.display_name || `${user?.first_name} ${user?.first_name}` || user?.email || "User"}
+          </h6>
         </div>
       ) : (
         <div className="flex-shrink-0">

space/components/views/project-details.tsx

@@ -36,8 +36,7 @@ export const ProjectDetailsView: FC<ProjectDetailsViewProps> = observer((props)
   // hooks
   const { fetchProjectSettings } = useProject();
   const { issueFilters } = useIssueFilter();
-  const { loader, issues, error } = useIssue();
+  const { loader, issues, error, fetchPublicIssues } = useIssue();
-  const { fetchPublicIssues } = useIssue();
   const issueDetailStore = useIssueDetails();
   const { data: currentUser, fetchCurrentUser } = useUser();
 
@@ -51,12 +50,10 @@ export const ProjectDetailsView: FC<ProjectDetailsViewProps> = observer((props)
       ? () => fetchPublicIssues(workspaceSlug, projectId, { states, priority, labels })
       : null
   );
-
+  useSWR(
-  useEffect(() => {
+    workspaceSlug && projectId && !currentUser ? "WORKSPACE_PROJECT_CURRENT_USER" : null,
-    if (!currentUser) {
+    workspaceSlug && projectId && !currentUser ? () => fetchCurrentUser() : null
-      fetchCurrentUser();
+  );
-    }
-  }, [currentUser, fetchCurrentUser]);
 
   useEffect(() => {
     if (peekId && workspaceSlug && projectId) {

space/store/project.store.ts

@@ -1,19 +1,19 @@
 // mobx
-import { observable, action, makeObservable, runInAction } from "mobx";
+import { observable, action, makeObservable, runInAction, computed } from "mobx";
 // service
 import ProjectService from "@/services/project.service";
 // store types
 import { RootStore } from "@/store/root.store";
 // types
-import { IWorkspace, IProject, IProjectSettings } from "@/types/project";
+import { TWorkspaceDetails, TProjectDetails, TProjectSettings } from "@/types/project";
 
 export interface IProjectStore {
   // observables
   loader: boolean;
-  error: any | null;
+  error: any | undefined;
-  workspace: IWorkspace | null;
+  settings: TProjectSettings | undefined;
-  project: IProject | null;
+  workspace: TWorkspaceDetails | undefined;
-  settings: IProjectSettings | null;
+  project: TProjectDetails | undefined;
   canReact: boolean;
   canComment: boolean;
   canVote: boolean;
@@ -25,13 +25,10 @@ export interface IProjectStore {
 export class ProjectStore implements IProjectStore {
   // observables
   loader: boolean = false;
-  error: any | null = null;
+  error: any | undefined = undefined;
-  workspace: IWorkspace | null = null;
+  settings: TProjectSettings | undefined = undefined;
-  project: IProject | null = null;
+  workspace: TWorkspaceDetails | undefined = undefined;
-  settings: IProjectSettings | null = null;
+  project: TProjectDetails | undefined = undefined;
-  canReact: boolean = false;
-  canComment: boolean = false;
-  canVote: boolean = false;
   // service
   projectService;
 
@@ -44,28 +41,28 @@ export class ProjectStore implements IProjectStore {
       workspace: observable,
       project: observable,
       settings: observable,
-      canReact: observable.ref,
+      // computed
-      canComment: observable.ref,
+      canReact: computed,
-      canVote: observable.ref,
+      canComment: computed,
+      canVote: computed,
       // actions
       fetchProjectSettings: action,
-
       hydrate: action,
-      // computed
     });
-
     // services
     this.projectService = new ProjectService();
   }
 
-  hydrate = (projectSettings: any) => {
+  // computed
-    const { workspace_detail, project_details, votes, comments, reactions } = projectSettings;
+  get canReact() {
-    this.workspace = workspace_detail;
+    return this.settings?.reactions ?? false;
-    this.project = project_details;
+  }
-    this.canComment = comments;
+  get canComment() {
-    this.canVote = votes;
+    return this.settings?.comments ?? false;
-    this.canReact = reactions;
+  }
-  };
+  get canVote() {
+    return this.settings?.votes ?? false;
+  }
 
   fetchProjectSettings = async (workspace_slug: string, project_slug: string) => {
     try {
@@ -75,14 +72,11 @@ export class ProjectStore implements IProjectStore {
       const response = await this.projectService.getProjectSettings(workspace_slug, project_slug);
 
       if (response) {
-        const currentProject: IProject = { ...response?.project_details };
-        const currentWorkspace: IWorkspace = { ...response?.workspace_detail };
-        const currentDeploySettings = { ...response };
         this.store.issueFilter.updateLayoutOptions(response?.views);
         runInAction(() => {
-          this.project = currentProject;
+          this.project = response?.project_details;
-          this.workspace = currentWorkspace;
+          this.workspace = response?.workspace_detail;
-          this.settings = currentDeploySettings;
+          this.settings = response;
           this.loader = false;
         });
       }
@@ -93,4 +87,10 @@ export class ProjectStore implements IProjectStore {
       return error;
     }
   };
+
+  hydrate = (projectSettings: TProjectSettings) => {
+    const { workspace_detail, project_details } = projectSettings;
+    this.workspace = workspace_detail;
+    this.project = project_details;
+  };
 }

space/store/root.store.ts

@@ -32,8 +32,8 @@ export class RootStore {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   hydrate = (data: any) => {
     if (!data) return;
-    this.instance.hydrate(data?.instance || {});
+    this.instance.hydrate(data?.instance || undefined);
-    this.user.hydrate(data?.user || {});
+    this.user.hydrate(data?.user || undefined);
   };
 
   reset = () => {

space/store/user.store.ts

@@ -29,7 +29,7 @@ export interface IUserStore {
   // actions
   fetchCurrentUser: () => Promise<IUser | undefined>;
   updateCurrentUser: (data: Partial<IUser>) => Promise<IUser | undefined>;
-  hydrate: (data: IUser) => void;
+  hydrate: (data: IUser | undefined) => void;
   reset: () => void;
   signOut: () => Promise<void>;
 }
@@ -91,7 +91,7 @@ export class UserStore implements IUserStore {
   fetchCurrentUser = async (): Promise<IUser> => {
     try {
       runInAction(() => {
-        this.isLoading = true;
+        if (this.data === undefined) this.isLoading = true;
         this.error = undefined;
       });
       const user = await this.userService.currentUser();
@@ -155,7 +155,8 @@ export class UserStore implements IUserStore {
     }
   };
 
-  hydrate = (data: IUser): void => {
+  hydrate = (data: IUser | undefined): void => {
+    if (!data) return;
     this.data = { ...this.data, ...data };
   };
 

space/styles/globals.css

@@ -329,3 +329,11 @@
   height: 0 !important;
   width: 0 !important;
 }
+
+/* By applying below class, the autofilled text in form fields will not have the default autofill background color and styles applied by WebKit browsers  */
+.disable-autofill-style:-webkit-autofill,
+.disable-autofill-style:-webkit-autofill:hover,
+.disable-autofill-style:-webkit-autofill:focus,
+.disable-autofill-style:-webkit-autofill:active {
+  -webkit-background-clip: text;
+}

space/types/project.d.ts

@@ -1,29 +1,42 @@
 import { TProjectLogoProps } from "@plane/types";
 
-export interface IWorkspace {
+export type TWorkspaceDetails = {
-  id: string;
   name: string;
   slug: string;
-}
+  id: string;
+};
 
-export interface IProject {
+export type TViewDetails = {
+  list: boolean;
+  gantt: boolean;
+  kanban: boolean;
+  calendar: boolean;
+  spreadsheet: boolean;
+};
+
+export type TProjectDetails = {
   id: string;
   identifier: string;
   name: string;
-  description: string;
+  cover_image: string | undefined;
-  cover_image: string | null;
   logo_props: TProjectLogoProps;
-}
+  description: string;
+};
 
-export interface IProjectSettings {
+export type TProjectSettings = {
+  id: string;
+  anchor: string;
   comments: boolean;
   reactions: boolean;
   votes: boolean;
-  views: {
+  inbox: unknown;
-    list: boolean;
+  workspace: string;
-    gantt: boolean;
+  workspace_detail: TWorkspaceDetails;
-    kanban: boolean;
+  project: string;
-    calendar: boolean;
+  project_details: TProjectDetails;
-    spreadsheet: boolean;
+  views: TViewDetails;
-  };
+  created_by: string;
-}
+  updated_by: string;
+  created_at: string;
+  updated_at: string;
+};

web/styles/globals.css

@@ -668,7 +668,6 @@ div.web-view-spinner div.bar12 {
 }
 
 /* By applying below class, the autofilled text in form fields will not have the default autofill background color and styles applied by WebKit browsers  */
-
 .disable-autofill-style:-webkit-autofill,
 .disable-autofill-style:-webkit-autofill:hover,
 .disable-autofill-style:-webkit-autofill:focus,