Fixing #207 in the context of the branch review

OpenCTI-Platform · Sep 2, 2019 · 2659d12 · 2659d12
1 parent 46fc068
commit 2659d12
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 34 deletions.
diff --git a/opencti-platform/opencti-front/src/private/components/nav/TopMenuReports.js b/opencti-platform/opencti-front/src/private/components/nav/TopMenuReports.js
@@ -46,38 +46,17 @@ class TopMenuReports extends Component {
           render={({ props }) => {
             if (props && props.attributes) {
               const reportClassesEdges = props.attributes.edges;
-              return reportClassesEdges.map(reportClassEdge => (
-                <Button
-                  key={reportClassEdge.node.value}
-                  component={Link}
-                  to={`/dashboard/reports/${reportClassEdge.node.value.replace(
-                    ' ',
-                    '_',
-                  )}`}
-                  variant={
-                    location.pathname
-                    === `/dashboard/reports/${reportClassEdge.node.value.replace(
-                      ' ',
-                      '_',
-                    )}`
-                      ? 'contained'
-                      : 'text'
-                  }
-                  size="small"
-                  color={
-                    location.pathname
-                    === `/dashboard/reports/${reportClassEdge.node.value.replace(
-                      ' ',
-                      '_',
-                    )}`
-                      ? 'primary'
-                      : 'inherit'
-                  }
-                  classes={{ root: classes.button }}
-                >
-                  {reportClassEdge.node.value}
-                </Button>
-              ));
+              return reportClassesEdges.map((reportClassEdge) => {
+                const uri = reportClassEdge.node.value.replace(/\s/g, '_');
+                return <Button key={uri} component={Link}
+                          to={`/dashboard/reports/${uri}`}
+                          variant={ location.pathname === `/dashboard/reports/${uri}` ? 'contained' : 'text' }
+                          size="small"
+                          color={ location.pathname === `/dashboard/reports/${uri}` ? 'primary' : 'inherit' }
+                          classes={{ root: classes.button }}>
+                          {reportClassEdge.node.value}
+                      </Button>;
+              });
             }
             return <span>&nbsp;</span>;
           }}

diff --git a/opencti-platform/opencti-front/src/private/components/reports/Reports.js b/opencti-platform/opencti-front/src/private/components/reports/Reports.js
@@ -117,8 +117,7 @@ class Reports extends Component {
       authorId,
       reportClass:
         reportClass !== 'all' && reportClass !== undefined
-          ? reportClass.replace('_', ' ')
-          : '',
+          ? reportClass.replace(/_/g, ' ') : '',
       search: searchTerm,
       orderBy: sortBy,
       orderMode: orderAsc ? 'asc' : 'desc',