Merge branch 'master' into production

requestly · Jun 11, 2024 · 6397adf · 6397adf
2 parents 5cc2de0 + 3ee8a24
commit 6397adf
Show file tree

Hide file tree

Showing 21 changed files with 1,203 additions and 276 deletions.
diff --git a/app/src/layouts/DashboardLayout/MenuHeader/WorkspaceSelector/index.jsx b/app/src/layouts/DashboardLayout/MenuHeader/WorkspaceSelector/index.jsx
@@ -42,6 +42,7 @@ import { trackWorkspaceInviteAnimationViewed } from "modules/analytics/events/co
 import { trackTopbarClicked } from "modules/analytics/events/common/onboarding/header";
 import { getPendingInvites } from "backend/workspace";
 import "./WorkSpaceSelector.css";
+import { useFeatureIsOn } from "@growthbook/growthbook-react";
 
 const { PATHS } = APP_CONSTANTS;
 
@@ -124,6 +125,8 @@ const WorkspaceSelector = () => {
   const dispatch = useDispatch();
   const { pathname } = useLocation();
 
+  const isLimitToPrivateWorkspaceActive = useFeatureIsOn("limit_to_private_workspace");
+
   // GLOBAL STATE
   const user = useSelector(getUserAuthDetails);
   const availableTeams = useSelector(getAvailableTeams);
@@ -417,8 +420,21 @@ const WorkspaceSelector = () => {
     joinWorkspaceDropdownItems[key]?.onClick?.();
   };
 
+  useEffect(() => {
+    if (isLimitToPrivateWorkspaceActive) {
+      if (currentlyActiveWorkspace?.id) {
+        confirmWorkspaceSwitch(handleSwitchToPrivateWorkspace);
+      }
+    }
+  }, [
+    isLimitToPrivateWorkspaceActive,
+    currentlyActiveWorkspace?.id,
+    confirmWorkspaceSwitch,
+    handleSwitchToPrivateWorkspace,
+  ]);
+
   const menu = (
-    <Menu className="workspaces-menu">
+    <Menu className="workspaces-menu" disabled={isLimitToPrivateWorkspaceActive}>
       <Menu.ItemGroup key="Workspaces" title="Your workspaces">
         <Menu.Item
           key="1"

diff --git a/browser-extension/common/package-lock.json b/browser-extension/common/package-lock.json