fix(renderfixes): some strange rendering fixes that should have been caught long time ago

This commit is contained in:
2025-06-23 16:46:14 -05:00
parent 2eea2911bc
commit 3b56a5e3e2
8 changed files with 298 additions and 98 deletions

View File

@@ -1,12 +1,19 @@
import {LstCard} from "@/components/extendedUI/LstCard";
import {Table, TableBody, TableCell, TableHead, TableHeader, TableRow} from "@/components/ui/table";
import {useSessionStore} from "@/lib/store/sessionStore";
import {useModuleStore} from "@/lib/store/useModuleStore";
import {useQuery} from "@tanstack/react-query";
import {useRouter} from "@tanstack/react-router";
import {ChangeSetting} from "./SettingForm";
import {getSettings} from "@/utils/querys/settings";
import {Skeleton} from "@/components/ui/skeleton";
import { LstCard } from "@/components/extendedUI/LstCard";
import {
Table,
TableBody,
TableCell,
TableHead,
TableHeader,
TableRow,
} from "@/components/ui/table";
import { useSessionStore } from "@/lib/store/sessionStore";
import { useModuleStore } from "@/lib/store/useModuleStore";
import { useQuery } from "@tanstack/react-query";
import { useRouter } from "@tanstack/react-router";
import { ChangeSetting } from "./SettingForm";
import { getSettings } from "@/utils/querys/settings";
import { Skeleton } from "@/components/ui/skeleton";
export type Settings = {
settings_id?: string;
@@ -16,18 +23,22 @@ export type Settings = {
};
export default function SettingsPage() {
const {user, token} = useSessionStore();
const {modules} = useModuleStore();
const { user, token } = useSessionStore();
const { modules } = useModuleStore();
const router = useRouter();
const adminModule = modules.filter((n) => n.name === "admin");
const userLevel = user?.roles.filter((r) => r.module_id === adminModule[0].module_id) || [];
const userLevel =
user?.roles.filter((r) => r.module_id === adminModule[0].module_id) ||
[];
if (!adminModule[0].roles.includes(userLevel[0]?.role)) {
router.navigate({to: "/"});
router.navigate({ to: "/" });
}
const {data, isError, error, isLoading} = useQuery(getSettings(token ?? ""));
const { data, isError, error, isLoading } = useQuery(
getSettings(token ?? "")
);
// if (isLoading) {
// return <div>Loading.....</div>;
@@ -51,32 +62,38 @@ export default function SettingsPage() {
<>
<TableBody>
{Array(10)
.fill(0)
.map((_, i) => (
<TableRow key={i}>
<TableCell className="font-medium">
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
</TableRow>
))}
.fill(0)
.map((_, i) => (
<TableRow key={i}>
<TableCell className="font-medium">
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
</TableRow>
))}
</TableBody>
</>
) : (
<TableBody>
{data?.map((setting: Settings) => (
<TableRow key={setting.settings_id}>
<TableCell className="font-medium">{setting.name}</TableCell>
<TableCell className="font-medium">{setting.value}</TableCell>
<TableCell className="font-medium">{setting.description}</TableCell>
<TableCell className="font-medium">
{setting.name}
</TableCell>
<TableCell className="font-medium">
{setting.value}
</TableCell>
<TableCell className="font-medium">
{setting.description}
</TableCell>
<TableCell className="font-medium">
<ChangeSetting setting={setting} />
</TableCell>