Merge pull request #722 from factly/fix/720-715/formats-dashboard-issues

Fix/720-715/formats-dashboard-issues
factly · May 12, 2023 · cac9a82 · cac9a82
2 parents ecb5702 + 201388d
commit cac9a82
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/studio/src/pages/dashboard/components/Features.js b/studio/src/pages/dashboard/components/Features.js
@@ -15,6 +15,17 @@ function Features() {
   const superOrg = useSelector(({ admin }) => {
     return admin.organisation;
   });
+  const selectedSpace = useSelector((state) =>({space_id:state.spaces.selected}));
+  React.useEffect(() => {
+    fetchEntities();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  React.useEffect(() => {
+    if (superOrg.is_admin) {
+      fetchEvents();
+    }
+  }, [superOrg.is_admin]);
 
   const {
     ratings,
@@ -101,7 +112,7 @@ function Features() {
             actions={[
               <Button
                 onClick={() => {
-                  dispatch(addDefaultFormats()).then(() => history.push('/advanced/formats'));
+                  dispatch(addDefaultFormats(selectedSpace)).then(() => history.push('/advanced/formats'));
                 }}
               >
                 <PlusOutlined /> CREATE FORMATS

diff --git a/studio/src/pages/dashboard/index.js b/studio/src/pages/dashboard/index.js
@@ -45,7 +45,7 @@ function Dashboard() {
                   <Col md={{ span: 5 }}>
                     <Card size="small" hoverable={true} title="Total">
                       <Link to="/posts">
-                        <Statistic value={article.publish + article.draft + article.ready} />
+                        <Statistic value={~~article.publish + ~~article.draft + ~~article.ready} />
                       </Link>
                     </Card>
                   </Col>
@@ -88,7 +88,7 @@ function Dashboard() {
                   <Col md={{ span: 5 }}>
                     <Card size="small" hoverable={true} title="Total">
                       <Link to="/fact-checks">
-                        <Statistic value={factCheck.publish + factCheck.draft + factCheck.ready} />
+                        <Statistic value={(~~factCheck.publish + ~~factCheck.draft + ~~factCheck.ready)} />
                       </Link>
                     </Card>
                   </Col>