From 8a6f69be79d711714e7b49b98fdc2fb8a1666435 Mon Sep 17 00:00:00 2001
From: Adrien Servel <50013774+Kedae@users.noreply.github.com>
Date: Sat, 2 Mar 2024 09:42:11 +0100
Subject: [PATCH] [frontend/backend] Add PAP at init + fix leftbar (#6154)
---
.../src/private/components/nav/LeftBar.jsx | 55 +++++++-------
.../src/database/data-initialization.js | 28 +++++++-
.../01-database/elasticSearch-test.js | 24 ++++---
.../01-database/marking-definition-test.js | 72 +++++++++----------
.../02-resolvers/markingDefinition-test.js | 4 +-
.../tests/03-streams/00-Raw/raw-test.js | 4 +-
.../opencti-graphql/tests/utils/testQuery.ts | 4 +-
7 files changed, 108 insertions(+), 83 deletions(-)
diff --git a/opencti-platform/opencti-front/src/private/components/nav/LeftBar.jsx b/opencti-platform/opencti-front/src/private/components/nav/LeftBar.jsx
index 5d44e9b1f33d..4710f0256412 100644
--- a/opencti-platform/opencti-front/src/private/components/nav/LeftBar.jsx
+++ b/opencti-platform/opencti-front/src/private/components/nav/LeftBar.jsx
@@ -1,4 +1,4 @@
-import React, { useState, useRef, useLayoutEffect } from 'react';
+import React, { useRef, useState } from 'react';
import { Link, useHistory, useLocation } from 'react-router-dom';
import { createStyles, makeStyles, styled, useTheme } from '@mui/styles';
import Toolbar from '@mui/material/Toolbar';
@@ -10,41 +10,41 @@ import Divider from '@mui/material/Divider';
import Drawer from '@mui/material/Drawer';
import Tooltip, { tooltipClasses } from '@mui/material/Tooltip';
import {
+ AccountBalanceOutlined,
AssignmentOutlined,
+ BiotechOutlined,
+ BugReportOutlined,
CasesOutlined,
ChevronLeft,
ChevronRight,
ConstructionOutlined,
DashboardOutlined,
+ DescriptionOutlined,
+ DiamondOutlined,
+ DomainOutlined,
+ EventOutlined,
+ ExpandLessOutlined,
+ ExpandMoreOutlined,
ExploreOutlined,
+ FlagOutlined,
InsertChartOutlinedOutlined,
LayersOutlined,
- DescriptionOutlined,
- WorkspacesOutlined,
- BiotechOutlined,
- SubjectOutlined,
LocalOfferOutlined,
- TaskAltOutlined,
- VisibilityOutlined,
- WifiTetheringOutlined,
- ExpandLessOutlined,
- ExpandMoreOutlined,
- DiamondOutlined,
- BugReportOutlined,
- WebAssetOutlined,
- SurroundSoundOutlined,
- StreamOutlined,
- SourceOutlined,
- SpeakerNotesOutlined,
+ MapOutlined,
PersonOutlined,
- StorageOutlined,
- AccountBalanceOutlined,
- EventOutlined,
- DomainOutlined,
PlaceOutlined,
- MapOutlined,
- FlagOutlined,
PublicOutlined,
+ SourceOutlined,
+ SpeakerNotesOutlined,
+ StorageOutlined,
+ StreamOutlined,
+ SubjectOutlined,
+ SurroundSoundOutlined,
+ TaskAltOutlined,
+ VisibilityOutlined,
+ WebAssetOutlined,
+ WifiTetheringOutlined,
+ WorkspacesOutlined,
} from '@mui/icons-material';
import {
AccountMultipleOutline,
@@ -304,10 +304,6 @@ const LeftBar = () => {
} = useAuth();
const settingsMessagesBannerHeight = useSettingsMessagesBannerHeight();
const { dimension } = useDimensions();
- const [height, setHeight] = useState(0);
- useLayoutEffect(() => {
- setHeight(ref.current.offsetHeight);
- }, [selectedMenu]);
const isMobile = dimension.width < 768;
const generateSubMenu = (menu, entries) => {
return navOpen ? (
@@ -860,12 +856,11 @@ const LeftBar = () => {
-
+
{(!platform_whitemark || !isEnterpriseEdition) && (