Update version to 0.4.7, integrate ChatContext into Sidebar, and enforce HTTPS for morphik.ai URLs

Author: Adityav369

ee/ui-component/components/MorphikUI.tsx

@@ -14,6 +14,7 @@ import { SettingsSection } from "@/components/settings/SettingsSection";
 import { extractTokenFromUri, getApiBaseUrlFromUri } from "@/lib/utils";
 import { PDFAPIService } from "@/components/pdf/PDFAPIService";
 import { MorphikSidebarRemote } from "@/components/sidebar-stateful";
+import { useChatContext } from "@/components/chat/chat-context";
 import { DynamicSiteHeader } from "@/components/dynamic-site-header";
 import { SidebarInset, SidebarProvider } from "@/components/ui/sidebar-components";
 import { MorphikProvider } from "@/contexts/morphik-context";
@@ -203,6 +204,58 @@ const MorphikUI: React.FC<MorphikUIProps> = props => {
     }
   };
 
+  // Local wrapper to bridge ChatContext into the Sidebar props
+  const SidebarWithChatContext: React.FC<{
+    logoLight?: string;
+    logoDark?: string;
+    showChatView: boolean;
+    onChatViewChange: (show: boolean) => void;
+    showSettingsView: boolean;
+    onSettingsViewChange: (show: boolean) => void;
+    currentSection: string;
+    onSectionChange: (section: string) => void;
+    userProfile?: typeof userProfile;
+    onLogout?: typeof onLogout;
+    onProfileNavigate?: typeof onProfileNavigate;
+    onUpgradeClick?: typeof onUpgradeClick;
+  }> = ({
+    logoLight,
+    logoDark,
+    showChatView,
+    onChatViewChange,
+    showSettingsView,
+    onSettingsViewChange,
+    currentSection,
+    onSectionChange,
+    userProfile,
+    onLogout,
+    onProfileNavigate,
+    onUpgradeClick,
+  }) => {
+    const { activeChatId, setActiveChatId, activeSettingsTab, setActiveSettingsTab } = useChatContext();
+
+    return (
+      <MorphikSidebarRemote
+        currentSection={currentSection}
+        onSectionChange={onSectionChange}
+        userProfile={userProfile}
+        onLogout={onLogout}
+        onProfileNavigate={onProfileNavigate}
+        onUpgradeClick={onUpgradeClick}
+        logoLight={logoLight}
+        logoDark={logoDark}
+        showChatView={showChatView}
+        onChatViewChange={onChatViewChange}
+        activeChatId={activeChatId}
+        onChatSelect={setActiveChatId}
+        showSettingsView={showSettingsView}
+        onSettingsViewChange={onSettingsViewChange}
+        activeSettingsTab={activeSettingsTab}
+        onSettingsTabChange={setActiveSettingsTab}
+      />
+    );
+  };
+
   const contentInner = (
     <PDFAPIService sessionId={sessionId} userId={userId}>
       <div className="min-h-screen bg-sidebar">
@@ -224,7 +277,7 @@ const MorphikUI: React.FC<MorphikUIProps> = props => {
                   } as React.CSSProperties
                 }
               >
-                <MorphikSidebarRemote
+                <SidebarWithChatContext
                   currentSection={currentSection}
                   onSectionChange={handleSectionChange}
                   userProfile={userProfile}

ee/ui-component/components/sidebar-base.tsx

@@ -395,8 +395,14 @@ export function BaseSidebar({
               </SidebarGroup>
               {onUpgradeClick && (userProfile?.tier === "free" || !userProfile?.tier) && (
                 <div className="mx-2 mb-2 mt-2">
-                  <Button className="w-full justify-between" variant="outline" size="default" onClick={onUpgradeClick}>
-                    <div className="flex items-center gap-2">
+                  <Button
+                    className="w-full justify-between group-data-[collapsible=icon]:justify-center"
+                    variant="outline"
+                    size="default"
+                    onClick={onUpgradeClick}
+                    title="Upgrade to PRO"
+                  >
+                    <div className="flex items-center gap-2 group-data-[collapsible=icon]:hidden">
                       <span>Upgrade to</span>
                       <Badge variant="secondary" className="text-xs">
                         PRO

ee/ui-component/contexts/morphik-context.tsx

@@ -129,14 +129,25 @@ export function MorphikProvider({
       return DEFAULT_API_BASE_URL;
     }
 
-    const url = connectionInfo.apiBaseUrl;
+    let url = connectionInfo.apiBaseUrl.trim();
 
     // Safety check: ensure it's a proper HTTP(S) URL
     if (!url.startsWith("http://") && !url.startsWith("https://")) {
       console.error("[MorphikContext] Invalid apiBaseUrl:", url);
       return DEFAULT_API_BASE_URL;
     }
 
+    // Force HTTPS for morphik.ai domains to avoid CORS preflight redirect failures
+    try {
+      const parsed = new URL(url);
+      if (parsed.protocol === "http:" && parsed.hostname.endsWith("morphik.ai")) {
+        parsed.protocol = "https:";
+        url = parsed.toString().replace(/\/$/, "");
+      }
+    } catch {
+      // ignore URL parse errors; fallback to original url
+    }
+
     return url;
   }, [connectionInfo]);
 

ee/ui-component/hooks/useChatSessions.ts

@@ -66,7 +66,17 @@ export function useChatSessions({ apiBaseUrl, authToken, limit = 100 }: UseChatS
       }
 
       try {
-        const res = await fetch(`${apiBaseUrl}/chats?limit=${limit}`, {
+        // Normalize to HTTPS for morphik.ai to avoid preflight redirects (CORS)
+        let base = apiBaseUrl;
+        try {
+          const u = new URL(apiBaseUrl);
+          if (u.protocol === "http:" && u.hostname.endsWith("morphik.ai")) {
+            u.protocol = "https:";
+            base = u.toString().replace(/\/$/, "");
+          }
+        } catch {}
+
+        const res = await fetch(`${base}/chats?limit=${limit}`, {
           headers: {
             ...(authToken ? { Authorization: `Bearer ${authToken}` } : {}),
           },

ee/ui-component/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morphik/ui",
-  "version": "0.4.4",
+  "version": "0.4.7",
   "private": true,
   "description": "Modern UI component for Morphik - A powerful document processing and querying system",
   "author": "Morphik Team",