Fix [4485, 4484]: lint issue

Joystream · Aug 31, 2023 · 328ca9a · 328ca9a
1 parent 04dd258
commit 328ca9a
Show file tree

Hide file tree

Showing 5 changed files with 106 additions and 97 deletions.
diff --git a/packages/ui/src/forum/components/ThreadCard/ThreadCard.stories.tsx b/packages/ui/src/forum/components/ThreadCard/ThreadCard.stories.tsx
@@ -23,30 +23,32 @@ const forumThread: ForumThreadWithDetails = {
   tags: [],
   visiblePostsCount: 5,
   status: { __typename: 'ThreadStatusActive' },
-  posts: [{
-    id: "1",
-    createdAt: "2023-06-28T19:14:00.000Z",
-    text: "Test text",
-    status: "PostStatusActive",
-    threadId: "459",
-    categoryId: "2",
-    author: {
-      id: "4129",
-      handle: "Codefikeyz",
-      rootAccount: "j4TZJCACAWao9bnh5k86qeRW2QhNVNkf9eEw1Vz4V8ZeqD4u4",
-      controllerAccount: "j4TZJCACAWao9bnh5k86qeRW2QhNVNkf9eEw1Vz4V8ZeqD4u4",
-      isCouncilMember: false,
-      isFoundingMember: true,
-      inviteCount: 1,
-      roles: [],    
-      boundAccounts: [
-        "j4TZJCACAWao9bnh5k86qeRW2QhNVNkf9eEw1Vz4V8ZeqD4u4",
-        "j4WJoUb8xxQucAUFtmF18r41gzb1AG22nzypW1PT4LMLJqzU5"
-      ],
-      isVerified: true,
-      createdAt:"2023-06-28T19:14:00.000Z",
-    }
-  }]
+  posts: [
+    {
+      id: '1',
+      createdAt: '2023-06-28T19:14:00.000Z',
+      text: 'Test text',
+      status: 'PostStatusActive',
+      threadId: '459',
+      categoryId: '2',
+      author: {
+        id: '4129',
+        handle: 'Codefikeyz',
+        rootAccount: 'j4TZJCACAWao9bnh5k86qeRW2QhNVNkf9eEw1Vz4V8ZeqD4u4',
+        controllerAccount: 'j4TZJCACAWao9bnh5k86qeRW2QhNVNkf9eEw1Vz4V8ZeqD4u4',
+        isCouncilMember: false,
+        isFoundingMember: true,
+        inviteCount: 1,
+        roles: [],
+        boundAccounts: [
+          'j4TZJCACAWao9bnh5k86qeRW2QhNVNkf9eEw1Vz4V8ZeqD4u4',
+          'j4WJoUb8xxQucAUFtmF18r41gzb1AG22nzypW1PT4LMLJqzU5',
+        ],
+        isVerified: true,
+        createdAt: '2023-06-28T19:14:00.000Z',
+      },
+    },
+  ],
 }
 
 const Template: Story = (args) => <ThreadCard thread={{ ...forumThread, ...args }} />

diff --git a/packages/ui/src/forum/components/threads/LatestActivity.tsx b/packages/ui/src/forum/components/threads/LatestActivity.tsx
@@ -13,6 +13,7 @@ export interface LatestActivitydProps {
   posts: ForumPost[]
 }
 export const LatestActivity = memo(({ /*threadId,*/ posts }: LatestActivitydProps) => {
+  posts.sort((a: ForumPost, b: ForumPost) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime())
   const post = posts[0] // const { post } = useThreadLatestPost(threadId)
 
   if (!post) return <Loading withoutMargin />

diff --git a/packages/ui/src/forum/components/threads/ThreadList.stories.tsx b/packages/ui/src/forum/components/threads/ThreadList.stories.tsx
@@ -32,30 +32,32 @@ const forumThread: ForumThreadWithDetails = {
   tags: [],
   visiblePostsCount: 5,
   status: { __typename: 'ThreadStatusActive' },
-  posts: [{
-    id: "1",
-    createdAt: "2023-06-28T19:14:00.000Z",
-    text: "Test text",
-    status: "PostStatusActive",
-    threadId: "459",
-    categoryId: "2",
-    author: {
-      id: "4129",
-      handle: "Codefikeyz",
-      rootAccount: "j4TZJCACAWao9bnh5k86qeRW2QhNVNkf9eEw1Vz4V8ZeqD4u4",
-      controllerAccount: "j4TZJCACAWao9bnh5k86qeRW2QhNVNkf9eEw1Vz4V8ZeqD4u4",
-      isCouncilMember: false,
-      isFoundingMember: true,
-      inviteCount: 1,
-      roles: [],    
-      boundAccounts: [
-        "j4TZJCACAWao9bnh5k86qeRW2QhNVNkf9eEw1Vz4V8ZeqD4u4",
-        "j4WJoUb8xxQucAUFtmF18r41gzb1AG22nzypW1PT4LMLJqzU5"
-      ],
-      isVerified: true,
-      createdAt:"2023-06-28T19:14:00.000Z",
-    }
-  }]
+  posts: [
+    {
+      id: '1',
+      createdAt: '2023-06-28T19:14:00.000Z',
+      text: 'Test text',
+      status: 'PostStatusActive',
+      threadId: '459',
+      categoryId: '2',
+      author: {
+        id: '4129',
+        handle: 'Codefikeyz',
+        rootAccount: 'j4TZJCACAWao9bnh5k86qeRW2QhNVNkf9eEw1Vz4V8ZeqD4u4',
+        controllerAccount: 'j4TZJCACAWao9bnh5k86qeRW2QhNVNkf9eEw1Vz4V8ZeqD4u4',
+        isCouncilMember: false,
+        isFoundingMember: true,
+        inviteCount: 1,
+        roles: [],
+        boundAccounts: [
+          'j4TZJCACAWao9bnh5k86qeRW2QhNVNkf9eEw1Vz4V8ZeqD4u4',
+          'j4WJoUb8xxQucAUFtmF18r41gzb1AG22nzypW1PT4LMLJqzU5',
+        ],
+        isVerified: true,
+        createdAt: '2023-06-28T19:14:00.000Z',
+      },
+    },
+  ],
 }
 
 const Template: Story = ({ isArchive, type, initialPostText, categoryTitle, title }) => {

diff --git a/packages/ui/test/forum/modals/DeleteThreadModal.test.tsx b/packages/ui/test/forum/modals/DeleteThreadModal.test.tsx
@@ -41,30 +41,32 @@ const modalData: ModalCallData<DeleteThreadModalCall> = {
     tags: [],
     visiblePostsCount: 5,
     status: { __typename: 'ThreadStatusActive' },
-    posts: [{
-      id: "1",
-      createdAt: "2023-06-28T19:14:00.000Z",
-      text: "Test text",
-      status: "PostStatusActive",
-      threadId: "459",
-      categoryId: "2",
-      author: {
-        id: "4129",
-        handle: "Codefikeyz",
-        rootAccount: "j4TZJCACAWao9bnh5k86qeRW2QhNVNkf9eEw1Vz4V8ZeqD4u4",
-        controllerAccount: "j4TZJCACAWao9bnh5k86qeRW2QhNVNkf9eEw1Vz4V8ZeqD4u4",
-        isCouncilMember: false,
-        isFoundingMember: true,
-        inviteCount: 1,
-        roles: [],    
-        boundAccounts: [
-          "j4TZJCACAWao9bnh5k86qeRW2QhNVNkf9eEw1Vz4V8ZeqD4u4",
-          "j4WJoUb8xxQucAUFtmF18r41gzb1AG22nzypW1PT4LMLJqzU5"
-        ],
-        isVerified: true,
-        createdAt:"2023-06-28T19:14:00.000Z",
-      }
-    }]
+    posts: [
+      {
+        id: '1',
+        createdAt: '2023-06-28T19:14:00.000Z',
+        text: 'Test text',
+        status: 'PostStatusActive',
+        threadId: '459',
+        categoryId: '2',
+        author: {
+          id: '4129',
+          handle: 'Codefikeyz',
+          rootAccount: 'j4TZJCACAWao9bnh5k86qeRW2QhNVNkf9eEw1Vz4V8ZeqD4u4',
+          controllerAccount: 'j4TZJCACAWao9bnh5k86qeRW2QhNVNkf9eEw1Vz4V8ZeqD4u4',
+          isCouncilMember: false,
+          isFoundingMember: true,
+          inviteCount: 1,
+          roles: [],
+          boundAccounts: [
+            'j4TZJCACAWao9bnh5k86qeRW2QhNVNkf9eEw1Vz4V8ZeqD4u4',
+            'j4WJoUb8xxQucAUFtmF18r41gzb1AG22nzypW1PT4LMLJqzU5',
+          ],
+          isVerified: true,
+          createdAt: '2023-06-28T19:14:00.000Z',
+        },
+      },
+    ],
   },
 }
 

diff --git a/packages/ui/test/forum/pages/ForumThread.test.tsx b/packages/ui/test/forum/pages/ForumThread.test.tsx
@@ -62,31 +62,33 @@ describe('UI: Forum Thread Page', () => {
     tags: [],
     visiblePostsCount: 0,
     status: { __typename: 'ThreadStatusActive' },
-    posts: [{
-      id: "1",
-      createdAt: "2023-06-28T19:14:00.000Z",
-      text: "Test text",
-      status: "PostStatusActive",
-      threadId: "459",
-      categoryId: "2",
-      author: {
-        id: "4129",
-        handle: "Codefikeyz",
-        rootAccount: "j4TZJCACAWao9bnh5k86qeRW2QhNVNkf9eEw1Vz4V8ZeqD4u4",
-        controllerAccount: "j4TZJCACAWao9bnh5k86qeRW2QhNVNkf9eEw1Vz4V8ZeqD4u4",
-        isCouncilMember: false,
-        isFoundingMember: true,
-        inviteCount: 1,
-        roles: [],    
-        boundAccounts: [
-          "j4TZJCACAWao9bnh5k86qeRW2QhNVNkf9eEw1Vz4V8ZeqD4u4",
-          "j4WJoUb8xxQucAUFtmF18r41gzb1AG22nzypW1PT4LMLJqzU5"
-        ],
-        isVerified: true,
-        createdAt:"2023-06-28T19:14:00.000Z",
-      }
-    }]
-    }
+    posts: [
+      {
+        id: '1',
+        createdAt: '2023-06-28T19:14:00.000Z',
+        text: 'Test text',
+        status: 'PostStatusActive',
+        threadId: '459',
+        categoryId: '2',
+        author: {
+          id: '4129',
+          handle: 'Codefikeyz',
+          rootAccount: 'j4TZJCACAWao9bnh5k86qeRW2QhNVNkf9eEw1Vz4V8ZeqD4u4',
+          controllerAccount: 'j4TZJCACAWao9bnh5k86qeRW2QhNVNkf9eEw1Vz4V8ZeqD4u4',
+          isCouncilMember: false,
+          isFoundingMember: true,
+          inviteCount: 1,
+          roles: [],
+          boundAccounts: [
+            'j4TZJCACAWao9bnh5k86qeRW2QhNVNkf9eEw1Vz4V8ZeqD4u4',
+            'j4WJoUb8xxQucAUFtmF18r41gzb1AG22nzypW1PT4LMLJqzU5',
+          ],
+          isVerified: true,
+          createdAt: '2023-06-28T19:14:00.000Z',
+        },
+      },
+    ],
+  }
 
   beforeAll(() => {
     stubAccounts([alice, bob])