Merge pull request #100 from n4ze3m/next

1.0.2 - white screen bug fix
n4ze3m · Oct 4, 2023 · 6d77878 · 6d77878
2 parents 76da28b + 2d9a37b
commit 6d77878
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 7 deletions.
diff --git a/app/ui/package.json b/app/ui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "app",
   "private": true,
-  "version": "1.0.1",
+  "version": "1.0.2",
   "type": "module",
   "scripts": {
     "dev": "vite",

diff --git a/app/ui/src/components/Bot/Playground/Chat.tsx b/app/ui/src/components/Bot/Playground/Chat.tsx
@@ -17,7 +17,7 @@ export const PlaygroundChat = () => {
   const [sourceData, setSourceData] = React.useState<any>(null);
   const [openSource, setOpenSource] = React.useState(false);
   const [fileType, setFileType] = React.useState<
-    "pdf" | "mp3" | "mp4" | "other"
+    "pdf" | "mp3" | "mp4" | "other" | "lang"
   >("other");
 
   React.useEffect(() => {
@@ -59,7 +59,21 @@ export const PlaygroundChat = () => {
                       } else if (fileExtension === "mp4") {
                         setFileType("mp4");
                       } else {
-                        setFileType("other");
+                        const isExist =
+                          COMMON_PROGRAMMING_LANGUAGES_EXTENSIONS[
+                            `${
+                              source?.metadata?.path || source?.metadata?.source
+                            }`
+                              .split(".")
+                              .pop() ||
+                              ("" as keyof typeof COMMON_PROGRAMMING_LANGUAGES_EXTENSIONS)
+                          ];
+
+                        if (isExist) {
+                          setFileType("lang");
+                        } else {
+                          setFileType("other");
+                        }
                       }
                       setSourceData(source);
                       setOpenSource(true);
@@ -107,7 +121,13 @@ export const PlaygroundChat = () => {
               </div>
             </>
           )}
+
           {fileType === "other" && (
+            <>
+              <p className="text-gray-500 text-sm">{sourceData?.pageContent}</p>
+            </>
+          )}
+          {fileType === "lang" && (
             <>
               <SyntaxHighlighter
                 startingLineNumber={sourceData?.metadata?.loc?.lines?.from}

diff --git a/app/widget/src/hooks/useChatId.tsx b/app/widget/src/hooks/useChatId.tsx
@@ -1,10 +1,10 @@
 import { useState, useEffect } from "react";
-
+import { generateUUID } from "../utils/uuid";
 const useChatId = () => {
   const [chatId, setChatId] = useState<string>("");
 
   const resetChatId = () => {
-    const newChatId = crypto.randomUUID();
+    const newChatId = generateUUID();
     localStorage.removeItem("DS_MESSAGE");
     localStorage.removeItem("DS_HISTORY");
     localStorage.setItem("DS_CHAT_ID", newChatId);
@@ -17,7 +17,7 @@ const useChatId = () => {
     if (storedChatId) {
       setChatId(storedChatId);
     } else {
-      const newChatId = crypto.randomUUID();
+      const newChatId = generateUUID();
       localStorage.setItem("DS_CHAT_ID", newChatId);
       setChatId(newChatId);
     }

diff --git a/app/widget/src/utils/uuid.ts b/app/widget/src/utils/uuid.ts
@@ -0,0 +1,21 @@
+// this is polyfill for crypto.randomUUID
+const generateUniqSerial = () => {
+  return "xxxx-xxxx-xxx-xxxx".replace(/[x]/g, () => {
+    const r = Math.floor(Math.random() * 16);
+    return r.toString(16);
+  });
+};
+
+export function generateUUID() {
+  try {
+    if (crypto.randomUUID) {
+      return crypto.randomUUID();
+    } else {
+      console.log("crypto.randomUUID not supported");
+      return generateUniqSerial();
+    }
+  } catch (e) {
+    console.log("crypto.randomUUID not supported");
+    return generateUniqSerial();
+  }
+}
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dialoqbase",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Create chatbots with ease",
   "scripts": {
     "ui:dev": "pnpm run --filter ui dev",