- Merge release

Signed-off-by: Dave Richer <dave@imexsystems.ca>

client/src/pages/parts-queue/parts-queue.page.container.jsx

@@ -1,9 +1,10 @@
 import React, {useEffect} from "react";
 import {useTranslation} from "react-i18next";
 import {connect} from "react-redux";
+import PartsQueueDetailCard from "../../components/parts-queue-card/parts-queue-card.component";
+import PartsQueueList from "../../components/parts-queue-list/parts-queue.list.component";
 import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
 import {setBreadcrumbs, setSelectedHeader,} from "../../redux/application/application.actions";
-import PartsQueuePage from "./parts-queue.page.component";
 
 const mapDispatchToProps = (dispatch) => ({
     setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
@@ -23,7 +24,8 @@ export function PartsQueuePageContainer({setBreadcrumbs, setSelectedHeader}) {
 
     return (
         <RbacWrapper action="jobs:partsqueue">
-            <PartsQueuePage/>
+            <PartsQueueList/>
+            <PartsQueueDetailCard/>
         </RbacWrapper>
     );
 }