Merge pull request #2072 from The-Commit-Company/develop

Merging develop into main

Author: nikkothari22

frontend/src/components/feature/CommandMenu/UserList.tsx

@@ -58,8 +58,9 @@ const UserList = ({ text }: { text: string }) => {
             filteredUsersWithChannels: usersWithChannels.filter((userWithChannel) => {
                 if (userWithChannel.user) {
                     return userWithChannel.user.full_name.toLowerCase().includes(text.toLowerCase())
+                } else {
+                    return userWithChannel.channel.peer_user_id?.toLowerCase()?.includes(text.toLowerCase()) ?? false
                 }
-                return userWithChannel.channel.peer_user_id.toLowerCase().includes(text.toLowerCase())
             }),
             filteredUsersWithoutChannels: usersWithoutChannels.filter((user) => user.full_name.toLowerCase().includes(text.toLowerCase()))
         }

frontend/src/components/feature/chat/ChatMessage/ActionModals/EditMessageModal.tsx

@@ -1,4 +1,4 @@
-import { useFrappeUpdateDoc } from "frappe-react-sdk"
+import { useFrappeDeleteDoc, useFrappeUpdateDoc } from "frappe-react-sdk"
 import { useEffect } from "react"
 import { ErrorBanner } from "../../../../layout/AlertBanner/ErrorBanner"
 import { IconButton, Dialog, Flex, Text, VisuallyHidden } from "@radix-ui/themes"
@@ -15,12 +15,21 @@ interface EditMessageModalProps {
 export const EditMessageModal = ({ onClose, message }: EditMessageModalProps) => {
 
     const { updateDoc, error, loading: updatingDoc, reset } = useFrappeUpdateDoc()
+    const { deleteDoc, error: deleteError, loading: deletingDoc } = useFrappeDeleteDoc()
 
     useEffect(() => {
         reset()
     }, [reset])
 
     const onSubmit = async (html: string, json: any) => {
+
+        // If the edited message is empty, delete the message
+        if (html.trim() === '' && message.is_thread === 0 && message.message_type === "Text") {
+            return deleteDoc('Raven Message', message.name).then((d) => {
+                onClose(true)
+                toast.success("Message deleted")
+            })
+        }
         return updateDoc('Raven Message', message.name,
             { text: html, json }).then((d) => {
                 onClose(true)
@@ -44,7 +53,8 @@ export const EditMessageModal = ({ onClose, message }: EditMessageModalProps) =>
 
             <Flex gap='2' direction='column'>
                 <ErrorBanner error={error} />
-                <Tiptap onMessageSend={onSubmit} isEdit disableSessionStorage messageSending={updatingDoc} defaultText={message.text} />
+                <ErrorBanner error={deleteError} />
+                <Tiptap onMessageSend={onSubmit} isEdit disableSessionStorage messageSending={updatingDoc || deletingDoc} defaultText={message.text} />
                 <Flex justify='end' className="hidden sm:block">
                     <Text size='1' color='gray'>Press <b>Enter</b> to save</Text>
                 </Flex>

frontend/src/components/feature/chat/ChatMessage/Renderers/PollMessage.tsx

@@ -59,10 +59,10 @@ const PollMessageBox = ({ data, messageID }: { data: Poll, messageID: string })
                         <Text size='2' weight={'medium'}>{data.poll.question}</Text>
                         {data.poll.is_anonymous ? <Badge color='blue' className={'w-fit'}>Anonymous</Badge> : null}
                     </Flex>
-                    {data.poll.is_disabled ? <Badge color="gray" className={'w-fit mb-2'}>
+                    {data.poll.is_disabled ? <Text color="gray" size='1'>
                         <IoLockClosed />
                         Poll is now closed. No more votes will be accepted.
-                    </Badge> : null}
+                    </Text> : null}
                     {data.poll.end_date && !data.poll.is_disabled && (
                         <Text size='1' color='gray'>
                             This poll will end on {new Date(data.poll.end_date).toLocaleString()}.

frontend/src/components/feature/chat/ChatMessage/Renderers/TiptapRenderer/TiptapRenderer.tsx

@@ -71,7 +71,7 @@ export const TiptapRenderer = ({ message, user, isScrolling = false, showMiniIma
         },
         bulletList: {
           HTMLAttributes: {
-            class: 'list-disc pl-4'
+            class: 'pl-4'
           }
         },
         listItem: {