From b01228073d3fa7ebececbfa5aa69cf02bb424d95 Mon Sep 17 00:00:00 2001
From: Plane Bot <146718762+plane-bot@users.noreply.github.com>
Date: Thu, 12 Sep 2024 17:00:48 +0530
Subject: [PATCH] sync: community changes (#1109)

* fix: issue properties dropdown (#5592)

* fix: not authorized flicker (#5593)

---------

Co-authored-by: Anmol Singh Bhatia <121005188+anmolsinghbhatia@users.noreply.github.com>
Co-authored-by: sriram veeraghanta <veeraghanta.sriram@gmail.com>
---
 web/core/components/dropdowns/cycle/index.tsx               | 2 ++
 web/core/components/dropdowns/date-range.tsx                | 1 +
 web/core/components/dropdowns/date.tsx                      | 1 +
 web/core/components/dropdowns/estimate.tsx                  | 2 ++
 web/core/components/dropdowns/member/index.tsx              | 2 ++
 web/core/components/dropdowns/module/index.tsx              | 2 ++
 web/core/components/dropdowns/priority.tsx                  | 2 ++
 web/core/components/dropdowns/project.tsx                   | 2 ++
 web/core/components/dropdowns/state.tsx                     | 2 ++
 .../components/issues/issue-layouts/properties/labels.tsx   | 1 +
 web/core/layouts/auth-layout/workspace-wrapper.tsx          | 4 ++--
 web/core/store/user/permissions.store.ts                    | 6 ++++++
 12 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/web/core/components/dropdowns/cycle/index.tsx b/web/core/components/dropdowns/cycle/index.tsx
index 682767d3b2..0f379e40db 100644
--- a/web/core/components/dropdowns/cycle/index.tsx
+++ b/web/core/components/dropdowns/cycle/index.tsx
@@ -84,6 +84,7 @@ export const CycleDropdown: React.FC<Props> = observer((props) => {
             buttonContainerClassName
           )}
           onClick={handleOnClick}
+          disabled={disabled}
         >
           {button}
         </button>
@@ -100,6 +101,7 @@ export const CycleDropdown: React.FC<Props> = observer((props) => {
             buttonContainerClassName
           )}
           onClick={handleOnClick}
+          disabled={disabled}
         >
           <DropdownButton
             className={buttonClassName}
diff --git a/web/core/components/dropdowns/date-range.tsx b/web/core/components/dropdowns/date-range.tsx
index 1681d195fd..c9e04fcfeb 100644
--- a/web/core/components/dropdowns/date-range.tsx
+++ b/web/core/components/dropdowns/date-range.tsx
@@ -146,6 +146,7 @@ export const DateRangeDropdown: React.FC<Props> = (props) => {
         buttonContainerClassName
       )}
       onClick={handleOnClick}
+      disabled={disabled}
     >
       <DropdownButton
         className={buttonClassName}
diff --git a/web/core/components/dropdowns/date.tsx b/web/core/components/dropdowns/date.tsx
index 9dba53ef44..77ad7bc46b 100644
--- a/web/core/components/dropdowns/date.tsx
+++ b/web/core/components/dropdowns/date.tsx
@@ -115,6 +115,7 @@ export const DateDropdown: React.FC<Props> = (props) => {
       )}
       ref={setReferenceElement}
       onClick={handleOnClick}
+      disabled={disabled}
     >
       <DropdownButton
         className={buttonClassName}
diff --git a/web/core/components/dropdowns/estimate.tsx b/web/core/components/dropdowns/estimate.tsx
index a655e064f0..7428e67d70 100644
--- a/web/core/components/dropdowns/estimate.tsx
+++ b/web/core/components/dropdowns/estimate.tsx
@@ -154,6 +154,7 @@ export const EstimateDropdown: React.FC<Props> = observer((props) => {
           type="button"
           className={cn("clickable block h-full w-full outline-none", buttonContainerClassName)}
           onClick={handleOnClick}
+          disabled={disabled}
         >
           {button}
         </button>
@@ -170,6 +171,7 @@ export const EstimateDropdown: React.FC<Props> = observer((props) => {
             buttonContainerClassName
           )}
           onClick={handleOnClick}
+          disabled={disabled}
         >
           <DropdownButton
             className={buttonClassName}
diff --git a/web/core/components/dropdowns/member/index.tsx b/web/core/components/dropdowns/member/index.tsx
index 4d068e4239..1f6c91050c 100644
--- a/web/core/components/dropdowns/member/index.tsx
+++ b/web/core/components/dropdowns/member/index.tsx
@@ -106,6 +106,7 @@ export const MemberDropdown: React.FC<Props> = observer((props) => {
           type="button"
           className={cn("clickable block h-full w-full outline-none", buttonContainerClassName)}
           onClick={handleOnClick}
+          disabled={disabled}
         >
           {button}
         </button>
@@ -122,6 +123,7 @@ export const MemberDropdown: React.FC<Props> = observer((props) => {
             buttonContainerClassName
           )}
           onClick={handleOnClick}
+          disabled={disabled}
         >
           <DropdownButton
             className={cn("text-xs", buttonClassName)}
diff --git a/web/core/components/dropdowns/module/index.tsx b/web/core/components/dropdowns/module/index.tsx
index f4a46a1e27..9f0fa5e42a 100644
--- a/web/core/components/dropdowns/module/index.tsx
+++ b/web/core/components/dropdowns/module/index.tsx
@@ -234,6 +234,7 @@ export const ModuleDropdown: React.FC<Props> = observer((props) => {
             buttonContainerClassName
           )}
           onClick={handleOnClick}
+          disabled={disabled}
         >
           {button}
         </button>
@@ -250,6 +251,7 @@ export const ModuleDropdown: React.FC<Props> = observer((props) => {
             buttonContainerClassName
           )}
           onClick={handleOnClick}
+          disabled={disabled}
         >
           <DropdownButton
             className={buttonClassName}
diff --git a/web/core/components/dropdowns/priority.tsx b/web/core/components/dropdowns/priority.tsx
index cca621b952..fcdb6ded97 100644
--- a/web/core/components/dropdowns/priority.tsx
+++ b/web/core/components/dropdowns/priority.tsx
@@ -379,6 +379,7 @@ export const PriorityDropdown: React.FC<Props> = (props) => {
           type="button"
           className={cn("clickable block h-full w-full outline-none", buttonContainerClassName)}
           onClick={handleOnClick}
+          disabled={disabled}
         >
           {button}
         </button>
@@ -395,6 +396,7 @@ export const PriorityDropdown: React.FC<Props> = (props) => {
             buttonContainerClassName
           )}
           onClick={handleOnClick}
+          disabled={disabled}
         >
           <ButtonToRender
             priority={value ?? undefined}
diff --git a/web/core/components/dropdowns/project.tsx b/web/core/components/dropdowns/project.tsx
index 17180afdbb..55fb94e465 100644
--- a/web/core/components/dropdowns/project.tsx
+++ b/web/core/components/dropdowns/project.tsx
@@ -124,6 +124,7 @@ export const ProjectDropdown: React.FC<Props> = observer((props) => {
           type="button"
           className={cn("clickable block h-full w-full outline-none", buttonContainerClassName)}
           onClick={handleOnClick}
+          disabled={disabled}
         >
           {button}
         </button>
@@ -140,6 +141,7 @@ export const ProjectDropdown: React.FC<Props> = observer((props) => {
             buttonContainerClassName
           )}
           onClick={handleOnClick}
+          disabled={disabled}
         >
           <DropdownButton
             className={buttonClassName}
diff --git a/web/core/components/dropdowns/state.tsx b/web/core/components/dropdowns/state.tsx
index ed72033a2e..b77b5d5cad 100644
--- a/web/core/components/dropdowns/state.tsx
+++ b/web/core/components/dropdowns/state.tsx
@@ -135,6 +135,7 @@ export const StateDropdown: React.FC<Props> = observer((props) => {
           type="button"
           className={cn("clickable block h-full w-full outline-none", buttonContainerClassName)}
           onClick={handleOnClick}
+          disabled={disabled}
         >
           {button}
         </button>
@@ -151,6 +152,7 @@ export const StateDropdown: React.FC<Props> = observer((props) => {
             buttonContainerClassName
           )}
           onClick={handleOnClick}
+          disabled={disabled}
         >
           <DropdownButton
             className={buttonClassName}
diff --git a/web/core/components/issues/issue-layouts/properties/labels.tsx b/web/core/components/issues/issue-layouts/properties/labels.tsx
index d0d0e217e0..4b241bfe2d 100644
--- a/web/core/components/issues/issue-layouts/properties/labels.tsx
+++ b/web/core/components/issues/issue-layouts/properties/labels.tsx
@@ -241,6 +241,7 @@ export const IssuePropertyLabels: React.FC<IIssuePropertyLabels> = observer((pro
             : "cursor-pointer hover:bg-custom-background-80"
       }  ${buttonClassName}`}
       onClick={handleOnClick}
+      disabled={disabled}
     >
       {label}
       {!hideDropdownArrow && !disabled && <ChevronDown className="h-3 w-3" aria-hidden="true" />}
diff --git a/web/core/layouts/auth-layout/workspace-wrapper.tsx b/web/core/layouts/auth-layout/workspace-wrapper.tsx
index 1712df8485..a1167a2f06 100644
--- a/web/core/layouts/auth-layout/workspace-wrapper.tsx
+++ b/web/core/layouts/auth-layout/workspace-wrapper.tsx
@@ -49,7 +49,7 @@ export const WorkspaceAuthWrapper: FC<IWorkspaceAuthWrapper> = observer((props)
 
   const { fetchAllIssueTypes } = useIssueTypes();
   const { isMobile } = usePlatformOS();
-  const { workspaceInfoBySlug, fetchUserWorkspaceInfo, fetchUserProjectPermissions, allowPermissions } =
+  const { loader, workspaceInfoBySlug, fetchUserWorkspaceInfo, fetchUserProjectPermissions, allowPermissions } =
     useUserPermissions();
   // derived values
   const canPerformWorkspaceMemberActions = allowPermissions(
@@ -141,7 +141,7 @@ export const WorkspaceAuthWrapper: FC<IWorkspaceAuthWrapper> = observer((props)
   const currentWorkspaceInfo = workspaceSlug && workspaceInfoBySlug(workspaceSlug.toString());
 
   // if list of workspaces are not there then we have to render the spinner
-  if ((flagsLoader && !flagsError) || allWorkspaces === undefined) {
+  if ((flagsLoader && !flagsError) || allWorkspaces === undefined || loader) {
     return (
       <div className="grid h-screen place-items-center bg-custom-background-100 p-4">
         <div className="flex flex-col items-center gap-3 text-center">
diff --git a/web/core/store/user/permissions.store.ts b/web/core/store/user/permissions.store.ts
index 0fd89af8e8..581d65bdd8 100644
--- a/web/core/store/user/permissions.store.ts
+++ b/web/core/store/user/permissions.store.ts
@@ -23,6 +23,7 @@ import { CoreRootStore } from "@/store/root.store";
 const workspaceService = new WorkspaceService();
 
 export interface IUserPermissionStore {
+  loader: boolean;
   // observables
   workspaceUserInfo: Record<string, IWorkspaceMemberMe>; // workspaceSlug -> IWorkspaceMemberMe
   projectUserInfo: Record<string, Record<string, IProjectMember>>; // workspaceSlug -> projectId -> IProjectMember
@@ -52,6 +53,7 @@ export interface IUserPermissionStore {
 }
 
 export class UserPermissionStore implements IUserPermissionStore {
+  loader: boolean = false;
   // constants
   workspaceUserInfo: Record<string, IWorkspaceMemberMe> = {};
   projectUserInfo: Record<string, Record<string, IProjectMember>> = {};
@@ -61,6 +63,7 @@ export class UserPermissionStore implements IUserPermissionStore {
   constructor(private store: CoreRootStore) {
     makeObservable(this, {
       // observables
+      loader: observable.ref,
       workspaceUserInfo: observable,
       projectUserInfo: observable,
       workspaceProjectsPermissions: observable,
@@ -156,15 +159,18 @@ export class UserPermissionStore implements IUserPermissionStore {
    */
   fetchUserWorkspaceInfo = async (workspaceSlug: string): Promise<IWorkspaceMemberMe | undefined> => {
     try {
+      this.loader = true;
       const response = await workspaceService.workspaceMemberMe(workspaceSlug);
       if (response) {
         runInAction(() => {
           set(this.workspaceUserInfo, [workspaceSlug], response);
+          this.loader = false;
         });
       }
       return response;
     } catch (error) {
       console.error("Error fetching user workspace information", error);
+      this.loader = false;
       throw error;
     }
   };