refactor: admin UI module

src/modules/access/fetchAuthState.ts

@@ -1,8 +1,8 @@
 import { verifySession } from "@/session";
 import { createServerFn } from "@tanstack/react-start";
 import { getUserLanguagesReadModel } from "../languages/read-models/getUserLanguagesReadModel";
-import { LanguageReadModel } from "../languages/read-models/getAllLanguagesReadModel";
 import { SystemRoleRaw } from "@/modules/users/types";
+import { UserLanguageReadModel } from "../languages/read-models/getUserLanguagesReadModel";
 
 export interface AuthState {
   user?: { id: string; name: string };
@@ -14,7 +14,7 @@ export const fetchAuthState = createServerFn().handler(
   async (): Promise<AuthState> => {
     const session = await verifySession();
 
-    let languages: LanguageReadModel[] = [];
+    let languages: UserLanguageReadModel[] = [];
     if (session) {
       languages = await getUserLanguagesReadModel(session.user.id);
     }

src/modules/reporting/index.ts

@@ -7,23 +7,3 @@ export {
   type BookProgressRow,
   type BookProgressContributor,
 } from "./read-models/getLanguageBookProgressReadModel";
-export {
-  getLanguageDashboardBooksReadModel,
-  type LanguageDashboardBookReadModel,
-} from "./read-models/getLanguageDashboardBooksReadModel";
-export {
-  getLanguageDashboardMembersReadModel,
-  type LanguageDashboardMemberReadModel,
-} from "./read-models/getLanguageDashboardMembersReadModel";
-export {
-  getLanguageDashboardContributionsReadModel,
-  type LanguageDashboardContributionReadModel,
-} from "./read-models/getLanguageDashboardContributionsReadModel";
-export {
-  getLanguageDashboardActivityReadModel,
-  type LanguageDashboardActivityEntryReadModel,
-} from "./read-models/getLanguageDashboardActivityReadModel";
-export {
-  getLanguageApprovalActivityReadModel,
-  type LanguageApprovalActivityReadModel,
-} from "./read-models/getLanguageApprovalActivityReadModel";

src/routes/_main/admin/__virtual.ts

@@ -0,0 +1,8 @@
+import {
+  defineVirtualSubtreeConfig,
+  physical,
+} from "@tanstack/virtual-file-routes";
+
+export default defineVirtualSubtreeConfig([
+  physical("../../../ui/admin/routes"),
+]);

src/modules/translation/ui/AIGlossesImportForm.tsx → src/ui/admin/components/AIGlossesImportForm.tsx

@@ -1,44 +1,10 @@
 import { Icon } from "@/components/Icon";
-import { createPolicyMiddleware, Policy } from "@/modules/access";
-import { importAIGlosses } from "../actions/importAIGlosses";
-import { getAIGlossImportJobReadModel } from "../read-models/getAIGlossImportJobReadModel";
-import { getAIGlossImportLanguagesReadModel } from "../read-models/getAIGlossImportLanguagesReadModel";
+import { importAIGlosses } from "@/modules/translation/actions/importAIGlosses";
 import JobStatusPoller from "@/shared/jobs/ui/JobStatusPoller";
 import { JobStatus } from "@/shared/jobs/model";
 import { useSuspenseQuery } from "@tanstack/react-query";
-import { createServerFn } from "@tanstack/react-start";
-import * as z from "zod";
 import Button from "@/components/Button";
-
-const requestSchema = z.object({
-  code: z.string(),
-});
-
-const policy = new Policy({
-  systemRoles: [Policy.SystemRole.Admin],
-  languageMember: true,
-});
-
-export const getAIGlossesImportFormData = createServerFn()
-  .inputValidator(requestSchema)
-  .middleware([
-    createPolicyMiddleware({
-      policy,
-      languageCodeField: "code",
-    }),
-  ])
-  .handler(async ({ data }) => {
-    const [job, availableLanguages] = await Promise.all([
-      getAIGlossImportJobReadModel(data.code),
-      getAIGlossImportLanguagesReadModel(),
-    ]);
-
-    const language = availableLanguages.find(
-      (entry) => entry.code === data.code,
-    );
-
-    return { job, languageAvailable: !!language };
-  });
+import { getAIGlossesImportFormData } from "@/ui/admin/serverFns/getAIGlossesImportFormData";
 
 export default function AIGlossesImportForm({ code }: { code: string }) {
   const { data, refetch } = useSuspenseQuery({

src/modules/languages/ui/ActivityChart.tsx → src/ui/admin/components/ActivityChart.tsx

@@ -163,9 +163,9 @@ function ActivityChartSVG({
   const xScaleRef = useRef<d3.ScaleTime<number, number, never> | null>(null);
 
   // Unique IDs so multiple charts on the same page don't share gradient defs
-  const uid = useId().replace(/:/g, "");
-  const gradientId = `activity-gradient-${uid}`;
-  const clipId = `activity-clip-${uid}`;
+  const chartId = useId().replace(/:/g, "");
+  const gradientId = `activity-gradient-${chartId}`;
+  const clipId = `activity-clip-${chartId}`;
 
   const [elementRef, size] = useElementDimensions<HTMLDivElement>();
 

src/modules/languages/ui/BookProgressDetailsModal.tsx → src/ui/admin/components/BookProgressDetailsModal.tsx

@@ -6,9 +6,9 @@ import ActivityChart, {
   ActivityChartProvider,
   type ActivityChartEntry,
   type ActivityChartRange,
-} from "@/modules/languages/ui/ActivityChart";
-import ProgressBar from "@/modules/languages/ui/ProgressBar";
-import RangeToggle from "@/modules/languages/ui/RangeToggle";
+} from "@/ui/admin/components/ActivityChart";
+import ProgressBar from "@/ui/admin/components/ProgressBar";
+import RangeToggle from "@/ui/admin/components/RangeToggle";
 import Button from "@/components/Button";
 
 export interface BookProgressDetails {

src/modules/export/ui/InterlinearExportPanel.tsx → src/ui/admin/components/InterlinearExportPanel.tsx

@@ -1,39 +1,11 @@
 import { requestInterlinearExport } from "@/modules/export/actions/requestInterlinearExport";
-import { createPolicyMiddleware, Policy } from "@/modules/access";
 import { JobStatus } from "@/shared/jobs/model";
 import Button from "@/components/Button";
 import { Icon } from "@/components/Icon";
-import exportJobQueryService from "../data-access/ExportJobQueryService";
 import JobStatusPoller from "@/shared/jobs/ui/JobStatusPoller";
 import { useTranslations } from "use-intl";
 import { useSuspenseQuery } from "@tanstack/react-query";
-import { createServerFn } from "@tanstack/react-start";
-import * as z from "zod";
-
-const requestSchema = z.object({
-  languageCode: z.string().min(1),
-});
-
-const policy = new Policy({
-  systemRoles: [Policy.SystemRole.Admin],
-  languageMember: true,
-});
-
-export const getInterlinearExportPanelData = createServerFn()
-  .inputValidator(requestSchema)
-  .middleware([
-    createPolicyMiddleware({
-      policy,
-    }),
-  ])
-  .handler(async ({ data }) => {
-    const [jobs, pendingJob] = await Promise.all([
-      exportJobQueryService.findRecentForLanguage(data.languageCode),
-      exportJobQueryService.findPendingForLanguage(data.languageCode),
-    ]);
-
-    return { jobs, pendingJob };
-  });
+import { getInterlinearExportPanelData } from "@/ui/admin/serverFns/getInterlinearExportPanelData";
 
 export default function InterlinearExportPanel({
   languageCode,

src/modules/languages/ui/LanguageBookProgressDashboardCard.tsx → src/ui/admin/components/LanguageBookProgressDashboardCard.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { useMemo } from "react";
-import ProgressBar from "@/modules/languages/ui/ProgressBar";
+import ProgressBar from "@/ui/admin/components/ProgressBar";
 import Button from "@/components/Button";
 import { Icon } from "@/components/Icon";
 import {
@@ -11,14 +11,12 @@ import {
 } from "./DashboardCard";
 import BookProgressDetailsModal, {
   type BookProgressDetails,
-} from "@/modules/languages/ui/BookProgressDetailsModal";
-import { type ActivityChartRange } from "@/modules/languages/ui/ActivityChart";
-import {
-  type LanguageDashboardActivityEntryReadModel,
-  type LanguageDashboardBookReadModel,
-  type LanguageDashboardContributionReadModel,
-  type LanguageDashboardMemberReadModel,
-} from "@/modules/reporting";
+} from "@/ui/admin/components/BookProgressDetailsModal";
+import { type ActivityChartRange } from "@/ui/admin/components/ActivityChart";
+import { type LanguageDashboardActivityEntryReadModel } from "@/ui/admin/readModels/getLanguageDashboardActivityReadModel";
+import { type LanguageDashboardContributionReadModel } from "@/ui/admin/readModels/getLanguageDashboardContributionsReadModel";
+import { type LanguageDashboardMemberReadModel } from "@/ui/admin/readModels/getLanguageDashboardMembersReadModel";
+import { type LanguageDashboardBookReadModel } from "@/ui/admin/readModels/getLanguageDashboardBooksReadModel";
 
 interface LanguageBookProgressDashboardCardProps {
   className?: string;

src/modules/languages/ui/LanguageGlossApprovalDashboardCard.tsx → src/ui/admin/components/LanguageGlossApprovalDashboardCard.tsx

@@ -14,7 +14,7 @@ import {
 import { UTCDate } from "@date-fns/utc";
 import * as d3 from "d3";
 import { useEffect, useId, useMemo, useRef, useState } from "react";
-import { type LanguageApprovalActivityReadModel } from "@/modules/reporting";
+import { type LanguageApprovalActivityReadModel } from "@/ui/admin/readModels/getLanguageApprovalActivityReadModel";
 import { useElementDimensions } from "@/utils/measure-element";
 import { type ActivityChartRange } from "./ActivityChart";
 import {
@@ -248,8 +248,8 @@ function ApprovalActivityChart({
     >
   > | null>(null);
 
-  const uid = useId().replace(/:/g, "");
-  const clipId = `approval-clip-${uid}`;
+  const chartId = useId().replace(/:/g, "");
+  const clipId = `approval-clip-${chartId}`;
 
   const [elementRef, size] = useElementDimensions<HTMLDivElement>();
 

src/modules/languages/ui/LanguageUsersDashboardCard.tsx → src/ui/admin/components/LanguageUsersDashboardCard.tsx

@@ -1,15 +1,13 @@
-import {
-  LanguageDashboardActivityEntryReadModel,
-  LanguageDashboardContributionReadModel,
-  LanguageDashboardMemberReadModel,
-} from "@/modules/reporting";
+import { type LanguageDashboardActivityEntryReadModel } from "@/ui/admin/readModels/getLanguageDashboardActivityReadModel";
+import { type LanguageDashboardContributionReadModel } from "@/ui/admin/readModels/getLanguageDashboardContributionsReadModel";
+import { type LanguageDashboardMemberReadModel } from "@/ui/admin/readModels/getLanguageDashboardMembersReadModel";
 import ActivityChart, { ActivityChartRange } from "./ActivityChart";
 import { useMemo } from "react";
 import { Icon } from "@/components/Icon";
 import ContributionBar from "./ContributionBar";
 import ServerAction from "@/components/ServerAction";
-import { removeLanguageMember } from "../actions/removeLanguageMember";
-import { reinviteLanguageMemberAction } from "../actions/reinviteLanguageMember";
+import { removeLanguageMember } from "@/modules/languages/actions/removeLanguageMember";
+import { reinviteLanguageMemberAction } from "@/modules/languages/actions/reinviteLanguageMember";
 import {
   DashboardCard,
   DashboardCardEmptyState,

src/modules/languages/ui/RangeToggle.tsx → src/ui/admin/components/RangeToggle.tsx

@@ -1,5 +1,5 @@
 import { Radio, RadioGroup } from "@headlessui/react";
-import { type ActivityChartRange } from "@/modules/languages/ui/ActivityChart";
+import { type ActivityChartRange } from "@/ui/admin/components/ActivityChart";
 
 export default function RangeToggle({
   range,

src/modules/translation/read-models/getAIGlossImportJobReadModel.ts → src/ui/admin/readModels/getAIGlossImportJobReadModel.ts

@@ -1,5 +1,5 @@
 import { getDb } from "@/db";
-import { TRANSLATION_JOB_TYPES } from "../jobs/jobType";
+import { TRANSLATION_JOB_TYPES } from "@/modules/translation/jobs/jobType";
 import { JobStatus } from "@/shared/jobs/model";
 
 interface AIGlossImportJobReadModel {

src/modules/translation/read-models/getAIGlossImportLanguagesReadModel.ts → src/ui/admin/readModels/getAIGlossImportLanguagesReadModel.ts

@@ -1,4 +1,4 @@
-import { aiGlossImportService } from "../data-access/aiGlossImportService";
+import { aiGlossImportService } from "@/modules/translation/data-access/aiGlossImportService";
 
 // TODO: Cache this
 export function getAIGlossImportLanguagesReadModel() {

src/modules/languages/read-models/getAllLanguagesReadModel.test.ts → src/ui/admin/readModels/getAllLanguagesReadModel.test.ts

@@ -1,6 +1,6 @@
 import { initializeDatabase } from "@/tests/vitest/dbUtils";
 import { expect, test } from "vitest";
-import { getAllLanguagesReadModel } from "./getAllLanguagesReadModel";
+import { getAllLanguagesReadModel } from "@/ui/admin/readModels/getAllLanguagesReadModel";
 import { languageFactory } from "@/modules/languages/test-utils/languageFactory";
 
 initializeDatabase();

src/modules/languages/read-models/getLanguageSettingsReadModel.test.ts → src/ui/admin/readModels/getLanguageSettingsReadModel.test.ts

@@ -1,8 +1,11 @@
 import { test, expect } from "vitest";
 import { initializeDatabase } from "@/tests/vitest/dbUtils";
-import { getLanguageSettingsReadModel } from "./getLanguageSettingsReadModel";
-import { languageFactory } from "../test-utils/languageFactory";
-import { MachineGlossStrategy, TextDirectionRaw } from "../model";
+import { getLanguageSettingsReadModel } from "@/ui/admin/readModels/getLanguageSettingsReadModel";
+import { languageFactory } from "@/modules/languages/test-utils/languageFactory";
+import {
+  MachineGlossStrategy,
+  TextDirectionRaw,
+} from "@/modules/languages/model";
 
 initializeDatabase();
 

src/modules/languages/read-models/getLanguageSettingsReadModel.ts → src/ui/admin/readModels/getLanguageSettingsReadModel.ts

@@ -1,6 +1,6 @@
 import { getDb } from "@/db";
 import { sql } from "kysely";
-import { MachineGlossStrategy } from "../model";
+import { MachineGlossStrategy } from "@/modules/languages/model";
 
 export interface LanguageSettingsReadModel {
   englishName: string;

src/modules/languages/read-models/searchLanguagesReadModel.test.ts → src/ui/admin/readModels/searchLanguagesReadModel.test.ts

@@ -1,6 +1,6 @@
 import { initializeDatabase } from "@/tests/vitest/dbUtils";
 import { expect, test } from "vitest";
-import { searchLanguagesReadModel } from "./searchLanguagesReadModel";
+import { searchLanguagesReadModel } from "@/ui/admin/readModels/searchLanguagesReadModel";
 import { languageFactory } from "@/modules/languages/test-utils/languageFactory";
 
 initializeDatabase();

src/modules/users/read-models/searchUsersReadModel.ts → src/ui/admin/readModels/searchUsersReadModel.ts

@@ -1,9 +1,9 @@
 import { jsonBuildObject } from "kysely/helpers/postgres";
 import { getDb } from "@/db";
-import { UserStatusRaw } from "../model/UserStatus";
+import { UserStatusRaw } from "@/modules/users/model/UserStatus";
 import { sql } from "kysely";
-import { SystemRoleRaw } from "../model/SystemRole";
-import { EmailStatusRaw } from "../model/EmailStatus";
+import { SystemRoleRaw } from "@/modules/users/model/SystemRole";
+import { EmailStatusRaw } from "@/modules/users/model/EmailStatus";
 
 export interface UserReadModel {
   id: string;