Merge branch 'integration' into rav-39-raven-bot-doctype-setup

mobile/src/components/features/channels/channel-members/ViewChannelMembers.tsx

@@ -53,7 +53,7 @@ export const ViewChannelMembers = ({ presentingElement, isOpen, onDismiss, chann
     }
 
     const removeMember = () => {
-        return call.post('raven.raven_channel_management.doctype.raven_channel_member.raven_channel_member.remove_channel_member', {
+        return call.post('raven.api.raven_channel_member.remove_channel_member', {
             user_id: selectedMember?.name,
             channel_id: channelID
         }).then(() => {

mobile/src/components/features/chat-input/ChatInput.tsx

@@ -14,7 +14,7 @@ type Props = {
 }
 export const ChatInput = ({ channelID, allChannels, allMembers, onMessageSend }: Props) => {
 
-    const { call, loading } = useFrappePostCall('raven.raven_messaging.doctype.raven_message.raven_message.send_message')
+    const { call, loading } = useFrappePostCall('raven.api.raven_message.send_message')
 
     const [files, setFiles] = useState<File[]>([])
 

mobile/src/components/features/chat-space/ChatInterface.tsx

@@ -65,7 +65,7 @@ export const ChatInterface = ({ channel }: { channel: ChannelListItem | DMChanne
      * 
      * */
     // Fetch all the messages in the channel
-    const { data: messages, error: messagesError, mutate: refreshMessages, isLoading: isMessageLoading } = useFrappeGetCall<{ message: MessagesWithDate }>("raven.raven_messaging.doctype.raven_message.raven_message.get_messages_with_dates", {
+    const { data: messages, error: messagesError, mutate: refreshMessages, isLoading: isMessageLoading } = useFrappeGetCall<{ message: MessagesWithDate }>("raven.api.raven_message.get_messages_with_dates", {
         channel_id: channel.name
     }, `get_messages_for_channel_${channel.name}`, {
         keepPreviousData: true,

mobile/src/components/features/direct-messages/DirectMessages.tsx

@@ -11,7 +11,7 @@ export const PrivateMessages = ({ users, unread_count }: { users: DMUser[], unre
 
     const { mutate } = useChannelList()
 
-    const { call } = useFrappePostCall<{ message: string }>("raven.raven_channel_management.doctype.raven_channel.raven_channel.create_direct_message_channel")
+    const { call } = useFrappePostCall<{ message: string }>("raven.api.raven_channel.create_direct_message_channel")
 
     const history = useHistory();
 

mobile/src/pages/channels/Channels.tsx

@@ -26,7 +26,7 @@ export const Channels = () => {
         return activeChannels.filter(channel => channel.channel_name.includes(searchTerm))
     }, [searchInput, channels])
 
-    const { data: unread_count, mutate: update_count } = useFrappeGetCall<{ message: UnreadCountData }>("raven.raven_messaging.doctype.raven_message.raven_message.get_unread_count_for_channels",
+    const { data: unread_count, mutate: update_count } = useFrappeGetCall<{ message: UnreadCountData }>("raven.api.raven_message.get_unread_count_for_channels",
         undefined,
         'unread_channel_count', {
         // revalidateOnFocus: false,

mobile/src/pages/direct-messages/DirectMessageList.tsx

@@ -23,7 +23,7 @@ export const DirectMessageList = () => {
         return users.filter(user => user.full_name.toLowerCase().includes(searchTerm))
     }, [users, searchInput])
 
-    const { data: unread_count, mutate: update_count } = useFrappeGetCall<{ message: UnreadCountData }>("raven.raven_messaging.doctype.raven_message.raven_message.get_unread_count_for_channels",
+    const { data: unread_count, mutate: update_count } = useFrappeGetCall<{ message: UnreadCountData }>("raven.api.raven_message.get_unread_count_for_channels",
         undefined,
         'unread_channel_count', {
         // revalidateOnFocus: false,

mobile/src/types/RavenMessaging/RavenMessage.ts

@@ -44,4 +44,6 @@ export interface RavenMessage{
 	is_bot_message?: 0 | 1
 	/**	Bot : Link - Raven User	*/
 	bot?: string
+	/**	Content : Long Text	*/
+	content?: string
 }

mobile/src/utils/channel/ChannelListProvider.tsx

@@ -71,7 +71,7 @@ const useFetchChannelList = (): ChannelListContextType => {
             position: 'bottom',
         });
     };
-    const { data, mutate, ...rest } = useFrappeGetCall<{ message: ChannelList }>("raven.raven_channel_management.doctype.raven_channel.raven_channel.get_all_channels", undefined, isLoggedIn ? undefined : null, {
+    const { data, mutate, ...rest } = useFrappeGetCall<{ message: ChannelList }>("raven.api.raven_channel.get_all_channels", undefined, isLoggedIn ? undefined : null, {
         revalidateOnFocus: false,
         revalidateIfStale: false,
         onError: (error) => {

raven-app/src/App.tsx

@@ -5,11 +5,11 @@ import { ProtectedRoute } from './utils/auth/ProtectedRoute'
 import { UserProvider } from './utils/auth/UserProvider'
 import { ChannelRedirect } from './utils/channel/ChannelRedirect'
 import "cal-sans";
-import { useState } from 'react'
 import { ThemeProvider } from './ThemeProvider'
 import { Toaster } from './components/common/Toast/Toaster'
 import { FullPageLoader } from './components/layout/Loaders'
 import { useStickyState } from './hooks/useStickyState'
+import { Settings } from './pages/settings/Settings'
 
 
 const router = createBrowserRouter(
@@ -23,6 +23,12 @@ const router = createBrowserRouter(
           <Route path="saved-messages" lazy={() => import('./components/feature/saved-messages/SavedMessages')} />
           <Route path=":channelID" lazy={() => import('@/pages/ChatSpace')} />
         </Route>
+        <Route path='settings' element={<Settings />}>
+          <Route path='integrations'>
+            <Route path='webhooks' element={<p>Webhooks</p>} />
+            <Route path='server-scripts' element={<p>SS</p>} />
+          </Route>
+        </Route>
       </Route>
     </>
   ), {

raven-app/src/components/feature/GlobalSearch/MessageSearch.tsx

@@ -55,7 +55,7 @@ export const MessageSearch = ({ onToggleMyChannels, isOpenMyChannels, onToggleSa
     const { virtuosoRef } = useContext(VirtuosoRefContext)
     const navigate = useNavigate()
 
-    const { call, reset } = useFrappePostCall<{ message: string }>("raven.raven_messaging.doctype.raven_message.raven_message.get_index_of_message")
+    const { call, reset } = useFrappePostCall<{ message: string }>("raven.api.raven_message.get_index_of_message")
 
     const handleNavigateToChannel = (channelID: string) => {
         onClose()

raven-app/src/components/feature/channel-shared-files/FilesSharedInChannel.tsx

@@ -21,7 +21,7 @@ interface FilesSharedInChannelProps {
 export const FilesSharedInChannel = ({ channelMembers }: FilesSharedInChannelProps) => {
 
     const { channelID } = useParams()
-    const { data, error } = useFrappeGetCall<{ message: ChannelFile[] }>("raven.raven_messaging.doctype.raven_message.raven_message.fetch_recent_files", {
+    const { data, error } = useFrappeGetCall<{ message: ChannelFile[] }>("raven.api.raven_message.fetch_recent_files", {
         channel_id: channelID
     }, undefined, {
         revalidateOnFocus: false

raven-app/src/components/feature/chat/ChatInput/useSendMessage.ts

@@ -4,7 +4,7 @@ import { Message } from '../../../../../../types/Messaging/Message'
 export const useSendMessage = (channelID: string, noOfFiles: number, uploadFiles: () => Promise<void>, handleCancelReply: VoidFunction, selectedMessage?: Message | null) => {
 
     const { mutate } = useSWRConfig()
-    const { call, loading } = useFrappePostCall('raven.raven_messaging.doctype.raven_message.raven_message.send_message')
+    const { call, loading } = useFrappePostCall('raven.api.raven_message.send_message')
 
     const sendMessage = async (content: string, json?: any): Promise<void> => {
 

raven-app/src/components/feature/chat/ChatMessage/MessageActions/QuickActions/QuickActionButton.tsx

@@ -7,7 +7,7 @@ interface QuickActionButtonProps extends IconButtonProps {
     tooltip: string
 }
 
-export const QUICK_ACTION_BUTTON_CLASS = 'bg-gray-2 dark:bg-gray-3 hover:bg-gray-4 dark:hover:bg-gray-6 text-gray-12 hover:text-gray-12'
+export const QUICK_ACTION_BUTTON_CLASS = 'bg-gray-2 dark:bg-gray-2 hover:bg-gray-4 dark:hover:bg-gray-5 text-gray-12 hover:text-gray-12'
 export const QuickActionButton = forwardRef(({ className, tooltip, ...props }: QuickActionButtonProps, ref) => {
     return (
         <Tooltip content={tooltip}>

raven-app/src/components/feature/chat/ChatMessage/MessageItem.tsx

@@ -141,7 +141,7 @@ const MessageLeftElement = ({ message, className, user, isActive, isScrolling, .
     // If it's a continuation, then show the timestamp
 
     // Else, show the avatar
-    return <Box className={clsx(message.is_continuation ? 'invisible group-hover:visible' : '', className)} {...props}>
+    return <Box className={clsx(message.is_continuation ? 'invisible group-hover:visible flex items-center max-w-[32px] w-[32px]' : '', className)} {...props}>
         {message.is_continuation ?
             <DateTooltipShort timestamp={message.creation} />
             : <MessageSenderAvatar userID={message.owner} user={user} isActive={isActive} isScrolling={isScrolling} />

raven-app/src/components/feature/chat/ChatMessage/Renderers/DateTooltip.tsx

@@ -21,7 +21,7 @@ export const DateTooltipShort = ({ timestamp }: { timestamp: string }) => {
         <Tooltip content={<DateMonthAtHourMinuteAmPm date={timestamp} />}>
             <Link
                 asChild
-                size='1'
+                style={{ fontSize: '0.68rem' }}
                 color="gray"
             >
                 <span><HourMinuteAmPm date={timestamp} amPm={false} /></span>

raven-app/src/components/feature/chat/ChatStream/ChatBoxBody.tsx

@@ -41,7 +41,7 @@ interface ChatBoxBodyProps {
 export const ChatBoxBody = ({ channelData }: ChatBoxBodyProps) => {
 
     const { currentUser } = useContext(UserContext)
-    const { data, error, mutate, isLoading } = useFrappeGetCall<{ message: MessagesWithDate }>("raven.raven_messaging.doctype.raven_message.raven_message.get_messages_with_dates", {
+    const { data, error, mutate, isLoading } = useFrappeGetCall<{ message: MessagesWithDate }>("raven.api.raven_message.get_messages_with_dates", {
         channel_id: channelData.name
     }, `get_messages_for_channel_${channelData.name}`, {
         revalidateOnFocus: false

raven-app/src/components/feature/chat/ChatStream/ChatHistory.tsx

@@ -82,7 +82,7 @@ export const ChatHistory = ({ parsedMessages, replyToMessage, channelData }: Cha
 
     const onReplyMessageClick = (messageID: string) => {
         if (virtuosoRef?.current) {
-            call.get('raven.raven_messaging.doctype.raven_message.raven_message.get_index_of_message', {
+            call.get('raven.api.raven_message.get_index_of_message', {
                 channel_id: channelData.name,
                 message_id: messageID
             }).then((result) => {
@@ -102,8 +102,8 @@ export const ChatHistory = ({ parsedMessages, replyToMessage, channelData }: Cha
                 itemContent={(index, data, context) => <RenderItem block={parsedMessages[index]} index={index} {...data} {...context} isScrolling={isScrolling} />}
                 initialTopMostItemIndex={parsedMessages.length - 1}
                 components={{
-                    Header: () => <ChannelHistoryFirstMessage channelID={channelData?.name} />,
-                    Footer: () => <Box p='4' className="z-10 relative"></Box>
+                    Header,
+                    Footer,
                 }}
                 isScrolling={setIsScrolling}
                 context={{ channelData, replyToMessage, onReplyMessageClick, setDeleteMessage, updateMessages, setEditMessage }}
@@ -117,6 +117,9 @@ export const ChatHistory = ({ parsedMessages, replyToMessage, channelData }: Cha
         </Box>
     )
 }
+const Header = ({ context: { channelData } }: any) => <ChannelHistoryFirstMessage channelID={channelData?.name} />
+const Footer = () => <Box p='4' className="z-10 relative"></Box>
+
 
 const RenderItem = ({ index, replyToMessage, updateMessages, block, onReplyMessageClick, channelData, setEditMessage, setDeleteMessage, isScrolling, ...props }: {
     index: number,
@@ -140,6 +143,7 @@ const RenderItem = ({ index, replyToMessage, updateMessages, block, onReplyMessa
                     message={block.data}
                     isScrolling={isScrolling}
                     updateMessages={updateMessages}
+                    key={`${block.data.name}_${block.data.modified}`}
                     onReplyMessageClick={onReplyMessageClick}
                     setEditMessage={setEditMessage}
                     replyToMessage={replyToMessage}

raven-app/src/components/feature/direct-messages/DirectMessageList.tsx

@@ -78,7 +78,7 @@ const DirectMessageItem = ({ channel, unreadCount }: { channel: DMChannelListIte
 const ExtraUsersItemList = () => {
 
     const { extra_users, mutate } = useContext(ChannelListContext) as ChannelListContextType
-    const { call } = useFrappePostCall<{ message: string }>("raven.raven_channel_management.doctype.raven_channel.raven_channel.create_direct_message_channel")
+    const { call } = useFrappePostCall<{ message: string }>("raven.api.raven_channel.create_direct_message_channel")
 
     const { toast } = useToast()
     const navigate = useNavigate()

raven-app/src/components/feature/raven-users/AddRavenUsersContent.tsx

@@ -31,7 +31,7 @@ const AddRavenUsersContent = ({ onClose }: { onClose: VoidFunction }) => {
     const [sortOrder, setSortOder] = useState<"asc" | "desc">("desc")
 
     const { data, error } = useFrappeGetDocList<User>("User", {
-        fields: ["name", "full_name", "user_image", "creation", "enabled", "user_type"],
+        fields: ["name", "full_name", "user_image", "creation", "enabled", "user_type", "role_profile_name"],
         filters,
         orderBy: {
             field: 'creation',

raven-app/src/components/feature/raven-users/UsersTable.tsx

@@ -1,8 +1,9 @@
 import { User } from "@/types/Core/User"
 import { useMemo } from "react"
-import { Checkbox, Flex, Table } from "@radix-ui/themes"
+import { Badge, Box, Checkbox, Flex, Table, Tooltip } from "@radix-ui/themes"
 import { UserAvatar } from "@/components/common/UserAvatar"
 import { StandardDate } from "@/utils/dateConversions"
+import { FiAlertTriangle } from "react-icons/fi"
 
 interface UsersTableProps {
     data: User[],
@@ -62,6 +63,7 @@ export const UsersTable = ({ data, selected, setSelected, defaultSelected }: Use
                     <Table.ColumnHeaderCell>Name</Table.ColumnHeaderCell>
                     <Table.ColumnHeaderCell>User ID</Table.ColumnHeaderCell>
                     <Table.ColumnHeaderCell>Created on</Table.ColumnHeaderCell>
+                    <Table.ColumnHeaderCell></Table.ColumnHeaderCell>
                 </Table.Row>
             </Table.Header>
             <Table.Body>
@@ -79,6 +81,16 @@ export const UsersTable = ({ data, selected, setSelected, defaultSelected }: Use
 
                             <Table.Cell>{user.name}</Table.Cell>
                             <Table.Cell><StandardDate date={user.creation} /></Table.Cell>
+                            <Table.Cell>
+                                {user.role_profile_name ?
+                                    <Box>
+                                        <Tooltip content={<span>A role profile has been assigned to this user.<br />If you want to add the user to Raven, please change their role profile.</span>}>
+                                            <Badge color='red' variant="solid">
+                                                <FiAlertTriangle size='12' />
+                                                Role Profile Added</Badge>
+                                        </Tooltip>
+                                    </Box> : null}
+                            </Table.Cell>
                         </Table.Row>
                     )
                 })}

raven-app/src/components/feature/saved-messages/SavedMessages.tsx

@@ -20,11 +20,11 @@ const SavedMessages = () => {
 
     const { virtuosoRef } = useContext(VirtuosoRefContext)
 
-    const { data, error } = useFrappeGetCall<{ message: Message[] }>("raven.raven_messaging.doctype.raven_message.raven_message.get_saved_messages", undefined, undefined, {
+    const { data, error } = useFrappeGetCall<{ message: Message[] }>("raven.api.raven_message.get_saved_messages", undefined, undefined, {
         revalidateOnFocus: false
     })
 
-    const { call, error: indexingError, reset } = useFrappePostCall<{ message: string }>("raven.raven_messaging.doctype.raven_message.raven_message.get_index_of_message")
+    const { call, error: indexingError, reset } = useFrappePostCall<{ message: string }>("raven.api.raven_message.get_index_of_message")
 
     const handleNavigateToChannel = (channelID: string, _callback: VoidFunction) => {
         navigate(`/channel/${channelID}`)

raven-app/src/components/feature/settings/Integrations.tsx

@@ -0,0 +1,39 @@
+import { SidebarGroup, SidebarGroupItem, SidebarGroupLabel, SidebarGroupList, SidebarItem } from "@/components/layout/Sidebar"
+import { Flex, Text } from "@radix-ui/themes"
+import { BiPlug } from "react-icons/bi"
+
+export interface Props { }
+
+export const Integrations = (props: Props) => {
+    return (
+        <SidebarGroup>
+            <SidebarGroupItem gap='2' className={'pl-1.5'}>
+                {/* <SidebarViewMoreButton onClick={toggle} /> */}
+                <BiPlug />
+                <Flex width='100%' justify='between' align='center' gap='2'>
+                    <Flex gap='3' align='center'>
+                        <SidebarGroupLabel className='cal-sans'>Integrations</SidebarGroupLabel>
+                    </Flex>
+                </Flex>
+            </SidebarGroupItem>
+            <SidebarGroup>
+                <SidebarGroupList>
+                    <IntegrationsItem route='/settings/integrations/webhooks' label='Webhooks' />
+                    <IntegrationsItem route='/settings/integrations/server-scripts' label='Server Scripts' />
+                </SidebarGroupList>
+            </SidebarGroup>
+        </SidebarGroup>
+    )
+}
+
+
+export const IntegrationsItem = ({ route, label }: { route: string, label: string }) => {
+
+    return (
+        <SidebarItem to={route ? route : "*"} className={'py-1.5'}>
+            <Flex justify='between' align={'center'} width='100%'>
+                <Text size='2' className="text-ellipsis line-clamp-1" as='span' weight={'regular'}>{label}</Text>
+            </Flex>
+        </SidebarItem>
+    )
+}

raven-app/src/components/layout/Settings/Sidebar.tsx

@@ -0,0 +1,24 @@
+import { Flex, Box, Separator } from "@radix-ui/themes"
+import { SidebarBody } from "./SidebarBody"
+import { SidebarFooter } from "../Sidebar/SidebarFooter"
+import { SidebarHeader } from "./SidebarHeader"
+
+export interface Props { }
+
+/**
+ * Sidebar for Settings page
+ */
+export const Sidebar = (props: Props) => {
+    return (
+        <Flex justify='between' direction='row' gap='2'>
+            <Flex direction='column' gap='2' width='100%'>
+                <SidebarHeader />
+                <Box px='3'>
+                    <Separator size='4' className={`bg-gray-4 dark:bg-gray-6`} />
+                </Box>
+                <SidebarBody />
+            </Flex>
+            <SidebarFooter isSettingsPage />
+        </Flex>
+    )
+}

raven-app/src/components/layout/Settings/SidebarBody.tsx

@@ -0,0 +1,14 @@
+import { Integrations } from "@/components/feature/settings/Integrations"
+import { ScrollArea, Flex } from "@radix-ui/themes"
+
+export interface Props { }
+
+export const SidebarBody = (props: Props) => {
+    return (
+        <ScrollArea type="hover" scrollbars="vertical" className='h-[calc(100vh-7rem)]'>
+            <Flex direction='column' gap='2' className='overflow-x-hidden' px='2'>
+                <Integrations />
+            </Flex>
+        </ScrollArea>
+    )
+}

raven-app/src/components/layout/Settings/SidebarHeader.tsx

@@ -0,0 +1,27 @@
+import { Flex, Text } from "@radix-ui/themes"
+import { BiChevronLeft } from "react-icons/bi"
+import { useNavigate } from "react-router-dom"
+
+export interface Props { }
+
+export const SidebarHeader = (props: Props) => {
+
+    const navigate = useNavigate()
+
+    return (
+        <header>
+            <Flex
+                px='3'
+                align='center'
+                gap={'3'}
+                pt='1'
+                height='8'
+                className="cursor-pointer"
+                onClick={() => navigate('/channel')}
+            >
+                <BiChevronLeft size={'24px'} color="gray" />
+                <Text as='span' size='4' weight={'medium'}>Settings</Text>
+            </Flex>
+        </header>
+    )
+}

raven-app/src/components/layout/Sidebar/SidebarBody.tsx

@@ -8,7 +8,7 @@ import { BiBookmark } from 'react-icons/bi'
 
 export const SidebarBody = () => {
 
-    const { data: unread_count, mutate: update_count } = useFrappeGetCall<{ message: UnreadCountData }>("raven.raven_messaging.doctype.raven_message.raven_message.get_unread_count_for_channels",
+    const { data: unread_count, mutate: update_count } = useFrappeGetCall<{ message: UnreadCountData }>("raven.api.raven_message.get_unread_count_for_channels",
         undefined,
         'unread_channel_count', {
         // revalidateOnFocus: false,