Skip to content

A1: Завершен #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
knoff merged 1 commit into from
Aug 29, 2025
Merged

A1: Завершен #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 35 additions & 0 deletions app/api/routes/schemas.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import os
from typing import Any, Dict, List, Optional
from fastapi import APIRouter, UploadFile, File, Depends, HTTPException
from pydantic import BaseModel
from sqlalchemy.orm import Session
from app.db import get_db
from app.models_sqlalchemy import Schema, SchemaType
Expand Down Expand Up @@ -34,6 +35,11 @@ def list_schemas(db: Session = Depends(get_db)) -> List[Dict[str, Any]]:
items = db.query(Schema).order_by(Schema.created_at.desc()).all()
return [_row_to_dict(s) for s in items]

@router.get("/types")
def list_schema_types(db: Session = Depends(get_db)) -> List[Dict[str, Any]]:
rows = db.query(SchemaType).order_by(SchemaType.title.asc()).all()
return [{"id": t.id, "code": t.code, "title": t.title} for t in rows]

@router.post("/upload")
async def upload_schema(file: UploadFile = File(...), db: Session = Depends(get_db)) -> Dict[str, Any]:
# проверки
Expand Down Expand Up @@ -85,6 +91,35 @@ def view_schema(schema_id: int, db: Session = Depends(get_db)) -> Dict[str, Any]
raise HTTPException(status_code=404, detail="Схема не найдена")
return _row_to_dict(schema)

class SchemaUpdate(BaseModel):
name: Optional[str] = None
version: Optional[str] = None
namespace: Optional[str] = None
description: Optional[str] = None
type_id: Optional[int] = None # null/0 -> снять тип

@router.put("/{schema_id}")
def update_schema(schema_id: int, payload: SchemaUpdate, db: Session = Depends(get_db)) -> Dict[str, Any]:
s = db.get(Schema, schema_id)
if not s:
raise HTTPException(status_code=404, detail="Схема не найдена")
# type_id
if payload.type_id is not None:
if payload.type_id in (0, ):
s.type_id = None
else:
st = db.get(SchemaType, payload.type_id)
if not st:
raise HTTPException(status_code=400, detail="Неизвестный type_id")
s.type_id = st.id
# текстовые поля
for fld in ("name", "version", "namespace", "description"):
val = getattr(payload, fld)
if val is not None:
setattr(s, fld, val.strip() if isinstance(val, str) else val)
db.commit()
db.refresh(s)
return _row_to_dict(s)

@router.post("/{schema_id}/delete")
def delete_schema(schema_id: int, db: Session = Depends(get_db)) -> Dict[str, Any]:
Expand Down
1 change: 1 addition & 0 deletions app/static/assets/index-BTyxcX7d.css
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion app/static/assets/index-BflQQHQj.css
View file
Open in desktop

This file was deleted.

159 changes: 159 additions & 0 deletions app/static/assets/index-ByrmC-P7.js
View file
Open in desktop

Large diffs are not rendered by default.

134 changes: 0 additions & 134 deletions app/static/assets/index-C6IcpXes.js
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions app/static/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<title>XSD Registry</title>
<script type="module" crossorigin src="/ui/assets/index-C6IcpXes.js"></script>
<link rel="stylesheet" crossorigin href="/ui/assets/index-BflQQHQj.css">
<script type="module" crossorigin src="/ui/assets/index-ByrmC-P7.js"></script>
<link rel="stylesheet" crossorigin href="/ui/assets/index-BTyxcX7d.css">
</head>
<body>
<div id="root"></div>
Expand Down
29 changes: 29 additions & 0 deletions frontend/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"preview": "vite preview --port 4173"
},
"dependencies": {
"@radix-ui/react-alert-dialog": "^1.1.15",
"@radix-ui/react-dialog": "^1.1.15",
"@radix-ui/react-dropdown-menu": "^2.1.16",
"@tanstack/react-table": "^8.21.3",
Expand Down
19 changes: 12 additions & 7 deletions frontend/src/components/ui/data-table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export function DataTable<TData, TValue>({
initialSizing,
initialPageSize = 10,
pageSizeOptions = [10, 50, 100],
rightActions,
}: {
columns: ColumnDef<TData, TValue>[];
data: TData[];
Expand All @@ -33,6 +34,7 @@ export function DataTable<TData, TValue>({
initialSizing?: ColumnSizingState;
initialPageSize?: number;
pageSizeOptions?: number[];
rightActions?: ReactNode; // extra action buttons on the right
}) {
const [columnVisibility, setColumnVisibility] = React.useState<VisibilityState>(initialVisibility ?? {});
const [columnSizing] = React.useState<ColumnSizingState>(initialSizing ?? {});
Expand Down Expand Up @@ -66,11 +68,12 @@ export function DataTable<TData, TValue>({
<div className={cn("space-y-3", className)}>
<div className="flex items-center justify-between">
<h2 className="text-lg font-semibold">Список</h2>
<DropdownMenu>
<DropdownMenuTrigger asChild>
<button className="h-9 rounded-2xl border px-3 text-sm hover:bg-zinc-50">{columnsTitle}</button>
</DropdownMenuTrigger>
<DropdownMenuContent className="max-h-80 overflow-auto">
<div className="flex items-center gap-2">
<DropdownMenu>
<DropdownMenuTrigger asChild>
<button className="h-9 rounded-2xl border px-3 text-sm hover:bg-zinc-50">{columnsTitle}</button>
</DropdownMenuTrigger>
<DropdownMenuContent className="max-h-80 overflow-auto">
{leaf.filter(c => c.getCanHide()).map((c) => (
<DropdownMenuItem key={c.id} onSelect={(e) => e.preventDefault()}>
<label className="flex items-center gap-2">
Expand All @@ -83,8 +86,10 @@ export function DataTable<TData, TValue>({
</label>
</DropdownMenuItem>
))}
</DropdownMenuContent>
</DropdownMenu>
</DropdownMenuContent>
</DropdownMenu>
{rightActions}
</div>
</div>

<div className="rounded-2xl border">
Expand Down
14 changes: 9 additions & 5 deletions frontend/src/components/ui/dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import * as React from "react";
import * as DialogPrimitive from "@radix-ui/react-dialog";
import { cn } from "@/lib/utils";
import { X } from "lucide-react";

export const Dialog = DialogPrimitive.Root;
export const DialogTrigger = DialogPrimitive.Trigger;
Expand Down Expand Up @@ -43,13 +44,16 @@ export const DialogContent = React.forwardRef<
{/* Кнопка-крестик (закрыть диалог) */}
<DialogPrimitive.Close
className={cn(
"absolute right-3 top-3 h-8 w-8 rounded-xl text-zinc-500",
"hover:bg-zinc-100 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2"
)}
"group absolute right-3 top-3 inline-flex h-8 w-8 items-center justify-center",
"rounded-lg text-zinc-500 transition",
"hover:bg-zinc-100 hover:text-zinc-700",
"focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2"
)}
aria-label="Закрыть"
title="Закрыть"
>
×
</DialogPrimitive.Close>
<X className="h-5 w-5 opacity-75 group-hover:opacity-100" aria-hidden="true" />
</DialogPrimitive.Close>
{children}
</DialogPrimitive.Content>
</DialogPortal>
Expand Down
Loading
Loading