diff --git a/net/web/src/carousel/Carousel.styled.js b/net/web/src/carousel/Carousel.styled.js
index 29ccb086..042c664b 100644
--- a/net/web/src/carousel/Carousel.styled.js
+++ b/net/web/src/carousel/Carousel.styled.js
@@ -99,7 +99,7 @@ export const CarouselWrapper = styled.div`
.asset {
height: 128px;
- border-radius: 8px;
+ border-radius: 3px;
overflow: hidden;
}
diff --git a/net/web/test/Thread.test.js b/net/web/test/Thread.test.js
index ef708563..6e31878e 100644
--- a/net/web/test/Thread.test.js
+++ b/net/web/test/Thread.test.js
@@ -6,23 +6,36 @@ import { ProfileContext, ProfileContextProvider } from 'context/ProfileContext';
import { StoreContextProvider } from 'context/StoreContext';
import { ViewportContextProvider } from 'context/ViewportContext';
import { ConversationContextProvider } from 'context/ConversationContext';
-import { CardContextProvider } from 'context/CardContext';
+import { CardContext, CardContextProvider } from 'context/CardContext';
import { UploadContextProvider } from 'context/UploadContext';
import { useConversation } from 'session/conversation/useConversation.hook';
import * as fetchUtil from 'api/fetchUtil';
+let conversation = null;
+let card = null;
function ThreadView() {
const { state, actions } = useConversation('card01', 'channel01');
const [renderCount, setRenderCount] = useState(0);
+ const [topics, setTopics] = useState([]);
+
+ conversation = actions;
+ card = useContext(CardContext);
useEffect(() => {
const rendered = [];
+ const entries = Array.from(state.topics.values());
+ entries.forEach(entry => {
+ rendered.push(
+
{ entry.text }
+ )
+ });
+ setTopics(rendered);
setRenderCount(renderCount + 1);
}, [state]);
return (
-
+ { topics }
);
}
@@ -48,18 +61,51 @@ function ThreadTestApp() {
);
}
-let updated;
+let fetchCards;
+let fetchChannels;
+let fetchTopics;
+let fetchDetail;
const realFetchWithTimeout = fetchUtil.fetchWithTimeout;
const realFetchWithCustomTimeout = fetchUtil.fetchWithCustomTimeout;
beforeEach(() => {
- let updated = false;
+ fetchCards = [];
+ fetchChannels = [];
+ fetchTopics = [];
+ fetchDetail = {};
+
const mockFetch = jest.fn().mockImplementation((url, options) => {
- if (options.method === 'PUT') {
- updated = true;
+
+ if (url.startsWith('/contact/cards?agent')) {
+ return Promise.resolve({
+ json: () => Promise.resolve(fetchCards)
+ });
+ }
+ if (url.startsWith('https://test.org/content/channels?contact')) {
+ return Promise.resolve({
+ json: () => Promise.resolve(fetchChannels)
+ });
+ }
+ if (url.startsWith('https://test.org/content/channels/channel01/topics?contact')) {
+ const headers = new Map();
+ headers.set('topic-marker', 48);
+ headers.set('topic-revision', 55);
+ return Promise.resolve({
+ url: 'getTopics',
+ status: 200,
+ headers: headers,
+ json: () => Promise.resolve(fetchTopics),
+ });
+ }
+ if (url.startsWith('https://test.org/content/channels/channel01/topics/topic01/detail?contact')) {
+ return Promise.resolve({
+ json: () => Promise.resolve(fetchDetail)
+ });
+ }
+ else {
+ return Promise.resolve({
+ json: () => Promise.resolve([])
+ });
}
- return Promise.resolve({
- json: () => Promise.resolve({ name: updated ? 'tested' : 'tester' })
- });
});
fetchUtil.fetchWithTimeout = mockFetch;
fetchUtil.fetchWithCustomTimeout = mockFetch;
@@ -72,6 +118,151 @@ afterEach(() => {
test('add, update, remove topic', async () => {
- render();
+ render();
+
+ await waitFor(async () => {
+ expect(card).not.toBe(null);
+ expect(conversation).not.toBe(null);
+ });
+
+ fetchCards = [{
+ id: 'card01',
+ revision: 1,
+ data: {
+ detailRevision: 2,
+ profileRevision: 3,
+ notifiedProfile: 3,
+ notifiedArticle: 5,
+ notifiedChannel: 6,
+ notifiedView: 7,
+ cardDetail: { status: 'connected', statusUpdate: 136, token: '01ab', },
+ cardProfile: { guid: 'guid01', handle: 'test1', name: 'tester', imageSet: false,
+ seal: 'abc', version: '1.1.1', node: 'test.org' },
+ },
+ }];
+
+ fetchChannels = [
+ { id: 'channel01', revision: 2, data: {
+ detailRevision: 3,
+ topicRevision: 5,
+ channelSummary: { guid: 'guid01', dataType: 'superbasictopic', data: 'testcardtopic' },
+ channelDetail: { dataType: 'superbasic', data: 'testcardchannel' },
+ }
+ },
+ ];
+
+ fetchTopics = [
+ { id: 'topic01', revision: 1, data: {
+ detailRevision: 1,
+ tagRevision: 1,
+ topicDetail: {
+ guid: 'guid01',
+ dataType: 'superbasictopic',
+ data: JSON.stringify({ text: 'message' }),
+ created: 1,
+ updated: 1,
+ status: 'confirmed',
+ transform: 'complete',
+ },
+ }},
+ ];
+
+ await act(async () => {
+ card.actions.setToken('abc123');
+ card.actions.setRevision(1);
+ });
+
+ await waitFor(async () => {
+ expect(screen.getByTestId('thread').children).toHaveLength(1);
+ expect(screen.getByTestId('topic01').textContent).toBe('message');
+ });
+
+ fetchCards = [{
+ id: 'card01',
+ revision: 2,
+ data: {
+ detailRevision: 2,
+ profileRevision: 3,
+ notifiedProfile: 3,
+ notifiedArticle: 5,
+ notifiedChannel: 7,
+ notifiedView: 7,
+ },
+ }];
+
+ fetchChannels = [
+ { id: 'channel01', revision: 3, data: {
+ detailRevision: 3,
+ topicRevision: 6,
+ channelSummary: { guid: 'guid01', dataType: 'superbasictopic', data: 'testcardtopic' },
+ channelDetail: { dataType: 'superbasic', data: 'testcardchannel' },
+ }
+ },
+ ];
+
+ fetchTopics = [
+ { id: 'topic01', revision: 2, data: {
+ detailRevision: 2,
+ tagRevision: 1,
+ }},
+ ];
+
+ fetchDetail = { id: 'topic01', revision: 2, data: {
+ detailRevision: 2,
+ tagRevision: 1,
+ topicDetail: {
+ guid: 'guid01',
+ dataType: 'superbasictopic',
+ data: JSON.stringify({ text: 'message2' }),
+ created: 1,
+ updated: 1,
+ status: 'confirmed',
+ transform: 'complete',
+ }
+ }}
+
+ await act(async () => {
+ card.actions.setRevision(2);
+ });
+
+ await waitFor(async () => {
+ expect(screen.getByTestId('topic01').textContent).toBe('message2');
+ });
+
+ fetchCards = [{
+ id: 'card01',
+ revision: 3,
+ data: {
+ detailRevision: 2,
+ profileRevision: 3,
+ notifiedProfile: 3,
+ notifiedArticle: 5,
+ notifiedChannel: 8,
+ notifiedView: 7,
+ },
+ }];
+
+ fetchChannels = [
+ { id: 'channel01', revision: 4, data: {
+ detailRevision: 3,
+ topicRevision: 7,
+ channelSummary: { guid: 'guid01', dataType: 'superbasictopic', data: 'testcardtopic' },
+ channelDetail: { dataType: 'superbasic', data: 'testcardchannel' },
+ }
+ },
+ ];
+
+ fetchTopics = [
+ { id: 'topic01', revision: 2 },
+ ];
+
+ await act(async () => {
+ card.actions.setRevision(3);
+ });
+
+ await waitFor(async () => {
+ expect(screen.getByTestId('thread').children).toHaveLength(0);
+ });
+
});