diff --git a/src/client/components/Import.tsx b/src/client/components/Import.tsx
index 42ec783..0d36270 100644
--- a/src/client/components/Import.tsx
+++ b/src/client/components/Import.tsx
@@ -62,7 +62,6 @@ export const Import = (props: IProps): ReactElement => {
},
[],
);
-
useEffect(() => {
dispatch(getImportJobResultStatistics());
}, []);
@@ -99,7 +98,6 @@ export const Import = (props: IProps): ReactElement => {
return null;
}
};
- console.log(...allImportJobResults);
return (
@@ -207,21 +205,23 @@ export const Import = (props: IProps): ReactElement => {
|
{format(
- new Date(jobResult.statuses[0].earliestTimestamp),
+ new Date(jobResult.earliestTimestamp),
"EEEE, hh:mma, do LLLL Y",
)}
|
- {jobResult._id}
+
+ {jobResult.sessionId}
+
|
- {jobResult.statuses[1].count}
+ {jobResult.completedJobs}
|
- {jobResult.statuses[0].count}
+ {jobResult.failedJobs}
|
diff --git a/src/client/components/Navbar.tsx b/src/client/components/Navbar.tsx
index f8dc3c3..7ad6ada 100644
--- a/src/client/components/Navbar.tsx
+++ b/src/client/components/Navbar.tsx
@@ -20,6 +20,25 @@ const Navbar: React.FunctionComponent = (props) => {
const socketDisconnectionReason = useSelector(
(state: RootState) => state.airdcpp.socketDisconnectionReason,
);
+
+ // Import-related selector hooks
+ const successfulImportJobCount = useSelector(
+ (state: RootState) => state.fileOps.successfulJobCount,
+ );
+ const failedImportJobCount = useSelector(
+ (state: RootState) => state.fileOps.failedJobCount,
+ );
+
+ const lastQueueJob = useSelector(
+ (state: RootState) => state.fileOps.lastQueueJob,
+ );
+ const libraryQueueImportStatus = useSelector(
+ (state: RootState) => state.fileOps.LSQueueImportStatus,
+ );
+
+ const allImportJobResults = useSelector(
+ (state: RootState) => state.fileOps.importJobStatistics,
+ );
return (
+
+ {!isUndefined(libraryQueueImportStatus) &&
+ location.hash !== "#/import" ? (
+
+ ) : null}
+
{/* AirDC++ socket connection status */}
{airDCPPSocketConnectionStatus ? (
diff --git a/src/client/reducers/fileops.reducer.ts b/src/client/reducers/fileops.reducer.ts
index 1338cc9..a527f29 100644
--- a/src/client/reducers/fileops.reducer.ts
+++ b/src/client/reducers/fileops.reducer.ts
@@ -181,6 +181,7 @@ function fileOpsReducer(state = initialState, action) {
}
case LS_IMPORT_QUEUE_DRAINED: {
+ localStorage.removeItem("sessionId");
return {
...state,
LSQueueImportStatus: "drained",
@@ -188,6 +189,7 @@ function fileOpsReducer(state = initialState, action) {
}
case RESTORE_JOB_COUNTS_AFTER_SESSION_RESTORATION: {
+ console.log("AASSSSHHHHH");
return {
...state,
successfulJobCount: action.completedJobCount,