[frontend] Minor fixes

OpenCTI-Platform · Nov 28, 2023 · afebe21 · afebe21
1 parent 0ccd460
commit afebe21
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 37 deletions.
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
@@ -26,6 +32,7 @@ interface ExtendedColor extends PaletteColorOptions {
   text: Partial<TypeText>
   mode: PaletteMode
   background: 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
@@ -33,6 +33,7 @@ const ThemeDark = (
     ee: {
       main: EE_COLOR,
       background: hexToRGB(EE_COLOR, 0.3),
+      contrastText: '#ffffff',
     },
     background: {
       default: background || THEME_DARK_DEFAULT_BACKGROUND,

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

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';
@@ -16,6 +16,41 @@ import useQueryLoading from '../utils/hooks/useQueryLoading';
 import Loader from '../components/Loader';
 import generateAnalyticsConfig from './Analytics';
 
+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 {
     me {
@@ -62,36 +97,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
@@ -170,7 +176,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(rootSettingsFragment, settingsFragment);
   const schema = {
     scos: schemaSCOs.edges.map((sco) => sco.node),
     sdos: schemaSDOs.edges.map((sco) => sco.node),

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
@@ -21,7 +21,7 @@ const EETooltip = ({ children, title }: { children: ReactElement, title?: string
   }
   return (
     <>
-      <Tooltip title={t('You need to activate OpenCTI enterprise edition to use this feature.')}>
+      <Tooltip title={title ? t(title) : undefined}>
         <span onClick={(e) => {
           setFeedbackCreation(true);
           e.preventDefault();

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
       }
     }
   }`;
@@ -42,9 +43,6 @@ const EnterpriseEditionAgreement: FunctionComponent<EnterpriseEditionAgreementPr
           value: now(),
         },
       },
-      onCompleted: () => {
-        window.location.reload();
-      },
     });
     onClose();
   };

diff --git a/opencti-platform/opencti-front/src/private/components/settings/Settings.jsx b/opencti-platform/opencti-front/src/private/components/settings/Settings.jsx
@@ -467,7 +467,7 @@ const Settings = () => {
                                       : t('Community Edition (CC)')
                                   }
                                   color={
-                                    isEnterpriseEdition ? 'success' : 'warning'
+                                    isEnterpriseEdition ? 'ee' : 'warning'
                                   }
                                   style={{ borderRadius: 5 }}
                                 />