mirror of
https://github.com/balzack/databag.git
synced 2025-03-13 09:00:06 +00:00
support resyncing offsync contacts
This commit is contained in:
parent
f69498645e
commit
2f5a6ae241
@ -1,9 +1,10 @@
|
|||||||
import React, { useEffect } from 'react'
|
import React, { useEffect } from 'react'
|
||||||
import { CardsWrapper, CardItem } from './Cards.styled';
|
import { CardsWrapper, CardItem, Offsync } from './Cards.styled';
|
||||||
import { Drawer, List } from 'antd';
|
import { Drawer, List, Tooltip } from 'antd';
|
||||||
import { Registry } from './Registry/Registry';
|
import { Registry } from './Registry/Registry';
|
||||||
import { useCards } from './useCards.hook';
|
import { useCards } from './useCards.hook';
|
||||||
import { Logo } from '../../../../Logo/Logo';
|
import { Logo } from '../../../../Logo/Logo';
|
||||||
|
import { ExclamationCircleOutlined } from '@ant-design/icons';
|
||||||
|
|
||||||
export function Cards({ showRegistry }) {
|
export function Cards({ showRegistry }) {
|
||||||
|
|
||||||
@ -38,6 +39,10 @@ export function Cards({ showRegistry }) {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const Resync = (id) => {
|
||||||
|
actions.resync(id);
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<CardsWrapper>
|
<CardsWrapper>
|
||||||
<Drawer
|
<Drawer
|
||||||
@ -63,6 +68,13 @@ export function Cards({ showRegistry }) {
|
|||||||
<Logo imageUrl={cardImage(item)}
|
<Logo imageUrl={cardImage(item)}
|
||||||
imageSet={cardProfile(item).imageSet} />
|
imageSet={cardProfile(item).imageSet} />
|
||||||
</div>
|
</div>
|
||||||
|
{item.error && (
|
||||||
|
<Tooltip placement="topLeft" title="sync failed: click to retry">
|
||||||
|
<Offsync onClick={(e) => {e.stopPropagation(); Resync(item.id)}} >
|
||||||
|
<ExclamationCircleOutlined />
|
||||||
|
</Offsync>
|
||||||
|
</Tooltip>
|
||||||
|
)}
|
||||||
<div class="username">
|
<div class="username">
|
||||||
<span class="name">{ cardProfile(item).name }</span>
|
<span class="name">{ cardProfile(item).name }</span>
|
||||||
<span class="handle">{ cardHandle(item) }</span>
|
<span class="handle">{ cardHandle(item) }</span>
|
||||||
|
@ -51,3 +51,8 @@ export const CardItem = styled(List.Item)`
|
|||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
export const Offsync = styled.div`
|
||||||
|
padding-left: 4px;
|
||||||
|
color: #ff8888;
|
||||||
|
`
|
||||||
|
|
||||||
|
@ -18,6 +18,9 @@ export function useCards() {
|
|||||||
getImageUrl: card.actions.getImageUrl,
|
getImageUrl: card.actions.getImageUrl,
|
||||||
select: (contact) => {
|
select: (contact) => {
|
||||||
navigate(`/user/contact/${contact.data.cardProfile.guid}`);
|
navigate(`/user/contact/${contact.data.cardProfile.guid}`);
|
||||||
|
},
|
||||||
|
resync: (id) => {
|
||||||
|
card.actions.resync(id);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -32,18 +32,37 @@ export function useCardContext() {
|
|||||||
const revision = useRef(null);
|
const revision = useRef(null);
|
||||||
const next = useRef(null);
|
const next = useRef(null);
|
||||||
const cards = useRef(new Map());
|
const cards = useRef(new Map());
|
||||||
|
const resync = useRef([]);
|
||||||
|
|
||||||
const updateState = (value) => {
|
const updateState = (value) => {
|
||||||
setState((s) => ({ ...s, ...value }))
|
setState((s) => ({ ...s, ...value }))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const updateCard = async (cardId) => {
|
||||||
|
let card = cards.current.get(cardId);
|
||||||
|
const { cardDetail, cardProfile } = card.data;
|
||||||
|
|
||||||
|
if (cardDetail.status === 'connected' && card.error) {
|
||||||
|
let message = await getContactProfile(cardProfile.node, cardProfile.guid, cardDetail.token);
|
||||||
|
await setCardProfile(access.current, card.id, message);
|
||||||
|
|
||||||
|
card.channels = new Map();
|
||||||
|
await updateContactChannels(card.data.cardProfile.node, card.id, card.data.cardProfile.guid, card.data.cardDetail.token, null, null, card.channels);
|
||||||
|
|
||||||
|
card.data.articles = new Map();
|
||||||
|
await updateContactArticles(card.data.cardProfile.node, card.id, card.data.cardProfile.guid, card.data.cardDetail.token, null, null, card.data.articles);
|
||||||
|
|
||||||
|
cards.current.set(card.id, { ...card, error: false });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const updateCards = async () => {
|
const updateCards = async () => {
|
||||||
let delta = await getCards(access.current, revision.current);
|
let delta = await getCards(access.current, revision.current);
|
||||||
for (let card of delta) {
|
for (let card of delta) {
|
||||||
if (card.data) {
|
if (card.data) {
|
||||||
let cur = cards.current.get(card.id);
|
let cur = cards.current.get(card.id);
|
||||||
if (cur == null) {
|
if (cur == null) {
|
||||||
cur = { id: card.id, data: { articles: new Map() }, channels: new Map() }
|
cur = { id: card.id, data: { articles: new Map() }, error: false, channels: new Map() }
|
||||||
}
|
}
|
||||||
if (cur.data.detailRevision != card.data.detailRevision) {
|
if (cur.data.detailRevision != card.data.detailRevision) {
|
||||||
if (card.data.cardDetail != null) {
|
if (card.data.cardDetail != null) {
|
||||||
@ -64,7 +83,7 @@ export function useCardContext() {
|
|||||||
cur.data.profileRevision = card.data.profileRevision;
|
cur.data.profileRevision = card.data.profileRevision;
|
||||||
}
|
}
|
||||||
const { cardDetail, cardProfile } = cur.data;
|
const { cardDetail, cardProfile } = cur.data;
|
||||||
if (cardDetail.status === 'connected') {
|
if (cardDetail.status === 'connected' && !cur.error) {
|
||||||
try {
|
try {
|
||||||
if (cur.data.profileRevision != card.data.notifiedProfile) {
|
if (cur.data.profileRevision != card.data.notifiedProfile) {
|
||||||
let message = await getContactProfile(cardProfile.node, cardProfile.guid, cardDetail.token);
|
let message = await getContactProfile(cardProfile.node, cardProfile.guid, cardDetail.token);
|
||||||
@ -103,7 +122,7 @@ export function useCardContext() {
|
|||||||
cur.channels = new Map();
|
cur.channels = new Map();
|
||||||
cur.articles = new Map();
|
cur.articles = new Map();
|
||||||
cur.revision = 0;
|
cur.revision = 0;
|
||||||
cards.current.set(card.id, { ...cur });
|
cards.current.set(card.id, { ...cur, error: true });
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -163,6 +182,9 @@ export function useCardContext() {
|
|||||||
|
|
||||||
const setCards = async (rev) => {
|
const setCards = async (rev) => {
|
||||||
if (next.current == null) {
|
if (next.current == null) {
|
||||||
|
if (rev == null) {
|
||||||
|
rev = revision.curren;
|
||||||
|
}
|
||||||
next.current = rev;
|
next.current = rev;
|
||||||
if (revision.current != rev) {
|
if (revision.current != rev) {
|
||||||
try {
|
try {
|
||||||
@ -174,6 +196,18 @@ export function useCardContext() {
|
|||||||
updateState({ init: true, cards: cards.current });
|
updateState({ init: true, cards: cards.current });
|
||||||
revision.current = rev;
|
revision.current = rev;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
while (resync.current.length) {
|
||||||
|
try {
|
||||||
|
await updateCard(resync.current.shift());
|
||||||
|
updateState({ cards: cards.current });
|
||||||
|
}
|
||||||
|
catch (err) {
|
||||||
|
console.log(err);
|
||||||
|
window.alert("failed to connect to contact");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
let r = next.current;
|
let r = next.current;
|
||||||
next.current = null;
|
next.current = null;
|
||||||
if (revision.current != r) {
|
if (revision.current != r) {
|
||||||
@ -181,7 +215,9 @@ export function useCardContext() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
next.current = rev;
|
if (rev != null) {
|
||||||
|
next.current = rev;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -307,6 +343,10 @@ export function useCardContext() {
|
|||||||
let node = card.data.cardProfile.node;
|
let node = card.data.cardProfile.node;
|
||||||
let token = card.data.cardProfile.guid + "." + card.data.cardDetail.token;
|
let token = card.data.cardProfile.guid + "." + card.data.cardDetail.token;
|
||||||
return getContactChannelTopicAssetUrl(node, token, channelId, topicId, assetId);
|
return getContactChannelTopicAssetUrl(node, token, channelId, topicId, assetId);
|
||||||
|
},
|
||||||
|
resync: (cardId) => {
|
||||||
|
resync.current.push(cardId);
|
||||||
|
setCards(null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user