Austin/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2024-11-16 19:59:50 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix: not return annotation author error happens (#1793)

Browse Source
This commit is contained in:
Joel 2023-12-19 17:22:54 +08:00 committed by GitHub
parent 43741ad5d1
commit c3275dfd36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web/app/components/app/annotation/header-opts/index.tsx
View File

@ -114,7 +114,8 @@ const HeaderOptions: FC<Props> = ({
)
}
// !w-[208px]
className={'!w-[131px] h-fit !z-20'}
className={'!w-[135px] h-fit !z-20'}
popupClassName='!w-full'
manualClose
/>
{showAddModal && (

2
web/app/components/app/chat/answer/index.tsx
View File

@ -247,7 +247,7 @@ const Answer: FC<IAnswerProps> = ({
<Markdown className='line-through !text-gray-400' content={content} />
</div>
<EditTitle title={t('appAnnotation.editBy', {
author: annotation?.logAnnotation.account.name,
author: annotation?.logAnnotation.account?.name,
})} />
</div>
)}

2
web/app/components/app/log/list.tsx
View File

@ -100,7 +100,7 @@ const getFormattedChatList = (messages: ChatMessage[]) => {
if (item.annotation_hit_history) {
return {
id: item.annotation_hit_history.annotation_id,
authorName: item.annotation_hit_history.annotation_create_account.name,
authorName: item.annotation_hit_history.annotation_create_account?.name || 'N/A',
created_at: item.annotation_hit_history.created_at,
}
}

16
web/app/components/base/popover/index.tsx
View File

@ -1,5 +1,6 @@
import { Popover, Transition } from '@headlessui/react'
import { Fragment, cloneElement, useRef } from 'react'
import cn from 'classnames'
import s from './style.module.css'
export type HtmlContentProps = {
@ -10,6 +11,7 @@ export type HtmlContentProps = {
type IPopover = {
className?: string
htmlContent: React.ReactElement<HtmlContentProps>
popupClassName?: string
trigger?: 'click' | 'hover'
position?: 'bottom' | 'br'
btnElement?: string | React.ReactNode
@ -23,6 +25,7 @@ export default function CustomPopover({
trigger = 'hover',
position = 'bottom',
htmlContent,
popupClassName,
btnElement,
className,
btnClassName,
@ -57,12 +60,11 @@ export default function CustomPopover({
>
<Popover.Button
ref={buttonRef}
className={`group ${s.popupBtn} ${open ? '' : 'bg-gray-100'} ${
!btnClassName
? ''
: typeof btnClassName === 'string'
? btnClassName
: btnClassName?.(open)
className={`group ${s.popupBtn} ${open ? '' : 'bg-gray-100'} ${!btnClassName
? ''
: typeof btnClassName === 'string'
? btnClassName
: btnClassName?.(open)
}`}
>
{btnElement}
@ -80,7 +82,7 @@ export default function CustomPopover({
>
{({ close }) => (
<div
className={s.panelContainer}
className={cn(s.panelContainer, popupClassName)}
{...(trigger !== 'hover'
? {}
: {