[api/frontend] Introduce custom attributes for report class and role …

…played (#73 / #104)
OpenCTI-Platform · Jul 19, 2019 · e072fd0 · e072fd0
1 parent 3f538d1
commit e072fd0
Show file tree

Hide file tree

Showing 28 changed files with 1,802 additions and 622 deletions.
diff --git a/opencti-platform/opencti-front/package.json b/opencti-platform/opencti-front/package.json
@@ -16,7 +16,7 @@
     "classnames": "^2.2.6",
     "countdown": "^2.6.0",
     "dagre": "^0.8.4",
-    "formik": "^1.5.7",
+    "formik": "^1.5.8",
     "formik-material-ui": "^0.0.20",
     "graphql": "^14.4.1",
     "http-proxy-middleware": "^0.19.1",

diff --git a/opencti-platform/opencti-front/src/private/Root.js b/opencti-platform/opencti-front/src/private/Root.js
@@ -130,21 +130,9 @@ class Root extends Component {
                         />
                         <BoundaryRoute
                           exact
-                          path="/dashboard/reports/all"
-                          component={Reports}
-                        />
-                        <BoundaryRoute
-                          exact
-                          path="/dashboard/reports/internal"
-                          render={routeProps => (
-                            <Reports {...routeProps} reportClass="internal" />
-                          )}
-                        />
-                        <BoundaryRoute
-                          exact
-                          path="/dashboard/reports/external"
+                          path="/dashboard/reports/:reportClass"
                           render={routeProps => (
-                            <Reports {...routeProps} reportClass="external" />
+                            <Reports {...routeProps} />
                           )}
                         />
                         <BoundaryRoute

diff --git a/...opencti-front/src/private/components/common/stix_relations/StixRelationEditionOverview.js b/...opencti-front/src/private/components/common/stix_relations/StixRelationEditionOverview.js
diff --git a/opencti-platform/opencti-front/src/private/components/nav/TopBar.js b/opencti-platform/opencti-front/src/private/components/nav/TopBar.js
@@ -248,7 +248,7 @@ class TopBar extends Component {
               ''
             )}
             {location.pathname === '/dashboard/reports'
-            || location.pathname.match('/dashboard/reports/[a-z_]+$') ? (
+            || location.pathname.match('/dashboard/reports/[a-zA-Z1-9_-]+$') ? (
               <TopMenuReports />
               ) : (
                 ''

diff --git a/opencti-platform/opencti-front/src/private/components/nav/TopMenuReports.js b/opencti-platform/opencti-front/src/private/components/nav/TopMenuReports.js
@@ -5,6 +5,8 @@ import { compose } from 'ramda';
 import { withStyles } from '@material-ui/core/styles';
 import Button from '@material-ui/core/Button';
 import inject18n from '../../../components/i18n';
+import { QueryRenderer } from '../../../relay/environment';
+import { attributesQuery } from '../settings/attributes/AttributesList';
 
 const styles = theme => ({
   button: {
@@ -38,42 +40,47 @@ class TopMenuReports extends Component {
         >
           {t('All reports')}
         </Button>
-        <Button
-          component={Link}
-          to="/dashboard/reports/internal"
-          variant={
-            location.pathname === '/dashboard/reports/internal'
-              ? 'contained'
-              : 'text'
-          }
-          size="small"
-          color={
-            location.pathname === '/dashboard/reports/internal'
-              ? 'primary'
-              : 'inherit'
-          }
-          classes={{ root: classes.button }}
-        >
-          {t('Internal productions')}
-        </Button>
-        <Button
-          component={Link}
-          to="/dashboard/reports/external"
-          variant={
-            location.pathname === '/dashboard/reports/external'
-              ? 'contained'
-              : 'text'
-          }
-          size="small"
-          color={
-            location.pathname === '/dashboard/reports/external'
-              ? 'primary'
-              : 'inherit'
-          }
-          classes={{ root: classes.button }}
-        >
-          {t('External sources')}
-        </Button>
+        <QueryRenderer
+          query={attributesQuery}
+          variables={{ type: 'report_class' }}
+          render={({ props }) => {
+            if (props && props.attributes) {
+              const reportClassesEdges = props.attributes.edges;
+              return reportClassesEdges.map(reportClassEdge => (
+                <Button
+                  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 <span>&nbsp;</span>;
+          }}
+        />
         <Button
           component={Link}
           to="/dashboard/reports/references"

diff --git a/opencti-platform/opencti-front/src/private/components/nav/TopMenuSettings.js b/opencti-platform/opencti-front/src/private/components/nav/TopMenuSettings.js
@@ -109,6 +109,24 @@ class TopMenuSettings extends Component {
         >
           {t('Kill chain phases')}
         </Button>
+        <Button
+          component={Link}
+          to="/dashboard/settings/attributes"
+          variant={
+            location.pathname.includes('/dashboard/settings/attributes')
+              ? 'contained'
+              : 'text'
+          }
+          size="small"
+          color={
+            location.pathname.includes('/dashboard/settings/attributes')
+              ? 'primary'
+              : 'inherit'
+          }
+          classes={{ root: classes.button }}
+        >
+          {t('Custom attributes')}
+        </Button>
       </div>
     );
   }