IO-2626 Correct Sorting, Linking, Pagination and Update Response Container

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

@@ -1,22 +1,20 @@
-import { Row, Col } from "antd";
 import { useQuery } from "@apollo/client";
-import queryString from "query-string";
-import React, { useEffect } from "react";
+import { Col, Row } from "antd";
+import React, { useEffect, useState } 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 RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.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";
-import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
-import {pageLimit} from "../../utils/config";
+
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
@@ -32,29 +30,13 @@ export function ShopCsiContainer({
   setSelectedHeader,
 }) {
   const { t } = useTranslation();
-
-  const searchParams = queryString.parse(useLocation().search);
-  const { page, sortcolumn, sortorder } = searchParams;
+  const [responseid, setresponseid] = useState("");
 
   const { loading, error, data, refetch } = useQuery(
     QUERY_CSI_RESPONSE_PAGINATED,
     {
       fetchPolicy: "network-only",
       nextFetchPolicy: "network-only",
-      variables: {
-        //search: search || "",
-        offset: page ? (page - 1) * pageLimit : 0,
-        limit: pageLimit,
-        order: [
-          {
-            [sortcolumn || "completedon"]: sortorder
-              ? sortorder === "descend"
-                ? "desc_nulls_last"
-                : "asc"
-              : "desc_nulls_last",
-          },
-        ],
-      },
     }
   );
 
@@ -73,12 +55,7 @@ export function ShopCsiContainer({
   if (error) return <AlertComponent message={error.message} type="error" />;
 
   return (
-    <RbacWrapper
-      action="csi:page"
-      // noauth={
-      //   <AlertComponent message="You don't have acess to see this screen." />
-      // }
-    >
+    <RbacWrapper action="csi:page">
       <Row gutter={16}>
         <Col span={10}>
           <CsiResponseListPaginated
@@ -86,10 +63,11 @@ export function ShopCsiContainer({
             loading={loading}
             responses={data ? data.csi : []}
             total={data ? data.csi_aggregate.aggregate.count : 0}
+            setresponseid={setresponseid}
           />
         </Col>
         <Col span={14}>
-          <CsiResponseFormContainer />
+          <CsiResponseFormContainer responseid={responseid} />
         </Col>
       </Row>
     </RbacWrapper>