diff --git a/src/components/app-header.tsx b/src/components/app-header.tsx
index 9eb5d97..277af4b 100644
--- a/src/components/app-header.tsx
+++ b/src/components/app-header.tsx
@@ -7,7 +7,7 @@ import { classNames } from '../common/class-names';
const navigation = [
{ name: 'Dashboard', href: '/' },
- { name: 'Sms Requests', href: '/sms-requests' }
+ { name: 'Api Requests', href: '/api-requests' }
];
export function AppHeader() {
@@ -24,7 +24,7 @@ export function AppHeader() {
diff --git a/src/components/display-api-request-table.tsx b/src/components/display-api-request-table.tsx
new file mode 100644
index 0000000..dea33bc
--- /dev/null
+++ b/src/components/display-api-request-table.tsx
@@ -0,0 +1,17 @@
+import React from 'react';
+import { GetApiRequestsApiResponse } from '../store/api.gen.api';
+import { ApiListItem } from './api-list-item';
+
+interface DisplayApiRequestTableProps {
+ response: GetApiRequestsApiResponse;
+}
+
+export default function DisplayApiRequestTable({ response }: DisplayApiRequestTableProps) {
+ return (
+ ({
page: 0, size: 4
});
- const { data, error, isLoading, isError, isSuccess } = useGetSmsRequestsQuery({
+ const { data, error, isLoading, isError, isSuccess } = useGetApiRequestsQuery({
page: pagination.page, size: pagination.size
}, {
pollingInterval: 60_000,
@@ -52,7 +52,7 @@ export function AllSmsRequestsScreen() {
});
return (
-
+
{isLoading && (
Loading...
@@ -68,7 +68,7 @@ export function AllSmsRequestsScreen() {
{isSuccess && (
+
Single
);
diff --git a/src/service/router.tsx b/src/service/router.tsx
index ae1789c..3104c19 100644
--- a/src/service/router.tsx
+++ b/src/service/router.tsx
@@ -12,15 +12,15 @@ export const router = createBrowserRouter([
{
path: '',
// https://reactrouter.com/en/main/components/navigate
- Component: () =>
+ {response.content.map(({ id, ...rest }, idx) => (
+
+ );
+}
\ No newline at end of file
diff --git a/src/components/display-sms-request-table.tsx b/src/components/display-sms-request-table.tsx
deleted file mode 100644
index 9d025b2..0000000
--- a/src/components/display-sms-request-table.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from 'react';
-import { GetSmsRequestsApiResponse } from '../store/sms.gen.api';
-import { SmsListItem } from './sms-list-item';
-
-interface DisplaySmsRequestTableProps {
- response: GetSmsRequestsApiResponse;
-}
-
-export default function DisplaySmsRequestTable({ response }: DisplaySmsRequestTableProps) {
- return (
-
- {response.content.map(({ id, ...rest }, idx) => (
-
- );
-}
\ No newline at end of file
diff --git a/src/components/socket.component.tsx b/src/components/socket.component.tsx
index 36d7400..b1e0085 100644
--- a/src/components/socket.component.tsx
+++ b/src/components/socket.component.tsx
@@ -2,7 +2,7 @@ import { socket } from '../service/socket';
import { useEffect } from 'react';
import { setSocketConnection } from '../service/socket.slice';
import { mk } from '../common/keys';
-import { smsApi } from '../store/sms.gen.api';
+import { apiApi } from '../store/api.gen.api';
import { useAppDispatch } from '../service/store';
import * as _ from 'lodash';
@@ -19,8 +19,8 @@ export function SocketComponent() {
dispatch(setSocketConnection(true));
};
- const onNewSms = (obj: any) => {
- const updateQueryDataThunk = smsApi.util.updateQueryData('getSmsRequests', {
+ const onNewApi = (obj: any) => {
+ const updateQueryDataThunk = apiApi.util.updateQueryData('getApiRequests', {
page: 0, size
}, (data) => {
if (!_.includes(data.content, obj)) {
@@ -37,13 +37,13 @@ export function SocketComponent() {
socket.on('connect', onConnect);
socket.on('disconnect', onDisconnect);
- socket.on(mk`new_sms_request`, onNewSms);
+ socket.on(mk`new_api_request`, onNewApi);
return () => {
socket.off('connect', onConnect);
socket.off('disconnect', onDisconnect);
- socket.off(mk`new_sms_request`, onNewSms);
+ socket.off(mk`new_api_request`, onNewApi);
};
}, [dispatch]);
diff --git a/src/screens/all-sms-requests.screen.tsx b/src/screens/all-api-requests.screen.tsx
similarity index 87%
rename from src/screens/all-sms-requests.screen.tsx
rename to src/screens/all-api-requests.screen.tsx
index d69459c..c5cc4af 100644
--- a/src/screens/all-sms-requests.screen.tsx
+++ b/src/screens/all-api-requests.screen.tsx
@@ -1,14 +1,14 @@
import React, { Fragment, lazy, Suspense, useEffect, useState } from 'react';
import { AppLayout } from '../components/app-layout';
-import { useGetSmsRequestsQuery } from '../store/sms.gen.api';
+import { useGetApiRequestsQuery } from '../store/api.gen.api';
import { AppPagination } from '../components/pagination';
import { useLocation, useNavigate, useSearchParams } from 'react-router-dom';
import { Loading } from '../components/loading';
import { Pagination } from '../types/pagination';
-const DisplaySmsRequestTable = lazy(() => import('../components/display-sms-request-table'));
+const DisplayApiRequestTable = lazy(() => import('../components/display-api-request-table'));
-export function AllSmsRequestsScreen() {
+export function AllApiRequestsScreen() {
const navigate = useNavigate();
const location = useLocation();
const [params] = useSearchParams();
@@ -16,7 +16,7 @@ export function AllSmsRequestsScreen() {
const [pagination, setPagination] = useState