Merge branch 'master' into fix/panel

Author: Vidit-Kushwaha

src/custom/Workspaces/WorkspaceCard.tsx

@@ -52,7 +52,12 @@ interface CardFrontProps {
   onAssignDesign: () => void;
   isEnvironmentAllowed: boolean;
   isTeamAllowed: boolean;
-  isDesignAndViewAllowed: boolean;
+  isDesignAllowed: boolean;
+  isViewAllowed: boolean;
+  isViewsVisible: boolean;
+  isDesignsVisible: boolean;
+  isTeamsVisible: boolean;
+  isEnvironmentsVisible: boolean;
 }
 
 interface CardBackProps {
@@ -90,9 +95,14 @@ interface WorkspaceCardProps {
   designAndViewOfWorkspaceCount: number;
   isEnvironmentAllowed: boolean;
   isTeamAllowed: boolean;
-  isDesignAndViewAllowed: boolean;
+  isDesignAllowed: boolean;
+  isViewAllowed: boolean;
   isDeleteWorkspaceAllowed: boolean;
   isEditWorkspaceAllowed: boolean;
+  isViewsVisible: boolean;
+  isDesignsVisible: boolean;
+  isTeamsVisible: boolean;
+  isEnvironmentsVisible: boolean;
 }
 
 /**
@@ -142,9 +152,14 @@ const WorkspaceCard = ({
   designAndViewOfWorkspaceCount,
   isEnvironmentAllowed,
   isTeamAllowed,
-  isDesignAndViewAllowed,
+  isDesignAllowed,
+  isViewAllowed,
   isDeleteWorkspaceAllowed,
-  isEditWorkspaceAllowed
+  isEditWorkspaceAllowed,
+  isViewsVisible,
+  isDesignsVisible,
+  isEnvironmentsVisible,
+  isTeamsVisible
 }: WorkspaceCardProps) => {
   const deleted = workspaceDetails.deleted_at.Valid;
   return (
@@ -164,7 +179,12 @@ const WorkspaceCard = ({
         onAssignDesign={onAssignDesign}
         isEnvironmentAllowed={isEnvironmentAllowed}
         isTeamAllowed={isTeamAllowed}
-        isDesignAndViewAllowed={isDesignAndViewAllowed}
+        isDesignAllowed={isDesignAllowed}
+        isViewAllowed={isViewAllowed}
+        isViewsVisible={isViewsVisible}
+        isDesignsVisible={isDesignsVisible}
+        isEnvironmentsVisible={isEnvironmentsVisible}
+        isTeamsVisible={isTeamsVisible}
       />
 
       <CardBack
@@ -201,7 +221,12 @@ const CardFront = ({
   onAssignDesign,
   isEnvironmentAllowed,
   isTeamAllowed,
-  isDesignAndViewAllowed
+  isDesignAllowed,
+  isViewAllowed,
+  isViewsVisible,
+  isDesignsVisible,
+  isEnvironmentsVisible,
+  isTeamsVisible
 }: CardFrontProps) => {
   return (
     <CardFrontWrapper elevation={2} onClick={onFlip}>
@@ -227,52 +252,77 @@ const CardFront = ({
           gap: 1
         }}
       >
-        <AllocationColumnGrid xs={12} sm={4}>
-          <AllocationWorkspace onClick={(e) => e.stopPropagation()}>
-            {isEnvironmentAllowed ? (
-              <TransferButton
-                title="Environments"
-                count={environmentsCount}
-                onAssign={onAssignEnvironment}
-                disabled={!isEnvironmentAllowed}
-              />
-            ) : (
-              <RedirectButton title="Environment" count={environmentsCount} />
-            )}
-            <RedirectButton title="Connections" count={0} />
-          </AllocationWorkspace>
-        </AllocationColumnGrid>
+        {isEnvironmentsVisible && (
+          <AllocationColumnGrid>
+            <AllocationWorkspace onClick={(e) => e.stopPropagation()}>
+              {isEnvironmentAllowed ? (
+                <TransferButton
+                  title="Environments"
+                  count={environmentsCount}
+                  onAssign={onAssignEnvironment}
+                  disabled={!isEnvironmentAllowed}
+                />
+              ) : (
+                <RedirectButton title="Environment" count={environmentsCount} />
+              )}
+              <RedirectButton title="Connections" count={0} />
+            </AllocationWorkspace>
+          </AllocationColumnGrid>
+        )}
 
-        <AllocationColumnGrid xs={12} sm={4}>
-          <AllocationWorkspace onClick={(e) => e.stopPropagation()}>
-            {isTeamAllowed ? (
-              <TransferButton
-                title="Teams"
-                count={teamsCount}
-                onAssign={onAssignTeam}
-                disabled={!isTeamAllowed}
-              />
-            ) : (
-              <RedirectButton title="Teams" count={teamsCount} />
-            )}
-            <RedirectButton title="Users" count={0} />
-          </AllocationWorkspace>
-        </AllocationColumnGrid>
-        <AllocationColumnGrid xs={12} sm={4}>
-          <AllocationWorkspace onClick={(e) => e.stopPropagation()}>
-            {isDesignAndViewAllowed ? (
-              <TransferButton
-                title="Designs/Views"
-                count={designAndViewOfWorkspaceCount}
-                onAssign={onAssignDesign}
-                disabled={!isDesignAndViewAllowed}
-              />
-            ) : (
-              <RedirectButton title="Designs/Views" count={designAndViewOfWorkspaceCount} />
-            )}
-            <RedirectButton title="Deploys" count={0} />
-          </AllocationWorkspace>
-        </AllocationColumnGrid>
+        {isTeamsVisible && (
+          <AllocationColumnGrid>
+            <AllocationWorkspace onClick={(e) => e.stopPropagation()}>
+              {isTeamAllowed ? (
+                <TransferButton
+                  title="Teams"
+                  count={teamsCount}
+                  onAssign={onAssignTeam}
+                  disabled={!isTeamAllowed}
+                />
+              ) : (
+                <RedirectButton title="Teams" count={teamsCount} />
+              )}
+              <RedirectButton title="Users" count={0} />
+            </AllocationWorkspace>
+          </AllocationColumnGrid>
+        )}
+
+        {isDesignsVisible && !isViewsVisible && (
+          <AllocationColumnGrid>
+            <AllocationWorkspace onClick={(e) => e.stopPropagation()}>
+              {isDesignAllowed ? (
+                <TransferButton
+                  title="Designs"
+                  count={designAndViewOfWorkspaceCount}
+                  onAssign={onAssignDesign}
+                  disabled={!isDesignAllowed}
+                />
+              ) : (
+                <RedirectButton title="Designs" count={designAndViewOfWorkspaceCount} />
+              )}
+              <RedirectButton title="Deploys" count={0} />
+            </AllocationWorkspace>
+          </AllocationColumnGrid>
+        )}
+
+        {isDesignsVisible && isViewsVisible && (
+          <AllocationColumnGrid>
+            <AllocationWorkspace onClick={(e) => e.stopPropagation()}>
+              {isDesignAllowed && isViewAllowed ? (
+                <TransferButton
+                  title="Designs/Views"
+                  count={designAndViewOfWorkspaceCount}
+                  onAssign={onAssignDesign}
+                  disabled={!(isDesignAllowed && isViewAllowed)}
+                />
+              ) : (
+                <RedirectButton title="Designs/Views" count={designAndViewOfWorkspaceCount} />
+              )}
+              <RedirectButton title="Deploys" count={0} />
+            </AllocationWorkspace>
+          </AllocationColumnGrid>
+        )}
       </Grid>
     </CardFrontWrapper>
   );

src/custom/Workspaces/hooks/useDesignAssignment.tsx

@@ -14,13 +14,15 @@ interface useDesignAssignmentProps {
   useGetDesignsOfWorkspaceQuery: any;
   useAssignDesignToWorkspaceMutation: any;
   useUnassignDesignFromWorkspaceMutation: any;
+  isDesignsVisible?: boolean;
 }
 
 const useDesignAssignment = ({
   workspaceId,
   useGetDesignsOfWorkspaceQuery,
   useAssignDesignToWorkspaceMutation,
-  useUnassignDesignFromWorkspaceMutation
+  useUnassignDesignFromWorkspaceMutation,
+  isDesignsVisible
 }: useDesignAssignmentProps): AssignmentHookResult<Pattern> => {
   const [designsPage, setDesignsPage] = useState<number>(0);
   const [designsData, setDesignsData] = useState<Pattern[]>([]);
@@ -40,7 +42,7 @@ const useDesignAssignment = ({
       filter: '{"assigned":false}'
     }),
     {
-      skip: skipDesigns
+      skip: skipDesigns || !isDesignsVisible
     }
   );
 
@@ -51,7 +53,7 @@ const useDesignAssignment = ({
       pagesize: designsPageSize
     }),
     {
-      skip: skipDesigns
+      skip: skipDesigns || !isDesignsVisible
     }
   );
 

src/custom/Workspaces/hooks/useEnvironmentAssignment.tsx

@@ -8,13 +8,15 @@ interface UseEnvironmentAssignmentProps {
   useGetEnvironmentsOfWorkspaceQuery: any;
   useAssignEnvironmentToWorkspaceMutation: any;
   useUnassignEnvironmentFromWorkspaceMutation: any;
+  isEnvironmentsVisible?: boolean;
 }
 
 const useEnvironmentAssignment = ({
   workspaceId,
   useGetEnvironmentsOfWorkspaceQuery,
   useAssignEnvironmentToWorkspaceMutation,
-  useUnassignEnvironmentFromWorkspaceMutation
+  useUnassignEnvironmentFromWorkspaceMutation,
+  isEnvironmentsVisible
 }: UseEnvironmentAssignmentProps): AssignmentHookResult<Environment> => {
   const [environmentsPage, setEnvironmentsPage] = useState<number>(0);
   const [environmentsData, setEnvironmentsData] = useState<Environment[]>([]);
@@ -34,7 +36,7 @@ const useEnvironmentAssignment = ({
       filter: '{"assigned":false}'
     }),
     {
-      skip: skipEnvironments
+      skip: skipEnvironments || !isEnvironmentsVisible
     }
   );
 
@@ -45,7 +47,7 @@ const useEnvironmentAssignment = ({
       pagesize: environmentsPageSize
     }),
     {
-      skip: skipEnvironments
+      skip: skipEnvironments || !isEnvironmentsVisible
     }
   );
 

src/custom/Workspaces/hooks/useTeamAssignment.tsx

@@ -8,13 +8,15 @@ interface UseTeamAssignmentProps {
   useGetTeamsOfWorkspaceQuery: any;
   useAssignTeamToWorkspaceMutation: any;
   useUnassignTeamFromWorkspaceMutation: any;
+  isTeamsVisible?: boolean;
 }
 
 const useTeamAssignment = ({
   workspaceId,
   useGetTeamsOfWorkspaceQuery,
   useAssignTeamToWorkspaceMutation,
-  useUnassignTeamFromWorkspaceMutation
+  useUnassignTeamFromWorkspaceMutation,
+  isTeamsVisible
 }: UseTeamAssignmentProps): AssignmentHookResult<Team> => {
   const [teamsPage, setTeamsPage] = useState<number>(0);
   const [teamsData, setTeamsData] = useState<Team[]>([]);
@@ -36,7 +38,7 @@ const useTeamAssignment = ({
       filter: '{"assigned":false}'
     }),
     {
-      skip: skipTeams
+      skip: skipTeams || !isTeamsVisible
     }
   );
 
@@ -47,7 +49,7 @@ const useTeamAssignment = ({
       pagesize: teamsPageSize
     }),
     {
-      skip: skipTeams
+      skip: skipTeams || !isTeamsVisible
     }
   );
 

src/custom/Workspaces/hooks/useViewsAssignment.tsx

@@ -14,13 +14,15 @@ interface useViewAssignmentProps {
   useGetViewsOfWorkspaceQuery: any;
   useAssignViewToWorkspaceMutation: any;
   useUnassignViewFromWorkspaceMutation: any;
+  isEnvironmentsVisible?: boolean;
 }
 
 const useViewAssignment = ({
   workspaceId,
   useGetViewsOfWorkspaceQuery,
   useAssignViewToWorkspaceMutation,
-  useUnassignViewFromWorkspaceMutation
+  useUnassignViewFromWorkspaceMutation,
+  isEnvironmentsVisible
 }: useViewAssignmentProps): AssignmentHookResult<Pattern> => {
   const [viewsPage, setviewsPage] = useState<number>(0);
   const [viewsData, setviewsData] = useState<Pattern[]>([]);
@@ -40,7 +42,7 @@ const useViewAssignment = ({
       filter: '{"assigned":false}'
     }),
     {
-      skip: skipviews
+      skip: skipviews || !isEnvironmentsVisible
     }
   );
 
@@ -51,7 +53,7 @@ const useViewAssignment = ({
       pagesize: viewsPageSize
     }),
     {
-      skip: skipviews
+      skip: skipviews || !isEnvironmentsVisible
     }
   );