Merge pull request #249 from microsoft/package-upgrade

Fix console warnings
microsoft · Nov 2, 2023 · d05cda2 · d05cda2
2 parents 1708a4a + 587b3b4
commit d05cda2
Show file tree

Hide file tree

Showing 12 changed files with 43 additions and 32 deletions.
diff --git a/src/app/change-log/page.tsx b/src/app/change-log/page.tsx
@@ -1,4 +1,4 @@
-import { Markdown } from "@/components/chat/markdown";
+import { Markdown } from "@/components/markdown/markdown";
 import { Card } from "@/components/ui/card";
 import { VersionDisplay } from "@/features/change-log/version-display";
 import { promises as fs } from "fs";

diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -21,7 +21,7 @@ export default function RootLayout({
   children: React.ReactNode;
 }) {
   return (
-    <html lang="en" className="h-full overflow-hidden light">
+    <html lang="en" className="h-full overflow-hidden">
       <body className={cn(inter.className, "flex w-full h-full")}>
         <Providers>
           <ThemeProvider attribute="class" defaultTheme="system" enableSystem>

diff --git a/src/components/chat/chat-row.tsx b/src/components/chat/chat-row.tsx
@@ -4,10 +4,10 @@ import { isNotNullOrEmpty } from "@/features/chat/chat-services/utils";
 import { cn } from "@/lib/utils";
 import { CheckIcon, ClipboardIcon, UserCircle } from "lucide-react";
 import { FC, useState } from "react";
+import { Markdown } from "../markdown/markdown";
 import Typography from "../typography";
 import { Avatar, AvatarImage } from "../ui/avatar";
 import { Button } from "../ui/button";
-import { Markdown } from "./markdown";
 
 interface ChatRowProps {
   name: string;

diff --git a/src/components/markdown/config.tsx b/src/components/markdown/config.tsx
@@ -0,0 +1,12 @@
+import { citation } from "@/features/chat/chat-ui/markdown/citation";
+import { Config } from "@markdoc/markdoc";
+import { paragraph } from "./paragraph";
+
+export const citationConfig: Config = {
+  nodes: {
+    paragraph: paragraph,
+  },
+  tags: {
+    citation,
+  },
+};
diff --git a/src/components/chat/markdown.tsx → src/components/markdown/markdown.tsx b/src/components/chat/markdown.tsx → src/components/markdown/markdown.tsx
@@ -1,9 +1,8 @@
 import Markdoc from "@markdoc/markdoc";
 import React, { FC } from "react";
-import {
-  Citation,
-  citationConfig,
-} from "../../features/chat/chat-ui/markdown/citation";
+import { Citation } from "../../features/chat/chat-ui/markdown/citation";
+import { citationConfig } from "./config";
+import { Paragraph } from "./paragraph";
 
 interface Props {
   content: string;
@@ -15,7 +14,8 @@ export const Markdown: FC<Props> = (props) => {
   const content = Markdoc.transform(ast, {
     ...citationConfig,
   });
+
   return Markdoc.renderers.react(content, React, {
-    components: { Citation },
+    components: { Citation, Paragraph },
   });
 };
diff --git a/src/components/markdown/paragraph.tsx b/src/components/markdown/paragraph.tsx
@@ -0,0 +1,7 @@
+export const Paragraph = ({ children, className }: any) => {
+  return <div className={...className}>{children}</div>;
+};
+
+export const paragraph = {
+  render: "Paragraph",
+};
diff --git a/src/features/chat/chat-ui/chat-file/chat-file-slider.tsx b/src/features/chat/chat-ui/chat-file/chat-file-slider.tsx
@@ -2,7 +2,6 @@ import { Button } from "@/components/ui/button";
 import {
   Sheet,
   SheetContent,
-  SheetDescription,
   SheetHeader,
   SheetTitle,
   SheetTrigger,
@@ -14,18 +13,18 @@ export const ChatFileSlider = () => {
   return (
     <div>
       <Sheet>
-        <SheetTrigger>
+        <SheetTrigger asChild>
           <Button size="icon" variant={"ghost"}>
             <FileText size={16} />
           </Button>
         </SheetTrigger>
         <SheetContent>
           <SheetHeader>
             <SheetTitle>Upload File</SheetTitle>
-            <SheetDescription>
-              <ChatFileUI />
-            </SheetDescription>
           </SheetHeader>
+          <div className="py-4">
+            <ChatFileUI />
+          </div>
         </SheetContent>
       </Sheet>
     </div>

diff --git a/src/features/chat/chat-ui/chat-input/chat-input.tsx b/src/features/chat/chat-ui/chat-input/chat-input.tsx
@@ -39,7 +39,7 @@ const ChatInput: FC<Props> = (props) => {
       onSubmit={submit}
       className="absolute bottom-0 w-full flex items-center"
     >
-      <div className="container mx-auto max-w-4xl relative py-2 flex gap-2 items-end items-center">
+      <div className="container mx-auto max-w-4xl relative py-2 flex gap-2 items-center">
         {fileCHatVisible && <ChatFileSlider />}
         <Textarea
           rows={rows}

diff --git a/src/features/chat/chat-ui/markdown/citation-action.tsx b/src/features/chat/chat-ui/markdown/citation-action.tsx
@@ -1,6 +1,6 @@
 "use server";
 
-import { simpleSearch } from "../../chat-services/azure-cog-search/azure-cog-vector-store";
+import { simpleSearch } from "@/features/chat/chat-services/azure-cog-search/azure-cog-vector-store";
 
 export const CitationAction = async (
   previousState: any,

diff --git a/src/features/chat/chat-ui/markdown/citation-slider.tsx b/src/features/chat/chat-ui/markdown/citation-slider.tsx
@@ -2,7 +2,6 @@ import { Button } from "@/components/ui/button";
 import {
   Sheet,
   SheetContent,
-  SheetDescription,
   SheetHeader,
   SheetTitle,
   SheetTrigger,
@@ -21,13 +20,14 @@ export const CitationSlider: FC<SliderProps> = (props) => {
   const [node, formAction] = useFormState(CitationAction, null);
   return (
     <form>
+      <input type="hidden" name="id" value={props.id} />
       <Sheet>
-        <SheetTrigger>
-          <input type="hidden" name="id" value={props.id} />
+        <SheetTrigger asChild>
           <Button
             variant="outline"
             size="sm"
             formAction={formAction}
+            type="submit"
             value={22}
           >
             {props.index}
@@ -36,8 +36,8 @@ export const CitationSlider: FC<SliderProps> = (props) => {
         <SheetContent>
           <SheetHeader>
             <SheetTitle>Citation</SheetTitle>
-            <SheetDescription>{node}</SheetDescription>
           </SheetHeader>
+          <div className="text-sm text-muted-foreground">{node}</div>
         </SheetContent>
       </Sheet>
     </form>

diff --git a/src/features/chat/chat-ui/markdown/citation.tsx b/src/features/chat/chat-ui/markdown/citation.tsx
@@ -1,5 +1,4 @@
 "use client";
-import { Config } from "@markdoc/markdoc";
 import { FC } from "react";
 import { CitationSlider } from "./citation-slider";
 
@@ -12,16 +11,12 @@ interface Props {
   items: Citation[];
 }
 
-export const citationConfig: Config = {
-  tags: {
-    citation: {
-      render: "Citation",
-      selfClosing: true,
-      attributes: {
-        items: {
-          type: Array,
-        },
-      },
+export const citation = {
+  render: "Citation",
+  selfClosing: true,
+  attributes: {
+    items: {
+      type: Array,
     },
   },
 };

diff --git a/src/next.config.js b/src/next.config.js
@@ -1,8 +1,6 @@
 /** @type {import('next').NextConfig} */
 const nextConfig = {
   output: "standalone",
-  experimental: {
-  },
 };
 
 module.exports = nextConfig;