mirror of
https://github.com/hexastack/hexabot
synced 2025-06-26 18:27:28 +00:00
feat: update frontend to use id instead of foreign_id
This commit is contained in:
parent
e2c81a9618
commit
c35be05416
@ -1,11 +1,12 @@
|
||||
/*
|
||||
* Copyright © 2024 Hexastack. All rights reserved.
|
||||
* Copyright © 2025 Hexastack. All rights reserved.
|
||||
*
|
||||
* Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
|
||||
* 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
|
||||
* 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
|
||||
*/
|
||||
|
||||
|
||||
import { Grid } from "@mui/material";
|
||||
import { GridRenderCellParams } from "@mui/x-data-grid";
|
||||
|
||||
@ -29,13 +30,7 @@ export const buildRenderPicture = (
|
||||
}}
|
||||
>
|
||||
<img
|
||||
src={getAvatarSrc(
|
||||
apiUrl,
|
||||
entityType,
|
||||
entityType === EntityType.USER
|
||||
? params.row.id
|
||||
: params.row.foreign_id,
|
||||
)}
|
||||
src={getAvatarSrc(apiUrl, entityType, params.row.id)}
|
||||
style={{ width: "36px", height: "36px" }}
|
||||
/>
|
||||
</Grid>
|
||||
|
@ -1,11 +1,12 @@
|
||||
/*
|
||||
* Copyright © 2024 Hexastack. All rights reserved.
|
||||
* Copyright © 2025 Hexastack. All rights reserved.
|
||||
*
|
||||
* Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
|
||||
* 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
|
||||
* 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
|
||||
*/
|
||||
|
||||
|
||||
import {
|
||||
Avatar,
|
||||
ChatContainer,
|
||||
@ -70,11 +71,7 @@ export function Chat() {
|
||||
<ConversationHeader>
|
||||
<Avatar
|
||||
name={subscriber?.first_name}
|
||||
src={getAvatarSrc(
|
||||
apiUrl,
|
||||
EntityType.SUBSCRIBER,
|
||||
subscriber.foreign_id,
|
||||
)}
|
||||
src={getAvatarSrc(apiUrl, EntityType.SUBSCRIBER, subscriber.id)}
|
||||
/>
|
||||
<ConversationHeader.Content>
|
||||
<ChatHeader />
|
||||
@ -127,9 +124,8 @@ export function Chat() {
|
||||
message.sender
|
||||
? EntityType.SUBSCRIBER
|
||||
: EntityType.USER,
|
||||
(message.sender
|
||||
? subscriber.foreign_id
|
||||
: message.sentBy) || "",
|
||||
(message.sender ? subscriber.id : message.sentBy) ||
|
||||
"",
|
||||
)}
|
||||
/>,
|
||||
]
|
||||
|
@ -1,11 +1,12 @@
|
||||
/*
|
||||
* Copyright © 2024 Hexastack. All rights reserved.
|
||||
* Copyright © 2025 Hexastack. All rights reserved.
|
||||
*
|
||||
* Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
|
||||
* 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
|
||||
* 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
|
||||
*/
|
||||
|
||||
|
||||
import {
|
||||
Avatar,
|
||||
Conversation,
|
||||
@ -50,30 +51,26 @@ export const SubscribersList = (props: {
|
||||
loadingMore={isFetching}
|
||||
onYReachEnd={handleLoadMore}
|
||||
>
|
||||
{subscribers.map((conversation) => (
|
||||
{subscribers.map((subscriber) => (
|
||||
<Conversation
|
||||
onClick={() => chat.setSubscriberId(conversation.id)}
|
||||
onClick={() => chat.setSubscriberId(subscriber.id)}
|
||||
className="changeColor"
|
||||
key={conversation.id}
|
||||
active={chat.subscriber?.id === conversation.id}
|
||||
key={subscriber.id}
|
||||
active={chat.subscriber?.id === subscriber.id}
|
||||
>
|
||||
<Avatar
|
||||
src={getAvatarSrc(
|
||||
apiUrl,
|
||||
EntityType.SUBSCRIBER,
|
||||
conversation.foreign_id,
|
||||
)}
|
||||
src={getAvatarSrc(apiUrl, EntityType.SUBSCRIBER, subscriber.id)}
|
||||
/>
|
||||
<Conversation.Content>
|
||||
<div>
|
||||
{conversation.first_name} {conversation.last_name}
|
||||
{subscriber.first_name} {subscriber.last_name}
|
||||
</div>
|
||||
<div className="cs-conversation__info">
|
||||
{conversation.lastvisit?.toLocaleString(i18n.language)}
|
||||
{subscriber.lastvisit?.toLocaleString(i18n.language)}
|
||||
</div>
|
||||
</Conversation.Content>
|
||||
<Conversation.Operations visible>
|
||||
<Chip size="small" label={conversation.channel.name} />
|
||||
<Chip size="small" label={subscriber.channel.name} />
|
||||
</Conversation.Operations>
|
||||
</Conversation>
|
||||
))}
|
||||
|
Loading…
Reference in New Issue
Block a user