Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(frontend): prepare api base url for submodule #2998

Merged
merged 6 commits into from
Jul 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion web/src/components/Editor/hooks/useTooltip.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {useCallback, useState} from 'react';
import {TResolveExpressionContext, TResolveRequestInfo} from 'types/Expression.types';
import {useParseExpressionMutation} from 'redux/apis/TraceTest.api';
import {useParseExpressionMutation} from 'redux/apis/Tracetest';

const useTooltip = (context: TResolveExpressionContext = {}) => {
const [parseExpressionMutation, {isLoading}] = useParseExpressionMutation();
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/ResourceCard/TestCard.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {DownOutlined, RightOutlined} from '@ant-design/icons';
import {useMemo} from 'react';
import TestRunCard from 'components/RunCard/TestRunCard';
import {useLazyGetRunListQuery} from 'redux/apis/TraceTest.api';
import {useLazyGetRunListQuery} from 'redux/apis/Tracetest';
import {ResourceType} from 'types/Resource.type';
import Test from 'models/Test.model';
import TestRun from 'models/TestRun.model';
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/ResourceCard/TransactionCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {DownOutlined, RightOutlined} from '@ant-design/icons';
import {useMemo} from 'react';

import TransactionRunCard from 'components/RunCard/TransactionRunCard';
import {useLazyGetTransactionRunsQuery} from 'redux/apis/TraceTest.api';
import {useLazyGetTransactionRunsQuery} from 'redux/apis/Tracetest';
import {ResourceType} from 'types/Resource.type';
import Transaction from 'models/Transaction.model';
import TransactionRun from 'models/TransactionRun.model';
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/RunDetailTrace/Search.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {useCallback, useMemo, useState} from 'react';
import Editor from 'components/Editor';
import {SupportedEditors} from 'constants/Editor.constants';
import {useTestRun} from 'providers/TestRun/TestRun.provider';
import {useLazyGetSelectedSpansQuery} from 'redux/apis/TraceTest.api';
import {useLazyGetSelectedSpansQuery} from 'redux/apis/Tracetest';
import {useAppDispatch, useAppSelector} from 'redux/hooks';
import {matchSpans, selectSpan, setSearchText} from 'redux/slices/Trace.slice';
import TraceSelectors from 'selectors/Trace.selectors';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import TraceTestAttributes from 'constants/TracetestAttributes.constants';
import {useGetConventionsQuery} from 'redux/apis/OtelRepo.api';
import {useGetConventionsQuery} from 'redux/apis/OtelRepo';

export type OtelReference = Record<string, OtelReferenceModel>;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Col, Form, Row} from 'antd';
import {useGetTestListQuery} from 'redux/apis/TraceTest.api';
import {useGetTestListQuery} from 'redux/apis/Tracetest';
import TestsSelectionInput from './TestsSelectionInput/TestsSelectionInput';

const TestsSelectionForm = () => {
Expand Down
2 changes: 1 addition & 1 deletion web/src/gateways/Test.gateway.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {endpoints} from 'redux/apis/TraceTest.api';
import {endpoints} from 'redux/apis/Tracetest';
import {TRawTestResource} from 'models/Test.model';

const {createTest, editTest, getTestById, getTestList, runTest} = endpoints;
Expand Down
4 changes: 2 additions & 2 deletions web/src/gateways/TestRun.gateway.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {endpoints} from 'redux/apis/TraceTest.api';
import { TRawTestSpecs } from 'models/TestSpecs.model';
import {endpoints} from 'redux/apis/Tracetest';
import {TRawTestSpecs} from 'models/TestSpecs.model';

const {getRunList, getRunById, reRun, dryRun, runTest} = endpoints;

Expand Down
4 changes: 2 additions & 2 deletions web/src/gateways/__tests__/Test.gateway.test.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import {TRawTestResource} from '../../models/Test.model';
import {endpoints} from '../../redux/apis/TraceTest.api';
import {endpoints} from '../../redux/apis/Tracetest';
import TestGateway from '../Test.gateway';

const {createTest, getTestById, getTestList, runTest} = endpoints;

jest.mock('../../redux/apis/TraceTest.api', () => {
jest.mock('../../redux/apis/Tracetest', () => {
const initiate = jest.fn(() => Promise.resolve());

return {
Expand Down
4 changes: 2 additions & 2 deletions web/src/gateways/__tests__/TestRun.gateway.test.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import {endpoints} from '../../redux/apis/TraceTest.api';
import {endpoints} from '../../redux/apis/Tracetest';
import TestRunResultGateway from '../TestRun.gateway';

const {getRunList, getRunById, reRun} = endpoints;

jest.mock('../../redux/apis/TraceTest.api', () => {
jest.mock('../../redux/apis/Tracetest', () => {
const initiate = jest.fn(() => Promise.resolve());

return {
Expand Down
2 changes: 1 addition & 1 deletion web/src/hooks/useDefinitionFile.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {useCallback, useState} from 'react';
import {useLazyGetResourceDefinitionQuery} from 'redux/apis/TraceTest.api';
import {useLazyGetResourceDefinitionQuery} from 'redux/apis/Tracetest';
import {ResourceType} from 'types/Resource.type';

const useDefinitionFile = () => {
Expand Down
2 changes: 1 addition & 1 deletion web/src/hooks/useDeleteResource.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {useCallback} from 'react';
import {capitalize} from 'lodash';
import {useDashboard} from 'providers/Dashboard/Dashboard.provider';
import {useConfirmationModal} from 'providers/ConfirmationModal/ConfirmationModal.provider';
import {useDeleteTestByIdMutation, useDeleteTransactionByIdMutation} from 'redux/apis/TraceTest.api';
import {useDeleteTestByIdMutation, useDeleteTransactionByIdMutation} from 'redux/apis/Tracetest';
import TestAnalyticsService from 'services/Analytics/TestAnalytics.service';
import {ResourceType} from 'types/Resource.type';
import {useNotification} from 'providers/Notification/Notification.provider';
Expand Down
2 changes: 1 addition & 1 deletion web/src/hooks/useDeleteResourceRun.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {useCallback} from 'react';

import {useConfirmationModal} from 'providers/ConfirmationModal/ConfirmationModal.provider';
import {useDeleteRunByIdMutation, useDeleteTransactionRunByIdMutation} from 'redux/apis/TraceTest.api';
import {useDeleteRunByIdMutation, useDeleteTransactionRunByIdMutation} from 'redux/apis/Tracetest';
import TestAnalyticsService from 'services/Analytics/TestAnalytics.service';
import {ResourceType} from 'types/Resource.type';
import {useDashboard} from 'providers/Dashboard/Dashboard.provider';
Expand Down
2 changes: 1 addition & 1 deletion web/src/hooks/useJUnitResult.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {useCallback, useState} from 'react';
import {useLazyGetJUnitByRunIdQuery} from 'redux/apis/TraceTest.api';
import {useLazyGetJUnitByRunIdQuery} from 'redux/apis/Tracetest';

const useJUnitResult = () => {
const [getJUnit] = useLazyGetJUnitByRunIdQuery();
Expand Down
2 changes: 1 addition & 1 deletion web/src/pages/Environments/EnvironmentList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Empty from 'components/Empty';
import Pagination from 'components/Pagination';
import usePagination from 'hooks/usePagination';
import Loading from 'pages/Home/Loading';
import {useGetEnvironmentsQuery} from 'redux/apis/TraceTest.api';
import {useGetEnvironmentsQuery} from 'redux/apis/Tracetest';
import Environment from 'models/Environment.model';
import {ENVIRONMENTS_DOCUMENTATION_URL} from 'constants/Common.constants';
import * as S from './Environment.styled';
Expand Down
2 changes: 1 addition & 1 deletion web/src/pages/Home/Resources.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import useDeleteResource from 'hooks/useDeleteResource';
import usePagination from 'hooks/usePagination';
import useTestCrud from 'providers/Test/hooks/useTestCrud';
import {useCallback, useState} from 'react';
import {useGetResourcesQuery} from 'redux/apis/TraceTest.api';
import {useGetResourcesQuery} from 'redux/apis/Tracetest';
import {ADD_TEST_URL} from 'constants/Common.constants';
import HomeAnalyticsService from 'services/Analytics/HomeAnalytics.service';
import {ResourceType} from 'types/Resource.type';
Expand Down
2 changes: 1 addition & 1 deletion web/src/pages/Test/Content.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import TestRun from 'models/TestRun.model';
import {useDashboard} from 'providers/Dashboard/Dashboard.provider';
import {useTest} from 'providers/Test/Test.provider';
import useTestCrud from 'providers/Test/hooks/useTestCrud';
import {useGetRunListQuery} from 'redux/apis/TraceTest.api';
import {useGetRunListQuery} from 'redux/apis/Tracetest';
import {ResourceType} from 'types/Resource.type';
import * as S from './Test.styled';

Expand Down
2 changes: 1 addition & 1 deletion web/src/pages/Transaction/Content.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import TransactionRun from 'models/TransactionRun.model';
import {useDashboard} from 'providers/Dashboard/Dashboard.provider';
import {useTransaction} from 'providers/Transaction/Transaction.provider';
import useTransactionCrud from 'providers/Transaction/hooks/useTransactionCrud';
import {useGetTransactionRunsQuery} from 'redux/apis/TraceTest.api';
import {useGetTransactionRunsQuery} from 'redux/apis/Tracetest';
import * as S from './Transaction.styled';

const Content = () => {
Expand Down
2 changes: 1 addition & 1 deletion web/src/providers/CreateTest/CreateTest.provider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
} from 'redux/slices/CreateTest.slice';
import {useAppDispatch, useAppSelector} from 'redux/hooks';
import CreateTestSelectors from 'selectors/CreateTest.selectors';
import {useCreateTestMutation} from 'redux/apis/TraceTest.api';
import {useCreateTestMutation} from 'redux/apis/Tracetest';
import {ICreateTestState, TDraftTest} from 'types/Test.types';
import TestService from 'services/Test.service';
import {Plugins} from 'constants/Plugins.constants';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {noop} from 'lodash';
import {createContext, useCallback, useContext, useMemo} from 'react';
import {useCreateTransactionMutation} from 'redux/apis/TraceTest.api';
import {useCreateTransactionMutation} from 'redux/apis/Tracetest';
import {useAppDispatch, useAppSelector} from 'redux/hooks';
import {
initialState,
Expand Down
6 changes: 1 addition & 5 deletions web/src/providers/DataStore/DataStore.provider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@ import {createContext, useCallback, useContext, useMemo, useState} from 'react';

import {SupportedDataStoresToName} from 'constants/DataStore.constants';
import ConnectionResult from 'models/ConnectionResult.model';
import {
useTestConnectionMutation,
useUpdateDataStoreMutation,
useDeleteDataStoreMutation,
} from 'redux/apis/TraceTest.api';
import {useTestConnectionMutation, useUpdateDataStoreMutation, useDeleteDataStoreMutation} from 'redux/apis/Tracetest';
import DataStoreService from 'services/DataStore.service';
import {useContactUsModal} from 'components/ContactUs';
import {SupportedDataStores, TConnectionResult, TDraftDataStore} from 'types/DataStore.types';
Expand Down
2 changes: 1 addition & 1 deletion web/src/providers/Environment/Environment.provider.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {noop} from 'lodash';
import {createContext, useContext, useMemo, useCallback, useState} from 'react';
import {useGetEnvironmentsQuery} from 'redux/apis/TraceTest.api';
import {useGetEnvironmentsQuery} from 'redux/apis/Tracetest';
import {useAppDispatch, useAppSelector} from 'redux/hooks';
import {setUserPreference} from 'redux/slices/User.slice';
import EnvironmentSelectors from 'selectors/Environment.selectors';
Expand Down
2 changes: 1 addition & 1 deletion web/src/providers/Environment/hooks/useEnvironmentCrud.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
useCreateEnvironmentMutation,
useDeleteEnvironmentMutation,
useUpdateEnvironmentMutation,
} from 'redux/apis/TraceTest.api';
} from 'redux/apis/Tracetest';
import {useConfirmationModal} from 'providers/ConfirmationModal/ConfirmationModal.provider';
import {useNotification} from 'providers/Notification/Notification.provider';
import {TRawEnvironment} from 'models/Environment.model';
Expand Down
2 changes: 1 addition & 1 deletion web/src/providers/Settings/Settings.provider.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {noop} from 'lodash';
import {createContext, useCallback, useContext, useMemo} from 'react';

import {useCreateSettingMutation, useUpdateSettingMutation} from 'redux/apis/TraceTest.api';
import {useCreateSettingMutation, useUpdateSettingMutation} from 'redux/apis/Tracetest';
import {TDraftResource} from 'types/Settings.types';
import {useNotification} from '../Notification/Notification.provider';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
useGetPollingQuery,
useGetLinterQuery,
useGetTestRunnerQuery,
} from 'redux/apis/TraceTest.api';
} from 'redux/apis/Tracetest';
import {useAppDispatch, useAppSelector} from 'redux/hooks';
import {setUserPreference} from 'redux/slices/User.slice';
import UserSelectors from 'selectors/User.selectors';
Expand Down
2 changes: 1 addition & 1 deletion web/src/providers/Span/Span.provider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import SpanSelectors from 'selectors/Span.selectors';
import {RouterSearchFields} from 'constants/Common.constants';
import Span from 'models/Span.model';
import RouterActions from 'redux/actions/Router.actions';
import {useLazyGetSelectedSpansQuery} from 'redux/apis/TraceTest.api';
import {useLazyGetSelectedSpansQuery} from 'redux/apis/Tracetest';
import SelectedSpans from 'models/SelectedSpans.model';

interface IContext {
Expand Down
2 changes: 1 addition & 1 deletion web/src/providers/Test/Test.provider.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {noop} from 'lodash';
import {createContext, useCallback, useContext, useMemo, useState} from 'react';
import {useGetTestByIdQuery, useGetTestVersionByIdQuery} from 'redux/apis/TraceTest.api';
import {useGetTestByIdQuery, useGetTestVersionByIdQuery} from 'redux/apis/Tracetest';
import {TDraftTest} from 'types/Test.types';
import VersionMismatchModal from 'components/VersionMismatchModal';
import TestService from 'services/Test.service';
Expand Down
2 changes: 1 addition & 1 deletion web/src/providers/Test/hooks/useTestCrud.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {useDashboard} from 'providers/Dashboard/Dashboard.provider';
import {useEnvironment} from 'providers/Environment/Environment.provider';
import {useMissingVariablesModal} from 'providers/MissingVariablesModal/MissingVariablesModal.provider';
import {useTestSpecs} from 'providers/TestSpecs/TestSpecs.provider';
import {useEditTestMutation, useRunTestMutation} from 'redux/apis/TraceTest.api';
import {useEditTestMutation, useRunTestMutation} from 'redux/apis/Tracetest';
import {useAppDispatch} from 'redux/hooks';
import {reset} from 'redux/slices/TestSpecs.slice';
import TestAnalyticsService from 'services/Analytics/TestAnalytics.service';
Expand Down
2 changes: 1 addition & 1 deletion web/src/providers/TestOutput/TestOutput.provider.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {noop} from 'lodash';
import {createContext, useCallback, useContext, useEffect, useMemo, useState} from 'react';

import {useParseExpressionMutation} from 'redux/apis/TraceTest.api';
import {useParseExpressionMutation} from 'redux/apis/Tracetest';
import {useAppDispatch, useAppSelector} from 'redux/hooks';
import {selectIsPending, selectSelectedOutputs, selectTestOutputs} from 'redux/testOutputs/selectors';
import {
Expand Down Expand Up @@ -129,7 +129,7 @@
setDraft(undefined);
setIsOpen(false);
onValidate(undefined, TestOutput({}));
}, []);

Check warning on line 132 in web/src/providers/TestOutput/TestOutput.provider.tsx

View workflow job for this annotation

GitHub Actions / WebUI unit tests

React Hook useCallback has a missing dependency: 'onValidate'. Either include it or remove the dependency array

const onCancel = useCallback(() => {
dispatch(outputsReverted());
Expand Down
2 changes: 1 addition & 1 deletion web/src/providers/TestRun/TestRun.provider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {createContext, useCallback, useContext, useEffect, useMemo, useState} fr

import TestRun, {isRunStateFinished} from 'models/TestRun.model';
import TestRunEvent from 'models/TestRunEvent.model';
import {useGetRunByIdQuery, useGetRunEventsQuery, useStopRunMutation} from 'redux/apis/TraceTest.api';
import {useGetRunByIdQuery, useGetRunEventsQuery, useStopRunMutation} from 'redux/apis/Tracetest';
import TestProvider from '../Test';

interface IContext {
Expand Down
2 changes: 1 addition & 1 deletion web/src/providers/Transaction/Transaction.provider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {createContext, ReactNode, useCallback, useContext, useMemo, useState} fr
import VersionMismatchModal from 'components/VersionMismatchModal';
import Transaction from 'models/Transaction.model';
import {useDashboard} from 'providers/Dashboard/Dashboard.provider';
import {useGetTransactionByIdQuery, useGetTransactionVersionByIdQuery} from 'redux/apis/TraceTest.api';
import {useGetTransactionByIdQuery, useGetTransactionVersionByIdQuery} from 'redux/apis/Tracetest';
import TransactionService from 'services/Transaction.service';
import {TDraftTransaction} from 'types/Transaction.types';
import useTransactionCrud from './hooks/useTransactionCrud';
Expand Down
2 changes: 1 addition & 1 deletion web/src/providers/Transaction/hooks/useTransactionCrud.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
useEditTransactionMutation,
useLazyGetTransactionVersionByIdQuery,
useRunTransactionMutation,
} from 'redux/apis/TraceTest.api';
} from 'redux/apis/Tracetest';
import {RunErrorTypes} from 'types/TestRun.types';
import {TDraftTransaction} from 'types/Transaction.types';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {createContext, useContext, useMemo} from 'react';
import {useGetTransactionRunByIdQuery} from 'redux/apis/TraceTest.api';
import {useGetTransactionRunByIdQuery} from 'redux/apis/Tracetest';
import TransactionRun from 'models/TransactionRun.model';
import TransactionProvider from '../Transaction/Transaction.provider';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {createApi, fetchBaseQuery} from '@reduxjs/toolkit/query/react';
import * as jsyaml from 'js-yaml';
import {OtelReference} from '../../components/TestSpecForm/hooks/useGetOTELSemanticConventionAttributesInfo';
import {OtelReference} from 'components/TestSpecForm/hooks/useGetOTELSemanticConventionAttributesInfo';
import {CompleteAttribute, OTELYaml} from './OTELYaml';

const PATH = 'https://raw.githubusercontent.com/open-telemetry/semantic-conventions/main/';
Expand Down Expand Up @@ -41,6 +41,4 @@ const OtelRepoAPI = createApi({
});

export const {useGetConventionsQuery} = OtelRepoAPI;
export const {endpoints} = OtelRepoAPI;

export default OtelRepoAPI;
2 changes: 2 additions & 0 deletions web/src/redux/apis/OtelRepo/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// eslint-disable-next-line no-restricted-exports
export {default, useGetConventionsQuery} from './OtelRepo.api';