Import from top level types

felixmosh · Jan 25, 2020 · 69c93cd · 69c93cd
1 parent 4799c34
commit 69c93cd
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 24 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -8,7 +8,7 @@ import { retryAll } from './routes/retryAll'
 import { retryJob } from './routes/retryJob'
 import { cleanAll } from './routes/cleanAll'
 import { entryPoint } from './routes/index'
-import { BullBoardQueues } from './@types'
+import { BullBoardQueues } from './@types/app'
 
 const bullBoardQueues: BullBoardQueues = {}
 
@@ -34,7 +34,7 @@ router.put('/queues/:queueName/clean/:queueStatus', wrapAsync(cleanAll))
 
 export const setQueues = (bullQueues: Queue[] | QueueMq[]) => {
   bullQueues.forEach((queue: Queue | QueueMq) => {
-    const name = queue instanceof QueueMq ? queue.toKey('~') : queue.name // TODO: Figure out what 'type' to give `toKey`
+    const name = queue instanceof QueueMq ? queue.toKey('~') : queue.name
 
     bullBoardQueues[name] = {
       queue,

diff --git a/src/routes/cleanAll.ts b/src/routes/cleanAll.ts
@@ -1,7 +1,7 @@
 import { RequestHandler } from 'express'
 import { Queue as QueueMq } from 'bullmq'
 
-import { BullBoardQueues } from '../@types'
+import { BullBoardQueues } from '../@types/app'
 
 export const cleanAll: RequestHandler = async (req, res) => {
   try {

diff --git a/src/routes/retryJob.ts b/src/routes/retryJob.ts
@@ -1,5 +1,5 @@
 import { RequestHandler } from 'express'
-import { BullBoardQueues } from '../@types'
+import { BullBoardQueues } from '../@types/app'
 
 export const retryJob: RequestHandler = async (req, res) => {
   try {

diff --git a/src/ui/components/App.tsx b/src/ui/components/App.tsx
@@ -4,14 +4,6 @@ import { Queue as QueueElement } from './Queue'
 import { RedisStats } from './RedisStats'
 import { Header } from './Header'
 import { useStore } from './hooks/useStore'
-import { Job, JobCounts } from 'bull'
-import { Job as JobMq } from 'bullmq'
-
-interface Queueue {
-  name: string
-  counts: JobCounts
-  jobs: (Job | JobMq)[]
-}
 
 export const App = ({ basePath }: { basePath: string }) => {
   const {
@@ -38,18 +30,19 @@ export const App = ({ basePath }: { basePath: string }) => {
               <>No stats to display </>
             )}
 
-            {state.data.queues.map((queue: Queueue) => (
-              <QueueElement
-                queue={queue}
-                key={queue.name}
-                selectedStatus={selectedStatuses[queue.name]}
-                selectStatus={setSelectedStatuses}
-                retryJob={retryJob(queue.name)}
-                retryAll={retryAll(queue.name)}
-                cleanAllDelayed={cleanAllDelayed(queue.name)}
-                cleanAllFailed={cleanAllFailed(queue.name)}
-              />
-            ))}
+            {state.data &&
+              state.data.queues.map(queue => (
+                <QueueElement
+                  queue={queue}
+                  key={queue.name}
+                  selectedStatus={selectedStatuses[queue.name]}
+                  selectStatus={setSelectedStatuses}
+                  retryJob={retryJob(queue.name)}
+                  retryAll={retryAll(queue.name)}
+                  cleanAllDelayed={cleanAllDelayed(queue.name)}
+                  cleanAllFailed={cleanAllFailed(queue.name)}
+                />
+              ))}
           </>
         )}
       </main>