Skip to content

Commit b3d4205

Browse files
nikkothari22nikkothari22
authored
Merge pull request #1565 from The-Commit-Company/develop
Version 2.1.12
2 parents 02fa4be + 61eef71 commit b3d4205

20 files changed

Lines changed: 148 additions & 78 deletions

File tree

‎frontend/index.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
88
<title>{{ app_name }}</title>
99
<meta name="description" content="Simple, work messaging tool.">
10-
<link rel="apple-touch-icon" sizes="180x180" href="/assets/raven/manifest/apple-touch-icon.png">
11-
<link rel="icon" type="image/png" sizes="32x32" href="/assets/raven/manifest/favicon-32x32.png">
12-
<link rel="icon" type="image/png" sizes="16x16" href="/assets/raven/manifest/favicon-16x16.png">
10+
<link rel="apple-touch-icon" sizes="180x180" href="{{ apple_touch_icon }}">
11+
<link rel="icon" type="image/png" sizes="32x32" href="{{ icon_32 }}">
12+
<link rel="icon" type="image/png" sizes="16x16" href="{{ icon_16 }}">
1313
<meta name="msapplication-TileColor" content="#000000">
1414
<meta name="theme-color" content="#191919">
15-
<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#000000">
15+
<link rel="mask-icon" href="{{ mask_icon }}" color="#000000">
1616

1717
<meta name="apple-mobile-web-app-capable" content="yes" />
1818
<meta name="apple-mobile-web-app-title" content="{{ app_name }} | Raven" />

‎frontend/package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "raven-ui",
33
"private": true,
44
"license": "AGPL-3.0-only",
5-
"version": "2.1.11",
5+
"version": "2.1.12",
66
"type": "module",
77
"scripts": {
88
"dev": "vite",
@@ -40,7 +40,7 @@
4040
"downshift": "^8.3.1",
4141
"emoji-mart": "^5.6.0",
4242
"firebase": "10.9.0",
43-
"frappe-react-sdk": "^1.9.0",
43+
"frappe-react-sdk": "^1.11.0",
4444
"highlight.js": "^11.9.0",
4545
"html-react-parser": "^5.1.8",
4646
"jotai": "^2.10.3",
@@ -55,16 +55,16 @@
5555
"react-idle-timer": "^5.7.2",
5656
"react-intersection-observer": "^9.10.3",
5757
"react-router-dom": "^6.26.1",
58-
"react-virtuoso": "^4.12.3",
59-
"react-zoom-pan-pinch": "^3.4.4",
60-
"sonner": "^1.7.0",
58+
"react-virtuoso": "^4.12.5",
59+
"react-zoom-pan-pinch": "^3.7.0",
60+
"sonner": "^2.0.1",
6161
"tailwindcss": "^3.4.10",
6262
"tailwindcss-animate": "^1.0.7",
6363
"tippy.js": "^6.3.7",
6464
"turndown": "^7.2.0",
65-
"use-double-tap": "^1.3.6",
65+
"use-double-tap": "^1.3.7",
6666
"vaul": "^1.1.1",
67-
"vite": "^4.5.6",
67+
"vite": "^4.5.10",
6868
"vite-plugin-pwa": "^0.20.0",
6969
"vite-plugin-svgr": "^4.2.0"
7070
},

‎frontend/src/components/feature/chat/ChatMessage/MessageItem.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ export const MessageItem = ({ message, setDeleteMessage, isHighlighted, onReplyM
187187
px-1
188188
py-1.5
189189
sm:p-1.5
190-
rounded-md`, is_continuation ? '' : 'py-2.5 sm:py-3', isHighlighted ? 'bg-yellow-50 hover:bg-yellow-50 dark:bg-yellow-300/20 dark:hover:bg-yellow-300/20' : !isDesktop && isHovered ? 'bg-gray-2 dark:bg-gray-3' : '', isEmojiPickerOpen ? 'bg-gray-2 dark:bg-gray-3' : '')}>
190+
rounded-md`, is_continuation ? '' : 'pt-2.5 sm:pt-3', isHighlighted ? 'bg-yellow-50 hover:bg-yellow-50 dark:bg-yellow-300/20 dark:hover:bg-yellow-300/20' : !isDesktop && isHovered ? 'bg-gray-2 dark:bg-gray-3' : '', isEmojiPickerOpen ? 'bg-gray-2 dark:bg-gray-3' : '')}>
191191
<Flex className='gap-2.5 sm:gap-3 items-start'>
192192
<MessageLeftElement message={message} user={user} isActive={isActive} />
193193
<Flex direction='column' className='gap-0.5 w-[90%]' justify='center'>

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,10 @@ export const UserMentionRenderer = ({ node }: NodeViewRendererProps) => {
4747
<NodeViewWrapper as={'span'}>
4848
<HoverCard.Root>
4949
<HoverCard.Trigger>
50-
<Link size='2' onClick={onClick} className='cursor-pointer'>
50+
<Link size={{
51+
sm: '3',
52+
md: '2'
53+
}} onClick={onClick} className='cursor-pointer'>
5154
@{user?.full_name ?? node.attrs.label}
5255
</Link>
5356
</HoverCard.Trigger>
@@ -86,7 +89,10 @@ export const ChannelMentionRenderer = ({ node }: NodeViewRendererProps) => {
8689

8790
return (
8891
<NodeViewWrapper as={'span'}>
89-
<Link asChild>
92+
<Link asChild size={{
93+
sm: '3',
94+
md: '2'
95+
}}>
9096
<RouterLink to={`/channel/${node.attrs.id}`}>
9197
#{node.attrs.label}
9298
</RouterLink>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,12 @@ export const TiptapRenderer = ({ message, user, isScrolling = false, showMiniIma
7676
},
7777
listItem: {
7878
HTMLAttributes: {
79-
class: 'rt-Text leading-relaxed text-sm'
79+
class: 'rt-Text leading-relaxed text-base sm:text-sm'
8080
}
8181
},
8282
paragraph: {
8383
HTMLAttributes: {
84-
class: 'rt-Text text-sm'
84+
class: 'rt-Text text-base sm:text-sm'
8585
}
8686
},
8787
code: {

‎frontend/src/components/feature/pinned-messages/PinnedMessageModalContent.tsx‎

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { Dialog, Flex, IconButton, Text } from '@radix-ui/themes'
1+
import { Dialog, Flex, IconButton, Text, VisuallyHidden } from '@radix-ui/themes'
22
import { useFrappeGetCall } from 'frappe-react-sdk'
3-
import { useParams } from 'react-router-dom'
3+
import { useNavigate, useParams } from 'react-router-dom'
44
import { Message } from '../../../../../types/Messaging/Message'
55
import { ErrorBanner } from '@/components/layout/AlertBanner/ErrorBanner'
66
import { MessageBox } from '../GlobalSearch/MessageBox'
@@ -14,6 +14,29 @@ export const PinnedMessageModalContent = ({ onClose }: { onClose: () => void })
1414
revalidateOnFocus: false
1515
})
1616

17+
const navigate = useNavigate()
18+
19+
const { workspaceID } = useParams()
20+
21+
const handleNavigateToChannel = (channelID: string, workspace?: string, baseMessage?: string) => {
22+
let baseRoute = ''
23+
if (workspace) {
24+
baseRoute = `/${workspace}`
25+
} else {
26+
baseRoute = `/${workspaceID}`
27+
}
28+
29+
navigate({
30+
pathname: `${baseRoute}/${channelID}`,
31+
search: `message_id=${baseMessage}`
32+
})
33+
}
34+
35+
const handleScrollToMessage = (messageName: string, channelID: string, workspace?: string) => {
36+
handleNavigateToChannel(channelID, workspace, messageName)
37+
onClose()
38+
}
39+
1740
return (
1841
<>
1942
<Dialog.Title>
@@ -24,11 +47,16 @@ export const PinnedMessageModalContent = ({ onClose }: { onClose: () => void })
2447
</IconButton>
2548
</Flex>
2649
</Dialog.Title>
50+
<VisuallyHidden>
51+
<Dialog.Description>
52+
Pinned Messages
53+
</Dialog.Description>
54+
</VisuallyHidden>
2755
<ErrorBanner error={error} />
2856
<Flex direction='column' gap='3' justify='start'>
2957
{data?.message?.map((message) => {
3058
return (
31-
<MessageBox key={message.name} message={message} />
59+
<MessageBox key={message.name} message={message} handleScrollToMessage={handleScrollToMessage} />
3260
)
3361
})}
3462
</Flex>

‎frontend/src/components/feature/userSettings/UploadImage/ImageUploader.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ export const UploadImage = ({ open, setOpen, uploadImage, userID }: { open: bool
7272
</Dialog.Trigger>
7373
</Tooltip>
7474
<Dialog.Content className={DIALOG_CONTENT_CLASS}>
75-
<UploadImageModal uploadImage={uploadImage} doctype={"Raven User"} docname={userID} fieldname={"user_image"} />
75+
<UploadImageModal isPrivate={false} uploadImage={uploadImage} doctype={"Raven User"} docname={userID} fieldname={"user_image"} />
7676
</Dialog.Content>
7777
</Dialog.Root>
7878
)

‎frontend/src/components/feature/userSettings/UploadImage/UploadImageModal.tsx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@ interface UploadImageModalProps {
1414
doctype: string,
1515
docname: string,
1616
fieldname: string,
17+
isPrivate?: boolean,
1718
}
1819

19-
export const UploadImageModal = ({ uploadImage, label = 'Upload Image', doctype, docname, fieldname }: UploadImageModalProps) => {
20+
export const UploadImageModal = ({ uploadImage, label = 'Upload Image', doctype, docname, fieldname, isPrivate = true }: UploadImageModalProps) => {
2021

2122
const [file, setFile] = useState<CustomFile | undefined>()
2223
const [fileError, setFileError] = useState<FrappeError>()
@@ -36,9 +37,9 @@ export const UploadImageModal = ({ uploadImage, label = 'Upload Image', doctype,
3637
otherData: {
3738
optimize: '1',
3839
},
39-
isPrivate: true,
40+
isPrivate: isPrivate,
4041
}).then((res) => {
41-
uploadImage(res.file_url + "?fid=" + res.name)
42+
uploadImage(res.file_url)
4243
}).catch((e) => {
4344
setFileError(e)
4445
})

‎frontend/src/components/feature/workspaces/AddWorkspaceForm.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ const AddWorkspaceForm = ({ onClose }: { onClose: (workspaceID?: string) => void
4444
otherData: {
4545
optimize: '1',
4646
},
47-
isPrivate: true,
47+
isPrivate: false,
4848
}).then((fileRes) => {
4949
return updateDoc("Raven Workspace", res.name, {
50-
logo: fileRes.file_url + "?fid=" + fileRes.name
50+
logo: fileRes.file_url
5151
})
5252
})
5353
}

‎frontend/src/components/feature/workspaces/WorkspaceLogoField.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export const UploadImage = ({ open, setOpen, uploadImage, workspaceID }: { open:
5959
</Dialog.Trigger>
6060
</Tooltip>
6161
<Dialog.Content className={DIALOG_CONTENT_CLASS}>
62-
<UploadImageModal uploadImage={uploadImage} doctype={"Raven Workspace"} docname={workspaceID} fieldname={"logo"} />
62+
<UploadImageModal isPrivate={false} uploadImage={uploadImage} doctype={"Raven Workspace"} docname={workspaceID} fieldname={"logo"} />
6363
</Dialog.Content>
6464
</Dialog.Root>
6565
)

0 commit comments

Comments
 (0)
⚡