From 7c1d9125ba7830330a122fef316fe88a94182289 Mon Sep 17 00:00:00 2001 From: glax Date: Mon, 1 Sep 2025 21:50:38 +0200 Subject: [PATCH] Add Workers Drawer --- tranga-website/src/App.tsx | 4 +- .../src/Components/WorkerModal/Workers.tsx | 72 +++++++++++++++++++ tranga-website/src/apiClient/V2.ts | 69 ++++++++++-------- .../src/apiClient/data-contracts.ts | 64 +++++++++++++---- 4 files changed, 166 insertions(+), 43 deletions(-) create mode 100644 tranga-website/src/Components/WorkerModal/Workers.tsx diff --git a/tranga-website/src/App.tsx b/tranga-website/src/App.tsx index 5c75f70..b3ba0cf 100644 --- a/tranga-website/src/App.tsx +++ b/tranga-website/src/App.tsx @@ -13,6 +13,7 @@ import { } from "./apiClient/data-contracts.ts"; import Search from "./Components/Search.tsx"; import { Typography } from "@mui/joy"; +import Workers from "./Components/WorkerModal/Workers.tsx"; export const MangaConnectorContext = createContext([]); export const MangaContext = createContext([]); @@ -43,7 +44,7 @@ export default function App() { if (response.ok) setFileLibraries(response.data); }); - Api.queryMangaDownloadingList().then((response) => { + Api.mangaDownloadingList().then((response) => { if (response.ok) setManga(response.data); }); }, []); @@ -67,6 +68,7 @@ export default function App() {
+
diff --git a/tranga-website/src/Components/WorkerModal/Workers.tsx b/tranga-website/src/Components/WorkerModal/Workers.tsx new file mode 100644 index 0000000..ad4de17 --- /dev/null +++ b/tranga-website/src/Components/WorkerModal/Workers.tsx @@ -0,0 +1,72 @@ +import { Dispatch, ReactNode, useContext, useState } from "react"; +import Drawer from "@mui/joy/Drawer"; +import { Button, Option, Select, Table } from "@mui/joy"; +import { BaseWorker } from "../../apiClient/data-contracts.ts"; +import ModalClose from "@mui/joy/ModalClose"; +import { ApiContext } from "../../apiClient/ApiContext.tsx"; + +export default function (): ReactNode { + const [open, setOpen] = useState(false); + + const [workers, setWorkers] = useState([]); + const Api = useContext(ApiContext); + Api.workerList().then((response) => { + if (response.ok) { + setWorkers(response.data); + } + }); + + return ( + <> + + + + ); +} + +function WorkerDrawer({ + open, + setOpen, + workers, +}: { + open: boolean; + setOpen: Dispatch; + workers: BaseWorker[]; +}): ReactNode { + return ( + setOpen(false)} size={"lg"}> + + + + + + + + + + + {workers.map((worker) => { + return ( + + + + + + ); + })} + +
KeyCan runMissing dependencies
{worker.key}{worker.allDependenciesFulfilled ? "yes" : "no"} + +
+ + ); +} diff --git a/tranga-website/src/apiClient/V2.ts b/tranga-website/src/apiClient/V2.ts index 657295e..399e85f 100644 --- a/tranga-website/src/apiClient/V2.ts +++ b/tranga-website/src/apiClient/V2.ts @@ -227,12 +227,42 @@ export class V2< * @request GET:/v2/Manga */ mangaList = (params: RequestParams = {}) => - this.request({ + this.request({ path: `/v2/Manga`, method: "GET", format: "json", ...params, }); + /** + * No description + * + * @tags Manga + * @name MangaKeysList + * @summary Returns all cached API.Schema.MangaContext.Manga.Keys + * @request GET:/v2/Manga/Keys + */ + mangaKeysList = (params: RequestParams = {}) => + this.request({ + path: `/v2/Manga/Keys`, + method: "GET", + format: "json", + ...params, + }); + /** + * No description + * + * @tags Manga + * @name MangaDownloadingList + * @summary Returns all API.Schema.MangaContext.Manga that are being downloaded from at least one API.MangaConnectors.MangaConnector + * @request GET:/v2/Manga/Downloading + */ + mangaDownloadingList = (params: RequestParams = {}) => + this.request({ + path: `/v2/Manga/Downloading`, + method: "GET", + format: "json", + ...params, + }); /** * No description * @@ -863,27 +893,12 @@ export class V2< format: "json", ...params, }); - /** - * No description - * - * @tags Query - * @name QueryMangaDownloadingList - * @summary Returns all API.Schema.MangaContext.Manga that are being downloaded from at least one API.MangaConnectors.MangaConnector - * @request GET:/v2/Query/Manga/Downloading - */ - queryMangaDownloadingList = (params: RequestParams = {}) => - this.request({ - path: `/v2/Query/Manga/Downloading`, - method: "GET", - format: "json", - ...params, - }); /** * No description * * @tags Query * @name QueryMangaSimilarNameList - * @summary Returns API.Schema.MangaContext.Manga with names similar to API.Schema.MangaContext.Manga (identified by MangaId + * @summary Returns API.Schema.MangaContext.Manga with names similar to API.Schema.MangaContext.Manga (identified by MangaId) * @request GET:/v2/Query/Manga/{MangaId}/SimilarName */ queryMangaSimilarNameList = (mangaId: string, params: RequestParams = {}) => @@ -1283,11 +1298,11 @@ export class V2< * * @tags Worker * @name WorkerList - * @summary Returns all API.Workers.BaseWorker.Keys + * @summary Returns all API.Workers.BaseWorker * @request GET:/v2/Worker */ workerList = (params: RequestParams = {}) => - this.request({ + this.request({ path: `/v2/Worker`, method: "GET", format: "json", @@ -1297,16 +1312,14 @@ export class V2< * No description * * @tags Worker - * @name WorkerWithIDsCreate - * @summary Returns API.Workers.BaseWorker with requested WorkerIds - * @request POST:/v2/Worker/WithIDs + * @name WorkerKeysList + * @summary Returns all API.Workers.BaseWorker.Keys + * @request GET:/v2/Worker/Keys */ - workerWithIDsCreate = (data: string[], params: RequestParams = {}) => - this.request({ - path: `/v2/Worker/WithIDs`, - method: "POST", - body: data, - type: ContentType.Json, + workerKeysList = (params: RequestParams = {}) => + this.request({ + path: `/v2/Worker/Keys`, + method: "GET", format: "json", ...params, }); diff --git a/tranga-website/src/apiClient/data-contracts.ts b/tranga-website/src/apiClient/data-contracts.ts index 3b1b5a0..f5354ab 100644 --- a/tranga-website/src/apiClient/data-contracts.ts +++ b/tranga-website/src/apiClient/data-contracts.ts @@ -52,7 +52,11 @@ export interface AltTitle { * @maxLength 256 */ title: string; - key?: string | null; + /** + * @minLength 16 + * @maxLength 64 + */ + key: string; } export interface Author { @@ -61,20 +65,24 @@ export interface Author { * @maxLength 128 */ authorName: string; - key?: string | null; + /** + * @minLength 16 + * @maxLength 64 + */ + key: string; } export interface BaseWorker { /** Workers this Worker depends on being completed before running. */ dependsOn?: BaseWorker[] | null; - /** Dependencies and dependencies of dependencies. See also API.Workers.BaseWorker.DependsOn. */ - allDependencies?: BaseWorker[] | null; - /** API.Workers.BaseWorker.AllDependencies and Self. */ - dependenciesAndSelf?: BaseWorker[] | null; /** API.Workers.BaseWorker.DependsOn where API.Workers.WorkerExecutionState is less than Completed. */ missingDependencies?: BaseWorker[] | null; allDependenciesFulfilled?: boolean; - key?: string | null; + /** + * @minLength 16 + * @maxLength 64 + */ + key: string; } export interface Chapter { @@ -103,7 +111,11 @@ export interface Chapter { fileName: string; downloaded: boolean; fullArchiveFilePath?: string | null; - key?: string | null; + /** + * @minLength 16 + * @maxLength 64 + */ + key: string; } export interface ChapterMangaConnectorId { @@ -129,7 +141,11 @@ export interface ChapterMangaConnectorId { */ websiteUrl?: string | null; useForDownload?: boolean; - key?: string | null; + /** + * @minLength 16 + * @maxLength 64 + */ + key: string; } export interface FileLibrary { @@ -143,7 +159,11 @@ export interface FileLibrary { * @maxLength 512 */ libraryName: string; - key?: string | null; + /** + * @minLength 16 + * @maxLength 64 + */ + key: string; } export interface GotifyRecord { @@ -167,7 +187,11 @@ export interface LibraryConnector { * @maxLength 256 */ auth: string; - key?: string | null; + /** + * @minLength 16 + * @maxLength 64 + */ + key: string; } export interface Link { @@ -182,7 +206,11 @@ export interface Link { * @maxLength 2048 */ linkUrl: string; - key?: string | null; + /** + * @minLength 16 + * @maxLength 64 + */ + key: string; } export interface Manga { @@ -220,7 +248,11 @@ export interface Manga { chapterIds?: string[] | null; idsOnMangaConnectors?: Record; mangaConnectorIdsIds?: string[] | null; - key?: string | null; + /** + * @minLength 16 + * @maxLength 64 + */ + key: string; } export interface MangaConnector { @@ -270,7 +302,11 @@ export interface MangaMangaConnectorId { */ websiteUrl?: string | null; useForDownload?: boolean; - key?: string | null; + /** + * @minLength 16 + * @maxLength 64 + */ + key: string; } export interface MangaTag {