[backend/frontend] Deactivate feature flag (#6724)

OpenCTI-Platform · Sep 11, 2024 · c2cebff · c2cebff
1 parent 3b2b7b8
commit c2cebff
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/opencti-platform/opencti-front/src/private/components/settings/sub_types/SubType.tsx b/opencti-platform/opencti-front/src/private/components/settings/sub_types/SubType.tsx
@@ -71,8 +71,6 @@ interface SubTypeProps {
 
 const SubType: React.FC<SubTypeProps> = ({ data }) => {
   const { t_i18n } = useFormatter();
-  const { isFeatureEnable } = useHelper();
-  const isOverviewLayoutCustomizationEnabled = isFeatureEnable('OVERVIEW_LAYOUT_CUSTOMIZATION');
   const classes = useStyles();
   const subType = useFragment<SubType_subType$key>(subTypeFragment, data);
 
@@ -155,11 +153,9 @@ const SubType: React.FC<SubTypeProps> = ({ data }) => {
             </Paper>
           </Grid>
         )}
-        { isOverviewLayoutCustomizationEnabled && (
-          <EntitySettingCustomOverview
-            entitySettingsData={subType.settings}
-          />
-        )}
+        <EntitySettingCustomOverview
+          entitySettingsData={subType.settings}
+        />
       </Grid>
     </div>
   );

diff --git a/opencti-platform/opencti-graphql/config/default.json b/opencti-platform/opencti-graphql/config/default.json
@@ -13,8 +13,7 @@
       "FILIGRAN_LOADER",
       "BULK_ENTITIES",
       "CONTAINERS_AUTHORIZED_MEMBERS",
-      "TELEMETRY_COUNT_ACTIVE_USERS",
-      "OVERVIEW_LAYOUT_CUSTOMIZATION"
+      "TELEMETRY_COUNT_ACTIVE_USERS"
     ],
     "https_cert": {
       "ca": [],

diff --git a/opencti-platform/opencti-graphql/src/modules/entitySetting/entitySetting-domain.ts b/opencti-platform/opencti-graphql/src/modules/entitySetting/entitySetting-domain.ts
@@ -92,10 +92,7 @@ export const entitySettingEditField = async (context: AuthContext, user: AuthUse
 };
 
 export const getOverviewLayoutCustomization = (entitySetting: BasicStoreEntityEntitySetting) => {
-  if (!isFeatureEnabled('OVERVIEW_LAYOUT_CUSTOMIZATION') || !entitySetting.overview_layout_customization?.[0]) {
-    return schemaOverviewLayoutCustomization.get(entitySetting.target_type);
-  }
-  return entitySetting.overview_layout_customization;
+  return entitySetting.overview_layout_customization?.[0] ? entitySetting.overview_layout_customization : schemaOverviewLayoutCustomization.get(entitySetting.target_type);
 };
 
 export const entitySettingsEditField = async (context: AuthContext, user: AuthUser, entitySettingIds: string[], input: EditInput[]) => {