Revert "Revert "Revert "Fix issues with limits. (pull request #1091)"

Release/2023 12 01

client/src/components/chat-conversation-title/chat-conversation-title.component.jsx

@@ -4,7 +4,6 @@ import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 import ChatArchiveButton from "../chat-archive-button/chat-archive-button.component";
 import ChatConversationTitleTags from "../chat-conversation-title-tags/chat-conversation-title-tags.component";
 import ChatLabelComponent from "../chat-label/chat-label.component";
-import ChatPrintButton from "../chat-print-button/chat-print-button.component";
 import ChatTagRoContainer from "../chat-tag-ro/chat-tag-ro.container";
 
 export default function ChatConversationTitle({ conversation }) {
@@ -14,7 +13,6 @@ export default function ChatConversationTitle({ conversation }) {
         {conversation && conversation.phone_num}
       </PhoneNumberFormatter>
       <ChatLabelComponent conversation={conversation} />
-      <ChatPrintButton conversation={conversation} />
       <ChatConversationTitleTags
         jobConversations={
           (conversation && conversation.job_conversations) || []

client/src/components/chat-print-button/chat-print-button.component.jsx

@@ -1,59 +0,0 @@
-import { MailOutlined, PrinterOutlined } from "@ant-design/icons";
-import { Space, Spin } from "antd";
-import React, { useState } from "react";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { setEmailOptions } from "../../redux/email/email.actions";
-import { GenerateDocument } from "../../utils/RenderTemplate";
-import { TemplateList } from "../../utils/TemplateConstants";
-
-const mapStateToProps = createStructuredSelector({});
-
-const mapDispatchToProps = (dispatch) => ({
-  setEmailOptions: (e) => dispatch(setEmailOptions(e)),
-});
-
-export function ChatPrintButton({ conversation }) {
-  const [loading, setLoading] = useState(false);
-
-  return (
-    <Space wrap>
-      <PrinterOutlined
-        onClick={() => {
-          setLoading(true);
-          GenerateDocument(
-            {
-              name: TemplateList("messaging").conversation_list.key,
-              variables: { id: conversation.id },
-            },
-            {
-              subject: TemplateList("messaging").conversation_list.subject,
-            },
-            "p",
-            conversation.id
-          );
-          setLoading(false);
-        }}
-      />
-      <MailOutlined
-        onClick={() => {
-          setLoading(true);
-          GenerateDocument(
-            {
-              name: TemplateList("messaging").conversation_list.key,
-              variables: { id: conversation.id },
-            },
-            {
-              subject: TemplateList("messaging").conversation_list.subject,
-            },
-            "e",
-            conversation.id
-          );
-          setLoading(false);
-        }}
-      />
-      {loading && <Spin />}
-    </Space>
-  );
-}
-export default connect(mapStateToProps, mapDispatchToProps)(ChatPrintButton);

client/src/components/inventory-list/inventory-list.container.jsx

@@ -11,7 +11,6 @@ import {
 } from "../../redux/application/application.actions";
 import AlertComponent from "../alert/alert.component";
 import InventoryListPaginated from "./inventory-list.component";
-import {pageLimit} from "../../utils/config";
 
 const mapStateToProps = createStructuredSelector({
   //bodyshop: selectBodyshop,
@@ -33,8 +32,8 @@ export function InventoryList({ setBreadcrumbs, setSelectedHeader }) {
       nextFetchPolicy: "network-only",
       variables: {
         search: search || "",
-        offset: page ? (page - 1) * pageLimit : 0,
-        limit: pageLimit,
+        offset: page ? (page - 1) * 25 : 0,
+        limit: 25,
         consumedIsNull: showall === "true" ? null : true,
         order: [
           {

client/src/components/jobs-list/jobs-list.component.jsx

@@ -1,105 +1,120 @@
-import {
-    SyncOutlined,
-    ExclamationCircleFilled,
-    PauseCircleOutlined,
-    BranchesOutlined,
-} from "@ant-design/icons";
-import { useQuery } from "@apollo/client";
-import { Button, Card, Grid, Input, Space, Table, Tooltip } from "antd";
+import {BranchesOutlined, ExclamationCircleFilled, PauseCircleOutlined, SyncOutlined,} from "@ant-design/icons";
+import {useQuery} from "@apollo/client";
+import {Button, Card, Grid, Input, Space, Table, Tooltip, Typography} from "antd";
 import queryString from "query-string";
-import React, { useState } from "react";
-import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { Link, useHistory, useLocation } from "react-router-dom";
-import { createStructuredSelector } from "reselect";
-import { QUERY_ALL_ACTIVE_JOBS } from "../../graphql/jobs.queries";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import { onlyUnique } from "../../utils/arrayHelper";
+import React, {useEffect, useState} from "react";
+import {useTranslation} from "react-i18next";
+import {connect} from "react-redux";
+import {Link, useHistory, useLocation} from "react-router-dom";
+import {createStructuredSelector} from "reselect";
+import {QUERY_ALL_ACTIVE_JOBS_PAGINATED} from "../../graphql/jobs.queries";
+import {selectBodyshop} from "../../redux/user/user.selectors";
+import {onlyUnique} from "../../utils/arrayHelper";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import { alphaSort } from "../../utils/sorters";
 import AlertComponent from "../alert/alert.component";
 import ChatOpenButton from "../chat-open-button/chat-open-button.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+import {flattenDeep} from "lodash";
+import { pageLimit } from '../../utils/config';
+import axios from "axios";
 
 const mapStateToProps = createStructuredSelector({
     bodyshop: selectBodyshop,
 });
 
-export function JobsList({ bodyshop }) {
-    const searchParams = queryString.parse(useLocation().search);
-    const { selected } = searchParams;
+const mapDispatchToProps = () => ({
+});
+
+export function JobsList({bodyshop,}) {
+    const search = queryString.parse(useLocation().search);
+    const [openSearchResults, setOpenSearchResults] = useState([]);
+    const [searchLoading, setSearchLoading] = useState(false);
+    const {page, selected, sortorder, sortcolumn} = search;
+
     const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
         .filter((screen) => !!screen[1])
         .slice(-1)[0];
-    const { loading, error, data, refetch } = useQuery(QUERY_ALL_ACTIVE_JOBS, {
+
+    const {loading, error, data, refetch} = useQuery(QUERY_ALL_ACTIVE_JOBS_PAGINATED, {
         variables: {
+            offset: page ? (page - 1) * pageLimit : 0,
+            limit: 10,
             statuses: bodyshop.md_ro_statuses.active_statuses || ["Open", "Open*"],
+            order: [
+                {
+                    [sortcolumn || "ro_number"]:
+                        sortorder && sortorder !== "false"
+                            ? (sortorder === "descend"
+                                ? "desc"
+                                : "asc")
+                            : "desc",
+                },
+            ],
         },
         fetchPolicy: "network-only",
         nextFetchPolicy: "network-only",
     });
 
+    const total = data?.jobs_aggregate?.aggregate?.count || 0;
+
     const [state, setState] = useState({
-        sortedInfo: {},
-        filteredInfo: { text: "" },
+        filteredInfo: {text: ""},
     });
 
-    const { t } = useTranslation();
+    const {t} = useTranslation();
     const history = useHistory();
-    const [searchText, setSearchText] = useState("");
 
-    if (error) return <AlertComponent message={error.message} type="error" />;
-
-    const jobs = data
-        ? searchText === ""
-            ? data.jobs
-            : data.jobs.filter(
-                (j) =>
-                    (j.ro_number || "")
-                        .toString()
-                        .toLowerCase()
-                        .includes(searchText.toLowerCase()) ||
-                    (j.ownr_co_nm || "")
-                        .toLowerCase()
-                        .includes(searchText.toLowerCase()) ||
-                    (j.comments || "")
-                        .toLowerCase()
-                        .includes(searchText.toLowerCase()) ||
-                    (j.ownr_fn || "")
-                        .toLowerCase()
-                        .includes(searchText.toLowerCase()) ||
-                    (j.ownr_ln || "")
-                        .toLowerCase()
-                        .includes(searchText.toLowerCase()) ||
-                    (j.clm_no || "").toLowerCase().includes(searchText.toLowerCase()) ||
-                    (j.plate_no || "")
-                        .toLowerCase()
-                        .includes(searchText.toLowerCase()) ||
-                    (j.v_model_desc || "")
-                        .toLowerCase()
-                        .includes(searchText.toLowerCase()) ||
-                    (j.est_ct_fn || "")
-                        .toLowerCase()
-                        .includes(searchText.toLowerCase()) ||
-                    (j.est_ct_ln || "")
-                        .toLowerCase()
-                        .includes(searchText.toLowerCase()) ||
-                    (j.v_make_desc || "")
-                        .toLowerCase()
-                        .includes(searchText.toLowerCase())
-            )
-        : [];
+    const jobs = data?.jobs || [];
 
     const handleTableChange = (pagination, filters, sorter) => {
-        setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
+        // TODO: Is this needed?
+        setState({...state, filteredInfo: filters});
+
+        search.page = pagination.current;
+        search.sortcolumn = sorter.column && sorter.column.key;
+        search.sortorder = sorter.order;
+
+        if (filters.status) {
+            search.statusFilters = JSON.stringify(flattenDeep(filters.status));
+        } else {
+            delete search.statusFilters;
+        }
+
+        history.push({search: queryString.stringify(search)});
     };
 
+    useEffect(() => {
+        if (search.search && search.search.trim() !== "") {
+            searchJobs().catch(e => {
+                console.error('Something went wrong searching for jobs in the job-list component', e);
+            });
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
+
+    if (error) return <AlertComponent message={error.message} type="error"/>;
+
+    async function searchJobs(value) {
+        try {
+            setSearchLoading(true);
+            const searchData = await axios.post("/search", {
+                search: value || search.search,
+                index: "jobs",
+            });
+            setOpenSearchResults(searchData.data.hits.hits.map((s) => s._source));
+        } catch (error) {
+            console.log("Error while fetching search results", error);
+        } finally {
+            setSearchLoading(false);
+        }
+    }
+
     const handleOnRowClick = (record) => {
         if (record) {
             if (record.id) {
                 history.push({
                     search: queryString.stringify({
-                        ...searchParams,
+                        ...search,
                         selected: record.id,
                     }),
                 });
@@ -112,11 +127,9 @@ export function JobsList({ bodyshop }) {
             title: t("jobs.fields.ro_number"),
             dataIndex: "ro_number",
             key: "ro_number",
-            sorter: (a, b) =>
-                parseInt((a.ro_number || "0").replace(/\D/g, "")) -
-                parseInt((b.ro_number || "0").replace(/\D/g, "")),
+            sorter: true,
             sortOrder:
-                state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
+                sortcolumn === "ro_number" && sortorder,
 
             render: (text, record) => (
                 <Link
@@ -126,14 +139,14 @@ export function JobsList({ bodyshop }) {
                     <Space>
                         {record.ro_number || t("general.labels.na")}
                         {record.production_vars && record.production_vars.alert ? (
-                            <ExclamationCircleFilled className="production-alert" />
+                            <ExclamationCircleFilled className="production-alert"/>
                         ) : null}
                         {record.suspended && (
-                            <PauseCircleOutlined style={{ color: "orangered" }} />
+                            <PauseCircleOutlined style={{color: "orangered"}}/>
                         )}
                         {record.iouparent && (
                             <Tooltip title={t("jobs.labels.iou")}>
-                                <BranchesOutlined style={{ color: "orangered" }} />
+                                <BranchesOutlined style={{color: "orangered"}}/>
                             </Tooltip>
                         )}
                     </Space>
@@ -145,22 +158,20 @@ export function JobsList({ bodyshop }) {
             dataIndex: "owner",
             key: "owner",
             ellipsis: true,
-
             responsive: ["md"],
-            sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
-            sortOrder:
-                state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
+            sorter: false,
+            sortOrder: sortcolumn === "owner" && sortorder,
             render: (text, record) => {
                 return record.ownerid ? (
                     <Link
                         to={"/manage/owners/" + record.ownerid}
                         onClick={(e) => e.stopPropagation()}
                     >
-                        <OwnerNameDisplay ownerObject={record} />
+                        <OwnerNameDisplay ownerObject={record}/>
                     </Link>
                 ) : (
                     <span>
-            <OwnerNameDisplay ownerObject={record} />
+            <OwnerNameDisplay ownerObject={record}/>
           </span>
                 );
             },
@@ -172,7 +183,7 @@ export function JobsList({ bodyshop }) {
             ellipsis: true,
             responsive: ["md"],
             render: (text, record) => (
-                <ChatOpenButton phone={record.ownr_ph1} jobid={record.id} />
+                <ChatOpenButton phone={record.ownr_ph1} jobid={record.id}/>
             ),
         },
         {
@@ -182,7 +193,7 @@ export function JobsList({ bodyshop }) {
             ellipsis: true,
             responsive: ["md"],
             render: (text, record) => (
-                <ChatOpenButton phone={record.ownr_ph2} jobid={record.id} />
+                <ChatOpenButton phone={record.ownr_ph2} jobid={record.id}/>
             ),
         },
 
@@ -191,10 +202,9 @@ export function JobsList({ bodyshop }) {
             dataIndex: "status",
             key: "status",
             ellipsis: true,
-
-            sorter: (a, b) => alphaSort(a.status, b.status),
+            sorter: true,
             sortOrder:
-                state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
+                sortcolumn === "status" && sortorder,
             filters:
                 (jobs &&
                     jobs
@@ -209,7 +219,6 @@ export function JobsList({ bodyshop }) {
                 [],
             onFilter: (value, record) => value.includes(record.status),
         },
-
         {
             title: t("jobs.fields.vehicle"),
             dataIndex: "vehicle",
@@ -237,11 +246,10 @@ export function JobsList({ bodyshop }) {
             dataIndex: "plate_no",
             key: "plate_no",
             ellipsis: true,
-
             responsive: ["md"],
-            sorter: (a, b) => alphaSort(a.plate_no, b.plate_no),
+            sorter: true,
             sortOrder:
-                state.sortedInfo.columnKey === "plate_no" && state.sortedInfo.order,
+                sortcolumn === "plate_no" && sortorder,
         },
         {
             title: t("jobs.fields.clm_no"),
@@ -249,9 +257,9 @@ export function JobsList({ bodyshop }) {
             key: "clm_no",
             ellipsis: true,
             responsive: ["md"],
-            sorter: (a, b) => alphaSort(a.clm_no, b.clm_no),
+            sorter: true,
             sortOrder:
-                state.sortedInfo.columnKey === "clm_no" && state.sortedInfo.order,
+                sortcolumn === "clm_no" && sortorder,
             render: (text, record) =>
                 `${record.clm_no || ""}${
                     record.po_number ? ` (PO: ${record.po_number})` : ""
@@ -283,10 +291,9 @@ export function JobsList({ bodyshop }) {
             key: "clm_total",
             responsive: ["md"],
             ellipsis: true,
-
-            sorter: (a, b) => a.clm_total - b.clm_total,
+            sorter: true,
             sortOrder:
-                state.sortedInfo.columnKey === "clm_total" && state.sortedInfo.order,
+                sortcolumn === "clm_total" && sortorder,
             render: (text, record) => (
                 <CurrencyFormatter>{record.clm_total}</CurrencyFormatter>
             ),
@@ -349,26 +356,57 @@ export function JobsList({ bodyshop }) {
             title={t("titles.bc.jobs-active")}
             extra={
                 <Space wrap>
+                    {search.search && (
+                        <>
+                            <Typography.Title level={4}>
+                                {t("general.labels.searchresults", { search: search.search })}
+                            </Typography.Title>
+                            <Button
+                                onClick={() => {
+                                    delete search.search;
+                                    delete search.page;
+                                    history.push({ search: queryString.stringify(search) });
+                                }}
+                            >
+                                {t("general.actions.clear")}
+                            </Button>
+                        </>
+                    )}
                     <Button onClick={() => refetch()}>
                         <SyncOutlined />
                     </Button>
                     <Input.Search
-                        placeholder={t("general.labels.search")}
-                        onChange={(e) => {
-                            setSearchText(e.target.value);
+                        placeholder={search.search || t("general.labels.search")}
+                        onSearch={(value) => {
+                            search.search = value;
+                            history.push({ search: queryString.stringify(search) });
+                            searchJobs(value);
                         }}
-                        value={searchText}
+                        loading={loading || searchLoading}
                         enterButton
                     />
                 </Space>
             }
         >
             <Table
-                loading={loading}
-                pagination={{ defaultPageSize: 50 }}
+                loading={loading || searchLoading }
+                pagination={
+                    search?.search
+                        ? {
+                            pageSize: pageLimit,
+                            showSizeChanger: false,
+
+                        }
+                        : {
+                            pageSize: pageLimit,
+                            current: parseInt(page || 1),
+                            total: total,
+                            showSizeChanger: false,
+                        }
+                }
                 columns={columns}
                 rowKey="id"
-                dataSource={jobs}
+                dataSource={search?.search ? openSearchResults : jobs}
                 scroll={{
                     x: selectedBreakpoint ? scrollMapper[selectedBreakpoint[0]] : "100%",
                 }}
@@ -380,9 +418,9 @@ export function JobsList({ bodyshop }) {
                     type: "radio",
                 }}
                 onChange={handleTableChange}
-                onRow={(record, rowIndex) => {
+                onRow={(record) => {
                     return {
-                        onClick: (event) => {
+                        onClick: () => {
                             handleOnRowClick(record);
                         },
                     };
@@ -392,4 +430,4 @@ export function JobsList({ bodyshop }) {
     );
 }
 
-export default connect(mapStateToProps, null)(JobsList);
+export default connect(mapStateToProps, mapDispatchToProps)(JobsList);

client/src/components/owners-list/owners-list.container.jsx

@@ -5,7 +5,6 @@ import AlertComponent from "../alert/alert.component";
 import OwnersListComponent from "./owners-list.component";
 import queryString from "query-string";
 import { useLocation } from "react-router-dom";
-import {pageLimit} from "../../utils/config";
 
 export default function OwnersListContainer() {
   const searchParams = queryString.parse(useLocation().search);
@@ -17,8 +16,8 @@ export default function OwnersListContainer() {
       nextFetchPolicy: "network-only",
       variables: {
         search: search || "",
-        offset: page ? (page - 1) * pageLimit : 0,
-        limit: pageLimit,
+        offset: page ? (page - 1) * 25 : 0,
+        limit: 25,
         order: [
           {
             [sortcolumn || "created_at"]: sortorder

client/src/components/vehicles-list/vehicles-list.container.jsx

@@ -5,7 +5,6 @@ import AlertComponent from "../alert/alert.component";
 import { QUERY_ALL_VEHICLES_PAGINATED } from "../../graphql/vehicles.queries";
 import queryString from "query-string";
 import { useLocation } from "react-router-dom";
-import {pageLimit} from "../../utils/config";
 
 export default function VehiclesListContainer() {
   const searchParams = queryString.parse(useLocation().search);
@@ -16,8 +15,8 @@ export default function VehiclesListContainer() {
     {
       variables: {
         search: search || "",
-        offset: page ? (page - 1) * pageLimit : 0,
-        limit: pageLimit,
+        offset: page ? (page - 1) * 25 : 0,
+        limit: 25,
         order: [
           {
             [sortcolumn || "created_at"]: sortorder

client/src/pages/bills/bills.page.container.jsx

@@ -13,7 +13,6 @@ import {
   setSelectedHeader,
 } from "../../redux/application/application.actions";
 import BillsPageComponent from "./bills.page.component";
-import {pageLimit} from "../../utils/config";
 
 const mapDispatchToProps = (dispatch) => ({
   setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
@@ -39,8 +38,8 @@ export function BillsPageContainer({ setBreadcrumbs, setSelectedHeader }) {
       fetchPolicy: "network-only",
       nextFetchPolicy: "network-only",
       variables: {
-        offset: page ? (page - 1) * pageLimit : 0,
-        limit: pageLimit,
+        offset: page ? (page - 1) * 25 : 0,
+        limit: 25,
         order: [
           searchObj
             ? JSON.parse(searchObj)

client/src/pages/contracts/contracts.page.container.jsx

@@ -12,7 +12,6 @@ import {
   setSelectedHeader,
 } from "../../redux/application/application.actions";
 import ContractsPageComponent from "./contracts.page.component";
-import {pageLimit} from "../../utils/config";
 
 const mapDispatchToProps = (dispatch) => ({
   setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
@@ -30,8 +29,8 @@ export function ContractsPageContainer({ setBreadcrumbs, setSelectedHeader }) {
       nextFetchPolicy: "network-only",
       variables: {
         search: search || "",
-        offset: page ? (page - 1) * pageLimit : 0,
-        limit: pageLimit,
+        offset: page ? (page - 1) * 25 : 0,
+        limit: 25,
         order: [
           {
             [sortcolumn || "start"]: sortorder

client/src/pages/courtesy-car-detail/courtesy-car-detail.page.container.jsx

@@ -19,7 +19,6 @@ import NotFound from "../../components/not-found/not-found.component";
 import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
 import queryString from "query-string";
 import { useLocation } from "react-router-dom";
-import {pageLimit} from "../../utils/config";
 
 const mapDispatchToProps = (dispatch) => ({
   setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
@@ -42,8 +41,8 @@ export function CourtesyCarDetailPageContainer({
   const { loading, error, data } = useQuery(QUERY_CC_BY_PK, {
     variables: {
       id: ccId,
-      offset: page ? (page - 1) * pageLimit : 0,
-      limit: pageLimit,
+      offset: page ? (page - 1) * 25 : 0,
+      limit: 25,
       order: [
         {
           [sortcolumn || "start"]: sortorder

client/src/pages/export-logs/export-logs.page.component.jsx

@@ -30,8 +30,8 @@ export function ExportLogsPageComponent({ bodyshop }) {
       nextFetchPolicy: "network-only",
       variables: {
         search: search || "",
-        offset: page ? (page - 1) * pageLimit : 0,
-        limit: pageLimit,
+        offset: page ? (page - 1) * 25 : 0,
+        limit: 25,
         order: [
           {
             [sortcolumn || "created_at"]: sortorder

client/src/pages/jobs-all/jobs-all.container.jsx

@@ -13,7 +13,6 @@ import {
   setBreadcrumbs,
   setSelectedHeader,
 } from "../../redux/application/application.actions";
-import {pageLimit} from "../../utils/config";
 
 const mapStateToProps = createStructuredSelector({
   //bodyshop: selectBodyshop,
@@ -34,8 +33,8 @@ export function AllJobs({ setBreadcrumbs, setSelectedHeader }) {
       fetchPolicy: "network-only",
       nextFetchPolicy: "network-only",
       variables: {
-        offset: page ? (page - 1) * pageLimit : 0,
-        limit: pageLimit,
+        offset: page ? (page - 1) * 10 : 0,
+        limit: 25,
         ...(statusFilters ? { statusList: JSON.parse(statusFilters) } : {}),
         order: [
           {

client/src/pages/payments-all/payments-all.container.page.jsx

@@ -14,7 +14,6 @@ import {
   setSelectedHeader,
 } from "../../redux/application/application.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import {pageLimit} from "../../utils/config";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -35,8 +34,8 @@ export function AllJobs({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
       fetchPolicy: "network-only",
       nextFetchPolicy: "network-only",
       variables: {
-        offset: page ? (page - 1) * pageLimit : 0,
-        limit: pageLimit,
+        offset: page ? (page - 1) * 25 : 0,
+        limit: 25,
         order: [
           searchObj
           ? JSON.parse(searchObj)

client/src/pages/phonebook/phonebook.page.component.jsx

@@ -36,8 +36,8 @@ export function PhonebookPageComponent({ bodyshop, authLevel }) {
       nextFetchPolicy: "network-only",
       variables: {
         search: search || "",
-        offset: page ? (page - 1) * pageLimit : 0,
-        limit: pageLimit,
+        offset: page ? (page - 1) * 25 : 0,
+        limit: 25,
         order: [
           {
             [sortcolumn || "lastname"]: sortorder

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

@@ -16,7 +16,6 @@ import {
 } 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,
 });
@@ -43,8 +42,8 @@ export function ShopCsiContainer({
       nextFetchPolicy: "network-only",
       variables: {
         //search: search || "",
-        offset: page ? (page - 1) * pageLimit : 0,
-        limit: pageLimit,
+        offset: page ? (page - 1) * 25 : 0,
+        limit: 25,
         order: [
           {
             [sortcolumn || "completedon"]: sortorder

client/src/translations/en_us/common.json

@@ -2044,9 +2044,6 @@
 				"sentby": "Sent by {{by}} at {{time}}",
 				"typeamessage": "Send a message...",
 				"unarchive": "Unarchive"
-			},
-			"render": {
-				"conversation_list": "Conversation List"
 			}
 		},
 		"notes": {

client/src/translations/es/common.json

@@ -2044,9 +2044,6 @@
 				"sentby": "",
 				"typeamessage": "Enviar un mensaje...",
 				"unarchive": ""
-			},
-			"render": {
-				"conversation_list": ""
 			}
 		},
 		"notes": {

client/src/translations/fr/common.json

@@ -2044,9 +2044,6 @@
 				"sentby": "",
 				"typeamessage": "Envoyer un message...",
 				"unarchive": ""
-			},
-			"render": {
-				"conversation_list": ""
 			}
 		},
 		"notes": {

client/src/utils/TemplateConstants.js

@@ -2102,17 +2102,6 @@ export const TemplateList = (type, context) => {
           // },
         }
       : {}),
-    ...(!type || type === "messaging"
-      ? {
-          conversation_list: {
-            title: i18n.t("messaging.render.conversation_list"),
-            description: "",
-            subject: i18n.t("messaging.render.conversation_list"),
-            key: "conversation_list",
-            disabled: false,
-          },
-        }
-      : {}),
     ...(!type || type === "vendor"
       ? {
           purchases_by_vendor_detailed: {