From 5ffcb0d6420ffccbbfe2c039f1427568f290d98b Mon Sep 17 00:00:00 2001 From: Rishi Ghan Date: Sat, 16 Dec 2023 22:02:56 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=AA=91=20Refactoring=20the=20table?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AirDCPPSettingsConfirmation.tsx | 4 +-- .../QbittorrentConnectionForm.tsx | 32 +++++++++++++++---- src/client/components/shared/T2Table.tsx | 10 ++++-- 3 files changed, 35 insertions(+), 11 deletions(-) diff --git a/src/client/components/Settings/AirDCPPSettings/AirDCPPSettingsConfirmation.tsx b/src/client/components/Settings/AirDCPPSettings/AirDCPPSettingsConfirmation.tsx index 89c6253..c522d0e 100644 --- a/src/client/components/Settings/AirDCPPSettings/AirDCPPSettingsConfirmation.tsx +++ b/src/client/components/Settings/AirDCPPSettings/AirDCPPSettingsConfirmation.tsx @@ -10,14 +10,14 @@ export const AirDCPPSettingsConfirmation = (settingsObject): ReactElement => { -
+

Connected

-

+

{settings._id}
Client version: {settings.system_info.client_version}
diff --git a/src/client/components/Settings/QbittorrentSettings/QbittorrentConnectionForm.tsx b/src/client/components/Settings/QbittorrentSettings/QbittorrentConnectionForm.tsx index f0cbfda..f75da4e 100644 --- a/src/client/components/Settings/QbittorrentSettings/QbittorrentConnectionForm.tsx +++ b/src/client/components/Settings/QbittorrentSettings/QbittorrentConnectionForm.tsx @@ -1,9 +1,10 @@ import React, { ReactElement } from "react"; import { ConnectionForm } from "../../shared/ConnectionForm/ConnectionForm"; -import { useQuery, useMutation } from "@tanstack/react-query"; +import { useQuery, useMutation, QueryClient } from "@tanstack/react-query"; import axios from "axios"; export const QbittorrentConnectionForm = (): ReactElement => { + const queryClient = new QueryClient(); // fetch settings const { data, isLoading, isError } = useQuery({ queryKey: ["settings"], @@ -13,7 +14,8 @@ export const QbittorrentConnectionForm = (): ReactElement => { method: "GET", }), }); - const hostDetails = data?.data.bittorrent.client.host; + console.log(data); + const hostDetails = data?.data?.bittorrent?.client?.host; // connect to qbittorrent client const { data: connectionDetails } = useQuery({ queryKey: [], @@ -35,7 +37,7 @@ export const QbittorrentConnectionForm = (): ReactElement => { }), enabled: !!connectionDetails, }); - console.log(qbittorrentClientInfo?.data); + console.log(qbittorrentClientInfo); // Update action using a mutation const { mutate } = useMutation({ mutationFn: async (values) => @@ -44,6 +46,9 @@ export const QbittorrentConnectionForm = (): ReactElement => { method: "POST", data: { settingsPayload: values, settingsKey: "bittorrent" }, }), + onSuccess: () => { + queryClient.invalidateQueries({ queryKey: ["settings"] }); + }, }); if (isError) @@ -61,9 +66,24 @@ export const QbittorrentConnectionForm = (): ReactElement => { submitHandler={mutate} /> -
-          {JSON.stringify(qbittorrentClientInfo?.data, null, 4)}
-        
+ + + qBittorrent Client Information + + + + +
+ + + + +

Connected

+
+

+

 {JSON.stringify(qbittorrentClientInfo?.data, null, 4)}
+

+
); } diff --git a/src/client/components/shared/T2Table.tsx b/src/client/components/shared/T2Table.tsx index 7a9efc3..26fc835 100644 --- a/src/client/components/shared/T2Table.tsx +++ b/src/client/components/shared/T2Table.tsx @@ -71,7 +71,7 @@ export const T2Table = (tableOptions): ReactElement => { return ( <> -
+
{/* Search bar */}
@@ -125,12 +125,16 @@ export const T2Table = (tableOptions): ReactElement => {
- +
{table.getHeaderGroups().map((headerGroup, idx) => ( {headerGroup.headers.map((header, idx) => ( -
+ {header.isPlaceholder ? null : flexRender(