Merge branch 'main' into comicvine-integration-improvements

Included # of issues in a wanted volume

Dockerfile

@@ -12,8 +12,7 @@ RUN apk --no-cache add g++ make libpng-dev git python3 autoconf automake libjpeg
 
 # Install node modules
 RUN yarn install --ignore-engines
-# Explicitly install sass
-RUN yarn add -D sass
+
 # Copy the rest of the application
 COPY . .
 

package.json

@@ -29,14 +29,14 @@
     "@types/react-router-dom": "^5.3.3",
     "@vitejs/plugin-react": "^4.2.1",
     "airdcpp-apisocket": "^2.5.0-beta.2",
-    "axios": "^1.7.4",
+    "axios": "^1.6.8",
     "axios-cache-interceptor": "^1.0.1",
     "axios-rate-limit": "^1.3.0",
     "babel-plugin-styled-components": "^2.1.4",
     "date-fns": "^2.28.0",
     "dayjs": "^1.10.6",
     "ellipsize": "^0.5.1",
-    "express": "^4.20.0",
+    "express": "^4.19.2",
     "filename-parser": "^1.0.2",
     "final-form": "^4.20.2",
     "final-form-arrays": "^3.0.2",
@@ -53,27 +53,30 @@
     "pretty-bytes": "^5.6.0",
     "prop-types": "^15.8.1",
     "qs": "^6.10.5",
-    "react": "^19.0.0",
+    "react": "^18.2.0",
     "react-collapsible": "^2.9.0",
     "react-comic-viewer": "^0.4.0",
     "react-day-picker": "^8.10.0",
-    "react-dom": "^19.0.0",
+    "react-dom": "^18.2.0",
     "react-fast-compare": "^3.2.0",
     "react-final-form": "^6.5.9",
     "react-final-form-arrays": "^3.1.4",
     "react-i18next": "^14.1.0",
     "react-loader-spinner": "^4.0.0",
     "react-modal": "^3.15.1",
-    "react-router": "^7.1.5",
+    "react-router": "^6.9.0",
+    "react-router-dom": "^6.9.0",
     "react-select": "^5.8.0",
     "react-select-async-paginate": "^0.7.2",
     "react-sliding-pane": "^7.1.0",
     "react-textarea-autosize": "^8.3.4",
-    "react-toastify": "^10.0.5",
+    "reapop": "^4.2.1",
     "socket.io-client": "^4.3.2",
     "styled-components": "^6.1.0",
     "threetwo-ui-typings": "^1.0.14",
-    "vite": "^5.4.12",
+
+    "vite": "^5.2.7",
+
     "vite-plugin-html": "^3.2.0",
     "websocket": "^1.0.34",
     "zustand": "^4.4.6"
@@ -97,8 +100,8 @@
     "@types/jest": "^26.0.20",
     "@types/lodash": "^4.14.168",
     "@types/node": "^14.14.34",
-    "@types/react": "^19.0.0",
-    "@types/react-dom": "^19.0.0",
+    "@types/react": "^18.0.28",
+    "@types/react-dom": "^18.0.11",
     "@types/react-redux": "^7.1.25",
     "autoprefixer": "^10.4.16",
     "body-parser": "^1.19.0",
@@ -112,7 +115,7 @@
     "eslint-plugin-prettier": "^3.3.1",
     "eslint-plugin-react": "^7.22.0",
     "eslint-plugin-storybook": "^0.6.13",
-    "express": "^4.20.0",
+    "express": "^4.19.2",
     "install": "^0.13.0",
     "jest": "^29.6.3",
     "nodemon": "^3.0.1",

src/client/components/App.tsx

@@ -1,7 +1,6 @@
 import React, { ReactElement } from "react";
-import { Outlet } from "react-router";
+import { Outlet } from "react-router-dom";
 import { Navbar2 } from "./shared/Navbar2";
-import { ToastContainer } from "react-toastify";
 import "../assets/scss/App.scss";
 
 export const App = (): ReactElement => {
@@ -9,7 +8,6 @@ export const App = (): ReactElement => {
     <>
       <Navbar2 />
       <Outlet />
-      <ToastContainer stacked hideProgressBar />
     </>
   );
 };

src/client/components/ComicDetail/AcquisitionPanel.tsx

@@ -1,4 +1,5 @@
 import React, { useCallback, ReactElement, useEffect, useState } from "react";
+import { getBundlesForComic, sleep } from "../../actions/airdcpp.actions";
 import { SearchQuery, PriorityEnum, SearchResponse } from "threetwo-ui-typings";
 import { RootState, SearchInstance } from "threetwo-ui-typings";
 import ellipsize from "ellipsize";
@@ -33,20 +34,18 @@ export const AcquisitionPanel = (
     priority: PriorityEnum;
   }
   interface SearchResult {
-    id: string;
+    result: {
+      id: number;
+    };
+    search_id: number;
     // Add other properties as needed
-    slots: any;
-    type: any;
-    users: any;
-    name: string;
-    dupe: Boolean;
-    size: number;
   }
 
   const handleSearch = (searchQuery) => {
     // Use the already connected socket instance to emit events
     socketIOInstance.emit("initiateSearch", searchQuery);
   };
+
   const {
     data: settings,
     isLoading,
@@ -110,36 +109,42 @@ export const AcquisitionPanel = (
    */
   const search = async (searchData: any) => {
     setAirDCPPSearchResults([]);
-    socketIOInstance.emit("call", "socket.search", {
-      query: searchData,
-      config: {
-        protocol: `ws`,
-        // hostname: `192.168.1.119:5600`,
-        hostname: `127.0.0.1:5600`,
-        username: `user`,
-        password: `pass`,
+    socketIOInstance.emit(
+      "call",
+      "socket.search",
+      {
+        query: searchData,
+        config: {
+          protocol: `ws`,
+          hostname: `localhost:5600`,
+          username: `user`,
+          password: `pass`,
+        },
       },
-    });
+      (data: any) => console.log(data),
+    );
   };
 
-  socketIOInstance.on("searchResultAdded", ({ result }: any) => {
+  socketIOInstance.on("searchResultAdded", (data: SearchResult) => {
     setAirDCPPSearchResults((previousState) => {
-      const exists = previousState.some((item) => result.id === item.id);
+      const exists = previousState.some(
+        (item) => data.result.id === item.result.id,
+      );
       if (!exists) {
-        return [...previousState, result];
+        return [...previousState, data];
       }
       return previousState;
     });
   });
 
-  socketIOInstance.on("searchResultUpdated", ({ result }: any) => {
+  socketIOInstance.on("searchResultUpdated", (groupedResult: SearchResult) => {
     // ...update properties of the existing result in the UI
     const bundleToUpdateIndex = airDCPPSearchResults?.findIndex(
-      (bundle) => bundle.id === result.id,
+      (bundle) => bundle.result.id === groupedResult.result.id,
     );
     const updatedState = [...airDCPPSearchResults];
-    if (!isNil(difference(updatedState[bundleToUpdateIndex], result))) {
-      updatedState[bundleToUpdateIndex] = result;
+    if (!isNil(difference(updatedState[bundleToUpdateIndex], groupedResult))) {
+      updatedState[bundleToUpdateIndex] = groupedResult;
     }
     setAirDCPPSearchResults((state) => [...state, ...updatedState]);
   });
@@ -170,7 +175,7 @@ export const AcquisitionPanel = (
     size: Number,
     type: any,
     config: any,
-  ): Promise<void> => {
+  ): void => {
     socketIOInstance.emit(
       "call",
       "socket.download",
@@ -192,7 +197,7 @@ export const AcquisitionPanel = (
         pattern: `${searchQuery.issueName}`,
         extensions: ["cbz", "cbr", "cb7"],
       },
-      hub_urls: [hubs?.data[0].hub_url],
+      hub_urls: map(hubs?.data, (hub) => hub.hub_url),
       priority: 5,
     };
 
@@ -201,7 +206,7 @@ export const AcquisitionPanel = (
 
   return (
     <>
-      <div className="mt-5 mb-3">
+      <div className="mt-5">
         {!isEmpty(hubs?.data) ? (
           <Form
             onSubmit={getDCPPSearchResults}
@@ -247,24 +252,16 @@ export const AcquisitionPanel = (
             )}
           />
         ) : (
-          <article
-            role="alert"
-            className="mt-4 rounded-lg text-sm max-w-screen-md border-s-4 border-yellow-500 bg-yellow-50 p-4 dark:border-s-4 dark:border-yellow-600 dark:bg-yellow-300 dark:text-slate-600"
-          >
-            No AirDC++ hub configured. Please configure it in{" "}
-            <code>Settings &gt; AirDC++ &gt; Hubs</code>.
-          </article>
+          <div className="">
+            <article className="">
+              <div className="">
+                AirDC++ is not configured. Please configure it in{" "}
+                <code>Settings &gt; AirDC++ &gt; Connection</code>.
+              </div>
+            </article>
+          </div>
         )}
       </div>
-      {/* configured hub */}
-      {!isEmpty(hubs?.data) && (
-        <span className="inline-flex items-center bg-green-50 text-slate-800 text-xs font-medium px-2.5 py-0.5 rounded-md dark:text-slate-900 dark:bg-green-300">
-          <span className="pr-1 pt-1">
-            <i className="icon-[solar--server-2-bold-duotone] w-5 h-5"></i>
-          </span>
-          {hubs && hubs?.data[0].hub_url}
-        </span>
-      )}
 
       {/* AirDC++ search instance details */}
       {!isNil(airDCPPSearchInstance) &&
@@ -275,7 +272,7 @@ export const AcquisitionPanel = (
               <dl>
                 <dt>
                   <div className="mb-1">
-                    {hubs?.data.map((value, idx: string) => (
+                    {hubs?.data.map((value, idx) => (
                       <span className="tag is-warning" key={idx}>
                         {value.identity.name}
                       </span>
@@ -314,7 +311,7 @@ export const AcquisitionPanel = (
         )}
 
       {/* AirDC++ results */}
-      <div className="">
+      <div className="columns">
         {!isNil(airDCPPSearchResults) && !isEmpty(airDCPPSearchResults) ? (
           <div className="overflow-x-auto w-fit mt-4 rounded-lg border border-gray-200 dark:border-gray-500">
             <table className="min-w-full divide-y-2 divide-gray-200 dark:divide-gray-500 text-md">
@@ -335,121 +332,118 @@ export const AcquisitionPanel = (
                 </tr>
               </thead>
               <tbody className="divide-y divide-slate-100 dark:divide-gray-500">
-                {map(
-                  airDCPPSearchResults,
-                  ({ dupe, type, name, id, slots, users, size }, idx) => {
-                    return (
-                      <tr
-                        key={idx}
-                        className={
-                          !isNil(dupe)
-                            ? "bg-gray-100 dark:bg-gray-700"
-                            : "w-fit text-sm"
-                        }
-                      >
-                        <td className="whitespace-nowrap px-3 py-3 text-gray-700 dark:text-slate-300">
-                          <p className="mb-2">
-                            {type.id === "directory" ? (
-                              <i className="fas fa-folder"></i>
-                            ) : null}
-                            {ellipsize(name, 70)}
-                          </p>
+                {map(airDCPPSearchResults, ({ result, search_id }, idx) => {
+                  return (
+                    <tr
+                      key={idx}
+                      className={
+                        !isNil(result.dupe)
+                          ? "bg-gray-100 dark:bg-gray-700"
+                          : "w-fit text-sm"
+                      }
+                    >
+                      <td className="whitespace-nowrap px-3 py-3 text-gray-700 dark:text-slate-300">
+                        <p className="mb-2">
+                          {result.type.id === "directory" ? (
+                            <i className="fas fa-folder"></i>
+                          ) : null}
+                          {ellipsize(result.name, 70)}
+                        </p>
 
-                          <dl>
-                            <dd>
-                              <div className="inline-flex flex-row gap-2">
-                                {!isNil(dupe) ? (
-                                  <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
-                                    <span className="pr-1 pt-1">
-                                      <i className="icon-[solar--copy-bold-duotone] w-5 h-5"></i>
-                                    </span>
-
-                                    <span className="text-md text-slate-500 dark:text-slate-900">
-                                      Dupe
-                                    </span>
-                                  </span>
-                                ) : null}
-
-                                {/* Nicks */}
+                        <dl>
+                          <dd>
+                            <div className="inline-flex flex-row gap-2">
+                              {!isNil(result.dupe) ? (
                                 <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
                                   <span className="pr-1 pt-1">
-                                    <i className="icon-[solar--user-rounded-bold-duotone] w-5 h-5"></i>
+                                    <i className="icon-[solar--copy-bold-duotone] w-5 h-5"></i>
                                   </span>
 
                                   <span className="text-md text-slate-500 dark:text-slate-900">
-                                    {users.user.nicks}
+                                    Dupe
                                   </span>
                                 </span>
-                                {/* Flags */}
-                                {users.user.flags.map((flag, idx) => (
-                                  <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
-                                    <span className="pr-1 pt-1">
-                                      <i className="icon-[solar--tag-horizontal-bold-duotone] w-5 h-5"></i>
-                                    </span>
+                              ) : null}
 
-                                    <span className="text-md text-slate-500 dark:text-slate-900">
-                                      {flag}
-                                    </span>
+                              {/* Nicks */}
+                              <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                                <span className="pr-1 pt-1">
+                                  <i className="icon-[solar--user-rounded-bold-duotone] w-5 h-5"></i>
+                                </span>
+
+                                <span className="text-md text-slate-500 dark:text-slate-900">
+                                  {result.users.user.nicks}
+                                </span>
+                              </span>
+                              {/* Flags */}
+                              {result.users.user.flags.map((flag, idx) => (
+                                <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                                  <span className="pr-1 pt-1">
+                                    <i className="icon-[solar--tag-horizontal-bold-duotone] w-5 h-5"></i>
                                   </span>
-                                ))}
-                              </div>
-                            </dd>
-                          </dl>
-                        </td>
-                        <td>
-                          {/* Extension */}
-                          <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
-                            <span className="pr-1 pt-1">
-                              <i className="icon-[solar--zip-file-bold-duotone] w-5 h-5"></i>
-                            </span>
 
-                            <span className="text-md text-slate-500 dark:text-slate-900">
-                              {type.str}
-                            </span>
+                                  <span className="text-md text-slate-500 dark:text-slate-900">
+                                    {flag}
+                                  </span>
+                                </span>
+                              ))}
+                            </div>
+                          </dd>
+                        </dl>
+                      </td>
+                      <td>
+                        {/* Extension */}
+                        <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                          <span className="pr-1 pt-1">
+                            <i className="icon-[solar--zip-file-bold-duotone] w-5 h-5"></i>
                           </span>
-                        </td>
-                        <td className="px-2">
-                          {/* Slots */}
-                          <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
-                            <span className="pr-1 pt-1">
-                              <i className="icon-[solar--settings-minimalistic-bold-duotone] w-5 h-5"></i>
-                            </span>
 
-                            <span className="text-md text-slate-500 dark:text-slate-900">
-                              {slots.total} slots; {slots.free} free
-                            </span>
+                          <span className="text-md text-slate-500 dark:text-slate-900">
+                            {result.type.str}
                           </span>
-                        </td>
-                        <td className="px-2">
-                          <button
-                            className="flex space-x-1 sm:mt-0 sm:flex-row sm:items-center rounded-lg border border-green-400 dark:border-green-200 bg-green-200 px-3 py-1 text-gray-500 hover:bg-transparent hover:text-green-600 focus:outline-none focus:ring active:text-indigo-500"
-                            onClick={() =>
-                              download(
-                                airDCPPSearchInstance.id,
-                                id,
-                                comicObjectId,
-                                name,
-                                size,
-                                type,
-                                {
-                                  protocol: `ws`,
-                                  hostname: `192.168.1.119:5600`,
-                                  username: `admin`,
-                                  password: `password`,
-                                },
-                              )
-                            }
-                          >
-                            <span className="text-xs">Download</span>
-                            <span className="w-5 h-5">
-                              <i className="h-5 w-5 icon-[solar--download-bold-duotone]"></i>
-                            </span>
-                          </button>
-                        </td>
-                      </tr>
-                    );
-                  },
-                )}
+                        </span>
+                      </td>
+                      <td className="px-2">
+                        {/* Slots */}
+                        <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                          <span className="pr-1 pt-1">
+                            <i className="icon-[solar--settings-minimalistic-bold-duotone] w-5 h-5"></i>
+                          </span>
+
+                          <span className="text-md text-slate-500 dark:text-slate-900">
+                            {result.slots.total} slots; {result.slots.free} free
+                          </span>
+                        </span>
+                      </td>
+                      <td className="px-2">
+                        <button
+                          className="flex space-x-1 sm:mt-0 sm:flex-row sm:items-center rounded-lg border border-green-400 dark:border-green-200 bg-green-200 px-3 py-1 text-gray-500 hover:bg-transparent hover:text-green-600 focus:outline-none focus:ring active:text-indigo-500"
+                          onClick={() =>
+                            download(
+                              airDCPPSearchInstance.id,
+                              result.id,
+                              comicObjectId,
+                              result.name,
+                              result.size,
+                              result.type,
+                              {
+                                protocol: `ws`,
+                                hostname: `localhost:5600`,
+                                username: `user`,
+                                password: `pass`,
+                              },
+                            )
+                          }
+                        >
+                          <span className="text-xs">Download</span>
+                          <span className="w-5 h-5">
+                            <i className="h-5 w-5 icon-[solar--download-bold-duotone]"></i>
+                          </span>
+                        </button>
+                      </td>
+                    </tr>
+                  );
+                })}
               </tbody>
             </table>
           </div>

src/client/components/ComicDetail/AsyncSelectPaginate/AsyncSelectPaginate.tsx

@@ -1,17 +1,11 @@
 import React, { ReactElement, useCallback, useState } from "react";
+import PropTypes from "prop-types";
 import { fetchMetronResource } from "../../../actions/metron.actions";
 import Creatable from "react-select/creatable";
 import { withAsyncPaginate } from "react-select-async-paginate";
 const CreatableAsyncPaginate = withAsyncPaginate(Creatable);
 
-interface AsyncSelectPaginateProps {
-  metronResource: string;
-  placeholder?: string;
-  value?: object;
-  onChange?(...args: unknown[]): unknown;
-}
-
-export const AsyncSelectPaginate = (props: AsyncSelectPaginateProps): ReactElement => {
+export const AsyncSelectPaginate = (props): ReactElement => {
   const [value, setValue] = useState(null);
   const [isAddingInProgress, setIsAddingInProgress] = useState(false);
 
@@ -44,4 +38,11 @@ export const AsyncSelectPaginate = (props: AsyncSelectPaginateProps): ReactEleme
   );
 };
 
+AsyncSelectPaginate.propTypes = {
+  metronResource: PropTypes.string.isRequired,
+  placeholder: PropTypes.string,
+  value: PropTypes.object,
+  onChange: PropTypes.func,
+};
+
 export default AsyncSelectPaginate;

src/client/components/ComicDetail/ComicDetail.tsx

@@ -1,5 +1,5 @@
 import React, { useState, ReactElement, useCallback } from "react";
-import { useParams } from "react-router";
+import { useParams } from "react-router-dom";
 import Card from "../shared/Carda";
 import { ComicVineMatchPanel } from "./ComicVineMatchPanel";
 

src/client/components/ComicDetail/ComicDetailContainer.tsx

@@ -1,5 +1,5 @@
 import React, { ReactElement } from "react";
-import { useParams } from "react-router";
+import { useParams } from "react-router-dom";
 import { ComicDetail } from "../ComicDetail/ComicDetail";
 import { useQuery } from "@tanstack/react-query";
 import { LIBRARY_SERVICE_BASE_URI } from "../../constants/endpoints";

src/client/components/ComicDetail/ComicVineDetails.tsx

@@ -1,21 +1,12 @@
 import React, { ReactElement } from "react";
+import PropTypes from "prop-types";
 import { detectIssueTypes } from "../../shared/utils/tradepaperback.utils";
 import dayjs from "dayjs";
 import { isEmpty, isUndefined } from "lodash";
 import Card from "../shared/Carda";
 import { convert } from "html-to-text";
 
-interface ComicVineDetailsProps {
-  updatedAt?: string;
-  data?: {
-    name?: string;
-    number?: string;
-    resource_type?: string;
-    id?: number;
-  };
-}
-
-export const ComicVineDetails = (props: ComicVineDetailsProps): ReactElement => {
+export const ComicVineDetails = (props): ReactElement => {
   const { data, updatedAt } = props;
   return (
     <div className="text-slate-500 dark:text-gray-400">
@@ -116,3 +107,13 @@ export const ComicVineDetails = (props: ComicVineDetailsProps): ReactElement =>
 };
 
 export default ComicVineDetails;
+
+ComicVineDetails.propTypes = {
+  updatedAt: PropTypes.string,
+  data: PropTypes.shape({
+    name: PropTypes.string,
+    number: PropTypes.string,
+    resource_type: PropTypes.string,
+    id: PropTypes.number,
+  }),
+};

src/client/components/ComicDetail/DownloadsPanel.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect, useContext, ReactElement, useState } from "react";
 import { RootState } from "threetwo-ui-typings";
-import { isEmpty, isNil, isUndefined, map } from "lodash";
+import { isEmpty, map } from "lodash";
 import { AirDCPPBundles } from "./AirDCPPBundles";
 import { TorrentDownloads } from "./TorrentDownloads";
 import { useQuery } from "@tanstack/react-query";
@@ -9,11 +9,10 @@ import {
   LIBRARY_SERVICE_BASE_URI,
   QBITTORRENT_SERVICE_BASE_URI,
   TORRENT_JOB_SERVICE_BASE_URI,
-  SOCKET_BASE_URI,
 } from "../../constants/endpoints";
 import { useStore } from "../../store";
 import { useShallow } from "zustand/react/shallow";
-import { useParams } from "react-router";
+import { useParams } from "react-router-dom";
 
 interface IDownloadsPanelProps {
   key: number;
@@ -23,11 +22,13 @@ export const DownloadsPanel = (
   props: IDownloadsPanelProps,
 ): ReactElement | null => {
   const { comicObjectId } = useParams<{ comicObjectId: string }>();
+  const [bundles, setBundles] = useState([]);
   const [infoHashes, setInfoHashes] = useState<string[]>([]);
   const [torrentDetails, setTorrentDetails] = useState([]);
-  const [activeTab, setActiveTab] = useState("directconnect");
-  const { socketIOInstance } = useStore(
+  const [activeTab, setActiveTab] = useState("torrents");
+  const { airDCPPSocketInstance, socketIOInstance } = useStore(
     useShallow((state: any) => ({
+      airDCPPSocketInstance: state.airDCPPSocketInstance,
       socketIOInstance: state.socketIOInstance,
     })),
   );
@@ -43,29 +44,32 @@ export const DownloadsPanel = (
       .filter((item) => item !== undefined);
     setTorrentDetails(torrents);
   });
-
-  /**
-   * Query to fetch AirDC++ download bundles for a given comic resource Id
-   * @param {string} {comicObjectId} - A mongo id that identifies a comic document
-   */
-  const { data: bundles } = useQuery({
+  // Fetch the downloaded files and currently-downloading file(s) from AirDC++
+  const { data: comicObject, isSuccess } = useQuery({
     queryKey: ["bundles"],
     queryFn: async () =>
       await axios({
-        url: `${LIBRARY_SERVICE_BASE_URI}/getBundles`,
+        url: `${LIBRARY_SERVICE_BASE_URI}/getComicBookById`,
         method: "POST",
+        headers: {
+          "Content-Type": "application/json; charset=utf-8",
+        },
         data: {
-          comicObjectId,
-          config: {
-            protocol: `ws`,
-            hostname: `192.168.1.119:5600`,
-            username: `admin`,
-            password: `password`,
-          },
+          id: `${comicObjectId}`,
         },
       }),
-    enabled: activeTab !== "" && activeTab === "directconnect",
   });
+  const getBundles = async (comicObject) => {
+    if (comicObject?.data.acquisition.directconnect) {
+      const filteredBundles =
+        comicObject.data.acquisition.directconnect.downloads.map(
+          async ({ bundleId }) => {
+            return await airDCPPSocketInstance.get(`queue/bundles/${bundleId}`);
+          },
+        );
+      return await Promise.all(filteredBundles);
+    }
+  };
 
   // Call the scheduled job for fetching torrent data
   // triggered by the active tab been set to "torrents"
@@ -79,9 +83,14 @@ export const DownloadsPanel = (
         },
       }),
     queryKey: [activeTab],
-    enabled: activeTab !== "" && activeTab === "torrents",
   });
-  console.log(bundles);
+
+  useEffect(() => {
+    getBundles(comicObject).then((result) => {
+      setBundles(result);
+    });
+  }, [comicObject]);
+
   return (
     <div className="columns is-multiline">
       <div>
@@ -126,14 +135,10 @@ export const DownloadsPanel = (
         </div>
       </div>
 
-      {activeTab === "torrents" ? (
-        <TorrentDownloads data={torrentDetails} />
-      ) : null}
-      {!isNil(bundles?.data) && bundles?.data.length !== 0 ? (
-        <AirDCPPBundles data={bundles.data} />
-      ) : (
-        "nutin"
-      )}
+      {activeTab === "torrents" && <TorrentDownloads data={torrentDetails} />}
+      {!isEmpty(airDCPPSocketInstance) &&
+        !isEmpty(bundles) &&
+        activeTab === "directconnect" && <AirDCPPBundles data={bundles} />}
     </div>
   );
 };

src/client/components/ComicDetail/RawFileDetails.tsx

@@ -1,36 +1,10 @@
 import React, { ReactElement } from "react";
+import PropTypes from "prop-types";
 import prettyBytes from "pretty-bytes";
 import { isEmpty } from "lodash";
 import { format, parseISO } from "date-fns";
 
-interface RawFileDetailsProps {
-  data?: {
-    rawFileDetails?: {
-      containedIn?: string;
-      name?: string;
-      fileSize?: number;
-      path?: string;
-      extension?: string;
-      mimeType?: string;
-      cover?: {
-        filePath?: string;
-      };
-    };
-    inferredMetadata?: {
-      issue?: {
-        year?: string;
-        name?: string;
-        number?: number;
-        subtitle?: string;
-      };
-    };
-    created_at?: string;
-    updated_at?: string;
-  };
-  children?: any;
-}
-
-export const RawFileDetails = (props: RawFileDetailsProps): ReactElement => {
+export const RawFileDetails = (props): ReactElement => {
   const { rawFileDetails, inferredMetadata, created_at, updated_at } =
     props.data;
   return (
@@ -124,3 +98,30 @@ export const RawFileDetails = (props: RawFileDetailsProps): ReactElement => {
 };
 
 export default RawFileDetails;
+
+RawFileDetails.propTypes = {
+  data: PropTypes.shape({
+    rawFileDetails: PropTypes.shape({
+      containedIn: PropTypes.string,
+      name: PropTypes.string,
+      fileSize: PropTypes.number,
+      path: PropTypes.string,
+      extension: PropTypes.string,
+      mimeType: PropTypes.string,
+      cover: PropTypes.shape({
+        filePath: PropTypes.string,
+      }),
+    }),
+    inferredMetadata: PropTypes.shape({
+      issue: PropTypes.shape({
+        year: PropTypes.string,
+        name: PropTypes.string,
+        number: PropTypes.number,
+        subtitle: PropTypes.string,
+      }),
+    }),
+    created_at: PropTypes.string,
+    updated_at: PropTypes.string,
+  }),
+  children: PropTypes.any,
+};

src/client/components/ComicDetail/TorrentSearchPanel.tsx

@@ -25,7 +25,7 @@ export const TorrentSearchPanel = (props) => {
         data: {
           prowlarrQuery: {
             port: "9696",
-            apiKey: "38c2656e8f5d4790962037b8c4416a8f",
+            apiKey: "c4f42e265fb044dc81f7e88bd41c3367",
             offset: 0,
             categories: [7030],
             query: searchTerm.issueName,

src/client/components/Dashboard/PullList.tsx

@@ -4,7 +4,7 @@ import Card from "../shared/Carda";
 import Header from "../shared/Header";
 import { importToDB } from "../../actions/fileops.actions";
 import ellipsize from "ellipsize";
-import { Link } from "react-router";
+import { Link } from "react-router-dom";
 
 import axios from "axios";
 import rateLimiter from "axios-rate-limit";
@@ -86,8 +86,8 @@ export const PullList = (): ReactElement => {
             <span className="text-md">
               Pull List aggregated for the week from{" "}
               <span className="underline">
-                <a href="https://www.tfaw.com/comics/new-releases.html">
-                  Things From Another World
+                <a href="https://leagueofcomicgeeks.com/comics/new-comics">
+                  League Of Comic Geeks
                 </a>
                 <i className="icon-[solar--arrow-right-up-outline] w-4 h-4" />
               </span>
@@ -132,13 +132,13 @@ export const PullList = (): ReactElement => {
               <div key={idx} className="keen-slider__slide">
                 <Card
                   orientation={"vertical-2"}
-                  imageUrl={issue.coverImageUrl}
+                  imageUrl={issue.cover}
                   hasDetails
                   title={ellipsize(issue.name, 25)}
                 >
                   <div className="px-1">
                     <span className="inline-flex mb-2 items-center bg-slate-50 text-slate-800 text-xs font-medium px-2.5 py-1 rounded-md dark:text-slate-900 dark:bg-slate-400">
-                      {issue.publicationDate}
+                      {issue.publisher}
                     </span>
                     <div className="flex flex-row justify-end">
                       <button

src/client/components/Dashboard/RecentlyImported.tsx

@@ -1,6 +1,6 @@
 import React, { ReactElement } from "react";
 import Card from "../shared/Carda";
-import { Link } from "react-router";
+import { Link } from "react-router-dom";
 import ellipsize from "ellipsize";
 import { isEmpty, isNil, isUndefined, map } from "lodash";
 import { detectIssueTypes } from "../../shared/utils/tradepaperback.utils";

src/client/components/Dashboard/VolumeGroups.tsx

@@ -1,7 +1,7 @@
 import { map, unionBy } from "lodash";
 import React, { ReactElement } from "react";
 import ellipsize from "ellipsize";
-import { Link, useNavigate } from "react-router";
+import { Link, useNavigate } from "react-router-dom";
 import Card from "../shared/Carda";
 import Header from "../shared/Header";
 

src/client/components/Dashboard/WantedComicsList.tsx

@@ -1,6 +1,6 @@
 import React, { ReactElement } from "react";
 import Card from "../shared/Carda";
-import { Link, useNavigate } from "react-router";
+import { Link, useNavigate } from "react-router-dom";
 import ellipsize from "ellipsize";
 import { isEmpty, isNil, isUndefined, map } from "lodash";
 import { detectIssueTypes } from "../../shared/utils/tradepaperback.utils";

src/client/components/Library/Library.tsx

@@ -1,6 +1,6 @@
 import React, { useMemo, ReactElement, useState, useEffect } from "react";
 import PropTypes from "prop-types";
-import { useNavigate } from "react-router";
+import { useNavigate } from "react-router-dom";
 import { isEmpty, isNil, isUndefined } from "lodash";
 import MetadataPanel from "../shared/MetadataPanel";
 import T2Table from "../shared/T2Table";

src/client/components/Library/LibraryGrid.tsx

@@ -14,7 +14,7 @@ import { isNil, isEmpty, isUndefined } from "lodash";
 import Masonry from "react-masonry-css";
 import Card from "../shared/Carda";
 import { detectIssueTypes } from "../../shared/utils/tradepaperback.utils";
-import { Link } from "react-router";
+import { Link } from "react-router-dom";
 import { LIBRARY_SERVICE_HOST } from "../../constants/endpoints";
 
 interface ILibraryGridProps {}

src/client/components/Library/SearchBar.tsx

@@ -1,7 +1,7 @@
 import React, { ReactElement } from "react";
 import PropTypes from "prop-types";
 import { Form, Field } from "react-final-form";
-import { Link } from "react-router";
+import { Link } from "react-router-dom";
 
 export const SearchBar = (props): ReactElement => {
   const { searchHandler } = props;

src/client/components/Search/Search.tsx

@@ -63,6 +63,7 @@ export const Search = ({}: ISearchProps): ReactElement => {
       markEntireVolumeWanted,
       resourceType,
     }) => {
+      console.log("jigni", comicObject);
       let volumeInformation = {};
       let issues = [];
       switch (resourceType) {
@@ -72,12 +73,11 @@ export const Search = ({}: ISearchProps): ReactElement => {
           // Add issue metadata
           issues.push({
             id,
-            url: api_detail_url,
+            api_detail_url,
             image,
             coverDate: cover_date,
             issueNumber: issue_number,
           });
-          console.log(issues);
           // Get volume metadata from CV
           const response = await axios({
             url: `${COMICVINE_SERVICE_URI}/getVolumes`,

src/client/components/Settings/AirDCPPSettings/AirDCPPHubsForm.tsx

@@ -1,10 +1,9 @@
-import React, { ReactElement, useState } from "react";
+import React, { ReactElement, useEffect, useState, useContext } from "react";
 import { Form, Field } from "react-final-form";
 import { isEmpty, isNil, isUndefined } from "lodash";
 import Select from "react-select";
 import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
 import axios from "axios";
-import { produce } from "immer";
 import { AIRDCPP_SERVICE_BASE_URI } from "../../../constants/endpoints";
 
 export const AirDCPPHubsForm = (): ReactElement => {
@@ -14,7 +13,6 @@ export const AirDCPPHubsForm = (): ReactElement => {
     data: settings,
     isLoading,
     isError,
-    refetch,
   } = useQuery({
     queryKey: ["settings"],
     queryFn: async () =>
@@ -22,9 +20,11 @@ export const AirDCPPHubsForm = (): ReactElement => {
         url: "http://localhost:3000/api/settings/getAllSettings",
         method: "GET",
       }),
-    staleTime: Infinity,
   });
 
+  /**
+   * Get the hubs list from an AirDCPP Socket
+   */
   const { data: hubs } = useQuery({
     queryKey: ["hubs"],
     queryFn: async () =>
@@ -37,16 +37,14 @@ export const AirDCPPHubsForm = (): ReactElement => {
       }),
     enabled: !isEmpty(settings?.data.directConnect?.client?.host),
   });
-
-  let hubList: any[] = [];
+  let hubList = {};
   if (!isNil(hubs)) {
     hubList = hubs?.data.map(({ hub_url, identity }) => ({
       value: hub_url,
       label: identity.name,
     }));
   }
-
-  const mutation = useMutation({
+  const { mutate } = useMutation({
     mutationFn: async (values) =>
       await axios({
         url: `http://localhost:3000/api/settings/saveSettings`,
@@ -57,112 +55,82 @@ export const AirDCPPHubsForm = (): ReactElement => {
           settingsKey: "directConnect",
         },
       }),
-    onSuccess: (data) => {
-      queryClient.setQueryData(["settings"], (oldData: any) =>
-        produce(oldData, (draft: any) => {
-          draft.data.directConnect.client = {
-            ...draft.data.directConnect.client,
-            ...data.data.directConnect.client,
-          };
-        }),
-      );
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ["settings"] });
     },
   });
-
-  const validate = async (values) => {
-    const errors = {};
-    // Add any validation logic here if needed
-    return errors;
-  };
+  const validate = async () => {};
 
   const SelectAdapter = ({ input, ...rest }) => {
     return <Select {...input} {...rest} isClearable isMulti />;
   };
 
-  if (isLoading) {
-    return <div>Loading...</div>;
-  }
-
-  if (isError) {
-    return <div>Error loading settings.</div>;
-  }
-
   return (
     <>
       {!isEmpty(hubList) && !isUndefined(hubs) ? (
         <Form
-          onSubmit={(values) => {
-            mutation.mutate(values);
-          }}
+          onSubmit={mutate}
           validate={validate}
           render={({ handleSubmit }) => (
-            <form onSubmit={handleSubmit} className="mt-10">
-              <h2 className="text-xl">Configure DC++ Hubs</h2>
-              <article
-                role="alert"
-                className="mt-4 rounded-lg max-w-screen-md border-s-4 border-blue-500 bg-blue-50 p-4 dark:border-s-4 dark:border-blue-600 dark:bg-blue-300 dark:text-slate-600"
-              >
+            <form onSubmit={handleSubmit}>
+              <div>
+                <h3 className="title">Hubs</h3>
                 <h6 className="subtitle has-text-grey-light">
-                  Select the hubs you want to perform searches against. Your
-                  selection in the dropdown <strong>will replace</strong> the
-                  existing selection.
+                  Select the hubs you want to perform searches against.
                 </h6>
-              </article>
-
-              <div className="field">
-                <label className="block py-1 mt-3">AirDC++ Host</label>
-                <Field
-                  name="hubs"
-                  component={SelectAdapter}
-                  className="basic-multi-select"
-                  placeholder="Select Hubs to Search Against"
-                  options={hubList}
-                />
               </div>
-              <button
-                type="submit"
-                className="flex space-x-1 sm:mt-5 sm:flex-row sm:items-center rounded-lg border border-green-400 dark:border-green-200 bg-green-200 px-4 py-2 text-gray-500 hover:bg-transparent hover:text-green-600 focus:outline-none focus:ring active:text-indigo-500"
-              >
+              <div className="field">
+                <label className="label">AirDC++ Host</label>
+                <div className="control">
+                  <Field
+                    name="hubs"
+                    component={SelectAdapter}
+                    className="basic-multi-select"
+                    placeholder="Select Hubs to Search Against"
+                    options={hubList}
+                  />
+                </div>
+              </div>
+
+              <button type="submit" className="button is-primary">
                 Submit
               </button>
             </form>
           )}
         />
       ) : (
-        <article
-          role="alert"
-          className="mt-4 rounded-lg max-w-screen-md border-s-4 border-yellow-500 bg-yellow-50 p-4 dark:border-s-4 dark:border-yellow-600 dark:bg-yellow-300 dark:text-slate-600"
-        >
-          <div className="message-body">
-            No configured hubs detected in AirDC++. <br />
-            Configure to a hub in AirDC++ and then select a default hub here.
-          </div>
-        </article>
+        <>
+          <article
+            role="alert"
+            className="mt-4 rounded-lg max-w-screen-md border-s-4 border-yellow-500 bg-yellow-50 p-4 dark:border-s-4 dark:border-yellow-600 dark:bg-yellow-300 dark:text-slate-600"
+          >
+            <div className="message-body">
+              No configured hubs detected in AirDC++. <br />
+              Configure to a hub in AirDC++ and then select a default hub here.
+            </div>
+          </article>
+        </>
       )}
       {!isEmpty(settings?.data.directConnect?.client.hubs) ? (
         <>
           <div className="mt-4">
             <article className="message is-warning">
-              <div className="message-body is-size-6 is-family-secondary"></div>
+              <div className="message-body is-size-6 is-family-secondary">
+                Your selection in the dropdown <strong>will replace</strong> the
+                existing selection.
+              </div>
             </article>
           </div>
-          <div>
-            <span className="flex items-center mt-10 mb-4">
-              <span className="text-xl text-slate-500 dark:text-slate-200 pr-5">
-                Default Hub for Searches
-              </span>
-              <span className="h-px flex-1 bg-slate-200 dark:bg-slate-400"></span>
-            </span>
-            <div className="block max-w-sm p-6 bg-white border border-gray-200 rounded-lg shadow dark:bg-slate-400 dark:border-gray-700">
-              {settings?.data.directConnect?.client.hubs.map(
-                ({ value, label }) => (
-                  <div key={value}>
-                    <div>{label}</div>
-                    <span className="is-size-7">{value}</span>
-                  </div>
-                ),
-              )}
-            </div>
+          <div className="box mt-3">
+            <h6>Default Hub For Searches:</h6>
+            {settings?.data.directConnect?.client.hubs.map(
+              ({ value, label }) => (
+                <div key={value}>
+                  <div>{label}</div>
+                  <span className="is-size-7">{value}</span>
+                </div>
+              ),
+            )}
           </div>
         </>
       ) : null}

src/client/components/Volumes/Volumes.tsx

@@ -4,7 +4,7 @@ import Card from "../shared/Carda";
 import T2Table from "../shared/T2Table";
 import ellipsize from "ellipsize";
 import { convert } from "html-to-text";
-import { Link } from "react-router";
+import { Link } from "react-router-dom";
 import { useQuery } from "@tanstack/react-query";
 import axios from "axios";
 import { SEARCH_SERVICE_BASE_URI } from "../../constants/endpoints";

src/client/components/shared/Carda.tsx

@@ -83,7 +83,7 @@ const renderCard = (props: ICardProps): ReactElement => {
 
     case "vertical-2":
       return (
-        <div className="block rounded-md max-w-64 h-fit shadow-md shadow-white-400 bg-gray-200 dark:bg-slate-500">
+        <div className="block rounded-md w-64 h-fit shadow-md shadow-white-400 bg-gray-200 dark:bg-slate-500">
           <img
             alt="Home"
             src={props.imageUrl}

src/client/components/shared/Header.tsx

@@ -1,5 +1,5 @@
 import React, { ReactElement } from "react";
-import { Link } from "react-router";
+import { Link } from "react-router-dom";
 
 type IHeaderProps = {
   headerContent: string;

src/client/components/shared/Navbar2.tsx

@@ -1,5 +1,5 @@
 import React, { ReactElement, useState } from "react";
-import { Link } from "react-router";
+import { Link } from "react-router-dom";
 import { useDarkMode } from "../../hooks/useDarkMode";
 
 export const Navbar2 = (): ReactElement => {

src/client/components/shared/T2Table.tsx

@@ -1,4 +1,5 @@
 import React, { ReactElement, useMemo, useState } from "react";
+import PropTypes from "prop-types";
 import {
   ColumnDef,
   flexRender,
@@ -8,19 +9,7 @@ import {
   PaginationState,
 } from "@tanstack/react-table";
 
-interface T2TableProps {
-  sourceData?: unknown[];
-  totalPages?: number;
-  columns?: unknown[];
-  paginationHandlers?: {
-    nextPage?(...args: unknown[]): unknown;
-    previousPage?(...args: unknown[]): unknown;
-  };
-  rowClickHandler?(...args: unknown[]): unknown;
-  children?: any;
-}
-
-export const T2Table = (tableOptions: T2TableProps): ReactElement => {
+export const T2Table = (tableOptions): ReactElement => {
   const {
     sourceData,
     columns,
@@ -153,4 +142,15 @@ export const T2Table = (tableOptions: T2TableProps): ReactElement => {
   );
 };
 
+T2Table.propTypes = {
+  sourceData: PropTypes.array,
+  totalPages: PropTypes.number,
+  columns: PropTypes.array,
+  paginationHandlers: PropTypes.shape({
+    nextPage: PropTypes.func,
+    previousPage: PropTypes.func,
+  }),
+  rowClickHandler: PropTypes.func,
+  children: PropTypes.any,
+};
 export default T2Table;

src/client/index.tsx

@@ -1,8 +1,12 @@
+import React from "react";
+import { render } from "react-dom";
 import { createRoot } from "react-dom/client";
 import App from "./components/App";
-import { createBrowserRouter, RouterProvider } from "react-router";
+import { createBrowserRouter, RouterProvider } from "react-router-dom";
 import Settings from "./components/Settings/Settings";
 import { ErrorPage } from "./components/shared/ErrorPage";
+const rootEl = document.getElementById("root");
+const root = createRoot(rootEl);
 import i18n from "./shared/utils/i18n.util";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import Import from "./components/Import/Import";
@@ -16,48 +20,34 @@ import WantedComics from "./components/WantedComics/WantedComics";
 
 const queryClient = new QueryClient();
 
-const router = createBrowserRouter(
-  [
-    {
-      path: "/",
-      element: <App />, 
-      errorElement: <ErrorPage />, 
-      children: [
-        { path: "/", element: <Dashboard /> },
-        { path: "dashboard", element: <Dashboard /> },
-        { path: "settings", element: <Settings /> },
-        { path: "library", element: <TabulatedContentContainer category="library" /> },
-        { path: "comic/details/:comicObjectId", element: <ComicDetailContainer /> },
-        { path: "import", element: <Import path={"./comics"} /> },
-        { path: "search", element: <Search /> },
-        { path: "volume/details/:comicObjectId", element: <VolumeDetails /> },
-        { path: "volumes", element: <Volumes /> },
-        { path: "wanted", element: <WantedComics /> },
-      ],
-    },
-  ],
+const router = createBrowserRouter([
   {
-    future: {
-      v7_relativeSplatPath: true,
-      v7_fetcherPersist: true,
-      v7_normalizeFormMethod: true,
-      v7_partialHydration: true,
-      v7_skipActionErrorRevalidation: true,
-    },
-  }
-);
+    path: "/",
+    element: <App />,
+    errorElement: <ErrorPage />,
+    children: [
+      { path: "/", element: <Dashboard /> },
+      { path: "dashboard", element: <Dashboard /> },
+      { path: "settings", element: <Settings /> },
+      {
+        path: "library",
+        element: <TabulatedContentContainer category="library" />,
+      },
+      {
+        path: "comic/details/:comicObjectId",
+        element: <ComicDetailContainer />,
+      },
+      { path: "import", element: <Import path={"./comics"} /> },
+      { path: "search", element: <Search /> },
+      { path: "volume/details/:comicObjectId", element: <VolumeDetails /> },
+      { path: "volumes", element: <Volumes /> },
+      { path: "wanted", element: <WantedComics /> },
+    ],
+  },
+]);
 
-const rootElement = document.getElementById("root");
-if (rootElement) {
-  const root = createRoot(rootElement);
-  root.render(
-    <QueryClientProvider client={queryClient}>
-      <RouterProvider
-        router={router}
-        future={{ v7_startTransition: true }}
-      />
-    </QueryClientProvider>
-  );
-} else {
-  console.error("Root element not found");
-}
+root.render(
+  <QueryClientProvider client={queryClient}>
+    <RouterProvider router={router} />
+  </QueryClientProvider>,
+);

src/client/shared/utils/metadata.utils.ts

@@ -45,8 +45,8 @@ export const determineCoverFile = (data): any => {
   // comicvine
   if (!isEmpty(data.comicvine)) {
     coverFile.comicvine.url = data?.comicvine?.image.small_url;
-    coverFile.comicvine.issueName = data.comicvine?.name;
-    coverFile.comicvine.publisher = data.comicvine?.publisher?.name;
+    coverFile.comicvine.issueName = data.comicvine.name;
+    coverFile.comicvine.publisher = data.comicvine.publisher.name;
   }
   // rawFileDetails
   if (!isEmpty(data.rawFileDetails)) {

src/client/store/index.ts

@@ -4,8 +4,6 @@ import io from "socket.io-client";
 import { SOCKET_BASE_URI } from "../constants/endpoints";
 import { produce } from "immer";
 import { QueryClient } from "@tanstack/react-query";
-import { toast } from "react-toastify";
-import "react-toastify/dist/ReactToastify.min.css";
 
 /*  Broadly, this file sets up:
  *    1. The zustand-based global client state
@@ -84,7 +82,6 @@ if (!isNil(sessionId)) {
     "call",
     "socket.resumeSession",
     {
-      namespace: "/",
       sessionId,
     },
     (data) => console.log(data),
@@ -132,11 +129,6 @@ socketIOInstance.on("LS_COVER_EXTRACTION_FAILED", (data) => {
   }));
 });
 
-socketIOInstance.on("searchResultsAvailable", (data) => {
-  console.log(data);
-  toast(`Results found for query: ${JSON.stringify(data.query, null, 2)}`);
-});
-
 // 1b.  Clear the localStorage sessionId upon receiving the
 //      LS_IMPORT_QUEUE_DRAINED event
 socketIOInstance.on("LS_IMPORT_QUEUE_DRAINED", (data) => {