diff --git a/__tests__/pages/Components/Component.spec.tsx b/__tests__/pages/Components/Component.spec.tsx index c71a40c2..60e2c1d9 100644 --- a/__tests__/pages/Components/Component.spec.tsx +++ b/__tests__/pages/Components/Component.spec.tsx @@ -9,10 +9,10 @@ import processesData from '../../../mocks/data/PROCESSES.json'; import { loadMockServer } from '../../../mocks/server'; import { waitForElementToBeRemovedTimeout } from '../../../src/config/config'; import { getTestsIds } from '../../../src/config/testIds'; +import LoadingPage from '../../../src/core/components/SkLoading'; import { Wrapper } from '../../../src/core/components/Wrapper'; import { ComponentLabels } from '../../../src/pages/ProcessGroups/Components.enum'; import Component from '../../../src/pages/ProcessGroups/views/Component'; -import LoadingPage from '../../../src/pages/shared/Loading'; import { MetricsLabels } from '../../../src/pages/shared/Metrics/Metrics.enum'; import { ProcessResponse, ComponentResponse } from '../../../src/types/REST.interfaces'; diff --git a/__tests__/pages/Components/PairsList.spec.tsx b/__tests__/pages/Components/PairsList.spec.tsx index 94bddd8f..b43b19ae 100644 --- a/__tests__/pages/Components/PairsList.spec.tsx +++ b/__tests__/pages/Components/PairsList.spec.tsx @@ -3,16 +3,16 @@ import { Suspense } from 'react'; import { render, screen, waitForElementToBeRemoved } from '@testing-library/react'; import { Server } from 'miragejs'; -import { SkEmptyDataLabels } from '../../../src/core/components/SkEmptyData'; import pairsList from '../../../mocks/data/PROCESS_GROUP_PAIRS.json'; import components from '../../../mocks/data/PROCESS_GROUPS.json'; import { loadMockServer } from '../../../mocks/server'; import { waitForElementToBeRemovedTimeout } from '../../../src/config/config'; import { getTestsIds } from '../../../src/config/testIds'; +import { SkEmptyDataLabels } from '../../../src/core/components/SkEmptyData'; +import LoadingPage from '../../../src/core/components/SkLoading'; import { Wrapper } from '../../../src/core/components/Wrapper'; import PairsList from '../../../src/pages/ProcessGroups/components/PairList'; -import LoadingPage from '../../../src/pages/shared/Loading'; import { ComponentResponse, BasePairs } from '../../../src/types/REST.interfaces'; const data = components.results[0] as ComponentResponse; diff --git a/__tests__/pages/Components/ProcessGroups.spec.tsx b/__tests__/pages/Components/ProcessGroups.spec.tsx index 489e2197..62d7e2d2 100644 --- a/__tests__/pages/Components/ProcessGroups.spec.tsx +++ b/__tests__/pages/Components/ProcessGroups.spec.tsx @@ -7,9 +7,9 @@ import componentsData from '../../../mocks/data/PROCESS_GROUPS.json'; import { loadMockServer } from '../../../mocks/server'; import { waitForElementToBeRemovedTimeout } from '../../../src/config/config'; import { getTestsIds } from '../../../src/config/testIds'; +import LoadingPage from '../../../src/core/components/SkLoading'; import { Wrapper } from '../../../src/core/components/Wrapper'; import Components from '../../../src/pages/ProcessGroups/views/Components'; -import LoadingPage from '../../../src/pages/shared/Loading'; const componentResults = componentsData.results; diff --git a/__tests__/pages/ErrorConsole.spec.tsx b/__tests__/pages/ErrorConsole.spec.tsx index d4cdfda2..aeb9d132 100644 --- a/__tests__/pages/ErrorConsole.spec.tsx +++ b/__tests__/pages/ErrorConsole.spec.tsx @@ -4,9 +4,9 @@ import { render, screen } from '@testing-library/react'; import { Server } from 'miragejs'; import { loadMockServer } from '../../mocks/server'; +import LoadingPage from '../../src/core/components/SkLoading'; import { Wrapper } from '../../src/core/components/Wrapper'; import ErrorConsole from '../../src/pages/shared/Errors/Console'; -import LoadingPage from '../../src/pages/shared/Loading'; describe('Begin testing the Error Console view', () => { let server: Server; diff --git a/__tests__/pages/ErrorNotFound.spec.tsx b/__tests__/pages/ErrorNotFound.spec.tsx index 4e17a1a0..eb93a557 100644 --- a/__tests__/pages/ErrorNotFound.spec.tsx +++ b/__tests__/pages/ErrorNotFound.spec.tsx @@ -4,10 +4,10 @@ import { render, screen } from '@testing-library/react'; import { Server } from 'miragejs'; import { loadMockServer } from '../../mocks/server'; +import LoadingPage from '../../src/core/components/SkLoading'; import { Wrapper } from '../../src/core/components/Wrapper'; import NotFound from '../../src/pages/shared/Errors/NotFound'; import { NotFoundLabels } from '../../src/pages/shared/Errors/NotFound/NotFound.enum'; -import LoadingPage from '../../src/pages/shared/Loading'; describe('Begin testing the NotFound view', () => { let server: Server; diff --git a/__tests__/pages/Metrics/Latency.spec.tsx b/__tests__/pages/Metrics/Latency.spec.tsx index 703dd80c..21da5a68 100644 --- a/__tests__/pages/Metrics/Latency.spec.tsx +++ b/__tests__/pages/Metrics/Latency.spec.tsx @@ -8,8 +8,8 @@ import { loadMockServer } from '../../../mocks/server'; import * as PrometheusAPIModule from '../../../src/API/Prometheus.api'; import { waitForElementToBeRemovedTimeout } from '../../../src/config/config'; import { getTestsIds } from '../../../src/config/testIds'; +import LoadingPage from '../../../src/core/components/SkLoading'; import { Wrapper } from '../../../src/core/components/Wrapper'; -import LoadingPage from '../../../src/pages/shared/Loading'; import Latency from '../../../src/pages/shared/Metrics/components/Latency'; import { MetricsLabels } from '../../../src/pages/shared/Metrics/Metrics.enum'; import { ProcessResponse } from '../../../src/types/REST.interfaces'; diff --git a/__tests__/pages/Metrics/Metrics.spec.tsx b/__tests__/pages/Metrics/Metrics.spec.tsx index 5bd9cbaa..cc903cbf 100644 --- a/__tests__/pages/Metrics/Metrics.spec.tsx +++ b/__tests__/pages/Metrics/Metrics.spec.tsx @@ -2,12 +2,12 @@ import { Suspense } from 'react'; import { act, render, renderHook } from '@testing-library/react'; -import { useMetricsState } from '../../../src/pages/shared/Metrics/hooks/useMetricsState'; import { Protocols } from '../../../src/API/REST.enum'; +import LoadingPage from '../../../src/core/components/SkLoading'; import { Wrapper } from '../../../src/core/components/Wrapper'; -import LoadingPage from '../../../src/pages/shared/Loading'; import Metrics, { MetricsProps } from '../../../src/pages/shared/Metrics'; +import { useMetricsState } from '../../../src/pages/shared/Metrics/hooks/useMetricsState'; import { configDefaultFilters } from '../../../src/pages/shared/Metrics/Metrics.constants'; describe('useMetrics', () => { diff --git a/__tests__/pages/Metrics/Request.spec.tsx b/__tests__/pages/Metrics/Request.spec.tsx index bb97e16f..d4471101 100644 --- a/__tests__/pages/Metrics/Request.spec.tsx +++ b/__tests__/pages/Metrics/Request.spec.tsx @@ -8,8 +8,8 @@ import { loadMockServer } from '../../../mocks/server'; import * as PrometheusAPIModule from '../../../src/API/Prometheus.api'; import { waitForElementToBeRemovedTimeout } from '../../../src/config/config'; import { getTestsIds } from '../../../src/config/testIds'; +import LoadingPage from '../../../src/core/components/SkLoading'; import { Wrapper } from '../../../src/core/components/Wrapper'; -import LoadingPage from '../../../src/pages/shared/Loading'; import Request from '../../../src/pages/shared/Metrics/components/Request'; import { MetricsLabels } from '../../../src/pages/shared/Metrics/Metrics.enum'; import { ProcessResponse } from '../../../src/types/REST.interfaces'; diff --git a/__tests__/pages/Metrics/Response.spec.tsx b/__tests__/pages/Metrics/Response.spec.tsx index 2a5b2b7b..968156ba 100644 --- a/__tests__/pages/Metrics/Response.spec.tsx +++ b/__tests__/pages/Metrics/Response.spec.tsx @@ -8,8 +8,8 @@ import { loadMockServer } from '../../../mocks/server'; import * as PrometheusAPIModule from '../../../src/API/Prometheus.api'; import { waitForElementToBeRemovedTimeout } from '../../../src/config/config'; import { getTestsIds } from '../../../src/config/testIds'; +import LoadingPage from '../../../src/core/components/SkLoading'; import { Wrapper } from '../../../src/core/components/Wrapper'; -import LoadingPage from '../../../src/pages/shared/Loading'; import Response from '../../../src/pages/shared/Metrics/components/Response'; import { MetricsLabels } from '../../../src/pages/shared/Metrics/Metrics.enum'; import { ProcessResponse } from '../../../src/types/REST.interfaces'; diff --git a/__tests__/pages/Metrics/TcpConnection.spec.tsx b/__tests__/pages/Metrics/TcpConnection.spec.tsx index 7280baa1..707578a4 100644 --- a/__tests__/pages/Metrics/TcpConnection.spec.tsx +++ b/__tests__/pages/Metrics/TcpConnection.spec.tsx @@ -8,8 +8,8 @@ import { loadMockServer } from '../../../mocks/server'; import * as PrometheusAPIModule from '../../../src/API/Prometheus.api'; import { waitForElementToBeRemovedTimeout } from '../../../src/config/config'; import { getTestsIds } from '../../../src/config/testIds'; +import LoadingPage from '../../../src/core/components/SkLoading'; import { Wrapper } from '../../../src/core/components/Wrapper'; -import LoadingPage from '../../../src/pages/shared/Loading'; import TcpConnection from '../../../src/pages/shared/Metrics/components/TcpConnection'; import { MetricsLabels } from '../../../src/pages/shared/Metrics/Metrics.enum'; import { ProcessResponse } from '../../../src/types/REST.interfaces'; diff --git a/__tests__/pages/Metrics/Traffic.spec.tsx b/__tests__/pages/Metrics/Traffic.spec.tsx index 93b87b0e..9ebf1031 100644 --- a/__tests__/pages/Metrics/Traffic.spec.tsx +++ b/__tests__/pages/Metrics/Traffic.spec.tsx @@ -7,8 +7,8 @@ import processesData from '../../../mocks/data/PROCESSES.json'; import { loadMockServer } from '../../../mocks/server'; import { waitForElementToBeRemovedTimeout } from '../../../src/config/config'; import { getTestsIds } from '../../../src/config/testIds'; +import LoadingPage from '../../../src/core/components/SkLoading'; import { Wrapper } from '../../../src/core/components/Wrapper'; -import LoadingPage from '../../../src/pages/shared/Loading'; import Traffic from '../../../src/pages/shared/Metrics/components/Traffic'; import { MetricsLabels } from '../../../src/pages/shared/Metrics/Metrics.enum'; import * as MetricsModule from '../../../src/pages/shared/Metrics/services/index'; diff --git a/__tests__/pages/Processes/Details.spec.tsx b/__tests__/pages/Processes/Details.spec.tsx index 1121381c..717d75de 100644 --- a/__tests__/pages/Processes/Details.spec.tsx +++ b/__tests__/pages/Processes/Details.spec.tsx @@ -6,9 +6,9 @@ import * as router from 'react-router'; import processesData from '../../../mocks/data/PROCESSES.json'; import { loadMockServer } from '../../../mocks/server'; +import LoadingPage from '../../../src/core/components/SkLoading'; import { Wrapper } from '../../../src/core/components/Wrapper'; import Details from '../../../src/pages/Processes/components/Details'; -import LoadingPage from '../../../src/pages/shared/Loading'; import { ProcessResponse } from '../../../src/types/REST.interfaces'; const processResult = processesData.results[0] as ProcessResponse; diff --git a/__tests__/pages/Processes/PairsList.spec.tsx b/__tests__/pages/Processes/PairsList.spec.tsx index 0cd88db0..2f273589 100644 --- a/__tests__/pages/Processes/PairsList.spec.tsx +++ b/__tests__/pages/Processes/PairsList.spec.tsx @@ -3,17 +3,17 @@ import { Suspense } from 'react'; import { render, screen, waitForElementToBeRemoved } from '@testing-library/react'; import { Server } from 'miragejs'; -import { SkEmptyDataLabels } from '../../../src/core/components/SkEmptyData'; import processesPairsData from '../../../mocks/data/PROCESS_PAIRS.json'; import processesData from '../../../mocks/data/PROCESSES.json'; import { loadMockServer } from '../../../mocks/server'; import { waitForElementToBeRemovedTimeout } from '../../../src/config/config'; import { getTestsIds } from '../../../src/config/testIds'; +import { SkEmptyDataLabels } from '../../../src/core/components/SkEmptyData'; +import LoadingPage from '../../../src/core/components/SkLoading'; import { Wrapper } from '../../../src/core/components/Wrapper'; import PairsList from '../../../src/pages/Processes/components/PairsList'; import { ProcessesLabels, ProcessesRoutesPaths } from '../../../src/pages/Processes/Processes.enum'; -import LoadingPage from '../../../src/pages/shared/Loading'; import { ProcessResponse, PairsResponse } from '../../../src/types/REST.interfaces'; const data = processesData.results[7] as ProcessResponse; diff --git a/__tests__/pages/Processes/Process.spec.tsx b/__tests__/pages/Processes/Process.spec.tsx index 7599e54f..369609bf 100644 --- a/__tests__/pages/Processes/Process.spec.tsx +++ b/__tests__/pages/Processes/Process.spec.tsx @@ -8,10 +8,10 @@ import processesData from '../../../mocks/data/PROCESSES.json'; import { loadMockServer } from '../../../mocks/server'; import { waitForElementToBeRemovedTimeout } from '../../../src/config/config'; import { getTestsIds } from '../../../src/config/testIds'; +import LoadingPage from '../../../src/core/components/SkLoading'; import { Wrapper } from '../../../src/core/components/Wrapper'; import { ProcessesLabels } from '../../../src/pages/Processes/Processes.enum'; import Process from '../../../src/pages/Processes/views/Process'; -import LoadingPage from '../../../src/pages/shared/Loading'; import { ProcessResponse } from '../../../src/types/REST.interfaces'; const processResult = processesData.results[0] as ProcessResponse; diff --git a/__tests__/pages/Processes/ProcessPairs.spec.tsx b/__tests__/pages/Processes/ProcessPairs.spec.tsx index 324ffd0b..a571c891 100644 --- a/__tests__/pages/Processes/ProcessPairs.spec.tsx +++ b/__tests__/pages/Processes/ProcessPairs.spec.tsx @@ -4,15 +4,15 @@ import { fireEvent, render, screen, waitForElementToBeRemoved } from '@testing-l import { Server } from 'miragejs'; import * as router from 'react-router'; -import { ProcessesLabels } from '../../../src/pages/Processes/Processes.enum'; import processPairsData from '../../../mocks/data/PROCESS_PAIRS.json'; import { loadMockServer } from '../../../mocks/server'; import { waitForElementToBeRemovedTimeout } from '../../../src/config/config'; import { getTestsIds } from '../../../src/config/testIds'; +import LoadingPage from '../../../src/core/components/SkLoading'; import { Wrapper } from '../../../src/core/components/Wrapper'; +import { ProcessesLabels } from '../../../src/pages/Processes/Processes.enum'; import ProcessPair, { ProcessPairContent } from '../../../src/pages/Processes/views/ProcessPair'; -import LoadingPage from '../../../src/pages/shared/Loading'; import { PairsResponse } from '../../../src/types/REST.interfaces'; const processPairsResultOpToCart = processPairsData.results[0] as PairsResponse; // HTTP2 flow diff --git a/__tests__/pages/Processes/Processes.spec.tsx b/__tests__/pages/Processes/Processes.spec.tsx index 3ce51b71..eafc4ad2 100644 --- a/__tests__/pages/Processes/Processes.spec.tsx +++ b/__tests__/pages/Processes/Processes.spec.tsx @@ -7,9 +7,9 @@ import processesData from '../../../mocks/data/PROCESSES.json'; import { loadMockServer } from '../../../mocks/server'; import { waitForElementToBeRemovedTimeout } from '../../../src/config/config'; import { getTestsIds } from '../../../src/config/testIds'; +import LoadingPage from '../../../src/core/components/SkLoading'; import { Wrapper } from '../../../src/core/components/Wrapper'; import Processes from '../../../src/pages/Processes/views/Processes'; -import LoadingPage from '../../../src/pages/shared/Loading'; const processesResults = processesData.results; diff --git a/__tests__/pages/Services/HttpRequests.spec.tsx b/__tests__/pages/Services/HttpRequests.spec.tsx index 5c23f8bd..54199781 100644 --- a/__tests__/pages/Services/HttpRequests.spec.tsx +++ b/__tests__/pages/Services/HttpRequests.spec.tsx @@ -3,15 +3,15 @@ import { Suspense } from 'react'; import { render, screen, waitForElementToBeRemoved } from '@testing-library/react'; import { Server } from 'miragejs'; -import HttpRequests from '../../../src/pages/Services/components/HttpRequests'; import biFlowData from '../../../mocks/data/FLOW_PAIRS.json'; import servicesData from '../../../mocks/data/SERVICES.json'; import { loadMockServer } from '../../../mocks/server'; import { waitForElementToBeRemovedTimeout } from '../../../src/config/config'; import { getTestsIds } from '../../../src/config/testIds'; +import LoadingPage from '../../../src/core/components/SkLoading'; import { Wrapper } from '../../../src/core/components/Wrapper'; -import LoadingPage from '../../../src/pages/shared/Loading'; +import HttpRequests from '../../../src/pages/Services/components/HttpRequests'; const servicesResults = servicesData.results; const biFlowResults = biFlowData.results; diff --git a/__tests__/pages/Services/PairList.spec.tsx b/__tests__/pages/Services/PairList.spec.tsx index 797ecfbe..6271ddac 100644 --- a/__tests__/pages/Services/PairList.spec.tsx +++ b/__tests__/pages/Services/PairList.spec.tsx @@ -3,15 +3,15 @@ import { Suspense } from 'react'; import { render, screen, waitForElementToBeRemoved } from '@testing-library/react'; import { Server } from 'miragejs'; -import ProcessServerList from '../../../src/pages/Services/components/ProcessServerList'; import biFlowData from '../../../mocks/data/FLOW_PAIRS.json'; import servicesData from '../../../mocks/data/SERVICES.json'; import { loadMockServer } from '../../../mocks/server'; import { waitForElementToBeRemovedTimeout } from '../../../src/config/config'; import { getTestsIds } from '../../../src/config/testIds'; +import LoadingPage from '../../../src/core/components/SkLoading'; import { Wrapper } from '../../../src/core/components/Wrapper'; -import LoadingPage from '../../../src/pages/shared/Loading'; +import ProcessServerList from '../../../src/pages/Services/components/ProcessServerList'; const servicesResults = servicesData.results; const biFlowResults = biFlowData.results; diff --git a/__tests__/pages/Services/Service.spec.tsx b/__tests__/pages/Services/Service.spec.tsx index bf85b142..a5ca618f 100644 --- a/__tests__/pages/Services/Service.spec.tsx +++ b/__tests__/pages/Services/Service.spec.tsx @@ -8,10 +8,10 @@ import servicesData from '../../../mocks/data/SERVICES.json'; import { loadMockServer } from '../../../mocks/server'; import { waitForElementToBeRemovedTimeout } from '../../../src/config/config'; import { getTestsIds } from '../../../src/config/testIds'; +import LoadingPage from '../../../src/core/components/SkLoading'; import { Wrapper } from '../../../src/core/components/Wrapper'; import { ServicesLabels } from '../../../src/pages/Services/Services.enum'; import Service from '../../../src/pages/Services/views/Service'; -import LoadingPage from '../../../src/pages/shared/Loading'; const servicesResults = servicesData.results; diff --git a/__tests__/pages/Services/Services.spec.tsx b/__tests__/pages/Services/Services.spec.tsx index ad4999c8..6108a5af 100644 --- a/__tests__/pages/Services/Services.spec.tsx +++ b/__tests__/pages/Services/Services.spec.tsx @@ -7,9 +7,9 @@ import servicesData from '../../../mocks/data/SERVICES.json'; import { loadMockServer } from '../../../mocks/server'; import { waitForElementToBeRemovedTimeout } from '../../../src/config/config'; import { getTestsIds } from '../../../src/config/testIds'; +import LoadingPage from '../../../src/core/components/SkLoading'; import { Wrapper } from '../../../src/core/components/Wrapper'; import Services from '../../../src/pages/Services/views/Services'; -import LoadingPage from '../../../src/pages/shared/Loading'; const servicesResults = servicesData.results; const service = servicesResults[0]; diff --git a/__tests__/pages/Services/TcpConnections.spec.tsx b/__tests__/pages/Services/TcpConnections.spec.tsx index 767b068b..8fb041c1 100644 --- a/__tests__/pages/Services/TcpConnections.spec.tsx +++ b/__tests__/pages/Services/TcpConnections.spec.tsx @@ -3,15 +3,15 @@ import { Suspense } from 'react'; import { render, screen, waitForElementToBeRemoved } from '@testing-library/react'; import { Server } from 'miragejs'; -import TcpConnections from '../../../src/pages/Services/components/TcpConnections'; import biFlowData from '../../../mocks/data/FLOW_PAIRS.json'; import servicesData from '../../../mocks/data/SERVICES.json'; import { loadMockServer } from '../../../mocks/server'; import { waitForElementToBeRemovedTimeout } from '../../../src/config/config'; import { getTestsIds } from '../../../src/config/testIds'; +import LoadingPage from '../../../src/core/components/SkLoading'; import { Wrapper } from '../../../src/core/components/Wrapper'; -import LoadingPage from '../../../src/pages/shared/Loading'; +import TcpConnections from '../../../src/pages/Services/components/TcpConnections'; const servicesResults = servicesData.results; const tcpBiFlowOpen = biFlowData.results[5]; diff --git a/__tests__/pages/Services/TcpTerminatedConnections.spec.tsx b/__tests__/pages/Services/TcpTerminatedConnections.spec.tsx index d7476e94..d1afde91 100644 --- a/__tests__/pages/Services/TcpTerminatedConnections.spec.tsx +++ b/__tests__/pages/Services/TcpTerminatedConnections.spec.tsx @@ -3,15 +3,15 @@ import { Suspense } from 'react'; import { render, waitForElementToBeRemoved } from '@testing-library/react'; import { Server } from 'miragejs'; -import TcpTerminatedConnections from '../../../src/pages/Services/components/TcpTerminatedConnections'; import BiflowData from '../../../mocks/data/FLOW_PAIRS.json'; import servicesData from '../../../mocks/data/SERVICES.json'; import { loadMockServer } from '../../../mocks/server'; import { waitForElementToBeRemovedTimeout } from '../../../src/config/config'; import { getTestsIds } from '../../../src/config/testIds'; +import LoadingPage from '../../../src/core/components/SkLoading'; import { Wrapper } from '../../../src/core/components/Wrapper'; -import LoadingPage from '../../../src/pages/shared/Loading'; +import TcpTerminatedConnections from '../../../src/pages/Services/components/TcpTerminatedConnections'; const servicesResults = servicesData.results; const tcpBiFlowTerminated = BiflowData.results[6]; diff --git a/__tests__/pages/Sites/PairsList.spec.tsx b/__tests__/pages/Sites/PairsList.spec.tsx index f682427c..90214159 100644 --- a/__tests__/pages/Sites/PairsList.spec.tsx +++ b/__tests__/pages/Sites/PairsList.spec.tsx @@ -3,15 +3,15 @@ import { Suspense } from 'react'; import { render, screen, waitForElementToBeRemoved } from '@testing-library/react'; import { Server } from 'miragejs'; -import { SkEmptyDataLabels } from '../../../src/core/components/SkEmptyData'; import pairsList from '../../../mocks/data/SITE_PAIRS.json'; import sites from '../../../mocks/data/SITES.json'; import { loadMockServer } from '../../../mocks/server'; import { waitForElementToBeRemovedTimeout } from '../../../src/config/config'; import { getTestsIds } from '../../../src/config/testIds'; +import { SkEmptyDataLabels } from '../../../src/core/components/SkEmptyData'; +import LoadingPage from '../../../src/core/components/SkLoading'; import { Wrapper } from '../../../src/core/components/Wrapper'; -import LoadingPage from '../../../src/pages/shared/Loading'; import PairsList from '../../../src/pages/Sites/components/PairList'; import { BasePairs, SiteResponse } from '../../../src/types/REST.interfaces'; diff --git a/__tests__/pages/Sites/Site.spec.tsx b/__tests__/pages/Sites/Site.spec.tsx index fff14947..5aa5100d 100644 --- a/__tests__/pages/Sites/Site.spec.tsx +++ b/__tests__/pages/Sites/Site.spec.tsx @@ -4,15 +4,15 @@ import { fireEvent, render, screen, waitForElementToBeRemoved, waitFor } from '@ import { Server } from 'miragejs'; import * as router from 'react-router'; -import { ProcessesRoutesPaths } from '../../../src/pages/Processes/Processes.enum'; import processesData from '../../../mocks/data/PROCESSES.json'; import sitesData from '../../../mocks/data/SITES.json'; import { loadMockServer } from '../../../mocks/server'; import { waitForElementToBeRemovedTimeout } from '../../../src/config/config'; import { getTestsIds } from '../../../src/config/testIds'; +import LoadingPage from '../../../src/core/components/SkLoading'; import { Wrapper } from '../../../src/core/components/Wrapper'; -import LoadingPage from '../../../src/pages/shared/Loading'; +import { ProcessesRoutesPaths } from '../../../src/pages/Processes/Processes.enum'; import { SiteLabels } from '../../../src/pages/Sites/Sites.enum'; import Site from '../../../src/pages/Sites/views/Site'; import { ProcessResponse, SiteResponse } from '../../../src/types/REST.interfaces'; diff --git a/__tests__/pages/Sites/Sites.spec.tsx b/__tests__/pages/Sites/Sites.spec.tsx index d4ff51e4..1553422c 100644 --- a/__tests__/pages/Sites/Sites.spec.tsx +++ b/__tests__/pages/Sites/Sites.spec.tsx @@ -8,9 +8,9 @@ import sitesData from '../../../mocks/data/SITES.json'; import { MockApiPaths, MockApi, loadMockServer } from '../../../mocks/server'; import { waitForElementToBeRemovedTimeout } from '../../../src/config/config'; import { getTestsIds } from '../../../src/config/testIds'; +import LoadingPage from '../../../src/core/components/SkLoading'; import { Wrapper } from '../../../src/core/components/Wrapper'; import ErrorConsole from '../../../src/pages/shared/Errors/Console'; -import LoadingPage from '../../../src/pages/shared/Loading'; import Sites from '../../../src/pages/Sites/views/Sites'; const siteResults = sitesData.results; diff --git a/__tests__/pages/Topology/DisplayServices.spec.tsx b/__tests__/pages/Topology/DisplayServices.spec.tsx index 83060c81..0019d0e8 100644 --- a/__tests__/pages/Topology/DisplayServices.spec.tsx +++ b/__tests__/pages/Topology/DisplayServices.spec.tsx @@ -4,8 +4,8 @@ import { render } from '@testing-library/react'; import { Server } from 'miragejs'; import { loadMockServer } from '../../../mocks/server'; +import LoadingPage from '../../../src/core/components/SkLoading'; import { Wrapper } from '../../../src/core/components/Wrapper'; -import LoadingPage from '../../../src/pages/shared/Loading'; import DisplayServices from '../../../src/pages/Topology/components/DisplayServices'; describe('DisplayServices', () => { diff --git a/__tests__/pages/Topology/Topology.spec.tsx b/__tests__/pages/Topology/Topology.spec.tsx index 7c0c8e42..26ebc4d3 100644 --- a/__tests__/pages/Topology/Topology.spec.tsx +++ b/__tests__/pages/Topology/Topology.spec.tsx @@ -5,8 +5,8 @@ import { Server } from 'miragejs'; import { loadMockServer } from '../../../mocks/server'; import { getTestsIds } from '../../../src/config/testIds'; +import LoadingPage from '../../../src/core/components/SkLoading'; import { Wrapper } from '../../../src/core/components/Wrapper'; -import LoadingPage from '../../../src/pages/shared/Loading'; import { TopologyViews } from '../../../src/pages/Topology/Topology.enum'; import Topology from '../../../src/pages/Topology/views/Topology'; diff --git a/__tests__/pages/Topology/TopologyComponents.spec.tsx b/__tests__/pages/Topology/TopologyComponents.spec.tsx index 1c862976..d9099df7 100644 --- a/__tests__/pages/Topology/TopologyComponents.spec.tsx +++ b/__tests__/pages/Topology/TopologyComponents.spec.tsx @@ -4,19 +4,19 @@ import { Button } from '@patternfly/react-core'; import { fireEvent, render, screen, waitForElementToBeRemoved } from '@testing-library/react'; import { Server } from 'miragejs'; -import { convertComponentToNode } from '../../../src/pages/Topology/services/topologyComponentController'; -import { ComponentResponse, PairsResponse } from '../../../src/types/REST.interfaces'; import componentPairsData from '../../../mocks/data/PROCESS_GROUP_PAIRS.json'; import componentData from '../../../mocks/data/PROCESS_GROUPS.json'; import { loadMockServer } from '../../../mocks/server'; import { waitForElementToBeRemovedTimeout } from '../../../src/config/config'; import { getTestsIds } from '../../../src/config/testIds'; +import LoadingPage from '../../../src/core/components/SkLoading'; import { Wrapper } from '../../../src/core/components/Wrapper'; -import LoadingPage from '../../../src/pages/shared/Loading'; import TopologyComponent from '../../../src/pages/Topology/components/TopologyComponent'; import { TopologyController } from '../../../src/pages/Topology/services'; +import { convertComponentToNode } from '../../../src/pages/Topology/services/topologyComponentController'; import { SkGraphProps } from '../../../src/types/Graph.interfaces'; +import { ComponentResponse, PairsResponse } from '../../../src/types/REST.interfaces'; const componentResult = componentData.results as ComponentResponse[]; const componentPairsResult = componentPairsData.results as PairsResponse[]; diff --git a/__tests__/pages/Topology/TopologyProcesses.spec.tsx b/__tests__/pages/Topology/TopologyProcesses.spec.tsx index 703f4807..ee9cd495 100644 --- a/__tests__/pages/Topology/TopologyProcesses.spec.tsx +++ b/__tests__/pages/Topology/TopologyProcesses.spec.tsx @@ -6,8 +6,6 @@ import eventUser from '@testing-library/user-event'; import { Server } from 'miragejs'; import * as router from 'react-router'; -import { TopoloyDetailsProps } from '../../../src/pages/Topology/components/TopologyDetails'; -import { convertProcessToNode } from '../../../src/pages/Topology/services/topologyProcessController'; import processesPairsData from '../../../mocks/data/PROCESS_PAIRS.json'; import processesData from '../../../mocks/data/PROCESSES.json'; @@ -15,12 +13,14 @@ import servicesData from '../../../mocks/data/SERVICES.json'; import { loadMockServer } from '../../../mocks/server'; import { waitForElementToBeRemovedTimeout } from '../../../src/config/config'; import { getTestsIds } from '../../../src/config/testIds'; +import LoadingPage from '../../../src/core/components/SkLoading'; import { Wrapper } from '../../../src/core/components/Wrapper'; import { ProcessesLabels, ProcessesRoutesPaths } from '../../../src/pages/Processes/Processes.enum'; -import LoadingPage from '../../../src/pages/shared/Loading'; +import { TopoloyDetailsProps } from '../../../src/pages/Topology/components/TopologyDetails'; import TopologyProcesses from '../../../src/pages/Topology/components/TopologyProcesses'; import * as useTopologyState from '../../../src/pages/Topology/hooks/useTopologyState'; import { TopologyController } from '../../../src/pages/Topology/services'; +import { convertProcessToNode } from '../../../src/pages/Topology/services/topologyProcessController'; import { TopologyLabels } from '../../../src/pages/Topology/Topology.enum'; import { SkGraphProps } from '../../../src/types/Graph.interfaces'; import { ProcessPairsResponse, ProcessResponse, ServiceResponse } from '../../../src/types/REST.interfaces'; diff --git a/__tests__/pages/Topology/TopologySite.spec.tsx b/__tests__/pages/Topology/TopologySite.spec.tsx index abf13185..70716da9 100644 --- a/__tests__/pages/Topology/TopologySite.spec.tsx +++ b/__tests__/pages/Topology/TopologySite.spec.tsx @@ -5,20 +5,20 @@ import { render, screen, waitForElementToBeRemoved } from '@testing-library/reac import eventUser from '@testing-library/user-event'; import { Server } from 'miragejs'; -import { convertSiteToNode } from '../../../src/pages/Topology/services/topologySiteController'; -import { PairsResponse, SiteResponse } from '../../../src/types/REST.interfaces'; - import sitePairsData from '../../../mocks/data/SITE_PAIRS.json'; import sitesData from '../../../mocks/data/SITES.json'; import { loadMockServer } from '../../../mocks/server'; import { waitForElementToBeRemovedTimeout } from '../../../src/config/config'; import { getTestsIds } from '../../../src/config/testIds'; +import LoadingPage from '../../../src/core/components/SkLoading'; import { Wrapper } from '../../../src/core/components/Wrapper'; -import LoadingPage from '../../../src/pages/shared/Loading'; import TopologySite from '../../../src/pages/Topology/components/TopologySite'; import { TopologyController } from '../../../src/pages/Topology/services'; +import { convertSiteToNode } from '../../../src/pages/Topology/services/topologySiteController'; import { SHOW_DATA_LINKS } from '../../../src/pages/Topology/Topology.constants'; import { SkGraphProps } from '../../../src/types/Graph.interfaces'; +import { PairsResponse, SiteResponse } from '../../../src/types/REST.interfaces'; + const sitesResults = sitesData.results as SiteResponse[]; const sitePairsResults = sitePairsData.results as PairsResponse[]; diff --git a/src/App.tsx b/src/App.tsx index b5df9602..9faae745 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -3,7 +3,7 @@ import { Suspense, lazy } from 'react'; import { Page, Toolbar, ToolbarContent, ToolbarItem } from '@patternfly/react-core'; import { AnimatePresence } from 'framer-motion'; -import LoadingPage from './pages/shared/Loading'; +import LoadingPage from './core/components/SkLoading'; import { routes } from './routes'; const SkBreadcrumb = lazy(() => import('./core/components/SkBreadcrumb')); diff --git a/src/pages/shared/Loading/Loading.css b/src/core/components/SkLoading/Loading.css similarity index 100% rename from src/pages/shared/Loading/Loading.css rename to src/core/components/SkLoading/Loading.css diff --git a/src/pages/shared/Loading/Loading.enum.ts b/src/core/components/SkLoading/Loading.enum.ts similarity index 100% rename from src/pages/shared/Loading/Loading.enum.ts rename to src/core/components/SkLoading/Loading.enum.ts diff --git a/src/pages/shared/Loading/index.tsx b/src/core/components/SkLoading/index.tsx similarity index 95% rename from src/pages/shared/Loading/index.tsx rename to src/core/components/SkLoading/index.tsx index d510e2b0..a7d724f8 100644 --- a/src/pages/shared/Loading/index.tsx +++ b/src/core/components/SkLoading/index.tsx @@ -5,7 +5,7 @@ import { CogIcon } from '@patternfly/react-icons'; import { LoadingLabels } from './Loading.enum'; import { getTestsIds } from '../../../config/testIds'; -import TransitionPage from '../../../core/components/TransitionPages/Fade'; +import TransitionPage from '../TransitionPages/Fade'; import './Loading.css'; diff --git a/src/layout/MainContainer.tsx b/src/layout/MainContainer.tsx index 696b7cdb..e8bd7796 100644 --- a/src/layout/MainContainer.tsx +++ b/src/layout/MainContainer.tsx @@ -17,10 +17,10 @@ import { ToolbarItem } from '@patternfly/react-core'; +import LoadingPage from '../core/components/SkLoading'; import SkNavigationViewLink from '../core/components/SkNavigationViewLink'; import SkUpdateDataButton from '../core/components/SkUpdateDataButton'; import TransitionPage from '../core/components/TransitionPages/Fade'; -import LoadingPage from '../pages/shared/Loading'; import { TopologyLabels } from '../pages/Topology/Topology.enum'; import '@patternfly/patternfly/patternfly-addons.css';