Moar Odyssey stuff!

src/components/DispatchTable/DispatchTable.js

@@ -17,7 +17,7 @@ function DispatchTable (props) {
   } = props
 
   const rescueIds = useSelector(selectDispatchBoard)
-  const queueLength = useRescueQueueCount()
+  const [queueLength, maxClients] = useRescueQueueCount()
 
   return (
     <section className={[styles.dispatchTable, className]}>
@@ -45,15 +45,20 @@ function DispatchTable (props) {
           }
         </tbody>
       </table>
-      {
-        queueLength > 0 && (
-          <div className={styles.queueLength}>
-            {'+'}
-            <b>{queueLength}</b>
-            <small>{' IN QUEUE'}</small>
-          </div>
-        )
-      }
+      <div className={styles.queueLength}>
+        <small>{'MAX '}</small>
+        {maxClients}
+        <small>{' CLIENTS'}</small>
+        {
+            queueLength > 0 && (
+              <>
+                <small>{' ( '}</small>
+                {queueLength}
+                <small>{' IN QUEUE )'}</small>
+              </>
+            )
+          }
+      </div>
     </section>
   )
 }

src/components/DispatchTable/DispatchTable.module.scss

@@ -73,6 +73,11 @@
   opacity: 0.25;
 }
 
+.odysseyIcon {
+  float: right;
+
+  padding-left: 0.5rem;
+}
 
 .queueLength {
   float: right;

src/components/DispatchTable/RescueRow.js

@@ -83,6 +83,7 @@ function RescueRow (props) {
     clientNick,
     client,
     commandIdentifier,
+    odyssey,
     system,
   } = rescue.attributes
 
@@ -110,6 +111,13 @@ function RescueRow (props) {
         text={clientNick ?? client}
         title={clientNick ?? ''}>
         {client ?? '?'}
+        {
+          odyssey && (
+            <span className={styles.odysseyIcon}>
+              <FontAwesomeIcon fixedWidth icon="shoe-prints" title="Odyssey Rescue" transform={{ rotate: -40 }} />
+            </span>
+          )
+        }
       </CopyToClipboard>
       <td
         className="rescue-row-language"

src/components/RescueDetails/RescueDetailsContent.js

@@ -1,4 +1,5 @@
 // import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import Link from 'next/link'
 // import { useRouter } from 'next/router'
 import PropTypes from 'prop-types'
@@ -62,6 +63,7 @@ function RescueDetailsContent (props) {
     platform,
     clientLanguage,
     createdAt,
+    odyssey,
     title,
     quotes,
   } = rescue.attributes
@@ -80,6 +82,14 @@ function RescueDetailsContent (props) {
       <div className={styles.header}>
         <div className={styles.title}>
           {`${typeof commandIdentifier === 'number' ? `#${commandIdentifier} - ` : ''}${title ?? client}`}
+          {
+            odyssey && (
+              <>
+                {' '}
+                <FontAwesomeIcon fixedWidth icon="shoe-prints" size="sm" title="Odyssey Rescue" transform={{ rotate: -40 }} />
+              </>
+            )
+          }
           {codeRed && <span className="badge">{'CODE RED'}</span>}
           {status === 'inactive' && <span className="badge warn">{'Inactive'}</span>}
         </div>

src/helpers/faIconLibrary.js

@@ -31,6 +31,7 @@ export {
   faPlus,
   faRocket,
   faShieldAlt,
+  faShoePrints,
   faShoppingCart,
   faSignature,
   faSpaceShuttle,

src/hooks/rescueHooks.js

@@ -35,7 +35,8 @@ export const usePlatformData = (rescue) => {
 
 
 export const useRescueQueueCount = () => {
-  const [rescueCount, setCount] = useState(0)
+  const [queueLength, setCount] = useState(0)
+  const [maxClients, setMax] = useState(0)
 
   useEffect(
     () => {
@@ -46,6 +47,7 @@ export const useRescueQueueCount = () => {
 
         if (status === HttpStatus.OK) {
           setCount(data.data.queueLength)
+          setMax(data.data.maxClients)
         }
 
 
@@ -64,5 +66,5 @@ export const useRescueQueueCount = () => {
   )
 
 
-  return rescueCount
+  return [queueLength, maxClients]
 }

src/pages/api/qms/queue.js

@@ -4,23 +4,34 @@ import axios from 'axios'
 import { methodRouter } from '~/helpers/apiMiddlewares'
 
 
-// 10 second maxAge
-const cacheMaxAge = 10000
+
+
 
 const cache = {
-  lastCheck: 0,
-  count: 0,
+  count: {
+    maxAge: 10000,
+    lastCheck: 0,
+    value: 0,
+  },
+  max: {
+    maxAge: 60000,
+    lastCheck: 0,
+    value: 0,
+  },
 }
 
 
+
+
+
 async function Queue (req, res) {
   const nowTime = Date.now()
 
-  if (nowTime - cache.lastCheck >= cacheMaxAge) {
-    cache.lastCheck = nowTime
+  if (nowTime - cache.count.lastCheck >= cache.count.maxAge) {
+    cache.count.lastCheck = nowTime
 
     const { data, status, statusText } = await axios.get(
-      `${process.env.QMS_API_URL}/api/v1/queue`,
+      `${process.env.QMS_API_URL}/api/v1/queue/`,
       {
         headers: {
           Authorization: `Bearer ${process.env.QMS_API_TOKEN}`,
@@ -33,21 +44,41 @@ async function Queue (req, res) {
         return !rescue.pending && !rescue.in_progress
       })
 
-      cache.count = rescueQueue.length
+      cache.count.value = rescueQueue.length
     } else {
+      console.error('GET /api/v1/queue/', status, statusText, data)
       res.status(status).end(statusText)
-      console.error(status, statusText, data)
+      return
+    }
+  }
+
+  if (nowTime - cache.max.lastCheck >= cache.max.maxAge) {
+    cache.max.lastCheck = nowTime
+    const { data, status, statusText } = await axios.get(
+      `${process.env.QMS_API_URL}/api/v1/config/`,
+      {
+        headers: {
+          Authorization: `Bearer ${process.env.QMS_API_TOKEN}`,
+        },
+      },
+    )
+
+    if (status === HttpStatus.OK) {
+      cache.max.value = data.max_active_clients
+    } else {
+      console.error('GET /api/v1/config/', status, statusText, data)
     }
   }
 
 
-  return res.status(HttpStatus.OK).json({
+  res.status(HttpStatus.OK).json({
     data: {
-      queueLength: cache.count,
+      queueLength: cache.count.value,
+      maxClients: cache.max.value,
     },
     meta: {
-      age: nowTime - cache.lastCheck,
-      maxAge: cacheMaxAge,
+      queueAge: nowTime - cache.count.lastCheck,
+      maxClientAge: nowTime - cache.max.lastCheck,
     },
   })
 }