From ffa1b0cc0943bd932c0a88adc85e427ce6a65147 Mon Sep 17 00:00:00 2001 From: Rishi Ghan Date: Thu, 24 Aug 2023 23:19:15 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=8F=97=EF=B8=8F=20Scaffold=20for=20job=20?= =?UTF-8?q?results?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/client/actions/fileops.actions.tsx | 7 +----- src/client/components/App.tsx | 1 - src/client/components/Import.tsx | 31 +++++++++++++++++++++----- src/client/constants/action-types.ts | 1 - src/client/reducers/fileops.reducer.ts | 10 --------- 5 files changed, 26 insertions(+), 24 deletions(-) diff --git a/src/client/actions/fileops.actions.tsx b/src/client/actions/fileops.actions.tsx index 486530d..290e159 100644 --- a/src/client/actions/fileops.actions.tsx +++ b/src/client/actions/fileops.actions.tsx @@ -4,13 +4,11 @@ import { COMICVINE_SERVICE_URI, IMAGETRANSFORMATION_SERVICE_BASE_URI, LIBRARY_SERVICE_BASE_URI, - LIBRARY_SERVICE_HOST, SEARCH_SERVICE_BASE_URI, } from "../constants/endpoints"; import { IMS_COMIC_BOOK_GROUPS_FETCHED, IMS_COMIC_BOOK_GROUPS_CALL_IN_PROGRESS, - IMS_COMIC_BOOK_GROUPS_CALL_FAILED, IMS_RECENT_COMICS_FETCHED, IMS_WANTED_COMICS_FETCHED, CV_API_CALL_IN_PROGRESS, @@ -22,24 +20,21 @@ import { LS_IMPORT, IMG_ANALYSIS_CALL_IN_PROGRESS, IMG_ANALYSIS_DATA_FETCH_SUCCESS, - IMS_COMIC_BOOK_ARCHIVE_EXTRACTION_SUCCESS, IMS_COMIC_BOOK_ARCHIVE_EXTRACTION_CALL_IN_PROGRESS, SS_SEARCH_RESULTS_FETCHED, SS_SEARCH_IN_PROGRESS, FILEOPS_STATE_RESET, LS_IMPORT_CALL_IN_PROGRESS, - LS_TOGGLE_IMPORT_QUEUE, SS_SEARCH_FAILED, SS_SEARCH_RESULTS_FETCHED_SPECIAL, WANTED_COMICS_FETCHED, VOLUMES_FETCHED, - CV_WEEKLY_PULLLIST_FETCHED, LIBRARY_SERVICE_HEALTH, LS_SET_QUEUE_STATUS, } from "../constants/action-types"; import { success } from "react-notification-system-redux"; -import { isNil, map } from "lodash"; +import { isNil } from "lodash"; export const getServiceStatus = (serviceName?: string) => async (dispatch) => { axios diff --git a/src/client/components/App.tsx b/src/client/components/App.tsx index 71e5f9b..a620940 100644 --- a/src/client/components/App.tsx +++ b/src/client/components/App.tsx @@ -1,6 +1,5 @@ import React, { ReactElement, useContext, useEffect } from "react"; import Dashboard from "./Dashboard/Dashboard"; - import Import from "./Import"; import { ComicDetailContainer } from "./ComicDetail/ComicDetailContainer"; import TabulatedContentContainer from "./Library/TabulatedContentContainer"; diff --git a/src/client/components/Import.tsx b/src/client/components/Import.tsx index 25bef03..22f0542 100644 --- a/src/client/components/Import.tsx +++ b/src/client/components/Import.tsx @@ -136,13 +136,9 @@ export const Import = (props: IProps): ReactElement => { - + - + @@ -178,6 +174,29 @@ export const Import = (props: IProps): ReactElement => { {lastQueueJob} )} + + {/* Past imports */} + +

Past Imports

+
- Completed Jobs - Completed Jobs Failed Jobs - Queue Controls - Queue Controls
+ + + + + + + + + + + + + + + + + +
Time StartedImportedFailedActions
); diff --git a/src/client/constants/action-types.ts b/src/client/constants/action-types.ts index 7a69fbf..22d8178 100644 --- a/src/client/constants/action-types.ts +++ b/src/client/constants/action-types.ts @@ -14,7 +14,6 @@ export const IMS_RAW_IMPORT_FAILED = "IMS_RAW_IMPORT_FAILED"; export const LS_IMPORT_CALL_IN_PROGRESS = "LS_IMPORT_CALL_IN_PROGRESS"; // Library import bull mq queue control export const LS_TOGGLE_IMPORT_QUEUE = "LS_TOGGLE_IMPORT_QUEUE"; -export const LS_QUEUE_DRAINED = "LS_QUEUE_DRAINED"; // ComicVine Metadata export const IMS_CV_METADATA_IMPORT_CALL_IN_PROGRESS = diff --git a/src/client/reducers/fileops.reducer.ts b/src/client/reducers/fileops.reducer.ts index 7073e90..e47baf2 100644 --- a/src/client/reducers/fileops.reducer.ts +++ b/src/client/reducers/fileops.reducer.ts @@ -15,11 +15,9 @@ import { IMS_COMIC_BOOK_GROUPS_FETCHED, IMS_COMIC_BOOK_GROUPS_CALL_FAILED, IMS_COMIC_BOOK_ARCHIVE_EXTRACTION_CALL_IN_PROGRESS, - IMS_COMIC_BOOK_ARCHIVE_EXTRACTION_SUCCESS, LS_IMPORT, LS_COVER_EXTRACTED, LS_COVER_EXTRACTION_FAILED, - LS_QUEUE_DRAINED, LS_COMIC_ADDED, IMG_ANALYSIS_CALL_IN_PROGRESS, IMG_ANALYSIS_DATA_FETCH_SUCCESS, @@ -32,7 +30,6 @@ import { VOLUMES_FETCHED, COMICBOOK_EXTRACTION_SUCCESS, LIBRARY_SERVICE_HEALTH, - HEALTH_STATUS_TICK, LS_IMPORT_QUEUE_DRAINED, LS_SET_QUEUE_STATUS, RESTORE_JOB_COUNTS_AFTER_SESSION_RESTORATION, @@ -233,14 +230,7 @@ function fileOpsReducer(state = initialState, action) { }; } } - case LS_QUEUE_DRAINED: { - console.log("drained", action); - return { - ...state, - }; - } case LS_COMIC_ADDED: { - console.log("ADDED na anna", action); return { ...state, };