Show github login popup after server response (BloopAI#210)

* show github login popup after server response * bump release version * fix ts error
aileague · Feb 23, 2023 · f5594b3 · f5594b3
1 parent 0cc44c9
commit f5594b3
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/apps/desktop/src-tauri/Cargo.toml b/apps/desktop/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bloop"
-version = "0.1.0"
+version = "0.2.2"
 description = "Search code. Fast."
 authors = ["Bloop AI Developers"]
 license = ""

diff --git a/apps/desktop/src-tauri/tauri.conf.json b/apps/desktop/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "bloop",
-    "version": "0.2.1"
+    "version": "0.2.2"
   },
   "tauri": {
     "allowlist": {

diff --git a/client/src/components/PageTemplate/index.tsx b/client/src/components/PageTemplate/index.tsx
@@ -22,14 +22,20 @@ const PageTemplate = ({ children }: Props) => {
   const { isSelfServe } = useContext(DeviceContext);
   const { isAnalyticsAllowed, setIsAnalyticsAllowed } =
     useContext(AnalyticsContext);
-  const { isGithubConnected, setOnBoardingState } = useContext(UIContext);
+  const { isGithubConnected, setOnBoardingState, isGithubChecked } =
+    useContext(UIContext);
   const [isModalOpen, setModalOpen] = useState(false);
 
   useEffect(() => {
-    if (!isGithubConnected && isAnalyticsAllowed && !isSelfServe) {
+    if (
+      isGithubChecked &&
+      !isGithubConnected &&
+      isAnalyticsAllowed &&
+      !isSelfServe
+    ) {
       setModalOpen(true);
     }
-  }, []);
+  }, [isGithubChecked]);
 
   const saveOptIn = useCallback((optIn: boolean) => {
     savePlainToStorage(IS_ANALYTICS_ALLOWED_KEY, optIn ? 'true' : 'false');

diff --git a/client/src/components/Settings/Settings.stories.tsx b/client/src/components/Settings/Settings.stories.tsx
@@ -35,6 +35,7 @@ export const Default = () => {
           setBugReportModalOpen: () => {},
           isGithubConnected: false,
           setGithubConnected: () => {},
+          isGithubChecked: true,
         }}
       >
         <RepositoriesContext.Provider
@@ -77,6 +78,7 @@ export const ScanErrors = () => {
           setBugReportModalOpen: () => {},
           isGithubConnected: false,
           setGithubConnected: () => {},
+          isGithubChecked: true,
         }}
       >
         <RepositoriesContext.Provider
@@ -201,6 +203,7 @@ export const EmailConfirmedReposSynced = () => {
           setBugReportModalOpen: () => {},
           isGithubConnected: true,
           setGithubConnected: () => {},
+          isGithubChecked: true,
         }}
       >
         <RepositoriesContext.Provider

diff --git a/client/src/context/providers/UiContextProvider.tsx b/client/src/context/providers/UiContextProvider.tsx
@@ -24,11 +24,13 @@ export const UIContextProvider = ({ children }: PropsWithChildren) => {
   );
   const { isSelfServe } = useContext(DeviceContext);
   const [isGithubConnected, setGithubConnected] = useState(isSelfServe);
+  const [isGithubChecked, setGithubChecked] = useState(false);
 
   useEffect(() => {
     if (!isSelfServe) {
       gitHubStatus().then((d) => {
         setGithubConnected(d.status === 'ok');
+        setGithubChecked(true);
       });
     }
   }, []);
@@ -47,6 +49,7 @@ export const UIContextProvider = ({ children }: PropsWithChildren) => {
       setBugReportModalOpen,
       isGithubConnected,
       setGithubConnected,
+      isGithubChecked,
     }),
     [
       isSettingsOpen,
@@ -55,6 +58,7 @@ export const UIContextProvider = ({ children }: PropsWithChildren) => {
       onBoardingState,
       isBugReportModalOpen,
       isGithubConnected,
+      isGithubChecked,
     ],
   );
   return (

diff --git a/client/src/context/uiContext.ts b/client/src/context/uiContext.ts
@@ -13,6 +13,7 @@ type ContextType = {
   setBugReportModalOpen: (b: boolean) => void;
   isGithubConnected: boolean;
   setGithubConnected: (b: boolean) => void;
+  isGithubChecked: boolean;
 };
 
 export const UIContext = createContext<ContextType>({
@@ -28,4 +29,5 @@ export const UIContext = createContext<ContextType>({
   setBugReportModalOpen: () => {},
   isGithubConnected: false,
   setGithubConnected: () => {},
+  isGithubChecked: false,
 });