[frontend] refactor usage of defaultValue for Distributions

OpenCTI-Platform · Mar 27, 2024 · 15eeda0 · 15eeda0
1 parent a7dbd0d
commit 15eeda0
Show file tree

Hide file tree

Showing 21 changed files with 34 additions and 30 deletions.
diff --git a/opencti-platform/opencti-front/src/components/dashboard/WidgetDonut.tsx b/opencti-platform/opencti-front/src/components/dashboard/WidgetDonut.tsx
@@ -27,7 +27,7 @@ const WidgetDonut = ({
   const chartData = data.map((n) => n.value);
   // eslint-disable-next-line no-nested-ternary
   const labels = data.map((n) => (groupBy.endsWith('_id')
-    ? defaultValue(n.entity, 'Restricted')
+    ? defaultValue(n.entity, t_i18n('Restricted'))
     : groupBy === 'entity_type' && t_i18n(`entity_${n.label}`) !== `entity_${n.label}`
       ? t_i18n(`entity_${n.label}`)
       : n.label));

diff --git a/opencti-platform/opencti-front/src/components/dashboard/WidgetListCoreObjects.tsx b/opencti-platform/opencti-front/src/components/dashboard/WidgetListCoreObjects.tsx
@@ -72,7 +72,7 @@ const WidgetListCoreObjects = ({
                 primary={
                   <>
                     <div style={bodyItemStyle('30%')}>
-                      {defaultValue(stixCoreObject, 'Restricted')}
+                      {defaultValue(stixCoreObject, t_i18n('Restricted'))}
                     </div>
                     <div style={bodyItemStyle('10%')}>
                       {fsd(date)}

diff --git a/opencti-platform/opencti-front/src/components/dashboard/WidgetListRelationships.tsx b/opencti-platform/opencti-front/src/components/dashboard/WidgetListRelationships.tsx
@@ -115,9 +115,7 @@ const WidgetListRelationships = ({
                     </div>
                     <div style={bodyItemStyle('18%')}>
                       <code>
-                        {stixRelationship.from
-                          ? defaultValue(stixRelationship.from)
-                          : t_i18n('Restricted')}
+                        {defaultValue(stixRelationship.from, t_i18n('Restricted')}
                       </code>
                     </div>
                     <div style={bodyItemStyle('10%')}>
@@ -148,9 +146,7 @@ const WidgetListRelationships = ({
                     </div>
                     <div style={bodyItemStyle('18%')}>
                       <code>
-                        {stixRelationship.to
-                          ? defaultValue(stixRelationship.to, t_i18n('Restricted'))
-                          : t_i18n('Restricted')}
+                        {defaultValue(stixRelationship.to, t_i18n('Restricted')}
                       </code>
                     </div>
                     <div style={bodyItemStyle('10%')}>

diff --git a/opencti-platform/opencti-front/src/components/dashboard/WidgetRadar.tsx b/opencti-platform/opencti-front/src/components/dashboard/WidgetRadar.tsx
@@ -33,7 +33,7 @@ const WidgetRadar = ({
 
   // eslint-disable-next-line no-nested-ternary,implicit-arrow-linebreak
   const labels = data.map((n) => (groupBy.endsWith('_id')
-    ? defaultValue(n.entity, 'Restricted')
+    ? defaultValue(n.entity, t_i18n('Restricted'))
     : groupBy === 'entity_type' && t_i18n(`entity_${n.label}`) !== `entity_${n.label}`
       ? t_i18n(`entity_${n.label}`)
       : n.label));

diff --git a/opencti-platform/opencti-front/src/components/dashboard/WidgetTimeline.tsx b/opencti-platform/opencti-front/src/components/dashboard/WidgetTimeline.tsx
@@ -67,7 +67,7 @@ const WidgetTimeline = ({ data }: WidgetTimelineProps) => {
               <TimelineContent>
                 <Paper variant="outlined" sx={{ padding: '15px' }} className="noDrag">
                   <Typography variant="h2">
-                    {defaultValue(value, 'Restricted')}
+                    {defaultValue(value, t_i18n('Restricted'))}
                   </Typography>
                   <div style={{ marginTop: -5, color: '#a8a8a8' }}>
                     <MarkdownDisplay

diff --git a/opencti-platform/opencti-front/src/components/dashboard/WidgetTree.tsx b/opencti-platform/opencti-front/src/components/dashboard/WidgetTree.tsx
@@ -28,7 +28,7 @@ const WidgetTree = ({
   const chartData = data.map((n) => ({
     // eslint-disable-next-line no-nested-ternary
     x: groupBy.endsWith('_id')
-      ? defaultValue(n.entity, 'Restricted')
+      ? defaultValue(n.entity, t_i18n('Restricted'))
       : groupBy === 'entity_type' && t_i18n(`entity_${n.label}`) !== `entity_${n.label}`
         ? t_i18n(`entity_${n.label}`)
         : n.label,

diff --git a/...ti-platform/opencti-front/src/private/components/common/audits/AuditsDistributionList.jsx b/...ti-platform/opencti-front/src/private/components/common/audits/AuditsDistributionList.jsx
@@ -264,7 +264,7 @@ const AuditsDistributionList = ({
                 selection.attribute.endsWith('.id')
                 || selection.attribute.endsWith('_id')
                 || selection.attribute.endsWith('_ids')
-                  ? defaultValue(o.entity)
+                  ? defaultValue(o.entity, t_i18n('Restricted'))
                   : selection.attribute === 'entity_type'
                     ? t_i18n(`entity_${o.label}`)
                     : o.label,

diff --git a/opencti-platform/opencti-front/src/private/components/common/audits/AuditsHorizontalBars.jsx b/opencti-platform/opencti-front/src/private/components/common/audits/AuditsHorizontalBars.jsx
@@ -283,7 +283,7 @@ const AuditsHorizontalBars = ({
                 selection.attribute.endsWith('.id')
                 || selection.attribute.endsWith('_id')
                 || selection.attribute.endsWith('_ids')
-                  ? defaultValue(n.entity)
+                  ? defaultValue(n.entity, t_i18n('Restricted'))
                   : selection.attribute === 'entity_type'
                     ? t_i18n(`entity_${n.label}`)
                     : n.label,

diff --git a/...i-front/src/private/components/common/stix_core_objects/StixCoreObjectsHorizontalBars.jsx b/...i-front/src/private/components/common/stix_core_objects/StixCoreObjectsHorizontalBars.jsx
@@ -263,7 +263,7 @@ const StixCoreObjectsHorizontalBars = ({
               return {
                 // eslint-disable-next-line no-nested-ternary
                 x: selection.attribute.endsWith('_id')
-                  ? defaultValue(n.entity)
+                  ? defaultValue(n.entity, t_i18n('Restricted'))
                   : selection.attribute === 'entity_type'
                     ? t_i18n(`entity_${n.label}`)
                     : n.label,

diff --git a/...nt/src/private/components/common/stix_core_objects/StixCoreObjectsMultiHorizontalBars.jsx b/...nt/src/private/components/common/stix_core_objects/StixCoreObjectsMultiHorizontalBars.jsx
@@ -467,7 +467,7 @@ const stixCoreObjectsMultiHorizontalBars = ({
                 x:
                   // eslint-disable-next-line no-nested-ternary
                   selection.attribute.endsWith('_id')
-                    ? defaultValue(n.entity, 'Restricted')
+                    ? defaultValue(n.entity, t_i18n('Restricted'))
                     : selection.attribute === 'entity_type'
                       ? t_i18n(`entity_${n.label}`)
                       : n.label,

diff --git a/...e/components/common/stix_core_relationships/EntityStixCoreRelationshipsHorizontalBars.jsx b/...e/components/common/stix_core_relationships/EntityStixCoreRelationshipsHorizontalBars.jsx
@@ -238,7 +238,7 @@ const EntityStixCoreRelationshipsHorizontalBars = (
               x:
               // eslint-disable-next-line no-nested-ternary
                 field === 'internal_id'
-                  ? defaultValue(n.entity, 'Restricted')
+                  ? defaultValue(n.entity, t_i18n('Restricted'))
                   : field === 'entity_type'
                     ? t_i18n(`entity_${n.label}`)
                     : n.label,

diff --git a/...ront/src/private/components/common/stix_relationships/StixRelationshipsHorizontalBars.jsx b/...ront/src/private/components/common/stix_relationships/StixRelationshipsHorizontalBars.jsx
@@ -281,7 +281,7 @@ const StixRelationshipsHorizontalBars = ({
               }
               return {
                 x: finalField.endsWith('_id')
-                  ? defaultValue(n.entity, 'Restricted')
+                  ? defaultValue(n.entity, t_i18n('Restricted'))
                   : n.label,
                 y: n.value,
                 fillColor: color,

diff --git a/...src/private/components/common/stix_relationships/StixRelationshipsMultiHorizontalBars.jsx b/...src/private/components/common/stix_relationships/StixRelationshipsMultiHorizontalBars.jsx
@@ -826,17 +826,17 @@ const StixRelationshipsMultiHorizontalBars = ({
             && props.stixRelationshipsDistribution
             && props.stixRelationshipsDistribution.length > 0
           ) {
-            const categories = props.stixRelationshipsDistribution.map((n) => defaultValue(n.entity, 'Restricted'));
+            const categories = props.stixRelationshipsDistribution.map((n) => defaultValue(n.entity, t_i18n('Restricted')));
             const entitiesMapping = {};
             for (const distrib of props.stixRelationshipsDistribution) {
               for (const subDistrib of distrib.entity[key]) {
                 entitiesMapping[
                   finalSubDistributionField === 'internal_id'
-                    ? defaultValue(subDistrib.entity, 'Restricted')
+                    ? defaultValue(subDistrib.entity, t_i18n('Restricted'))
                     : subDistrib.label
                 ] = (entitiesMapping[
                   finalSubDistributionField === 'internal_id'
-                    ? defaultValue(subDistrib.entity, 'Restricted')
+                    ? defaultValue(subDistrib.entity, t_i18n('Restricted'))
                     : subDistrib.label
                 ] || 0) + subDistrib.value;
               }

diff --git a/...cti-front/src/private/components/common/stix_relationships/StixRelationshipsPolarArea.jsx b/...cti-front/src/private/components/common/stix_relationships/StixRelationshipsPolarArea.jsx
@@ -247,7 +247,7 @@ const StixRelationshipsPolarArea = ({
               data = R.map(
                 (n) => R.assoc(
                   'label',
-                  defaultValue(n.entity, 'Restricted'),
+                  defaultValue(n.entity, t_i18n('Restricted')),
                   n,
                 ),
                 props.stixRelationshipsDistribution,

diff --git a/...front/src/private/components/data/relationships/RelationshipsStixCoreRelationshipLine.jsx b/...front/src/private/components/data/relationships/RelationshipsStixCoreRelationshipLine.jsx
@@ -150,7 +150,7 @@ const RelationshipsStixCoreRelationshipLineComponent = ({
               className={classes.bodyItem}
               style={{ width: dataColumns.fromName.width }}
             >
-              {node.from ? defaultValue(node.from) : t_i18n('Restricted')}
+              {defaultValue(node.from, t_i18n('Restricted'))}
             </div>
             <div
               className={classes.bodyItem}
@@ -204,7 +204,7 @@ const RelationshipsStixCoreRelationshipLineComponent = ({
               className={classes.bodyItem}
               style={{ width: dataColumns.toName.width }}
             >
-              {node.to ? defaultValue(node.to) : t_i18n('Restricted')}
+              {defaultValue(node.to, t_i18n('Restricted')}
             </div>
             <div
               className={classes.bodyItem}

diff --git a/...te/components/events/stix_sighting_relationships/EntityStixSightingRelationshipsDonut.jsx b/...te/components/events/stix_sighting_relationships/EntityStixSightingRelationshipsDonut.jsx
@@ -222,7 +222,7 @@ class EntityStixSightingRelationshipsDonut extends Component {
                   `${
                     toTypes.length > 1 && n.entity
                       ? `[${t(`entity_${n.entity.entity_type}`)}] ${n.entity.name}`
-                      : `${defaultValue(n.entity, 'Restricted')}`
+                      : `${defaultValue(n.entity, t_i18n('Restricted'))}`
                   }`,
                   n,
                 ),

diff --git a/...src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsHorizontalBars.tsx b/...src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsHorizontalBars.tsx
@@ -231,7 +231,7 @@ const PublicStixCoreObjectsHorizontalBarsComponent = ({
       return {
         // eslint-disable-next-line no-nested-ternary
         x: selection.attribute?.endsWith('_id')
-          ? defaultValue(n?.entity)
+          ? defaultValue(n?.entity, t_i18n('Restricted'))
           : selection.attribute === 'entity_type'
             ? t_i18n(`entity_${n?.label}`)
             : n?.label,

diff --git a/...ublic/components/dashboard/stix_relationships/PublicStixRelationshipsDistributionList.tsx b/...ublic/components/dashboard/stix_relationships/PublicStixRelationshipsDistributionList.tsx
@@ -188,13 +188,15 @@ const PublicStixRelationshipsDistributionListComponent = ({
     queryRef,
   );
 
+  const { t_i18n } = useFormatter();
+
   if (publicStixRelationshipsDistribution && publicStixRelationshipsDistribution.length > 0) {
     const finalField = dataSelection[0].attribute || 'entity_type';
     const data = publicStixRelationshipsDistribution.flatMap((o) => {
       if (!o) return [];
       return {
         label: finalField.endsWith('_id')
-          ? defaultValue(o.entity)
+          ? defaultValue(o.entity, t_i18n('Restricted'))
           : o.label,
         value: o.value,
         id: o.entity?.id ?? null,

diff --git a/.../public/components/dashboard/stix_relationships/PublicStixRelationshipsHorizontalBars.tsx b/.../public/components/dashboard/stix_relationships/PublicStixRelationshipsHorizontalBars.tsx
@@ -219,7 +219,7 @@ const PublicStixRelationshipsHorizontalBarsComponent = ({
       }
       return {
         x: finalField.endsWith('_id')
-          ? defaultValue(n?.entity)
+          ? defaultValue(n?.entity, t_i18n('Restricted'))
           : n?.label,
         y: n?.value,
         fillColor: color,

diff --git a/...ic/components/dashboard/stix_relationships/PublicStixRelationshipsMultiHorizontalBars.tsx b/...ic/components/dashboard/stix_relationships/PublicStixRelationshipsMultiHorizontalBars.tsx
@@ -349,6 +349,8 @@ const PublicStixRelationshipsMultiHorizontalBarsComponent = ({
     queryRef,
   );
 
+  const { t_i18n } = useFormatter();
+
   if (
     publicStixRelationshipsDistribution
     && publicStixRelationshipsDistribution.length > 0
@@ -358,7 +360,7 @@ const PublicStixRelationshipsMultiHorizontalBarsComponent = ({
     const subSelection = dataSelection[1];
     const finalSubDistributionField = subSelection.attribute || 'entity_type';
 
-    const categories = publicStixRelationshipsDistribution.map((n) => defaultValue(n?.entity));
+    const categories = publicStixRelationshipsDistribution.map((n) => defaultValue(n?.entity, t_i18n('Restricted')));
     const entitiesMapping: Record<string, number> = {};
     for (const distrib of publicStixRelationshipsDistribution) {
       for (const subDistrib of distrib?.breakdownDistribution ?? []) {
@@ -383,7 +385,7 @@ const PublicStixRelationshipsMultiHorizontalBarsComponent = ({
         const entityData = R.head(
           (distrib?.breakdownDistribution ?? []).filter(
             (n) => (finalSubDistributionField === 'internal_id'
-              ? defaultValue(n?.entity)
+              ? defaultValue(n?.entity, t_i18n('Restricted'))
               : n?.label) === sortedEntity[0],
           ),
         );

diff --git a/...t/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsPolarArea.tsx b/...t/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsPolarArea.tsx
@@ -182,6 +182,8 @@ const PublicStixRelationshipsPolarAreaComponent = ({
     queryRef,
   );
 
+  const { t_i18n } = useFormatter();
+
   if (
     publicStixRelationshipsDistribution
     && publicStixRelationshipsDistribution.length > 0
@@ -195,7 +197,9 @@ const PublicStixRelationshipsPolarAreaComponent = ({
             return [];
           }
           return {
-            label: attributeField.endsWith('_id') ? defaultValue(item.entity) : item.label,
+            label: attributeField.endsWith('_id')
+              ? defaultValue(item.entity, t_i18n('Restricted'))
+              : item.label,
             value: item.value ?? 0,
           };
         })}