From d7e68a2d1b0bcf74214f2c65186d6bcbd2b9728f Mon Sep 17 00:00:00 2001
From: sabaimran <narmiabas@gmail.com>
Date: Sun, 24 Nov 2024 14:52:36 -0800
Subject: [PATCH] Wait for iplcodata to load before first message

- Fix the console khoj ai ascii art
- Remove some not so good suggested prompt
---
 src/interface/web/app/automations/page.tsx    | 24 ++++++-------
 src/interface/web/app/chat/page.tsx           | 12 +++++--
 src/interface/web/app/common/utils.ts         | 34 +++++++++----------
 .../components/suggestions/suggestionsData.ts |  6 ----
 4 files changed, 37 insertions(+), 39 deletions(-)

diff --git a/src/interface/web/app/automations/page.tsx b/src/interface/web/app/automations/page.tsx
index e2c0c3f9..0ecf5809 100644
--- a/src/interface/web/app/automations/page.tsx
+++ b/src/interface/web/app/automations/page.tsx
@@ -994,7 +994,7 @@ export default function Automations() {
     const [suggestedAutomations, setSuggestedAutomations] = useState<AutomationsData[]>([]);
     const [showLoginPrompt, setShowLoginPrompt] = useState(false);
     const isMobileWidth = useIsMobileWidth();
-    const ipLocationData = useIPLocationData();
+    const { locationData, locationDataError, locationDataLoading } = useIPLocationData();
 
     useEffect(() => {
         if (newAutomationData) {
@@ -1044,18 +1044,18 @@ export default function Automations() {
                                     {authenticatedData.email}
                                 </span>
                             ) : null}
-                            {ipLocationData && (
+                            {locationData && (
                                 <span className="rounded-lg text-sm border-secondary border p-1 flex items-center shadow-sm">
                                     <MapPinSimple className="h-4 w-4 mr-2 inline text-purple-500" />
-                                    {ipLocationData
-                                        ? `${ipLocationData.city}, ${ipLocationData.country}`
+                                    {locationData
+                                        ? `${locationData.city}, ${locationData.country}`
                                         : "Unknown"}
                                 </span>
                             )}
-                            {ipLocationData && (
+                            {locationData && (
                                 <span className="rounded-lg text-sm border-secondary border p-1 flex items-center shadow-sm">
                                     <Clock className="h-4 w-4 mr-2 inline text-green-500" />
-                                    {ipLocationData ? `${ipLocationData.timezone}` : "Unknown"}
+                                    {locationData ? `${locationData.timezone}` : "Unknown"}
                                 </span>
                             )}
                         </div>
@@ -1086,7 +1086,7 @@ export default function Automations() {
                                 setNewAutomationData={setNewAutomationData}
                                 authenticatedData={authenticatedData}
                                 isCreating={isCreating}
-                                ipLocationData={ipLocationData}
+                                ipLocationData={locationData}
                             />
                         ) : (
                             <Button
@@ -1103,7 +1103,7 @@ export default function Automations() {
                         <SharedAutomationCard
                             isMobileWidth={isMobileWidth}
                             authenticatedData={authenticatedData}
-                            locationData={ipLocationData}
+                            locationData={locationData}
                             isLoggedIn={authenticatedData ? true : false}
                             setShowLoginPrompt={setShowLoginPrompt}
                             setNewAutomationData={setNewAutomationData}
@@ -1125,7 +1125,7 @@ export default function Automations() {
                                             setNewAutomationData={setNewAutomationData}
                                             authenticatedData={authenticatedData}
                                             isCreating={isCreating}
-                                            ipLocationData={ipLocationData}
+                                            ipLocationData={locationData}
                                         />
                                     ) : (
                                         <Button
@@ -1147,7 +1147,7 @@ export default function Automations() {
                                     key={automation.id}
                                     authenticatedData={authenticatedData}
                                     automation={automation}
-                                    locationData={ipLocationData}
+                                    locationData={locationData}
                                     isLoggedIn={authenticatedData ? true : false}
                                     setShowLoginPrompt={setShowLoginPrompt}
                                 />
@@ -1158,7 +1158,7 @@ export default function Automations() {
                                 key={automation.id}
                                 authenticatedData={authenticatedData}
                                 automation={automation}
-                                locationData={ipLocationData}
+                                locationData={locationData}
                                 isLoggedIn={authenticatedData ? true : false}
                                 setShowLoginPrompt={setShowLoginPrompt}
                             />
@@ -1173,7 +1173,7 @@ export default function Automations() {
                                 key={automation.id}
                                 authenticatedData={authenticatedData}
                                 automation={automation}
-                                locationData={ipLocationData}
+                                locationData={locationData}
                                 isLoggedIn={authenticatedData ? true : false}
                                 setShowLoginPrompt={setShowLoginPrompt}
                                 suggestedCard={true}
diff --git a/src/interface/web/app/chat/page.tsx b/src/interface/web/app/chat/page.tsx
index 5a391b4d..04835b6b 100644
--- a/src/interface/web/app/chat/page.tsx
+++ b/src/interface/web/app/chat/page.tsx
@@ -184,8 +184,10 @@ export default function Chat() {
         useState<AbortController | null>(null);
     const [triggeredAbort, setTriggeredAbort] = useState(false);
 
-    const locationData = useIPLocationData() || {
-        timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+    const { locationData, locationDataError, locationDataLoading } = useIPLocationData() || {
+        locationData: {
+            timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+        },
     };
     const authenticatedData = useAuthenticatedData();
     const isMobileWidth = useIsMobileWidth();
@@ -239,9 +241,13 @@ export default function Chat() {
 
     useEffect(() => {
         if (processQuerySignal) {
+            if (locationDataLoading) {
+                return;
+            }
+
             chat();
         }
-    }, [processQuerySignal]);
+    }, [processQuerySignal, locationDataLoading]);
 
     async function readChatStream(response: Response) {
         if (!response.ok) throw new Error(response.statusText);
diff --git a/src/interface/web/app/common/utils.ts b/src/interface/web/app/common/utils.ts
index efa2c1d3..8bf6db84 100644
--- a/src/interface/web/app/common/utils.ts
+++ b/src/interface/web/app/common/utils.ts
@@ -23,32 +23,30 @@ export function welcomeConsole() {
         `%c %s`,
         "font-family:monospace",
         `
-        __  __     __  __     ______       __        _____      __
-       /\\ \\/ /    /\\ \\_\\ \\   /\\  __ \\     /\\ \\      /\\  __ \\   /\\ \\
-       \\ \\  _"-.  \\ \\  __ \\  \\ \\ \\/\\ \\   _\\_\\ \\     \\ \\  __ \\  \\ \\ \\
-        \\ \\_\\ \\_\\  \\ \\_\\ \\_\\  \\ \\_____\\ /\\_____\\     \\ \\_\\ \\_\\  \\ \\_\\
-         \\/_/\\/_/   \\/_/\\/_/   \\/_____/ \\/_____/      \\/_/\\/_/   \\/_/
+ __  __     __  __     ______       __        _____      __
+/\\ \\/ /    /\\ \\_\\ \\   /\\  __ \\     /\\ \\      /\\  __ \\   /\\ \\
+\\ \\  _"-.  \\ \\  __ \\  \\ \\ \\/\\ \\   _\\_\\ \\     \\ \\  __ \\  \\ \\ \\
+ \\ \\_\\ \\_\\  \\ \\_\\ \\_\\  \\ \\_____\\ /\\_____\\     \\ \\_\\ \\_\\  \\ \\_\\
+  \\/_/\\/_/   \\/_/\\/_/   \\/_____/ \\/_____/      \\/_/\\/_/   \\/_/
 
 
-       Greetings traveller,
+Greetings traveller,
 
-       I am ✨Khoj✨, your open-source, personal AI copilot.
+I am ✨Khoj✨, your open-source, personal AI copilot.
 
-       See my source code at https://github.com/khoj-ai/khoj
-       Read my operating manual at https://docs.khoj.dev
-       `,
+See my source code at https://github.com/khoj-ai/khoj
+Read my operating manual at https://docs.khoj.dev
+`,
     );
 }
 
 export function useIPLocationData() {
-    const { data: locationData, error: locationDataError } = useSWR<LocationData>(
-        "/api/ip",
-        locationFetcher,
-        { revalidateOnFocus: false },
-    );
-
-    if (locationDataError || !locationData) return;
-    return locationData;
+    const {
+        data: locationData,
+        error: locationDataError,
+        isLoading: locationDataLoading,
+    } = useSWR<LocationData>("/api/ip", locationFetcher, { revalidateOnFocus: false });
+    return { locationData, locationDataError, locationDataLoading };
 }
 
 export function useIsMobileWidth() {
diff --git a/src/interface/web/app/components/suggestions/suggestionsData.ts b/src/interface/web/app/components/suggestions/suggestionsData.ts
index bd1a3836..43058bd6 100644
--- a/src/interface/web/app/components/suggestions/suggestionsData.ts
+++ b/src/interface/web/app/components/suggestions/suggestionsData.ts
@@ -724,12 +724,6 @@ export const suggestionsData: Suggestion[] = [
         description: "Draw a diagram illustrating the structure of the United States government.",
         link: "",
     },
-    {
-        type: SuggestionType.Health,
-        color: suggestionToColorMap[SuggestionType.Health] || DEFAULT_COLOR,
-        description: "Draw a diagram of the human skeletal system.",
-        link: "",
-    },
     {
         type: SuggestionType.Code,
         color: suggestionToColorMap[SuggestionType.Code] || DEFAULT_COLOR,