From d1c654617d27ba71ccb502935a0f3baf59a11f4b Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Wed, 25 Nov 2020 11:11:36 -0800
Subject: [PATCH] Added filtering for jobs with no close date on search. RPS-58

---
 WIP Changelog.txt                             |  1 +
 .../jobs-search-fields.molecule.jsx           | 33 ++++++++++++++++---
 src/graphql/jobs.queries.js                   |  2 ++
 3 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/WIP Changelog.txt b/WIP Changelog.txt
index 72936a0..10d1958 100644
--- a/WIP Changelog.txt	
+++ b/WIP Changelog.txt	
@@ -1,5 +1,6 @@
 New Features: 
 - Added a reference guide for MPI Grouping Guidelines next to the Group Descriptor on the estimate screen.
+- Added ability to filter for jobs with no close date on job search.
 
 Bug Fixes: 
 - Added better error handling on reporting for jobs that did not have a group set.
\ No newline at end of file
diff --git a/src/components/molecules/jobs-search-fields/jobs-search-fields.molecule.jsx b/src/components/molecules/jobs-search-fields/jobs-search-fields.molecule.jsx
index 5e869da..b5b2c65 100644
--- a/src/components/molecules/jobs-search-fields/jobs-search-fields.molecule.jsx
+++ b/src/components/molecules/jobs-search-fields/jobs-search-fields.molecule.jsx
@@ -1,8 +1,9 @@
 import { SearchOutlined } from "@ant-design/icons";
-import { Button, DatePicker, Form, Input } from "antd";
+import { Button, Checkbox, DatePicker, Form, Input } from "antd";
 import React from "react";
 import ipcTypes from "../../../ipc.types";
 const { ipcRenderer } = window;
+
 export default function JobsSearchFieldsMolecule({ callSearchQuery }) {
   const [form] = Form.useForm();
 
@@ -17,6 +18,9 @@ export default function JobsSearchFieldsMolecule({ callSearchQuery }) {
         search: values.search || "",
         startDate: (values.dateRange && values.dateRange[0]) || null,
         endDate: (values.dateRange && values.dateRange[1]) || null,
+        ...(values.closeDateIsNull
+          ? { closeDateIsNull: values.closeDateIsNull }
+          : {}),
       },
     });
   };
@@ -35,10 +39,29 @@ export default function JobsSearchFieldsMolecule({ callSearchQuery }) {
         <Form.Item name="dateRange" rules={[{ type: "array" }]}>
           <DatePicker.RangePicker />
         </Form.Item>
-        <Button type="primary" htmlType="submit" onClick={() => form.submit()}>
-          <SearchOutlined />
-          Search
-        </Button>
+        <Form.Item name="closeDateIsNull" valuePropName="checked">
+          <Checkbox>Only Jobs with No Close Date</Checkbox>
+        </Form.Item>
+        <Form.Item shouldUpdate>
+          {() => {
+            const disabled =
+              !!!form.getFieldValue("search") &&
+              !!!form.getFieldValue("dateRange") &&
+              !form.getFieldValue("closeDateIsNull");
+
+            return (
+              <Button
+                type="primary"
+                disabled={disabled}
+                htmlType="submit"
+                onClick={() => form.submit()}
+              >
+                <SearchOutlined />
+                Search
+              </Button>
+            );
+          }}
+        </Form.Item>
       </Form>
     </div>
   );
diff --git a/src/graphql/jobs.queries.js b/src/graphql/jobs.queries.js
index 1077399..ddc342b 100644
--- a/src/graphql/jobs.queries.js
+++ b/src/graphql/jobs.queries.js
@@ -44,11 +44,13 @@ export const SEARCH_JOBS_PAGINATED = gql`
     $search: String
     $startDate: date
     $endDate: date
+    $closeDateIsNull: Boolean
   ) {
     search_jobs(
       offset: $offset
       limit: $limit
       args: { enddate: $endDate, search: $search, startdate: $startDate }
+      where: { close_date: { _is_null: $closeDateIsNull } }
     ) {
       ownr_fn
       ownr_ln