From c47df15aaaebb21d1f4e477f6cef2aa4007d299b Mon Sep 17 00:00:00 2001
From: Chu Yi Ting <ytyt3902@outlook.com>
Date: Mon, 4 Nov 2024 12:36:55 +0800
Subject: [PATCH 1/5] Minor ui fixes

---
 .../components/blocks/interview/question-attempts/table.tsx    | 3 ++-
 frontend/src/routes/match/match-form.tsx                       | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/blocks/interview/question-attempts/table.tsx b/frontend/src/components/blocks/interview/question-attempts/table.tsx
index db2cf889f9..893dce4f54 100644
--- a/frontend/src/components/blocks/interview/question-attempts/table.tsx
+++ b/frontend/src/components/blocks/interview/question-attempts/table.tsx
@@ -171,7 +171,8 @@ export function QuestionAttemptsTable<TValue>({
                       </Button>
                     </PaginationItem>
                     <PaginationItem className='text-sm'>
-                      {table.getState().pagination.pageIndex + 1} of {table.getPageCount()}
+                      {table.getState().pagination.pageIndex + 1} of{' '}
+                      {Math.max(1, table.getPageCount())}
                     </PaginationItem>
                     <PaginationItem className='ml-1'>
                       <Button
diff --git a/frontend/src/routes/match/match-form.tsx b/frontend/src/routes/match/match-form.tsx
index dd8e1046bd..4c8886d2c5 100644
--- a/frontend/src/routes/match/match-form.tsx
+++ b/frontend/src/routes/match/match-form.tsx
@@ -85,9 +85,9 @@ export const MatchForm = ({ topics, difficulties }: MatchFormProps) => {
                             })}
                           </MultiSelectorList>
                         </MultiSelectorContent>
+                        <FormMessage />
                       </MultiSelector>
                     </FormControl>
-                    <FormMessage />
                   </FormItem>
                 )}
               />

From 3f220abe03ff6aa1fe4d7b0ed59179aa1b85f257 Mon Sep 17 00:00:00 2001
From: Chu Yi Ting <ytyt3902@outlook.com>
Date: Mon, 4 Nov 2024 14:32:11 +0800
Subject: [PATCH 2/5] Prevent 2 users that match on the same question again
 from entering the same interview room if the question was not completed

---
 backend/collaboration/src/service/get/collab-get-service.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/backend/collaboration/src/service/get/collab-get-service.ts b/backend/collaboration/src/service/get/collab-get-service.ts
index c6cb3db465..657b11211d 100644
--- a/backend/collaboration/src/service/get/collab-get-service.ts
+++ b/backend/collaboration/src/service/get/collab-get-service.ts
@@ -18,7 +18,8 @@ export async function getCollabRoomService(
     };
   }
 
-  const combinedString = `uid1=${userid1}|uid2=${userid2}|qid=${questionid}`;
+  const randomString = crypto.randomBytes(4).toString('hex');
+  const combinedString = `uid1=${userid1}|uid2=${userid2}|qid=${questionid}|rand=${randomString}`;
   const hash = crypto.createHash('sha256');
   const uniqueRoomName = hash.update(combinedString).digest('hex');
   return {

From f6f2f68ebbfbe4827de0374098dee6a519c34af0 Mon Sep 17 00:00:00 2001
From: Chu Yi Ting <ytyt3902@outlook.com>
Date: Mon, 4 Nov 2024 14:40:49 +0800
Subject: [PATCH 3/5] Fix text overflow

---
 frontend/src/components/blocks/interview/chat/chat-message.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/blocks/interview/chat/chat-message.tsx b/frontend/src/components/blocks/interview/chat/chat-message.tsx
index 63c7a797ac..f50eeb0364 100644
--- a/frontend/src/components/blocks/interview/chat/chat-message.tsx
+++ b/frontend/src/components/blocks/interview/chat/chat-message.tsx
@@ -26,7 +26,8 @@ export const ChatMessage: React.FC<ChatMessageProps> = ({ message }) => {
           className={cn(
             'prose prose-neutral text-sm text-primary',
             'prose-a:text-blue-500 prose-code:text-secondary-foreground prose-pre:ml-2 prose-pre:bg-transparent prose-pre:p-0',
-            'prose-headings:text-primary prose-strong:text-primary prose-p:text-primary'
+            'prose-headings:text-primary prose-strong:text-primary prose-p:text-primary',
+            'break-words'
           )}
         >
           {message.text}

From b3c598cc3aa8d432534cb679a4be92894039f978 Mon Sep 17 00:00:00 2001
From: Chu Yi Ting <ytyt3902@outlook.com>
Date: Mon, 4 Nov 2024 14:51:47 +0800
Subject: [PATCH 4/5] Text wrap round for the prompt buttons

---
 frontend/src/components/blocks/interview/ai-chat.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/blocks/interview/ai-chat.tsx b/frontend/src/components/blocks/interview/ai-chat.tsx
index fbcf946e97..d909d89c02 100644
--- a/frontend/src/components/blocks/interview/ai-chat.tsx
+++ b/frontend/src/components/blocks/interview/ai-chat.tsx
@@ -19,7 +19,7 @@ interface AIChatProps {
 }
 
 interface StoredChat {
-  messages: ChatMessageType[];
+  messages: Array<ChatMessageType>;
   questionDetails: string;
 }
 
@@ -35,7 +35,7 @@ export const AIChat: React.FC<AIChatProps> = ({
   language = 'python',
   questionDetails = '',
 }) => {
-  const [messages, setMessages] = useState<ChatMessageType[]>([]);
+  const [messages, setMessages] = useState<Array<ChatMessageType>>([]);
   const [isLoading, setIsLoading] = useState<boolean>(false);
   const [error, setError] = useState<string | null>(null);
   const streamingTextRef = useRef<string>('');
@@ -179,7 +179,7 @@ export const AIChat: React.FC<AIChatProps> = ({
       title='AI Assistant'
       onClearHistory={handleClearHistory}
       CustomPlaceHolderElem={({ onSend }) => (
-        <div className='flex flex-col gap-6 text-center'>
+        <div className='flex w-full flex-col gap-6 text-center'>
           <MessageSquareIcon className='mx-auto size-12 opacity-50' />
           <p>No messages yet. Start a conversation, or use one of these prompts:</p>
           <div className='flex flex-wrap gap-4'>
@@ -188,7 +188,7 @@ export const AIChat: React.FC<AIChatProps> = ({
                 key={index}
                 variant='outline'
                 size='sm'
-                className='rounded-xl'
+                className='max-w-full whitespace-normal break-words rounded-xl '
                 onClick={() => onSend(value)}
               >
                 <span>{value}</span>

From f1a27bfcf198189cd28e033062bb9b77a752d1fd Mon Sep 17 00:00:00 2001
From: SeeuSim <seeusimong@gmail.com>
Date: Mon, 4 Nov 2024 17:46:35 +0800
Subject: [PATCH 5/5] chore: fix editor interview rm styles

Signed-off-by: SeeuSim <seeusimong@gmail.com>
---
 frontend/src/components/blocks/interview/editor.tsx | 2 +-
 frontend/src/routes/interview/[room]/main.tsx       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/blocks/interview/editor.tsx b/frontend/src/components/blocks/interview/editor.tsx
index 0d9724fd29..664ab34613 100644
--- a/frontend/src/components/blocks/interview/editor.tsx
+++ b/frontend/src/components/blocks/interview/editor.tsx
@@ -22,7 +22,7 @@ import { CompleteDialog } from './room/complete-dialog';
 import { OtherUserCompletingDialog } from './room/other-user-completing-dialog';
 
 const EXTENSION_HEIGHT = 250;
-const MIN_EDITOR_HEIGHT = 350;
+const MIN_EDITOR_HEIGHT = 150;
 
 type EditorProps = {
   questionId: number;
diff --git a/frontend/src/routes/interview/[room]/main.tsx b/frontend/src/routes/interview/[room]/main.tsx
index 30f7851264..dfc315de19 100644
--- a/frontend/src/routes/interview/[room]/main.tsx
+++ b/frontend/src/routes/interview/[room]/main.tsx
@@ -59,8 +59,8 @@ export const InterviewRoom = () => {
   ) : (
     <WithNavBlocker>
       <WithNavBanner crumbs={crumbs}>
-        <div className='flex flex-1 overflow-hidden'>
-          <Card className='border-border m-4 flex w-[500px] overflow-hidden p-4 md:w-2/5'>
+        <div className='scrollbar-track-transparent scrollbar-thin flex flex-1 overflow-hidden sm:overflow-x-auto sm:overflow-y-hidden'>
+          <Card className='border-border m-4 flex w-[500px] overflow-hidden p-4 md:w-2/5 md:min-w-[292px]'>
             <Tabs defaultValue='details' className='size-full'>
               <TabsList className=''>
                 <TabsTrigger value='details'>Question Details</TabsTrigger>
@@ -85,7 +85,7 @@ export const InterviewRoom = () => {
             />
           </div>
           {(isAIChatOpen || isPartnerChatOpen) && (
-            <Card className='border-border m-4 w-[500px] overflow-hidden md:w-1/3'>
+            <Card className='border-border m-4 w-[500px] overflow-hidden md:w-1/3 md:min-w-[376px]'>
               {isAIChatOpen && (
                 <AIChat
                   isOpen={isAIChatOpen}