From c9eb7b0908b0640ded182b89a1afc41212cc5a1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B2=D0=BE=D0=B2=20=D0=90=D1=80=D1=82?=
 =?UTF-8?q?=D0=B5=D0=BC?= <apervov@alabuga.ru>
Date: Mon, 6 Apr 2026 02:46:06 +0300
Subject: [PATCH] Refactor EmbeddedActiveEquipmentPage to use custom data
 fetching and remove Authenticated wrapper from App component

---
 client/src/App.tsx                            | 17 ++--
 .../src/pages/EmbeddedActiveEquipmentPage.tsx | 78 +++++++++++++++++--
 2 files changed, 77 insertions(+), 18 deletions(-)

diff --git a/client/src/App.tsx b/client/src/App.tsx
index d5427c9..012f516 100644
--- a/client/src/App.tsx
+++ b/client/src/App.tsx
@@ -1,5 +1,4 @@
-import { Admin, Authenticated, CustomRoutes, Resource } from 'react-admin';
-import { Route } from 'react-router-dom';
+import { Admin, Resource } from 'react-admin';
 import { authProvider } from './auth/authProvider';
 import { dataProvider } from './dataProvider';
 import { EmbeddedActiveEquipmentPage } from './pages/EmbeddedActiveEquipmentPage';
@@ -13,18 +12,12 @@ import { EquipmentStatusChangeList } from './resources/equipment-status-change/E
 import { EquipmentStatusChangeShow } from './resources/equipment-status-change/EquipmentStatusChangeShow';
 
 function App() {
+  if (window.location.pathname === '/embedded/equipment-active') {
+    return <EmbeddedActiveEquipmentPage />;
+  }
+
   return (
     <Admin dataProvider={dataProvider} authProvider={authProvider}>
-      <CustomRoutes noLayout>
-        <Route
-          path="/embedded/equipment-active"
-          element={
-            <Authenticated>
-              <EmbeddedActiveEquipmentPage />
-            </Authenticated>
-          }
-        />
-      </CustomRoutes>
       <Resource
         name="equipment"
         list={EquipmentList}
diff --git a/client/src/pages/EmbeddedActiveEquipmentPage.tsx b/client/src/pages/EmbeddedActiveEquipmentPage.tsx
index 72cae7b..a33b3f2 100644
--- a/client/src/pages/EmbeddedActiveEquipmentPage.tsx
+++ b/client/src/pages/EmbeddedActiveEquipmentPage.tsx
@@ -9,7 +9,9 @@ import TableContainer from '@mui/material/TableContainer';
 import TableHead from '@mui/material/TableHead';
 import TableRow from '@mui/material/TableRow';
 import Typography from '@mui/material/Typography';
-import { useGetList } from 'react-admin';
+import { useEffect, useState } from 'react';
+import { env } from '../config/env';
+import { ensureFreshToken, getAccessToken } from '../auth/keycloak';
 
 type EquipmentRecord = {
   id: string;
@@ -33,11 +35,75 @@ function formatDate(value: string | null) {
 }
 
 export function EmbeddedActiveEquipmentPage() {
-  const { data, total, isPending, error } = useGetList<EquipmentRecord>('equipment', {
-    pagination: { page: 1, perPage: 100 },
-    sort: { field: 'name', order: 'ASC' },
-    filter: { status: ['Active'] },
-  });
+  const [data, setData] = useState<EquipmentRecord[]>([]);
+  const [total, setTotal] = useState<number | null>(null);
+  const [isPending, setIsPending] = useState(true);
+  const [error, setError] = useState<Error | null>(null);
+
+  useEffect(() => {
+    let cancelled = false;
+
+    const load = async () => {
+      setIsPending(true);
+      setError(null);
+
+      try {
+        await ensureFreshToken();
+
+        const token = getAccessToken();
+        const headers = new Headers({
+          Accept: 'application/json',
+        });
+
+        if (token) {
+          headers.set('Authorization', `Bearer ${token}`);
+        }
+
+        const query = new URLSearchParams({
+          _start: '0',
+          _end: '100',
+          _sort: 'name',
+          _order: 'ASC',
+        });
+        query.append('status', 'Active');
+
+        const response = await fetch(`${env.apiUrl}/equipment?${query.toString()}`, {
+          headers,
+        });
+
+        if (!response.ok) {
+          const requestError = new Error(`Request failed with status ${response.status}`) as Error & {
+            status?: number;
+          };
+          requestError.status = response.status;
+          throw requestError;
+        }
+
+        const payload = (await response.json()) as EquipmentRecord[];
+        const contentRange = response.headers.get('Content-Range');
+        const parsedTotal = contentRange?.match(/\/(\d+)$/)?.[1];
+
+        if (!cancelled) {
+          setData(payload);
+          setTotal(parsedTotal ? Number(parsedTotal) : payload.length);
+        }
+      } catch (caughtError) {
+        if (!cancelled) {
+          setError(caughtError instanceof Error ? caughtError : new Error('Unknown error'));
+        }
+      } finally {
+        if (!cancelled) {
+          setIsPending(false);
+        }
+      }
+    };
+
+    void load();
+
+    return () => {
+      cancelled = true;
+    };
+  }, []);
 
   return (
     <Box sx={{ minHeight: '100vh', boxSizing: 'border-box', p: { xs: 2, md: 3 }, bgcolor: '#f3f6fa' }}>