Merge branch 'master' into dev

This refactor covers the following workflows:

1. Adding a comic from LOCG or ComicVine adds it to the wanted list
2. Downloading that comic from DC++ correctly adds download metadata to the corresponding comic object in mongo
3. Successful download triggers automatic import to library and cover extraction, metadata application

src/client/components/Dashboard/RecentlyImported.tsx

@@ -2,6 +2,7 @@ import React, { ReactElement } from "react";
 import Card from "../Carda";
 import { Link } from "react-router-dom";
 import ellipsize from "ellipsize";
+import { escapePoundSymbol } from "../../shared/utils/formatting.utils";
 import { isEmpty, isNil, isUndefined, map } from "lodash";
 import { detectIssueTypes } from "../../shared/utils/tradepaperback.utils";
 import Masonry from "react-masonry-css";
@@ -51,6 +52,7 @@ export const RecentlyImported = ({
             },
             idx,
           ) => {
+            console.log(comicvine);
             const { issueName, url } = determineCoverFile({
               rawFileDetails,
               comicvine,
@@ -62,6 +64,7 @@ export const RecentlyImported = ({
               comicInfo,
               locg,
             });
+            console.log(name);
             const isComicBookMetadataAvailable =
               !isUndefined(comicvine) &&
               !isUndefined(comicvine.volumeInformation);

src/client/components/Library/Library.tsx

@@ -208,13 +208,14 @@ export const Library = (): ReactElement => {
   // ImportStatus.propTypes = {
   //   value: PropTypes.bool.isRequired,
   // };
+
   return (
     <section className="container">
       <div className="section">
         <div className="header-area">
           <h1 className="title">Library</h1>
         </div>
-        {!isEmpty(searchResults) ? (
+        {!isUndefined(searchResults.hits) && (
           <div>
             <div className="library">
               <T2Table
@@ -229,25 +230,7 @@ export const Library = (): ReactElement => {
               />
             </div>
           </div>
-        ): <div className="columns">
-          <div className="column is-two-thirds">
-            <article className="message is-link">
-              <div className="message-body">
-                No comics were found in the library, Elasticsearch reports no
-                indices. Try importing a few comics into the library and come
-                back.
-              </div>
-            </article>
-            <pre>
-              {!isUndefined(searchError.data) &&
-                JSON.stringify(
-                  searchError.data.meta.body.error.root_cause,
-                  null,
-                  4,
         )}
-            </pre>
-          </div>
-        </div> }
       </div>
     </section>
   );

src/client/components/Navbar.tsx

@@ -1,17 +1,15 @@
-import React, { useContext } from "react";
+import React from "react";
 import { SearchBar } from "./GlobalSearchBar/SearchBar";
 import { DownloadProgressTick } from "./ComicDetail/DownloadProgressTick";
 import { Link } from "react-router-dom";
 import { useSelector } from "react-redux";
-import { isUndefined, isEmpty } from "lodash";
-import { AirDCPPSocketContext } from "../context/AirDCPPSocket";
+import { isUndefined } from "lodash";
 
 const Navbar: React.FunctionComponent = (props) => {
   const downloadProgressTick = useSelector(
     (state: RootState) => state.airdcpp.downloadProgressData,
   );
-  const airDCPPConfiguration = useContext(AirDCPPSocketContext);
-console.log(airDCPPConfiguration)
+
   return (
     <nav className="navbar is-fixed-top">
       <div className="navbar-brand">
@@ -82,23 +80,10 @@ console.log(airDCPPConfiguration)
               <div className="navbar-dropdown download-progress-meter">
                 <a className="navbar-item">
                   <DownloadProgressTick data={downloadProgressTick} />
-                </a>              </div>
+                </a>
+              </div>
             ) : null}
           </div>
-          {/* AirDC++ socket connection status */}
-          <div className="navbar-item has-dropdown is-hoverable">
-            <a className="navbar-link is-arrowless has-text-success">
-              {!isEmpty(airDCPPConfiguration.airDCPPState.socketConnectionInformation) ? (
-                <i className="fa-solid fa-bolt"></i>) : null}
-            </a>    
-            <div className="navbar-dropdown download-progress-meter">
-              <a className="navbar-item">
-                <pre>{JSON.stringify(airDCPPConfiguration.airDCPPState.socketConnectionInformation, null, 2)}</pre>
-              </a>
-            </div>      
-          </div>
-          
-          
           <div className="navbar-item has-dropdown is-hoverable is-mega">
             <div className="navbar-link flex">Blog</div>
             <div id="blogDropdown" className="navbar-dropdown">

src/client/context/AirDCPPSocket.tsx

@@ -12,7 +12,7 @@ const AirDCPPSocketContextProvider = ({ children }) => {
       airDCPPState: {
         settings: settingsObject,
         socket: {},
-        socketConectionInformation: {},
+        socketConnectionInformation: {},
       },
     });
   };
@@ -56,12 +56,11 @@ const AirDCPPSocketContextProvider = ({ children }) => {
       hostname: `${host.hostname}:${host.port}`,
     });
 
-    let socketConnectionInformation = await initializedAirDCPPSocket.connect(
+    const socketConnectionInformation = await initializedAirDCPPSocket.connect(
       `${host.username}`,
       `${host.password}`,
       true,
     );
-
     persistSettings({
       ...airDCPPState,
       airDCPPState: {
@@ -81,7 +80,7 @@ const AirDCPPSocketContextProvider = ({ children }) => {
 };
 const AirDCPPSocketContext = createContext({
   airDCPPState: {},
-  saveSettings: () => { },
+  saveSettings: () => {},
 });
 
 export { AirDCPPSocketContext, AirDCPPSocketContextProvider };