From 46738f1ada475b0841a9044f227c3bba6ef43c0a Mon Sep 17 00:00:00 2001 From: FrancoisGrunert Date: Tue, 17 Sep 2024 15:39:28 +0200 Subject: [PATCH 1/4] [frontend] use new loader (#8288) --- .../stix_relationships/StixRelationshipsHorizontalBars.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsHorizontalBars.jsx b/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsHorizontalBars.jsx index 9d13956ce71b..547292b0898e 100644 --- a/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsHorizontalBars.jsx +++ b/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsHorizontalBars.jsx @@ -5,9 +5,9 @@ import { useFormatter } from '../../../../components/i18n'; import { buildFiltersAndOptionsForWidgets } from '../../../../utils/filters/filtersUtils'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import WidgetHorizontalBars from '../../../../components/dashboard/WidgetHorizontalBars'; import useDistributionGraphData from '../../../../utils/hooks/useDistributionGraphData'; +import Loader from '../../../../components/Loader'; export const stixRelationshipsHorizontalBarsDistributionQuery = graphql` query StixRelationshipsHorizontalBarsDistributionQuery( @@ -168,7 +168,7 @@ const StixRelationshipsHorizontalBars = ({ if (props) { return ; } - return ; + return ; }} /> ); From d4bf497fd019b1a84957929e81ccea3e3f5a836e Mon Sep 17 00:00:00 2001 From: FrancoisGrunert Date: Tue, 17 Sep 2024 15:47:57 +0200 Subject: [PATCH 2/4] [frontend] use loader variant variable (#8288) --- .../stix_relationships/StixRelationshipsHorizontalBars.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsHorizontalBars.jsx b/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsHorizontalBars.jsx index 547292b0898e..df09e267a843 100644 --- a/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsHorizontalBars.jsx +++ b/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsHorizontalBars.jsx @@ -7,7 +7,7 @@ import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; import WidgetHorizontalBars from '../../../../components/dashboard/WidgetHorizontalBars'; import useDistributionGraphData from '../../../../utils/hooks/useDistributionGraphData'; -import Loader from '../../../../components/Loader'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; export const stixRelationshipsHorizontalBarsDistributionQuery = graphql` query StixRelationshipsHorizontalBarsDistributionQuery( @@ -168,7 +168,7 @@ const StixRelationshipsHorizontalBars = ({ if (props) { return ; } - return ; + return ; }} /> ); From b5f78f733725d152ea374fe6aa18263cb64f6b92 Mon Sep 17 00:00:00 2001 From: FrancoisGrunert Date: Tue, 15 Oct 2024 15:22:08 +0200 Subject: [PATCH 3/4] [frontend] replace WidgetLoader by filigran loader (#8288) --- .../src/components/dashboard/WidgetLoader.tsx | 19 ------------------- .../src/private/components/Dashboard.jsx | 3 +-- .../common/audits/AuditsDistributionList.jsx | 4 ++-- .../components/common/audits/AuditsDonut.jsx | 4 ++-- .../components/common/audits/AuditsList.jsx | 4 ++-- .../common/audits/AuditsMultiAreaChart.jsx | 4 ++-- .../common/audits/AuditsMultiHeatMap.jsx | 4 ++-- .../common/audits/AuditsMultiLineChart.jsx | 4 ++-- .../common/audits/AuditsMultiVerticalBars.jsx | 4 ++-- .../components/common/audits/AuditsNumber.jsx | 4 ++-- .../common/audits/AuditsPolarArea.tsx | 6 +++--- .../components/common/audits/AuditsRadar.jsx | 4 ++-- .../common/audits/AuditsTreeMap.jsx | 4 ++-- .../StixCoreObjectsDistributionList.jsx | 4 ++-- .../StixCoreObjectsDonut.jsx | 4 ++-- .../StixCoreObjectsHorizontalBars.jsx | 4 ++-- .../stix_core_objects/StixCoreObjectsList.jsx | 4 ++-- .../StixCoreObjectsMultiAreaChart.jsx | 4 ++-- .../StixCoreObjectsMultiHeatMap.jsx | 4 ++-- .../StixCoreObjectsMultiLineChart.jsx | 4 ++-- .../StixCoreObjectsMultiVerticalBars.jsx | 4 ++-- .../StixCoreObjectsNumber.jsx | 4 ++-- .../StixCoreObjectsPolarArea.tsx | 6 +++--- .../StixCoreObjectsRadar.jsx | 4 ++-- .../StixCoreObjectsTimeline.jsx | 4 ++-- .../StixCoreObjectsTreeMap.jsx | 4 ++-- .../StixDomainObjectBookmarksList.jsx | 4 ++-- .../StixRelationshipsDistributionList.jsx | 4 ++-- .../StixRelationshipsDonut.jsx | 4 ++-- .../StixRelationshipsList.jsx | 4 ++-- .../StixRelationshipsMap.jsx | 4 ++-- .../StixRelationshipsMultiAreaChart.jsx | 4 ++-- .../StixRelationshipsMultiHeatMap.jsx | 4 ++-- .../StixRelationshipsMultiHorizontalBars.jsx | 4 ++-- .../StixRelationshipsMultiLineChart.jsx | 4 ++-- .../StixRelationshipsMultiVerticalBars.jsx | 4 ++-- .../StixRelationshipsNumber.jsx | 4 ++-- .../StixRelationshipsPolarArea.jsx | 4 ++-- .../StixRelationshipsRadar.jsx | 4 ++-- .../StixRelationshipsTimeline.jsx | 4 ++-- .../StixRelationshipsTreeMap.jsx | 4 ++-- .../PublicStixCoreObjectsDistributionList.tsx | 6 +++--- .../PublicStixCoreObjectsDonut.tsx | 6 +++--- .../PublicStixCoreObjectsHorizontalBars.tsx | 6 +++--- .../PublicStixCoreObjectsList.tsx | 6 +++--- .../PublicStixCoreObjectsMultiAreaChart.tsx | 6 +++--- .../PublicStixCoreObjectsMultiHeatMap.tsx | 6 +++--- .../PublicStixCoreObjectsMultiLineChart.tsx | 6 +++--- ...PublicStixCoreObjectsMultiVerticalBars.tsx | 6 +++--- .../PublicStixCoreObjectsNumber.tsx | 6 +++--- .../PublicStixCoreObjectsPolarArea.tsx | 6 +++--- .../PublicStixCoreObjectsRadar.tsx | 6 +++--- .../PublicStixCoreObjectsTimeline.tsx | 6 +++--- .../PublicStixCoreObjectsTreeMap.tsx | 6 +++--- .../PublicStixDomainObjectBookmarksList.tsx | 6 +++--- ...ublicStixRelationshipsDistributionList.tsx | 6 +++--- .../PublicStixRelationshipsDonut.tsx | 6 +++--- .../PublicStixRelationshipsHorizontalBars.tsx | 6 +++--- .../PublicStixRelationshipsList.tsx | 6 +++--- .../PublicStixRelationshipsMap.tsx | 6 +++--- .../PublicStixRelationshipsMultiAreaChart.tsx | 6 +++--- .../PublicStixRelationshipsMultiHeatMap.tsx | 6 +++--- ...icStixRelationshipsMultiHorizontalBars.tsx | 6 +++--- .../PublicStixRelationshipsMultiLineChart.tsx | 6 +++--- ...blicStixRelationshipsMultiVerticalBars.tsx | 6 +++--- .../PublicStixRelationshipsNumber.tsx | 6 +++--- .../PublicStixRelationshipsPolarArea.tsx | 6 +++--- .../PublicStixRelationshipsRadar.tsx | 6 +++--- .../PublicStixRelationshipsTimeline.tsx | 6 +++--- .../PublicStixRelationshipsTreeMap.tsx | 6 +++--- 70 files changed, 168 insertions(+), 188 deletions(-) delete mode 100644 opencti-platform/opencti-front/src/components/dashboard/WidgetLoader.tsx diff --git a/opencti-platform/opencti-front/src/components/dashboard/WidgetLoader.tsx b/opencti-platform/opencti-front/src/components/dashboard/WidgetLoader.tsx deleted file mode 100644 index 6d2f3cdf312a..000000000000 --- a/opencti-platform/opencti-front/src/components/dashboard/WidgetLoader.tsx +++ /dev/null @@ -1,19 +0,0 @@ -import CircularProgress from '@mui/material/CircularProgress'; -import React from 'react'; - -const WidgetLoader = () => { - return ( -
- -
- ); -}; - -export default WidgetLoader; diff --git a/opencti-platform/opencti-front/src/private/components/Dashboard.jsx b/opencti-platform/opencti-front/src/private/components/Dashboard.jsx index e41e2ebde548..4c5efcf21443 100644 --- a/opencti-platform/opencti-front/src/private/components/Dashboard.jsx +++ b/opencti-platform/opencti-front/src/private/components/Dashboard.jsx @@ -28,7 +28,6 @@ import StixRelationshipsHorizontalBars from './common/stix_relationships/StixRel import DashboardView from './workspaces/dashboards/Dashboard'; import useQueryLoading from '../../utils/hooks/useQueryLoading'; import useConnectedDocumentModifier from '../../utils/hooks/useConnectedDocumentModifier'; -import WidgetLoader from '../../components/dashboard/WidgetLoader'; // region styles // Deprecated - https://mui.com/system/styles/basics/ @@ -163,7 +162,7 @@ const TargetedCountries = ({ timeField }) => { return ( <> {queryRef && ( - }> + }> )} diff --git a/opencti-platform/opencti-front/src/private/components/common/audits/AuditsDistributionList.jsx b/opencti-platform/opencti-front/src/private/components/common/audits/AuditsDistributionList.jsx index 535e7565a9c1..18eeb393bc60 100644 --- a/opencti-platform/opencti-front/src/private/components/common/audits/AuditsDistributionList.jsx +++ b/opencti-platform/opencti-front/src/private/components/common/audits/AuditsDistributionList.jsx @@ -22,8 +22,8 @@ import useGranted, { SETTINGS_SETACCESSES } from '../../../../utils/hooks/useGra import useEnterpriseEdition from '../../../../utils/hooks/useEnterpriseEdition'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import WidgetDistributionList from '../../../../components/dashboard/WidgetDistributionList'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const auditsDistributionListDistributionQuery = graphql` query AuditsDistributionListDistributionQuery( @@ -161,7 +161,7 @@ const AuditsDistributionList = ({ if (props) { return ; } - return ; + return ; }} /> ); diff --git a/opencti-platform/opencti-front/src/private/components/common/audits/AuditsDonut.jsx b/opencti-platform/opencti-front/src/private/components/common/audits/AuditsDonut.jsx index 4ed0c207e306..69d96ee2f549 100644 --- a/opencti-platform/opencti-front/src/private/components/common/audits/AuditsDonut.jsx +++ b/opencti-platform/opencti-front/src/private/components/common/audits/AuditsDonut.jsx @@ -22,8 +22,8 @@ import useGranted, { SETTINGS_SECURITYACTIVITY, SETTINGS_SETACCESSES, VIRTUAL_OR import useEnterpriseEdition from '../../../../utils/hooks/useEnterpriseEdition'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import WidgetDonut from '../../../../components/dashboard/WidgetDonut'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const auditsDonutDistributionQuery = graphql` query AuditsDonutDistributionQuery( @@ -147,7 +147,7 @@ const AuditsDonut = ({ if (props) { return ; } - return ; + return ; }} /> ); diff --git a/opencti-platform/opencti-front/src/private/components/common/audits/AuditsList.jsx b/opencti-platform/opencti-front/src/private/components/common/audits/AuditsList.jsx index bf327c4a863b..0f1de839823f 100644 --- a/opencti-platform/opencti-front/src/private/components/common/audits/AuditsList.jsx +++ b/opencti-platform/opencti-front/src/private/components/common/audits/AuditsList.jsx @@ -33,7 +33,7 @@ import useEnterpriseEdition from '../../../../utils/hooks/useEnterpriseEdition'; import { buildFiltersAndOptionsForWidgets } from '../../../../utils/filters/filtersUtils'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; // Deprecated - https://mui.com/system/styles/basics/ // Do not use it for new code. @@ -259,7 +259,7 @@ const AuditsList = ({ if (props) { return ; } - return ; + return ; }} /> ); diff --git a/opencti-platform/opencti-front/src/private/components/common/audits/AuditsMultiAreaChart.jsx b/opencti-platform/opencti-front/src/private/components/common/audits/AuditsMultiAreaChart.jsx index b7d9c860e2e0..f98260fdeed0 100644 --- a/opencti-platform/opencti-front/src/private/components/common/audits/AuditsMultiAreaChart.jsx +++ b/opencti-platform/opencti-front/src/private/components/common/audits/AuditsMultiAreaChart.jsx @@ -23,8 +23,8 @@ import useEnterpriseEdition from '../../../../utils/hooks/useEnterpriseEdition'; import { removeEntityTypeAllFromFilterGroup } from '../../../../utils/filters/filtersUtils'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import WidgetMultiAreas from '../../../../components/dashboard/WidgetMultiAreas'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const auditsMultiAreaChartTimeSeriesQuery = graphql` query AuditsMultiAreaChartTimeSeriesQuery( @@ -125,7 +125,7 @@ const AuditsMultiAreaChart = ({ if (props) { return ; } - return ; + return ; }} /> ); diff --git a/opencti-platform/opencti-front/src/private/components/common/audits/AuditsMultiHeatMap.jsx b/opencti-platform/opencti-front/src/private/components/common/audits/AuditsMultiHeatMap.jsx index 9271a7960ca6..5b1edeb500c9 100644 --- a/opencti-platform/opencti-front/src/private/components/common/audits/AuditsMultiHeatMap.jsx +++ b/opencti-platform/opencti-front/src/private/components/common/audits/AuditsMultiHeatMap.jsx @@ -23,8 +23,8 @@ import useEnterpriseEdition from '../../../../utils/hooks/useEnterpriseEdition'; import { removeEntityTypeAllFromFilterGroup } from '../../../../utils/filters/filtersUtils'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import WidgetMultiHeatMap from '../../../../components/dashboard/WidgetMultiHeatMap'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const auditsMultiHeatMapTimeSeriesQuery = graphql` query AuditsMultiHeatMapTimeSeriesQuery( @@ -133,7 +133,7 @@ const AuditsMultiHeatMap = ({ if (props) { return ; } - return ; + return ; }} /> ); diff --git a/opencti-platform/opencti-front/src/private/components/common/audits/AuditsMultiLineChart.jsx b/opencti-platform/opencti-front/src/private/components/common/audits/AuditsMultiLineChart.jsx index e88d1882efc0..14867aa5e657 100644 --- a/opencti-platform/opencti-front/src/private/components/common/audits/AuditsMultiLineChart.jsx +++ b/opencti-platform/opencti-front/src/private/components/common/audits/AuditsMultiLineChart.jsx @@ -23,8 +23,8 @@ import useEnterpriseEdition from '../../../../utils/hooks/useEnterpriseEdition'; import { removeEntityTypeAllFromFilterGroup } from '../../../../utils/filters/filtersUtils'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import WidgetMultiLines from '../../../../components/dashboard/WidgetMultiLines'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const auditsMultiLineChartTimeSeriesQuery = graphql` query AuditsMultiLineChartTimeSeriesQuery( @@ -124,7 +124,7 @@ const AuditsMultiLineChart = ({ if (props) { return ; } - return ; + return ; }} /> ); diff --git a/opencti-platform/opencti-front/src/private/components/common/audits/AuditsMultiVerticalBars.jsx b/opencti-platform/opencti-front/src/private/components/common/audits/AuditsMultiVerticalBars.jsx index 220753eae341..bb138fb5f3be 100644 --- a/opencti-platform/opencti-front/src/private/components/common/audits/AuditsMultiVerticalBars.jsx +++ b/opencti-platform/opencti-front/src/private/components/common/audits/AuditsMultiVerticalBars.jsx @@ -23,8 +23,8 @@ import useEnterpriseEdition from '../../../../utils/hooks/useEnterpriseEdition'; import { removeEntityTypeAllFromFilterGroup } from '../../../../utils/filters/filtersUtils'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import WidgetVerticalBars from '../../../../components/dashboard/WidgetVerticalBars'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const auditsMultiVerticalBarsTimeSeriesQuery = graphql` query AuditsMultiVerticalBarsTimeSeriesQuery( @@ -125,7 +125,7 @@ const AuditsMultiVerticalBars = ({ if (props) { return ; } - return ; + return ; }} /> ); diff --git a/opencti-platform/opencti-front/src/private/components/common/audits/AuditsNumber.jsx b/opencti-platform/opencti-front/src/private/components/common/audits/AuditsNumber.jsx index 587243cedbb8..3b806ee3ecbc 100644 --- a/opencti-platform/opencti-front/src/private/components/common/audits/AuditsNumber.jsx +++ b/opencti-platform/opencti-front/src/private/components/common/audits/AuditsNumber.jsx @@ -23,9 +23,9 @@ import useEnterpriseEdition from '../../../../utils/hooks/useEnterpriseEdition'; import { buildFiltersAndOptionsForWidgets } from '../../../../utils/filters/filtersUtils'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import WidgetNumber from '../../../../components/dashboard/WidgetNumber'; import WidgetAccessDenied from '../../../../components/dashboard/WidgetAccessDenied'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const auditsNumberNumberQuery = graphql` query AuditsNumberNumberSeriesQuery( @@ -83,7 +83,7 @@ const AuditsNumber = ({ if (props) { return ; } - return ; + return ; }} /> ); diff --git a/opencti-platform/opencti-front/src/private/components/common/audits/AuditsPolarArea.tsx b/opencti-platform/opencti-front/src/private/components/common/audits/AuditsPolarArea.tsx index c934cfce01d3..e3c9fd850ee1 100644 --- a/opencti-platform/opencti-front/src/private/components/common/audits/AuditsPolarArea.tsx +++ b/opencti-platform/opencti-front/src/private/components/common/audits/AuditsPolarArea.tsx @@ -18,7 +18,6 @@ import React, { CSSProperties } from 'react'; import { AuditsPolarAreaDistributionQuery } from '@components/common/audits/__generated__/AuditsPolarAreaDistributionQuery.graphql'; import { useFormatter } from '../../../../components/i18n'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import useQueryLoading from '../../../../utils/hooks/useQueryLoading'; import WidgetPolarArea from '../../../../components/dashboard/WidgetPolarArea'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; @@ -26,6 +25,7 @@ import useGranted, { SETTINGS_SECURITYACTIVITY, SETTINGS_SETACCESSES, VIRTUAL_OR import useEnterpriseEdition from '../../../../utils/hooks/useEnterpriseEdition'; import WidgetAccessDenied from '../../../../components/dashboard/WidgetAccessDenied'; import { DashboardWidgetDataSelection, DashboardWidgetParameters } from '../../../../utils/dashboard'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const auditsPolarAreaDistributionQuery = graphql` query AuditsPolarAreaDistributionQuery( @@ -165,7 +165,7 @@ const AuditsPolarAreaQueyRef = ({ variant={variant} > {queryRef ? ( - }> + }> ) : ( - + )} ); diff --git a/opencti-platform/opencti-front/src/private/components/common/audits/AuditsRadar.jsx b/opencti-platform/opencti-front/src/private/components/common/audits/AuditsRadar.jsx index 2b79b96f9145..70576c95f1e9 100644 --- a/opencti-platform/opencti-front/src/private/components/common/audits/AuditsRadar.jsx +++ b/opencti-platform/opencti-front/src/private/components/common/audits/AuditsRadar.jsx @@ -21,8 +21,8 @@ import useGranted, { SETTINGS_SECURITYACTIVITY, SETTINGS_SETACCESSES, VIRTUAL_OR import useEnterpriseEdition from '../../../../utils/hooks/useEnterpriseEdition'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import WidgetRadar from '../../../../components/dashboard/WidgetRadar'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const auditsRadarDistributionQuery = graphql` query AuditsRadarDistributionQuery( @@ -155,7 +155,7 @@ const AuditsRadar = ({ if (props) { return ; } - return ; + return ; }} /> ); diff --git a/opencti-platform/opencti-front/src/private/components/common/audits/AuditsTreeMap.jsx b/opencti-platform/opencti-front/src/private/components/common/audits/AuditsTreeMap.jsx index 47a3b35af922..ea7554a814bb 100644 --- a/opencti-platform/opencti-front/src/private/components/common/audits/AuditsTreeMap.jsx +++ b/opencti-platform/opencti-front/src/private/components/common/audits/AuditsTreeMap.jsx @@ -21,8 +21,8 @@ import useGranted, { SETTINGS_SECURITYACTIVITY, SETTINGS_SETACCESSES, VIRTUAL_OR import useEnterpriseEdition from '../../../../utils/hooks/useEnterpriseEdition'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import WidgetTree from '../../../../components/dashboard/WidgetTree'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const auditsTreeMapDistributionQuery = graphql` query AuditsTreeMapDistributionQuery( @@ -169,7 +169,7 @@ const AuditsTreeMap = ({ if (props) { return ; } - return ; + return ; }} /> ); diff --git a/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsDistributionList.jsx b/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsDistributionList.jsx index 550cd137c6a4..187279495b53 100644 --- a/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsDistributionList.jsx +++ b/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsDistributionList.jsx @@ -6,9 +6,9 @@ import useGranted, { SETTINGS_SETACCESSES } from '../../../../utils/hooks/useGra import { buildFiltersAndOptionsForWidgets } from '../../../../utils/filters/filtersUtils'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import WidgetDistributionList from '../../../../components/dashboard/WidgetDistributionList'; import { getMainRepresentative, isFieldForIdentifier } from '../../../../utils/defaultRepresentatives'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const stixCoreObjectsDistributionListDistributionQuery = graphql` query StixCoreObjectsDistributionListDistributionQuery( @@ -141,7 +141,7 @@ const StixCoreObjectsDistributionList = ({ if (props) { return ; } - return ; + return ; }} /> ); diff --git a/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsDonut.jsx b/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsDonut.jsx index 668a8782ad6a..7d4f9ca786fc 100644 --- a/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsDonut.jsx +++ b/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsDonut.jsx @@ -4,9 +4,9 @@ import * as PropTypes from 'prop-types'; import { QueryRenderer } from '../../../../relay/environment'; import { useFormatter } from '../../../../components/i18n'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; import WidgetDonut from '../../../../components/dashboard/WidgetDonut'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const stixCoreObjectsDonutDistributionQuery = graphql` query StixCoreObjectsDonutDistributionQuery( @@ -136,7 +136,7 @@ const StixCoreObjectsDonut = ({ if (props) { return ; } - return ; + return ; }} /> ); diff --git a/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsHorizontalBars.jsx b/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsHorizontalBars.jsx index 4dbef617ee58..86dc3d4d5c18 100644 --- a/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsHorizontalBars.jsx +++ b/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsHorizontalBars.jsx @@ -5,9 +5,9 @@ import { useFormatter } from '../../../../components/i18n'; import { buildFiltersAndOptionsForWidgets } from '../../../../utils/filters/filtersUtils'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import WidgetHorizontalBars from '../../../../components/dashboard/WidgetHorizontalBars'; import useDistributionGraphData from '../../../../utils/hooks/useDistributionGraphData'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const stixCoreObjectsHorizontalBarsDistributionQuery = graphql` query StixCoreObjectsHorizontalBarsDistributionQuery( @@ -144,7 +144,7 @@ const StixCoreObjectsHorizontalBars = ({ if (props) { return ; } - return ; + return ; }} /> ); diff --git a/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsList.jsx b/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsList.jsx index 33be920a9684..57c52dcfd991 100644 --- a/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsList.jsx +++ b/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsList.jsx @@ -5,8 +5,8 @@ import { QueryRenderer } from '../../../../relay/environment'; import { buildFiltersAndOptionsForWidgets } from '../../../../utils/filters/filtersUtils'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import WidgetListCoreObjects from '../../../../components/dashboard/WidgetListCoreObjects'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const stixCoreObjectsListQuery = graphql` query StixCoreObjectsListQuery( @@ -258,7 +258,7 @@ const StixCoreObjectsList = ({ if (props) { return ; } - return ; + return ; }} /> diff --git a/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsMultiAreaChart.jsx b/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsMultiAreaChart.jsx index b2f8c053ce89..33878d0b1a2c 100644 --- a/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsMultiAreaChart.jsx +++ b/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsMultiAreaChart.jsx @@ -6,8 +6,8 @@ import { monthsAgo, now } from '../../../../utils/Time'; import { buildFiltersAndOptionsForWidgets } from '../../../../utils/filters/filtersUtils'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import WidgetMultiAreas from '../../../../components/dashboard/WidgetMultiAreas'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const stixCoreObjectsMultiAreaChartTimeSeriesQuery = graphql` query StixCoreObjectsMultiAreaChartTimeSeriesQuery( @@ -88,7 +88,7 @@ const StixCoreObjectsMultiAreaChart = ({ if (props) { return ; } - return ; + return ; }} /> ); diff --git a/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsMultiHeatMap.jsx b/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsMultiHeatMap.jsx index 31e343843f6b..d1864f4ad6b6 100644 --- a/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsMultiHeatMap.jsx +++ b/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsMultiHeatMap.jsx @@ -5,9 +5,9 @@ import { useFormatter } from '../../../../components/i18n'; import { monthsAgo, now } from '../../../../utils/Time'; import { removeEntityTypeAllFromFilterGroup } from '../../../../utils/filters/filtersUtils'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; import WidgetMultiHeatMap from '../../../../components/dashboard/WidgetMultiHeatMap'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const stixCoreObjectsMultiHeatMapTimeSeriesQuery = graphql` query StixCoreObjectsMultiHeatMapTimeSeriesQuery( @@ -94,7 +94,7 @@ const StixCoreObjectsMultiHeatMap = ({ if (props) { return ; } - return ; + return ; }} /> ); diff --git a/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsMultiLineChart.jsx b/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsMultiLineChart.jsx index 9f2077e6b0d0..ff3927be59e4 100644 --- a/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsMultiLineChart.jsx +++ b/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsMultiLineChart.jsx @@ -6,8 +6,8 @@ import { monthsAgo, now } from '../../../../utils/Time'; import { buildFiltersAndOptionsForWidgets } from '../../../../utils/filters/filtersUtils'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import WidgetMultiLines from '../../../../components/dashboard/WidgetMultiLines'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const stixCoreObjectsMultiLineChartTimeSeriesQuery = graphql` query StixCoreObjectsMultiLineChartTimeSeriesQuery( @@ -87,7 +87,7 @@ const StixCoreObjectsMultiLineChart = ({ if (props) { return ; } - return ; + return ; }} /> ); diff --git a/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsMultiVerticalBars.jsx b/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsMultiVerticalBars.jsx index 13435e135c01..a72d3534e39b 100644 --- a/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsMultiVerticalBars.jsx +++ b/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsMultiVerticalBars.jsx @@ -6,8 +6,8 @@ import { monthsAgo, now } from '../../../../utils/Time'; import { buildFiltersAndOptionsForWidgets } from '../../../../utils/filters/filtersUtils'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import WidgetVerticalBars from '../../../../components/dashboard/WidgetVerticalBars'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const stixCoreObjectsMultiVerticalBarsTimeSeriesQuery = graphql` query StixCoreObjectsMultiVerticalBarsTimeSeriesQuery( @@ -88,7 +88,7 @@ const StixCoreObjectsMultiVerticalBars = ({ if (props) { return ; } - return ; + return ; }} /> ); diff --git a/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsNumber.jsx b/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsNumber.jsx index b4e773c87c08..acf3bcfead6f 100644 --- a/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsNumber.jsx +++ b/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsNumber.jsx @@ -4,10 +4,10 @@ import { QueryRenderer } from '../../../../relay/environment'; import { useFormatter } from '../../../../components/i18n'; import { dayAgo } from '../../../../utils/Time'; import { buildFiltersAndOptionsForWidgets } from '../../../../utils/filters/filtersUtils'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; import WidgetNumber from '../../../../components/dashboard/WidgetNumber'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const stixCoreObjectsNumberNumberQuery = graphql` query StixCoreObjectsNumberNumberSeriesQuery( @@ -69,7 +69,7 @@ const StixCoreObjectsNumber = ({ if (props) { return ; } - return ; + return ; }} /> ); diff --git a/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsPolarArea.tsx b/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsPolarArea.tsx index 5d1e17918154..88f6aa62159b 100644 --- a/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsPolarArea.tsx +++ b/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsPolarArea.tsx @@ -3,11 +3,11 @@ import React, { CSSProperties } from 'react'; import { StixCoreObjectsPolarAreaDistributionQuery } from '@components/common/stix_core_objects/__generated__/StixCoreObjectsPolarAreaDistributionQuery.graphql'; import useQueryLoading from '../../../../utils/hooks/useQueryLoading'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import { useFormatter } from '../../../../components/i18n'; import WidgetPolarArea from '../../../../components/dashboard/WidgetPolarArea'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; import { DashboardWidgetDataSelection, DashboardWidgetParameters } from '../../../../utils/dashboard'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const stixCoreObjectsPolarAreaDistributionQuery = graphql` query StixCoreObjectsPolarAreaDistributionQuery( @@ -173,7 +173,7 @@ const StixCoreObjectsPolarArea = ({ variant={variant} > {queryRef ? ( - }> + }> ) : ( - + )} ); diff --git a/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsRadar.jsx b/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsRadar.jsx index 541b0e58b69c..9dcb74a8c31a 100644 --- a/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsRadar.jsx +++ b/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsRadar.jsx @@ -5,8 +5,8 @@ import { useFormatter } from '../../../../components/i18n'; import { buildFiltersAndOptionsForWidgets } from '../../../../utils/filters/filtersUtils'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import WidgetRadar from '../../../../components/dashboard/WidgetRadar'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const stixCoreObjectsRadarDistributionQuery = graphql` query StixCoreObjectsRadarDistributionQuery( @@ -137,7 +137,7 @@ const StixCoreObjectsRadar = ({ if (props) { return ; } - return ; + return ; }} /> ); diff --git a/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsTimeline.jsx b/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsTimeline.jsx index 4aad61959efe..05b9a748b1fd 100644 --- a/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsTimeline.jsx +++ b/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsTimeline.jsx @@ -5,9 +5,9 @@ import { QueryRenderer } from '../../../../relay/environment'; import { buildFiltersAndOptionsForWidgets } from '../../../../utils/filters/filtersUtils'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import WidgetTimeline from '../../../../components/dashboard/WidgetTimeline'; import { resolveLink } from '../../../../utils/Entity'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const stixCoreObjectsTimelineQuery = graphql` query StixCoreObjectsTimelineQuery( @@ -99,7 +99,7 @@ const StixCoreObjectsTimeline = ({ if (props) { return ; } - return ; + return ; }} /> ); diff --git a/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsTreeMap.jsx b/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsTreeMap.jsx index 55028a3bca6a..2e6cce1eaf61 100644 --- a/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsTreeMap.jsx +++ b/opencti-platform/opencti-front/src/private/components/common/stix_core_objects/StixCoreObjectsTreeMap.jsx @@ -4,9 +4,9 @@ import { QueryRenderer } from '../../../../relay/environment'; import { useFormatter } from '../../../../components/i18n'; import { buildFiltersAndOptionsForWidgets } from '../../../../utils/filters/filtersUtils'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; import WidgetTree from '../../../../components/dashboard/WidgetTree'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const stixCoreObjectsTreeMapDistributionQuery = graphql` query StixCoreObjectsTreeMapDistributionQuery( @@ -122,7 +122,7 @@ const StixCoreObjectsTreeMap = ({ if (props) { return ; } - return ; + return ; }} /> ); diff --git a/opencti-platform/opencti-front/src/private/components/common/stix_domain_objects/StixDomainObjectBookmarksList.jsx b/opencti-platform/opencti-front/src/private/components/common/stix_domain_objects/StixDomainObjectBookmarksList.jsx index b1fed1257880..f1bf6ce71fee 100644 --- a/opencti-platform/opencti-front/src/private/components/common/stix_domain_objects/StixDomainObjectBookmarksList.jsx +++ b/opencti-platform/opencti-front/src/private/components/common/stix_domain_objects/StixDomainObjectBookmarksList.jsx @@ -4,9 +4,9 @@ import { useFormatter } from '../../../../components/i18n'; import { QueryRenderer } from '../../../../relay/environment'; import { removeEntityTypeAllFromFilterGroup } from '../../../../utils/filters/filtersUtils'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; import WidgetBookmarks from '../../../../components/dashboard/WidgetBookmarks'; +import Loader from '../../../../components/Loader'; const stixDomainObjectBookmarksListQuery = graphql` query StixDomainObjectBookmarksListQuery($types: [String], $first: Int, $filters: FilterGroup) { @@ -186,7 +186,7 @@ const StixDomainObjectBookmarksList = ({ if (props) { return ; } - return ; + return ; }} /> ); diff --git a/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsDistributionList.jsx b/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsDistributionList.jsx index 4907a2c3c2ae..d2613f4fef61 100644 --- a/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsDistributionList.jsx +++ b/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsDistributionList.jsx @@ -6,9 +6,9 @@ import { getMainRepresentative, isFieldForIdentifier } from '../../../../utils/d import useGranted, { SETTINGS_SETACCESSES } from '../../../../utils/hooks/useGranted'; import { buildFiltersAndOptionsForWidgets } from '../../../../utils/filters/filtersUtils'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; import WidgetDistributionList from '../../../../components/dashboard/WidgetDistributionList'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const stixRelationshipsDistributionListDistributionQuery = graphql` query StixRelationshipsDistributionListDistributionQuery( @@ -166,7 +166,7 @@ const StixRelationshipsDistributionList = ({ if (props) { return ; } - return ; + return ; }} /> ); diff --git a/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsDonut.jsx b/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsDonut.jsx index 1c0ec25c3db6..37842887c564 100644 --- a/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsDonut.jsx +++ b/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsDonut.jsx @@ -5,8 +5,8 @@ import { useFormatter } from '../../../../components/i18n'; import { buildFiltersAndOptionsForWidgets } from '../../../../utils/filters/filtersUtils'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import WidgetDonut from '../../../../components/dashboard/WidgetDonut'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const stixRelationshipsDonutsDistributionQuery = graphql` query StixRelationshipsDonutDistributionQuery( @@ -157,7 +157,7 @@ const StixRelationshipsDonut = ({ if (props) { return ; } - return ; + return ; }} /> ); diff --git a/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsList.jsx b/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsList.jsx index ca677637a6b8..11a5e2078aa3 100644 --- a/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsList.jsx +++ b/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsList.jsx @@ -5,8 +5,8 @@ import { QueryRenderer } from '../../../../relay/environment'; import { buildFiltersAndOptionsForWidgets } from '../../../../utils/filters/filtersUtils'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import WidgetListRelationships from '../../../../components/dashboard/WidgetListRelationships'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; export const stixRelationshipsListSearchQuery = graphql` query StixRelationshipsListSearchQuery( @@ -4508,7 +4508,7 @@ const StixRelationshipsList = ({ if (props) { return ; } - return ; + return ; }} /> ); diff --git a/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsMap.jsx b/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsMap.jsx index 9db56b3a711d..721be2bd0a82 100644 --- a/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsMap.jsx +++ b/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsMap.jsx @@ -8,7 +8,7 @@ import { computeLevel } from '../../../../utils/Number'; import { buildFiltersAndOptionsForWidgets } from '../../../../utils/filters/filtersUtils'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; export const stixRelationshipsMapStixRelationshipsDistributionQuery = graphql` query StixRelationshipsMapStixRelationshipsDistributionQuery( @@ -159,7 +159,7 @@ const StixRelationshipsMap = ({ if (props) { return ; } - return ; + return ; }} /> ); diff --git a/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsMultiAreaChart.jsx b/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsMultiAreaChart.jsx index b3137796e5aa..8123c053ddb2 100644 --- a/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsMultiAreaChart.jsx +++ b/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsMultiAreaChart.jsx @@ -6,8 +6,8 @@ import { monthsAgo, now } from '../../../../utils/Time'; import { buildFiltersAndOptionsForWidgets } from '../../../../utils/filters/filtersUtils'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import WidgetMultiAreas from '../../../../components/dashboard/WidgetMultiAreas'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const stixRelationshipsMultiAreaChartTimeSeriesQuery = graphql` query StixRelationshipsMultiAreaChartTimeSeriesQuery( @@ -92,7 +92,7 @@ const StixRelationshipsMultiAreaChart = ({ if (props) { return ; } - return ; + return ; }} /> ); diff --git a/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsMultiHeatMap.jsx b/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsMultiHeatMap.jsx index 5223a8dd06ae..16028671abac 100644 --- a/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsMultiHeatMap.jsx +++ b/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsMultiHeatMap.jsx @@ -6,8 +6,8 @@ import { monthsAgo, now } from '../../../../utils/Time'; import { buildFiltersAndOptionsForWidgets } from '../../../../utils/filters/filtersUtils'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import WidgetMultiHeatMap from '../../../../components/dashboard/WidgetMultiHeatMap'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const stixRelationshipsMultiHeatMapTimeSeriesQuery = graphql` query StixRelationshipsMultiHeatMapTimeSeriesQuery( @@ -99,7 +99,7 @@ const StixRelationshipsMultiHeatMap = ({ if (props) { return ; } - return ; + return ; }} /> ); diff --git a/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsMultiHorizontalBars.jsx b/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsMultiHorizontalBars.jsx index 9a24c3b7626e..b0fae4c8ca19 100644 --- a/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsMultiHorizontalBars.jsx +++ b/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsMultiHorizontalBars.jsx @@ -7,8 +7,8 @@ import { getMainRepresentative } from '../../../../utils/defaultRepresentatives' import { buildFiltersAndOptionsForWidgets } from '../../../../utils/filters/filtersUtils'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import WidgetHorizontalBars from '../../../../components/dashboard/WidgetHorizontalBars'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const stixRelationshipsMultiHorizontalBarsWithRelationshipsDistributionQuery = graphql` query StixRelationshipsMultiHorizontalBarsWithRelationshipsDistributionQuery( @@ -550,7 +550,7 @@ const StixRelationshipsMultiHorizontalBars = ({ if (props) { return ; } - return ; + return ; }} /> ); diff --git a/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsMultiLineChart.jsx b/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsMultiLineChart.jsx index 0da732d2c55e..b65be4413542 100644 --- a/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsMultiLineChart.jsx +++ b/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsMultiLineChart.jsx @@ -6,8 +6,8 @@ import { monthsAgo, now } from '../../../../utils/Time'; import { buildFiltersAndOptionsForWidgets } from '../../../../utils/filters/filtersUtils'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import WidgetMultiLines from '../../../../components/dashboard/WidgetMultiLines'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const stixRelationshipsMultiLineChartTimeSeriesQuery = graphql` query StixRelationshipsMultiLineChartTimeSeriesQuery( @@ -90,7 +90,7 @@ const StixRelationshipsMultiLineChart = ({ if (props) { return ; } - return ; + return ; }} /> ); diff --git a/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsMultiVerticalBars.jsx b/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsMultiVerticalBars.jsx index 3e96758541ed..c7cf42f475da 100644 --- a/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsMultiVerticalBars.jsx +++ b/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsMultiVerticalBars.jsx @@ -6,8 +6,8 @@ import { monthsAgo, now } from '../../../../utils/Time'; import { buildFiltersAndOptionsForWidgets } from '../../../../utils/filters/filtersUtils'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import WidgetVerticalBars from '../../../../components/dashboard/WidgetVerticalBars'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const stixRelationshipsMultiVerticalBarsTimeSeriesQuery = graphql` query StixRelationshipsMultiVerticalBarsTimeSeriesQuery( @@ -91,7 +91,7 @@ const StixRelationshipsMultiVerticalBars = ({ if (props) { return ; } - return ; + return ; }} /> ); diff --git a/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsNumber.jsx b/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsNumber.jsx index b0e246b00fb7..98f7be1463a4 100644 --- a/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsNumber.jsx +++ b/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsNumber.jsx @@ -6,8 +6,8 @@ import { dayAgo } from '../../../../utils/Time'; import { buildFiltersAndOptionsForWidgets } from '../../../../utils/filters/filtersUtils'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import WidgetNumber from '../../../../components/dashboard/WidgetNumber'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const stixRelationshipsNumberNumberQuery = graphql` query StixRelationshipsNumberNumberSeriesQuery( @@ -89,7 +89,7 @@ const StixRelationshipsNumber = ({ if (props) { return ; } - return ; + return ; }} /> ); diff --git a/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsPolarArea.jsx b/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsPolarArea.jsx index f9f037c9b41b..cec0e2acdd98 100644 --- a/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsPolarArea.jsx +++ b/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsPolarArea.jsx @@ -4,9 +4,9 @@ import { QueryRenderer } from '../../../../relay/environment'; import { useFormatter } from '../../../../components/i18n'; import { buildFiltersAndOptionsForWidgets } from '../../../../utils/filters/filtersUtils'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; import WidgetPolarArea from '../../../../components/dashboard/WidgetPolarArea'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const stixRelationshipsPolarAreasDistributionQuery = graphql` query StixRelationshipsPolarAreaDistributionQuery( @@ -157,7 +157,7 @@ const StixRelationshipsPolarArea = ({ if (props) { return ; } - return ; + return ; }} /> ); diff --git a/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsRadar.jsx b/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsRadar.jsx index e977c946659c..2c7d716ad562 100644 --- a/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsRadar.jsx +++ b/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsRadar.jsx @@ -5,8 +5,8 @@ import { useFormatter } from '../../../../components/i18n'; import { buildFiltersAndOptionsForWidgets } from '../../../../utils/filters/filtersUtils'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import WidgetRadar from '../../../../components/dashboard/WidgetRadar'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const stixRelationshipsRadarsDistributionQuery = graphql` query StixRelationshipsRadarDistributionQuery( @@ -158,7 +158,7 @@ const StixRelationshipsRadar = ({ if (props) { return ; } - return ; + return ; }} /> ); diff --git a/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsTimeline.jsx b/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsTimeline.jsx index 7b8f0eb8f9d5..3312cbb1ef71 100644 --- a/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsTimeline.jsx +++ b/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsTimeline.jsx @@ -6,8 +6,8 @@ import { QueryRenderer } from '../../../../relay/environment'; import { buildFiltersAndOptionsForWidgets } from '../../../../utils/filters/filtersUtils'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import WidgetTimeline from '../../../../components/dashboard/WidgetTimeline'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const stixRelationshipsTimelineStixRelationshipQuery = graphql` query StixRelationshipsTimelineStixRelationshipQuery( @@ -1028,7 +1028,7 @@ const StixRelationshipsTimeline = ({ if (props) { return ; } - return ; + return ; }} /> ); diff --git a/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsTreeMap.jsx b/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsTreeMap.jsx index 3aba9dadef9a..3b6e930242ac 100644 --- a/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsTreeMap.jsx +++ b/opencti-platform/opencti-front/src/private/components/common/stix_relationships/StixRelationshipsTreeMap.jsx @@ -5,8 +5,8 @@ import { useFormatter } from '../../../../components/i18n'; import { buildFiltersAndOptionsForWidgets } from '../../../../utils/filters/filtersUtils'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import WidgetTree from '../../../../components/dashboard/WidgetTree'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const stixRelationshipsTreeMapsDistributionQuery = graphql` query StixRelationshipsTreeMapDistributionQuery( @@ -143,7 +143,7 @@ const StixRelationshipsTreeMap = ({ if (props) { return ; } - return ; + return ; }} /> ); diff --git a/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsDistributionList.tsx b/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsDistributionList.tsx index 206da34eda98..ed2cb7a17735 100644 --- a/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsDistributionList.tsx +++ b/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsDistributionList.tsx @@ -5,10 +5,10 @@ import type { PublicWidgetContainerProps } from '../PublicWidgetContainerProps'; import { useFormatter } from '../../../../components/i18n'; import useQueryLoading from '../../../../utils/hooks/useQueryLoading'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import WidgetDistributionList from '../../../../components/dashboard/WidgetDistributionList'; import { PublicStixCoreObjectsDistributionListQuery } from './__generated__/PublicStixCoreObjectsDistributionListQuery.graphql'; import { getMainRepresentative } from '../../../../utils/defaultRepresentatives'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const publicStixCoreObjectsDistributionListQuery = graphql` query PublicStixCoreObjectsDistributionListQuery( @@ -121,11 +121,11 @@ const PublicStixCoreObjectsDistributionList = ({ variant="inLine" > {queryRef ? ( - }> + }> ) : ( - + )} ); diff --git a/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsDonut.tsx b/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsDonut.tsx index 4d1253daae57..f1cf2e9b2671 100644 --- a/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsDonut.tsx +++ b/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsDonut.tsx @@ -5,10 +5,10 @@ import type { PublicWidgetContainerProps } from '../PublicWidgetContainerProps'; import { useFormatter } from '../../../../components/i18n'; import useQueryLoading from '../../../../utils/hooks/useQueryLoading'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import { PublicStixCoreObjectsDonutQuery } from './__generated__/PublicStixCoreObjectsDonutQuery.graphql'; import WidgetDonut from '../../../../components/dashboard/WidgetDonut'; import type { PublicManifestWidget } from '../PublicManifest'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const publicStixCoreObjectsDonutQuery = graphql` query PublicStixCoreObjectsDonutQuery( @@ -124,14 +124,14 @@ const PublicStixCoreObjectsDonut = ({ variant="inLine" > {queryRef ? ( - }> + }> ) : ( - + )} ); diff --git a/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsHorizontalBars.tsx b/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsHorizontalBars.tsx index 8984bc5a880d..42bed4809424 100644 --- a/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsHorizontalBars.tsx +++ b/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsHorizontalBars.tsx @@ -7,9 +7,9 @@ import WidgetHorizontalBars from '../../../../components/dashboard/WidgetHorizon import type { PublicWidgetContainerProps } from '../PublicWidgetContainerProps'; import useQueryLoading from '../../../../utils/hooks/useQueryLoading'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import { PublicStixCoreObjectsHorizontalBarsQuery } from './__generated__/PublicStixCoreObjectsHorizontalBarsQuery.graphql'; import useDistributionGraphData from '../../../../utils/hooks/useDistributionGraphData'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const publicStixCoreObjectsHorizontalBarsQuery = graphql` query PublicStixCoreObjectsHorizontalBarsQuery( @@ -131,7 +131,7 @@ const PublicStixCoreObjectsHorizontalBars = ({ variant="inLine" > {queryRef ? ( - }> + }> ) : ( - + )} ); diff --git a/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsList.tsx b/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsList.tsx index 2f7e37d98776..2e1e01f4aba8 100644 --- a/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsList.tsx +++ b/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsList.tsx @@ -6,9 +6,9 @@ import type { PublicWidgetContainerProps } from '../PublicWidgetContainerProps'; import { useFormatter } from '../../../../components/i18n'; import useQueryLoading from '../../../../utils/hooks/useQueryLoading'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import { PublicStixCoreObjectsListQuery } from './__generated__/PublicStixCoreObjectsListQuery.graphql'; import { DataTableProps } from '../../../../components/dataGrid/dataTableTypes'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const publicStixCoreObjectsListQuery = graphql` query PublicStixCoreObjectsListQuery( @@ -267,7 +267,7 @@ const PublicStixCoreObjectsList = ({ ref={rootRef} > {queryRef ? ( - }> + }> ) : ( - + )} ); diff --git a/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsMultiAreaChart.tsx b/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsMultiAreaChart.tsx index e6067f04eada..d3bbdd5f6618 100644 --- a/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsMultiAreaChart.tsx +++ b/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsMultiAreaChart.tsx @@ -7,9 +7,9 @@ import WidgetMultiAreas from '../../../../components/dashboard/WidgetMultiAreas' import type { PublicWidgetContainerProps } from '../PublicWidgetContainerProps'; import useQueryLoading from '../../../../utils/hooks/useQueryLoading'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import { PublicStixCoreObjectsMultiAreaChartQuery } from './__generated__/PublicStixCoreObjectsMultiAreaChartQuery.graphql'; import { monthsAgo, now } from '../../../../utils/Time'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const publicStixCoreObjectsMultiAreaChartQuery = graphql` query PublicStixCoreObjectsMultiAreaChartQuery( @@ -95,7 +95,7 @@ const PublicStixCoreObjectsMultiAreaChart = ({ variant="inLine" > {queryRef ? ( - }> + }> ) : ( - + )} ); diff --git a/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsMultiHeatMap.tsx b/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsMultiHeatMap.tsx index a9e3949b1193..fd33cda16e10 100644 --- a/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsMultiHeatMap.tsx +++ b/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsMultiHeatMap.tsx @@ -5,11 +5,11 @@ import type { PublicWidgetContainerProps } from '../PublicWidgetContainerProps'; import { useFormatter } from '../../../../components/i18n'; import useQueryLoading from '../../../../utils/hooks/useQueryLoading'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import { PublicStixCoreObjectsMultiHeatMapQuery } from './__generated__/PublicStixCoreObjectsMultiHeatMapQuery.graphql'; import WidgetMultiHeatMap from '../../../../components/dashboard/WidgetMultiHeatMap'; import type { PublicManifestWidget } from '../PublicManifest'; import { monthsAgo, now } from '../../../../utils/Time'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const publicStixCoreObjectsMultiHeatMapQuery = graphql` query PublicStixCoreObjectsMultiHeatMapQuery( @@ -101,7 +101,7 @@ const PublicStixCoreObjectsMultiHeatMap = ({ variant="inLine" > {queryRef ? ( - }> + }> ) : ( - + )} ); diff --git a/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsMultiLineChart.tsx b/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsMultiLineChart.tsx index afa51af9d9bc..1aad0308f84f 100644 --- a/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsMultiLineChart.tsx +++ b/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsMultiLineChart.tsx @@ -7,9 +7,9 @@ import WidgetMultiLines from '../../../../components/dashboard/WidgetMultiLines' import type { PublicWidgetContainerProps } from '../PublicWidgetContainerProps'; import useQueryLoading from '../../../../utils/hooks/useQueryLoading'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import { PublicStixCoreObjectsMultiLineChartQuery } from './__generated__/PublicStixCoreObjectsMultiLineChartQuery.graphql'; import { monthsAgo, now } from '../../../../utils/Time'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const publicStixCoreObjectsMultiLineChartQuery = graphql` query PublicStixCoreObjectsMultiLineChartQuery( @@ -94,7 +94,7 @@ const PublicStixCoreObjectsMultiLineChart = ({ variant="inLine" > {queryRef ? ( - }> + }> ) : ( - + )} ); diff --git a/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsMultiVerticalBars.tsx b/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsMultiVerticalBars.tsx index d7613a58ce98..2e0cf00e8064 100644 --- a/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsMultiVerticalBars.tsx +++ b/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsMultiVerticalBars.tsx @@ -4,12 +4,12 @@ import type { PublicWidgetContainerProps } from '../PublicWidgetContainerProps'; import { useFormatter } from '../../../../components/i18n'; import useQueryLoading from '../../../../utils/hooks/useQueryLoading'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; import WidgetVerticalBars from '../../../../components/dashboard/WidgetVerticalBars'; import { PublicStixCoreObjectsMultiVerticalBarsQuery } from './__generated__/PublicStixCoreObjectsMultiVerticalBarsQuery.graphql'; import type { PublicManifestWidget } from '../PublicManifest'; import { monthsAgo, now } from '../../../../utils/Time'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const publicStixCoreObjectsMultiVerticalBarsQuery = graphql` query PublicStixCoreObjectsMultiVerticalBarsQuery( @@ -95,7 +95,7 @@ const PublicStixCoreObjectsMultiVerticalBars = ({ variant="inLine" > {queryRef ? ( - }> + }> ) : ( - + )} ); diff --git a/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsNumber.tsx b/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsNumber.tsx index fee383217a3f..c6b385cd89ce 100644 --- a/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsNumber.tsx +++ b/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsNumber.tsx @@ -4,10 +4,10 @@ import useQueryLoading from '../../../../utils/hooks/useQueryLoading'; import { PublicStixCoreObjectsNumberQuery } from './__generated__/PublicStixCoreObjectsNumberQuery.graphql'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; import { useFormatter } from '../../../../components/i18n'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import WidgetNumber from '../../../../components/dashboard/WidgetNumber'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; import type { PublicWidgetContainerProps } from '../PublicWidgetContainerProps'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const publicStixCoreObjectsNumberQuery = graphql` query PublicStixCoreObjectsNumberQuery( @@ -72,11 +72,11 @@ const PublicStixCoreObjectsNumber = ({ variant="inLine" > {queryRef ? ( - }> + }> ) : ( - + )} ); diff --git a/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsPolarArea.tsx b/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsPolarArea.tsx index 507605a7c143..98e6a118181d 100644 --- a/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsPolarArea.tsx +++ b/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsPolarArea.tsx @@ -4,11 +4,11 @@ import type { PublicWidgetContainerProps } from '../PublicWidgetContainerProps'; import { useFormatter } from '../../../../components/i18n'; import useQueryLoading from '../../../../utils/hooks/useQueryLoading'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import { PublicStixCoreObjectsPolarAreaQuery } from './__generated__/PublicStixCoreObjectsPolarAreaQuery.graphql'; import type { PublicManifestWidget } from '../PublicManifest'; import WidgetPolarArea from '../../../../components/dashboard/WidgetPolarArea'; import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const publicStixCoreObjectsPolarAreaQuery = graphql` query PublicStixCoreObjectsPolarAreaQuery( @@ -125,14 +125,14 @@ const PublicStixCoreObjectsPolarArea = ({ variant="inLine" > {queryRef ? ( - }> + }> ) : ( - + )} ); diff --git a/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsRadar.tsx b/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsRadar.tsx index b429749654fb..df640fb4276d 100644 --- a/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsRadar.tsx +++ b/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsRadar.tsx @@ -5,10 +5,10 @@ import type { PublicWidgetContainerProps } from '../PublicWidgetContainerProps'; import { useFormatter } from '../../../../components/i18n'; import useQueryLoading from '../../../../utils/hooks/useQueryLoading'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import { PublicStixCoreObjectsRadarQuery } from './__generated__/PublicStixCoreObjectsRadarQuery.graphql'; import WidgetRadar from '../../../../components/dashboard/WidgetRadar'; import type { PublicManifestWidget } from '../PublicManifest'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const publicStixCoreObjectsRadarQuery = graphql` query PublicStixCoreObjectsRadarQuery( @@ -125,14 +125,14 @@ const PublicStixCoreObjectsRadar = ({ variant="inLine" > {queryRef ? ( - }> + }> ) : ( - + )} ); diff --git a/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsTimeline.tsx b/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsTimeline.tsx index 3a4b5356971c..ac1aee3cf343 100644 --- a/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsTimeline.tsx +++ b/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsTimeline.tsx @@ -5,9 +5,9 @@ import type { PublicWidgetContainerProps } from '../PublicWidgetContainerProps'; import { useFormatter } from '../../../../components/i18n'; import useQueryLoading from '../../../../utils/hooks/useQueryLoading'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import { PublicStixCoreObjectsTimelineQuery } from './__generated__/PublicStixCoreObjectsTimelineQuery.graphql'; import WidgetTimeline from '../../../../components/dashboard/WidgetTimeline'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const publicStixCoreObjectsTimelineQuery = graphql` query PublicStixCoreObjectsTimelineQuery( @@ -119,11 +119,11 @@ const PublicStixCoreObjectsTimeline = ({ variant="inLine" > {queryRef ? ( - }> + }> ) : ( - + )} ); diff --git a/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsTreeMap.tsx b/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsTreeMap.tsx index fde6052d6e0d..49b625c65622 100644 --- a/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsTreeMap.tsx +++ b/opencti-platform/opencti-front/src/public/components/dashboard/stix_core_objects/PublicStixCoreObjectsTreeMap.tsx @@ -5,10 +5,10 @@ import type { PublicWidgetContainerProps } from '../PublicWidgetContainerProps'; import { useFormatter } from '../../../../components/i18n'; import useQueryLoading from '../../../../utils/hooks/useQueryLoading'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import { PublicStixCoreObjectsTreeMapQuery } from './__generated__/PublicStixCoreObjectsTreeMapQuery.graphql'; import WidgetTree from '../../../../components/dashboard/WidgetTree'; import type { PublicManifestWidget } from '../PublicManifest'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const publicStixCoreObjectsTreeMapQuery = graphql` query PublicStixCoreObjectsTreeMapQuery( @@ -111,7 +111,7 @@ const PublicStixCoreObjectsTreeMap = ({ variant="inLine" > {queryRef ? ( - }> + }> ) : ( - + )} ); diff --git a/opencti-platform/opencti-front/src/public/components/dashboard/stix_domain_objects/PublicStixDomainObjectBookmarksList.tsx b/opencti-platform/opencti-front/src/public/components/dashboard/stix_domain_objects/PublicStixDomainObjectBookmarksList.tsx index 1b6b59080438..368f8d4dd23d 100644 --- a/opencti-platform/opencti-front/src/public/components/dashboard/stix_domain_objects/PublicStixDomainObjectBookmarksList.tsx +++ b/opencti-platform/opencti-front/src/public/components/dashboard/stix_domain_objects/PublicStixDomainObjectBookmarksList.tsx @@ -6,8 +6,8 @@ import type { PublicWidgetContainerProps } from '../PublicWidgetContainerProps'; import { useFormatter } from '../../../../components/i18n'; import useQueryLoading from '../../../../utils/hooks/useQueryLoading'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import { PublicStixDomainObjectBookmarksListQuery } from './__generated__/PublicStixDomainObjectBookmarksListQuery.graphql'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const publicStixDomainObjectBookmarksListQuery = graphql` query PublicStixDomainObjectBookmarksListQuery( @@ -212,11 +212,11 @@ const PublicStixDomainObjectBookmarksList = ({ variant="inLine" > {queryRef ? ( - }> + }> ) : ( - + )} ); diff --git a/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsDistributionList.tsx b/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsDistributionList.tsx index 1409f08619cb..19f7f3a6cac7 100644 --- a/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsDistributionList.tsx +++ b/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsDistributionList.tsx @@ -6,10 +6,10 @@ import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; import type { PublicWidgetContainerProps } from '../PublicWidgetContainerProps'; import useQueryLoading from '../../../../utils/hooks/useQueryLoading'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import { PublicStixRelationshipsDistributionListQuery } from './__generated__/PublicStixRelationshipsDistributionListQuery.graphql'; import type { PublicManifestWidget } from '../PublicManifest'; import { getMainRepresentative } from '../../../../utils/defaultRepresentatives'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const publicStixRelationshipsDistributionListQuery = graphql` query PublicStixRelationshipsDistributionListQuery( @@ -112,14 +112,14 @@ const PublicStixRelationshipsDistributionList = ({ variant="inLine" > {queryRef ? ( - }> + }> ) : ( - + )} ); diff --git a/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsDonut.tsx b/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsDonut.tsx index 0fbd549b2ad4..a04144ca937c 100644 --- a/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsDonut.tsx +++ b/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsDonut.tsx @@ -7,8 +7,8 @@ import type { PublicWidgetContainerProps } from '../PublicWidgetContainerProps'; import { useFormatter } from '../../../../components/i18n'; import useQueryLoading from '../../../../utils/hooks/useQueryLoading'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import { PublicStixRelationshipsDonutQuery } from './__generated__/PublicStixRelationshipsDonutQuery.graphql'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const publicStixRelationshipsDonutQuery = graphql` query PublicStixRelationshipsDonutQuery( @@ -124,14 +124,14 @@ const PublicStixRelationshipsDonut = ({ variant="inLine" > {queryRef ? ( - }> + }> ) : ( - + )} ); diff --git a/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsHorizontalBars.tsx b/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsHorizontalBars.tsx index 3ec87173c760..5de864cad3f9 100644 --- a/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsHorizontalBars.tsx +++ b/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsHorizontalBars.tsx @@ -7,9 +7,9 @@ import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; import type { PublicWidgetContainerProps } from '../PublicWidgetContainerProps'; import useQueryLoading from '../../../../utils/hooks/useQueryLoading'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import { PublicStixRelationshipsHorizontalBarsQuery } from './__generated__/PublicStixRelationshipsHorizontalBarsQuery.graphql'; import useDistributionGraphData from '../../../../utils/hooks/useDistributionGraphData'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const publicStixRelationshipsHorizontalBarsQuery = graphql` query PublicStixRelationshipsHorizontalBarsQuery( @@ -131,7 +131,7 @@ const PublicStixRelationshipsHorizontalBars = ({ variant="inLine" > {queryRef ? ( - }> + }> ) : ( - + )} ); diff --git a/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsList.tsx b/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsList.tsx index 62339470e381..eb231f94c8cd 100644 --- a/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsList.tsx +++ b/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsList.tsx @@ -5,9 +5,9 @@ import type { PublicWidgetContainerProps } from '../PublicWidgetContainerProps'; import { useFormatter } from '../../../../components/i18n'; import useQueryLoading from '../../../../utils/hooks/useQueryLoading'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import { PublicStixRelationshipsListQuery } from './__generated__/PublicStixRelationshipsListQuery.graphql'; import WidgetListRelationships from '../../../../components/dashboard/WidgetListRelationships'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const publicStixRelationshipsListQuery = graphql` query PublicStixRelationshipsListQuery( @@ -4399,14 +4399,14 @@ const PublicStixRelationshipsList = ({ variant="inLine" > {queryRef ? ( - }> + }> ) : ( - + )} ); diff --git a/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsMap.tsx b/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsMap.tsx index b98636ecad02..845fd3996c97 100644 --- a/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsMap.tsx +++ b/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsMap.tsx @@ -8,8 +8,8 @@ import type { PublicWidgetContainerProps } from '../PublicWidgetContainerProps'; import { useFormatter } from '../../../../components/i18n'; import useQueryLoading from '../../../../utils/hooks/useQueryLoading'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import { PublicStixRelationshipsMapQuery } from './__generated__/PublicStixRelationshipsMapQuery.graphql'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const publicStixRelationshipsMapQuery = graphql` query PublicStixRelationshipsMapQuery( @@ -123,14 +123,14 @@ const PublicStixRelationshipsMap = ({ variant="inLine" > {queryRef ? ( - }> + }> ) : ( - + )} ); diff --git a/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsMultiAreaChart.tsx b/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsMultiAreaChart.tsx index 1a7cd97b9ef4..9bda6f9bf612 100644 --- a/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsMultiAreaChart.tsx +++ b/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsMultiAreaChart.tsx @@ -7,9 +7,9 @@ import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; import type { PublicWidgetContainerProps } from '../PublicWidgetContainerProps'; import useQueryLoading from '../../../../utils/hooks/useQueryLoading'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import { PublicStixRelationshipsMultiAreaChartQuery } from './__generated__/PublicStixRelationshipsMultiAreaChartQuery.graphql'; import { monthsAgo, now } from '../../../../utils/Time'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const publicStixRelationshipsMultiAreaChartQuery = graphql` query PublicStixRelationshipsMultiAreaChartQuery( @@ -95,7 +95,7 @@ const PublicStixRelationshipsMultiAreaChart = ({ variant="inLine" > {queryRef ? ( - }> + }> ) : ( - + )} ); diff --git a/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsMultiHeatMap.tsx b/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsMultiHeatMap.tsx index 04018b50a284..c8edb80ee5e8 100644 --- a/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsMultiHeatMap.tsx +++ b/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsMultiHeatMap.tsx @@ -7,9 +7,9 @@ import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; import type { PublicWidgetContainerProps } from '../PublicWidgetContainerProps'; import useQueryLoading from '../../../../utils/hooks/useQueryLoading'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import { PublicStixRelationshipsMultiHeatMapQuery } from './__generated__/PublicStixRelationshipsMultiHeatMapQuery.graphql'; import { monthsAgo, now } from '../../../../utils/Time'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const publicStixRelationshipsMultiHeatMapQuery = graphql` query PublicStixRelationshipsMultiHeatMapQuery( @@ -101,7 +101,7 @@ const PublicStixRelationshipsMultiHeatMap = ({ variant="inLine" > {queryRef ? ( - }> + }> ) : ( - + )} ); diff --git a/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsMultiHorizontalBars.tsx b/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsMultiHorizontalBars.tsx index 23198f476e4d..c7e9ca55ba13 100644 --- a/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsMultiHorizontalBars.tsx +++ b/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsMultiHorizontalBars.tsx @@ -9,8 +9,8 @@ import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; import type { PublicWidgetContainerProps } from '../PublicWidgetContainerProps'; import useQueryLoading from '../../../../utils/hooks/useQueryLoading'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import { PublicStixRelationshipsMultiHorizontalBarsQuery } from './__generated__/PublicStixRelationshipsMultiHorizontalBarsQuery.graphql'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const publicStixRelationshipsMultiHorizontalBarsQuery = graphql` query PublicStixRelationshipsMultiHorizontalBarsQuery( @@ -285,7 +285,7 @@ const PublicStixRelationshipsMultiHorizontalBars = ({ variant="inLine" > {queryRef ? ( - }> + }> ) : ( - + )} ); diff --git a/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsMultiLineChart.tsx b/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsMultiLineChart.tsx index 82f2bb73a617..90a390ddfa0f 100644 --- a/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsMultiLineChart.tsx +++ b/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsMultiLineChart.tsx @@ -7,9 +7,9 @@ import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; import type { PublicWidgetContainerProps } from '../PublicWidgetContainerProps'; import useQueryLoading from '../../../../utils/hooks/useQueryLoading'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import { PublicStixRelationshipsMultiLineChartQuery } from './__generated__/PublicStixRelationshipsMultiLineChartQuery.graphql'; import { monthsAgo, now } from '../../../../utils/Time'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const publicStixRelationshipsMultiLineChartQuery = graphql` query PublicStixRelationshipsMultiLineChartQuery( @@ -94,7 +94,7 @@ const PublicStixRelationshipsMultiLineChart = ({ variant="inLine" > {queryRef ? ( - }> + }> ) : ( - + )} ); diff --git a/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsMultiVerticalBars.tsx b/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsMultiVerticalBars.tsx index 5aebf1b8670c..bd002631a722 100644 --- a/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsMultiVerticalBars.tsx +++ b/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsMultiVerticalBars.tsx @@ -7,9 +7,9 @@ import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; import type { PublicWidgetContainerProps } from '../PublicWidgetContainerProps'; import useQueryLoading from '../../../../utils/hooks/useQueryLoading'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import { PublicStixRelationshipsMultiVerticalBarsQuery } from './__generated__/PublicStixRelationshipsMultiVerticalBarsQuery.graphql'; import { monthsAgo, now } from '../../../../utils/Time'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const publicStixRelationshipsMultiVerticalBarsQuery = graphql` query PublicStixRelationshipsMultiVerticalBarsQuery( @@ -95,7 +95,7 @@ const PublicStixRelationshipsMultiVerticalBars = ({ variant="inLine" > {queryRef ? ( - }> + }> ) : ( - + )} ); diff --git a/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsNumber.tsx b/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsNumber.tsx index eec79cf58f09..08b6a95d1d8b 100644 --- a/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsNumber.tsx +++ b/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsNumber.tsx @@ -6,8 +6,8 @@ import type { PublicWidgetContainerProps } from '../PublicWidgetContainerProps'; import { useFormatter } from '../../../../components/i18n'; import useQueryLoading from '../../../../utils/hooks/useQueryLoading'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import { PublicStixRelationshipsNumberQuery } from './__generated__/PublicStixRelationshipsNumberQuery.graphql'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const publicStixRelationshipsNumberQuery = graphql` query PublicStixRelationshipsNumberQuery( @@ -72,11 +72,11 @@ const PublicStixCoreRelationshipsNumber = ({ variant="inLine" > {queryRef ? ( - }> + }> ) : ( - + )} ); diff --git a/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsPolarArea.tsx b/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsPolarArea.tsx index 03e06e046590..3775f8e667a8 100644 --- a/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsPolarArea.tsx +++ b/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsPolarArea.tsx @@ -6,9 +6,9 @@ import type { PublicWidgetContainerProps } from '../PublicWidgetContainerProps'; import { useFormatter } from '../../../../components/i18n'; import useQueryLoading from '../../../../utils/hooks/useQueryLoading'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import { PublicStixRelationshipsPolarAreaQuery } from './__generated__/PublicStixRelationshipsPolarAreaQuery.graphql'; import WidgetPolarArea from '../../../../components/dashboard/WidgetPolarArea'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const publicStixRelationshipsPolarAreaQuery = graphql` query PublicStixRelationshipsPolarAreaQuery( @@ -125,14 +125,14 @@ const PublicStixRelationshipsPolarArea = ({ variant="inLine" > {queryRef ? ( - }> + }> ) : ( - + )} ); diff --git a/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsRadar.tsx b/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsRadar.tsx index eebe0cb310a9..4280e51434bc 100644 --- a/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsRadar.tsx +++ b/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsRadar.tsx @@ -7,8 +7,8 @@ import type { PublicWidgetContainerProps } from '../PublicWidgetContainerProps'; import { useFormatter } from '../../../../components/i18n'; import useQueryLoading from '../../../../utils/hooks/useQueryLoading'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import { PublicStixRelationshipsRadarQuery } from './__generated__/PublicStixRelationshipsRadarQuery.graphql'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const publicStixRelationshipsRadarsQuery = graphql` query PublicStixRelationshipsRadarQuery( @@ -128,14 +128,14 @@ const PublicStixRelationshipsRadar = ({ variant="inLine" > {queryRef ? ( - }> + }> ) : ( - + )} ); diff --git a/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsTimeline.tsx b/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsTimeline.tsx index 20628b8455de..e25ab1541aa3 100644 --- a/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsTimeline.tsx +++ b/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsTimeline.tsx @@ -6,9 +6,9 @@ import type { PublicWidgetContainerProps } from '../PublicWidgetContainerProps'; import { useFormatter } from '../../../../components/i18n'; import useQueryLoading from '../../../../utils/hooks/useQueryLoading'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import { PublicStixRelationshipsTimelineQuery } from './__generated__/PublicStixRelationshipsTimelineQuery.graphql'; import type { PublicManifestWidget } from '../PublicManifest'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const publicStixRelationshipsTimelineQuery = graphql` query PublicStixRelationshipsTimelineQuery( @@ -1016,14 +1016,14 @@ const PublicStixRelationshipsTimeline = ({ variant="inLine" > {queryRef ? ( - }> + }> ) : ( - + )} ); diff --git a/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsTreeMap.tsx b/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsTreeMap.tsx index b9fbcee05c49..6d32a35d99eb 100644 --- a/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsTreeMap.tsx +++ b/opencti-platform/opencti-front/src/public/components/dashboard/stix_relationships/PublicStixRelationshipsTreeMap.tsx @@ -7,8 +7,8 @@ import type { PublicWidgetContainerProps } from '../PublicWidgetContainerProps'; import { useFormatter } from '../../../../components/i18n'; import useQueryLoading from '../../../../utils/hooks/useQueryLoading'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; -import WidgetLoader from '../../../../components/dashboard/WidgetLoader'; import { PublicStixRelationshipsTreeMapQuery } from './__generated__/PublicStixRelationshipsTreeMapQuery.graphql'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const publicStixRelationshipsTreeMapsQuery = graphql` query PublicStixRelationshipsTreeMapQuery( @@ -111,7 +111,7 @@ const PublicStixRelationshipsTreeMap = ({ variant="inLine" > {queryRef ? ( - }> + }> ) : ( - + )} ); From ad18b3afc0e3e45f89ea903e02d8cfe90e6f8a94 Mon Sep 17 00:00:00 2001 From: FrancoisGrunert Date: Wed, 16 Oct 2024 11:22:07 +0200 Subject: [PATCH 4/4] [frontend] add the last variant (#8288) --- .../stix_domain_objects/StixDomainObjectBookmarksList.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opencti-platform/opencti-front/src/private/components/common/stix_domain_objects/StixDomainObjectBookmarksList.jsx b/opencti-platform/opencti-front/src/private/components/common/stix_domain_objects/StixDomainObjectBookmarksList.jsx index f1bf6ce71fee..3cd269f8bdef 100644 --- a/opencti-platform/opencti-front/src/private/components/common/stix_domain_objects/StixDomainObjectBookmarksList.jsx +++ b/opencti-platform/opencti-front/src/private/components/common/stix_domain_objects/StixDomainObjectBookmarksList.jsx @@ -6,7 +6,7 @@ import { removeEntityTypeAllFromFilterGroup } from '../../../../utils/filters/fi import WidgetNoData from '../../../../components/dashboard/WidgetNoData'; import WidgetContainer from '../../../../components/dashboard/WidgetContainer'; import WidgetBookmarks from '../../../../components/dashboard/WidgetBookmarks'; -import Loader from '../../../../components/Loader'; +import Loader, { LoaderVariant } from '../../../../components/Loader'; const stixDomainObjectBookmarksListQuery = graphql` query StixDomainObjectBookmarksListQuery($types: [String], $first: Int, $filters: FilterGroup) { @@ -186,7 +186,7 @@ const StixDomainObjectBookmarksList = ({ if (props) { return ; } - return ; + return ; }} /> );