Merged in master (pull request #771)

Master
2023-05-08 15:53:29 +00:00
parent 6a9f1597cb 051ee347a9
commit 4da299f431
22 changed files with 520 additions and 212 deletions
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -1782,14 +1782,12 @@ export const QUERY_ALL_JOB_FIELDS = gql`

 export const QUERY_ALL_JOBS_PAGINATED_STATUS_FILTERED = gql`
  query QUERY_ALL_JOBS_PAGINATED_STATUS_FILTERED(
-    $search: String
    $offset: Int
    $limit: Int
    $order: [jobs_order_by!]
    $statusList: [String!]
  ) {
-    search_jobs(
-      args: { search: $search }
+    jobs(
      offset: $offset
      limit: $limit
      order_by: $order
@@ -1820,10 +1818,7 @@ export const QUERY_ALL_JOBS_PAGINATED_STATUS_FILTERED = gql`
      updated_at
      ded_amt
    }
-    search_jobs_aggregate(
-      args: { search: $search }
-      where: { status: { _in: $statusList } }
-    ) {
+    jobs_aggregate(where: { status: { _in: $statusList } }) {
      aggregate {
        count(distinct: true)
      }