OpenCTI-Platform · SamuelHassine · Nov 28, 2023 · Nov 27, 2023
diff --git a/opencti-platform/opencti-front/src/components/Theme.d.ts b/opencti-platform/opencti-front/src/components/Theme.d.ts
@@ -13,6 +13,12 @@ declare module '@mui/material/Button' {
   }
 }
 
+declare module '@mui/material/Button' {
+  interface ChipPropsColorOverrides {
+    ee: true
+  }
+}
+
 declare module '@mui/material/SvgIcon' {
   interface SvgIconPropsColorOverrides {
     ee: true
@@ -27,6 +33,7 @@ interface ExtendedColor extends PaletteColorOptions {
   mode: PaletteMode
   background: string
   lightBackground: string
+  contrastText: string
 }
 
 interface ExtendedBackground extends TypeBackground {

diff --git a/opencti-platform/opencti-front/src/components/ThemeDark.ts b/opencti-platform/opencti-front/src/components/ThemeDark.ts
@@ -34,6 +34,7 @@ const ThemeDark = (
     chip: { main: '#ffffff' },
     ee: {
       main: EE_COLOR,
+      contrastText: '#ffffff',
       background: hexToRGB(EE_COLOR, 0.2),
       lightBackground: hexToRGB(EE_COLOR, 0.08),
     },

diff --git a/opencti-platform/opencti-front/src/components/ThemeLight.ts b/opencti-platform/opencti-front/src/components/ThemeLight.ts
@@ -34,6 +34,7 @@ const ThemeLight = (
       main: EE_COLOR,
       background: hexToRGB(EE_COLOR, 0.2),
       lightBackground: hexToRGB(EE_COLOR, 0.08),
+      contrastText: '#ffffff',
     },
     background: {
       default: background || '#f3f6f9',

diff --git a/opencti-platform/opencti-front/src/private/Analytics.tsx b/opencti-platform/opencti-front/src/private/Analytics.tsx
@@ -14,10 +14,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 */
 
 import googleAnalytics from '@analytics/google-analytics';
-import { RootPrivateQuery$data } from './__generated__/RootPrivateQuery.graphql';
 import { isNotEmptyField } from '../utils/utils';
+import { RootSettings$data } from './__generated__/RootSettings.graphql';
 
-const generateAnalyticsConfig = (settings: RootPrivateQuery$data['settings']) => {
+const generateAnalyticsConfig = (settings: RootSettings$data) => {
   const isEnterpriseEdition = isNotEmptyField(settings.enterprise_edition);
   const googleMeasurement = settings.analytics_google_analytics_v4;
   return {

diff --git a/opencti-platform/opencti-front/src/private/Index.tsx b/opencti-platform/opencti-front/src/private/Index.tsx
@@ -32,14 +32,14 @@ import TimeoutLock from './components/TimeoutLock';
 import useAuth from '../utils/hooks/useAuth';
 import SettingsMessagesBanner, { useSettingsMessagesBannerHeight } from './components/settings/settings_messages/SettingsMessagesBanner';
 import { Theme } from '../components/Theme';
-import { RootPrivateQuery$data } from './__generated__/RootPrivateQuery.graphql';
+import { RootSettings$data } from './__generated__/RootSettings.graphql';
 
 const useStyles = makeStyles((theme: Theme) => ({
   toolbar: theme.mixins.toolbar,
 }));
 
 interface IndexProps {
-  settings: RootPrivateQuery$data['settings']
+  settings: RootSettings$data
 }
 
 const Index = ({ settings }: IndexProps) => {

diff --git a/opencti-platform/opencti-front/src/private/Root.tsx b/opencti-platform/opencti-front/src/private/Root.tsx
@@ -1,6 +1,6 @@
 import { StyledEngineProvider } from '@mui/material/styles';
 import React, { FunctionComponent } from 'react';
-import { graphql, PreloadedQuery, usePreloadedQuery } from 'react-relay';
+import { graphql, PreloadedQuery, useFragment, usePreloadedQuery } from 'react-relay';
 import { AnalyticsProvider } from 'use-analytics';
 import Analytics from 'analytics';
 import { ConnectedIntlProvider } from '../components/AppIntlProvider';
@@ -10,11 +10,47 @@ import { UserContext } from '../utils/hooks/useAuth';
 import platformModuleHelper from '../utils/platformModulesHelper';
 import { ONE_SECOND } from '../utils/Time';
 import { isNotEmptyField } from '../utils/utils';
-import { RootPrivateQuery, RootPrivateQuery$data } from './__generated__/RootPrivateQuery.graphql';
+import { RootPrivateQuery } from './__generated__/RootPrivateQuery.graphql';
 import Index from './Index';
 import useQueryLoading from '../utils/hooks/useQueryLoading';
 import Loader from '../components/Loader';
 import generateAnalyticsConfig from './Analytics';
+import { RootSettings$data, RootSettings$key } from './__generated__/RootSettings.graphql';
+
+const rootSettingsFragment = graphql`
+  fragment RootSettings on Settings {
+    id
+    platform_demo
+    platform_banner_text
+    platform_user_statuses {
+      status
+      message
+    }
+    platform_banner_level
+    platform_map_tile_server_dark
+    platform_map_tile_server_light
+    platform_theme
+    platform_whitemark
+    platform_session_idle_timeout
+    platform_session_timeout
+    platform_feature_flags {
+      id
+      enable
+    }
+    platform_modules {
+      id
+      enable
+      running
+      warning
+    }
+    enterprise_edition
+    ...AppThemeProvider_settings
+    ...AppIntlProvider_settings
+    ...PasswordPolicies
+    ...Policies
+    analytics_google_analytics_v4
+  }
+`;
 
 const rootPrivateQuery = graphql`
   query RootPrivateQuery {
@@ -62,36 +98,7 @@ const rootPrivateQuery = graphql`
       }
     }
     settings {
-      id
-      platform_demo
-      platform_banner_text
-      platform_user_statuses {
-        status
-        message
-      }
-      platform_banner_level
-      platform_map_tile_server_dark
-      platform_map_tile_server_light
-      platform_theme
-      platform_whitemark
-      platform_session_idle_timeout
-      platform_session_timeout
-      platform_feature_flags {
-        id
-        enable
-      }
-      platform_modules {
-        id
-        enable
-        running
-        warning
-      }
-      enterprise_edition
-      ...AppThemeProvider_settings
-      ...AppIntlProvider_settings
-      ...PasswordPolicies
-      ...Policies
-      analytics_google_analytics_v4
+      ...RootSettings
     }
     about {
       version
@@ -142,7 +149,7 @@ const rootPrivateQuery = graphql`
   }
 `;
 
-const computeBannerSettings = (settings: RootPrivateQuery$data['settings']) => {
+const computeBannerSettings = (settings: RootSettings$data) => {
   const bannerLevel = settings.platform_banner_level;
   const bannerText = settings.platform_banner_text;
   const isBannerActivated = isNotEmptyField(bannerLevel) && isNotEmptyField(bannerText);
@@ -170,7 +177,8 @@ interface RootComponentProps {
 
 const RootComponent: FunctionComponent<RootComponentProps> = ({ queryRef }) => {
   const queryData = usePreloadedQuery(rootPrivateQuery, queryRef);
-  const { me, settings, entitySettings, schemaSCOs, schemaSDOs, schemaSMOs, schemaSROs, schemaRelationsTypesMapping, schemaRelationsRefTypesMapping } = queryData;
+  const { me, settings: settingsFragment, entitySettings, schemaSCOs, schemaSDOs, schemaSMOs, schemaSROs, schemaRelationsTypesMapping, schemaRelationsRefTypesMapping } = queryData;
+  const settings = useFragment<RootSettings$key>(rootSettingsFragment, settingsFragment);
   const schema = {
     scos: schemaSCOs.edges.map((sco) => sco.node),
     sdos: schemaSDOs.edges.map((sco) => sco.node),
@@ -182,7 +190,7 @@ const RootComponent: FunctionComponent<RootComponentProps> = ({ queryRef }) => {
   // TODO : Use the hook useHelper when all project is pure function //
   const bannerSettings = computeBannerSettings(settings);
   const platformModuleHelpers = platformModuleHelper(settings);
-  const platformAnalyticsConfiguration = generateAnalyticsConfig(queryData.settings);
+  const platformAnalyticsConfiguration = generateAnalyticsConfig(settings);
   return (
     <UserContext.Provider
       value={{

diff --git a/...cti-platform/opencti-front/src/private/components/common/entreprise_edition/EETooltip.tsx b/...cti-platform/opencti-front/src/private/components/common/entreprise_edition/EETooltip.tsx
@@ -26,18 +26,12 @@ const EETooltip = ({
   }
   return (
     <>
-      <Tooltip
-        title={t(
-          'You need to activate OpenCTI enterprise edition to use this feature.',
-        )}
-      >
-        <span
-          onClick={(e) => {
-            setFeedbackCreation(true);
-            e.preventDefault();
-            e.stopPropagation();
-          }}
-        >
+      <Tooltip title={title ? t(title) : undefined}>
+        <span onClick={(e) => {
+          setFeedbackCreation(true);
+          e.preventDefault();
+          e.stopPropagation();
+        }}>
           {children}
         </span>
       </Tooltip>

diff --git a/...cti-front/src/private/components/common/entreprise_edition/EnterpriseEditionAgreement.tsx b/...cti-front/src/private/components/common/entreprise_edition/EnterpriseEditionAgreement.tsx
@@ -17,6 +17,7 @@ const EnterpriseEditionAgreementMutationFieldPatch = graphql`
     settingsEdit(id: $id) {
       fieldPatch(input: $input) {
         id
+        ...RootSettings
       }
     }
   }
@@ -45,9 +46,6 @@ EnterpriseEditionAgreementProps
           value: now(),
         },
       },
-      onCompleted: () => {
-        window.location.reload();
-      },
     });
     onClose();
   };

diff --git a/opencti-platform/opencti-front/src/utils/hooks/useAuth.ts b/opencti-platform/opencti-front/src/utils/hooks/useAuth.ts
@@ -1,6 +1,7 @@
 import React, { useContext } from 'react';
 import { RootPrivateQuery$data } from '../../private/__generated__/RootPrivateQuery.graphql';
 import { ModuleHelper } from '../platformModulesHelper';
+import { RootSettings$data } from '../../private/__generated__/RootSettings.graphql';
 
 export interface BannerSettings {
   bannerLevel?: string | null;
@@ -13,7 +14,7 @@ export interface BannerSettings {
 
 export interface UserContextType {
   me: RootPrivateQuery$data['me'] | undefined;
-  settings: RootPrivateQuery$data['settings'] | undefined;
+  settings: RootSettings$data | undefined;
   bannerSettings: BannerSettings | undefined;
   entitySettings: RootPrivateQuery$data['entitySettings'] | undefined;
   platformModuleHelpers: ModuleHelper | undefined;

diff --git a/opencti-platform/opencti-front/src/utils/platformModulesHelper.ts b/opencti-platform/opencti-front/src/utils/platformModulesHelper.ts
@@ -1,4 +1,4 @@
-import { RootPrivateQuery$data } from '../private/__generated__/RootPrivateQuery.graphql';
+import { RootSettings$data } from '../private/__generated__/RootSettings.graphql';
 
 export const DISABLE_MANAGER_MESSAGE = 'To use this feature, your platform administrator must enable the according manager in the config.';
 
@@ -31,7 +31,7 @@ export interface ModuleHelper {
 }
 
 const isFeatureEnable = (
-  settings: RootPrivateQuery$data['settings'],
+  settings: RootSettings$data,
   id: string,
 ) => {
   const flags = settings.platform_feature_flags ?? [];
@@ -40,7 +40,7 @@ const isFeatureEnable = (
 };
 
 const isModuleEnable = (
-  settings: RootPrivateQuery$data['settings'],
+  settings: RootSettings$data,
   id: string,
 ) => {
   const modules = settings.platform_modules || [];
@@ -49,7 +49,7 @@ const isModuleEnable = (
 };
 
 const isModuleWarning = (
-  settings: RootPrivateQuery$data['settings'],
+  settings: RootSettings$data,
   id: string,
 ) => {
   const modules = settings.platform_modules || [];
@@ -58,7 +58,7 @@ const isModuleWarning = (
 };
 
 const platformModuleHelper = (
-  settings: RootPrivateQuery$data['settings'],
+  settings: RootSettings$data,
 ): ModuleHelper => ({
   isModuleEnable: (id: string) => isModuleEnable(settings, id),
   isModuleWarning: (id: string) => isModuleWarning(settings, id),