Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
`ui.ts`). The original `index.ts` is now a barrel that re-exports
everything, so all existing `@/types` imports keep working unchanged.
New code can also import from a specific module (e.g. `@/types/admin`).
- Frontend layout polish on top of the directory restructure:
`app/slices/` split into `shared/` (`authSlice`), `scanner/`
(`scannerSlice`, `callsSlice`, `shareSlice`), and `admin/`
(`adminSlice`, `activitySlice`); `components/admin/AdminLayout.tsx`
inlined into `pages/Admin.tsx` (replacing the 5-line shim);
`components/admin/NavigationGuardContext.tsx` relocated to
`hooks/admin/useNavigationGuard.tsx`; and `services/downloadFilename.ts`
moved to `services/util/downloadFilename.ts`. All call sites updated;
no runtime behaviour change.

### Fixed

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
setDownloadMode,
setTranscript,
resetFilters,
} from "@/app/slices/callsSlice";
} from "@/app/slices/scanner/callsSlice";

const reducer = callsSlice.reducer;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
setAllTGs,
setConfig,
transcriptReceived,
} from "@/app/slices/scannerSlice";
} from "@/app/slices/scanner/scannerSlice";
import type { Call, ScannerConfig } from "@/types";

const reducer = scannerSlice.reducer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
clearCredentials,
setAuthReady,
setSetupStatus,
} from "@/app/slices/authSlice";
} from "@/app/slices/shared/authSlice";

const { reducer } = authSlice;

Expand Down
6 changes: 3 additions & 3 deletions frontend/src/app/store.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { configureStore } from "@reduxjs/toolkit";
import { useDispatch, useSelector } from "react-redux";
import { api } from "@/app/api";
import { scannerSlice } from "@/app/slices/scannerSlice";
import { authSlice } from "@/app/slices/authSlice";
import { callsSlice } from "@/app/slices/callsSlice";
import { scannerSlice } from "@/app/slices/scanner/scannerSlice";
import { authSlice } from "@/app/slices/shared/authSlice";
import { callsSlice } from "@/app/slices/scanner/callsSlice";

export const store = configureStore({
reducer: {
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/admin/ActivityPanel.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useAdminActivity } from "@/hooks/admin/useAdminActivity";
import type { ChartBucket } from "@/app/slices/activitySlice";
import type { ChartBucket } from "@/app/slices/admin/activitySlice";
import {
Activity,
Clock3,
Expand Down
260 changes: 0 additions & 260 deletions frontend/src/components/admin/AdminLayout.tsx

This file was deleted.

6 changes: 3 additions & 3 deletions frontend/src/components/admin/ApiKeysPanel.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import { configureStore } from "@reduxjs/toolkit";
import { Provider } from "react-redux";
import { MemoryRouter } from "react-router-dom";
import ApiKeysPanel from "@/components/admin/ApiKeysPanel";
import { scannerSlice } from "@/app/slices/scannerSlice";
import { authSlice } from "@/app/slices/authSlice";
import { callsSlice } from "@/app/slices/callsSlice";
import { scannerSlice } from "@/app/slices/scanner/scannerSlice";
import { authSlice } from "@/app/slices/shared/authSlice";
import { callsSlice } from "@/app/slices/scanner/callsSlice";
import { api } from "@/app/api";
import type { AdminApiKey, AdminSystem } from "@/types";

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/admin/OptionsPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
useGetConfigQuery,
useUpdateConfigMutation,
} from "@/hooks/admin/useAdminWsOps";
import { useNavigationGuard } from "@/components/admin/NavigationGuardContext";
import { useNavigationGuard } from "@/hooks/admin/useNavigationGuard";
import type { AdminSetting } from "@/types";

// ─── Known setting keys and their input types ───
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/admin/RadioReferenceCard.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useState, useRef, useCallback } from "react";
import { Upload, CheckCircle, XCircle, AlertTriangle } from "lucide-react";
import { useRrPreviewCSVMutation } from "@/app/slices/adminSlice";
import { useRrPreviewCSVMutation } from "@/app/slices/admin/adminSlice";
import { useRrApplyMutation, useListSystemsQuery } from "@/hooks/admin/useAdminWsOps";
import type {
RRPreviewResponse,
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/components/admin/SystemsPanel.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import { configureStore } from "@reduxjs/toolkit";
import { Provider } from "react-redux";
import { MemoryRouter } from "react-router-dom";
import SystemsPanel from "@/components/admin/SystemsPanel";
import { scannerSlice } from "@/app/slices/scannerSlice";
import { authSlice } from "@/app/slices/authSlice";
import { callsSlice } from "@/app/slices/callsSlice";
import { scannerSlice } from "@/app/slices/scanner/scannerSlice";
import { authSlice } from "@/app/slices/shared/authSlice";
import { callsSlice } from "@/app/slices/scanner/callsSlice";
import { api } from "@/app/api";
import type { AdminSystem } from "@/types";

Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/admin/ToolsPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
useImportUnitsMutation,
useImportGroupsMutation,
useImportTagsMutation,
} from "@/app/slices/adminSlice";
} from "@/app/slices/admin/adminSlice";
import {
useLazyExportConfigQuery,
useLazyExportTalkgroupsQuery,
Expand All @@ -21,7 +21,7 @@ import {
useImportConfigMutation,
useListSystemsQuery,
} from "@/hooks/admin/useAdminWsOps";
import { selectToken } from "@/app/slices/authSlice";
import { selectToken } from "@/app/slices/shared/authSlice";
import { useAppSelector } from "@/app/store";
import RadioReferenceCard from "@/components/admin/RadioReferenceCard";

Expand Down
6 changes: 3 additions & 3 deletions frontend/src/components/admin/UsersPanel.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import { configureStore } from "@reduxjs/toolkit";
import { Provider } from "react-redux";
import { MemoryRouter } from "react-router-dom";
import UsersPanel from "@/components/admin/UsersPanel";
import { scannerSlice } from "@/app/slices/scannerSlice";
import { authSlice } from "@/app/slices/authSlice";
import { callsSlice } from "@/app/slices/callsSlice";
import { scannerSlice } from "@/app/slices/scanner/scannerSlice";
import { authSlice } from "@/app/slices/shared/authSlice";
import { callsSlice } from "@/app/slices/scanner/callsSlice";
import { api } from "@/app/api";
import type { AdminUser, AdminSystem } from "@/types";

Expand Down
Loading
Loading