fix(board): fix load more button works incorrectly

erxes · Aug 10, 2020 · dbfa5fe · dbfa5fe
1 parent d7040ce
commit dbfa5fe
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/ui/src/modules/boards/components/ArchivedItems.tsx b/ui/src/modules/boards/components/ArchivedItems.tsx
@@ -1,4 +1,5 @@
 import EmptyState from 'modules/common/components/EmptyState';
+import Icon from 'modules/common/components/Icon';
 import { __ } from 'modules/common/utils';
 import { IDeal } from 'modules/deals/types';
 import { ITicket } from 'modules/tickets/types';
@@ -121,7 +122,7 @@ class ArchivedItems extends React.Component<Props, State> {
           />
         ))}
         {hasMore ? (
-          <LoadMore onClick={loadMore}>{__('Load More')}</LoadMore>
+          <LoadMore onClick={loadMore}><Icon icon="redo" />{__('Load More')}</LoadMore>
         ) : null}
       </>
     );

diff --git a/ui/src/modules/boards/containers/ArchivedItems.tsx b/ui/src/modules/boards/containers/ArchivedItems.tsx
@@ -171,7 +171,7 @@ class ArchivedItemsContainer extends React.Component<IFinalProps> {
 
           return {
             ...prev,
-            [itemName]: [...fetchedItems, ...prevItems]
+            [itemName]: [...prevItems, ...fetchedItems]
           };
         }
       });

diff --git a/ui/src/modules/boards/styles/rightMenu.ts b/ui/src/modules/boards/styles/rightMenu.ts
@@ -110,8 +110,15 @@ const ItemContainer = styled.div`
 
 const LoadMore = styled.span`
   text-decoration: underline;
-  margin-bottom: 20px;
+  margin-bottom: 10px;
   color: ${colors.colorCoreGray};
+  display: block;
+  text-align: center;
+
+  > i {
+    margin-right: 5px;
+  }
+
   &:hover {
     cursor: pointer;
     color: ${colors.textSecondary};