- Merge release

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

client/src/pages/shop-csi/shop-csi.container.page.jsx

@@ -1,20 +1,17 @@
-import {Col, Row} from "antd";
 import {useQuery} from "@apollo/client";
+import {Col, Row} from "antd";
 import React, {useEffect} from "react";
 import {useTranslation} from "react-i18next";
 import {connect} from "react-redux";
-import {useLocation} from "react-router-dom";
 import {createStructuredSelector} from "reselect";
 import AlertComponent from "../../components/alert/alert.component";
 import CsiResponseFormContainer from "../../components/csi-response-form/csi-response-form.container";
 import CsiResponseListPaginated
-  from "../../components/csi-response-list-paginated/csi-response-list-paginated.component";
-import {QUERY_CSI_RESPONSE_PAGINATED} from "../../graphql/csi.queries";
-import {setBreadcrumbs, setSelectedHeader} from "../../redux/application/application.actions";
-import {selectBodyshop} from "../../redux/user/user.selectors";
+    from "../../components/csi-response-list-paginated/csi-response-list-paginated.component";
 import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
-import {pageLimit} from "../../utils/config";
-import queryString from "query-string";
+import {QUERY_CSI_RESPONSE_PAGINATED} from "../../graphql/csi.queries";
+import {setBreadcrumbs, setSelectedHeader,} from "../../redux/application/application.actions";
+import {selectBodyshop} from "../../redux/user/user.selectors";
 
 const mapStateToProps = createStructuredSelector({
     bodyshop: selectBodyshop,
@@ -25,29 +22,18 @@ const mapDispatchToProps = (dispatch) => ({
     setSelectedHeader: (key) => dispatch(setSelectedHeader(key)),
 });
 
-export function ShopCsiContainer({bodyshop, setBreadcrumbs, setSelectedHeader}) {
+export function ShopCsiContainer({
+                                     bodyshop,
+                                     setBreadcrumbs,
+                                     setSelectedHeader,
+                                 }) {
     const {t} = useTranslation();
-    const searchParams = queryString.parse(useLocation().search);
-    const {page, sortcolumn, sortorder} = searchParams;
 
     const {loading, error, data, refetch} = useQuery(
         QUERY_CSI_RESPONSE_PAGINATED,
         {
             fetchPolicy: "network-only",
             nextFetchPolicy: "network-only",
-            variables: {
-                offset: page ? (page - 1) * pageLimit : 0,
-                limit: pageLimit,
-                order: [
-                    {
-                        [sortcolumn || "completedon"]: sortorder
-                            ? sortorder === "descend"
-                                ? "desc_nulls_last"
-                                : "asc"
-                            : "desc_nulls_last",
-                    },
-                ],
-            },
         }
     );