Merge pull request #432 from davidradl/git427

Git427 add validation
odpi · Apr 29, 2022 · 4f12c25 · 4f12c25
2 parents f09cab1 + 383e1c5
commit 4f12c25
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 21 deletions.
diff --git a/...client/src/components/RepositoryExplorer/components/instance-retrieval/DateTimePicker.jsx b/...client/src/components/RepositoryExplorer/components/instance-retrieval/DateTimePicker.jsx
@@ -28,14 +28,6 @@ export default function DateTimePicker(props) {
     // TODO localise
     return "mm/dd/yyyy";
   };
-  // asOfDateTimeStr={instancesContext.asOfDateTimeStr}
-
-  // onTimeChange={instancesContext.onAsOfTimeChange}
-  // dateValue={instancesContext.asOfDate}
-  // timeValue={instancesContext.asOfTimeStr}
-  // invalidTime={instancesContext.invalidTime}
-  // invalidDate={instancesContext.invalidDate}
-  // isTimeDisabled={instancesContext.isTimeDisabled}
 
   return (
     <div className="flexcontainer-column">

diff --git a/...nt/src/components/RepositoryExplorer/components/instance-retrieval/HistoricalDateTime.jsx b/...nt/src/components/RepositoryExplorer/components/instance-retrieval/HistoricalDateTime.jsx
@@ -13,10 +13,6 @@ import "./instance-retriever.scss";
 
 export default function HistoricalDateTime() {
   const instancesContext = useContext(InstancesContext);
-  const [errorMessage, setErrorMessage] = useState("");
-  const onErrorMessage = (msg) => {
-    setErrorMessage(msg);
-  };
 
   return (
     <div>
@@ -33,9 +29,11 @@ export default function HistoricalDateTime() {
             <DateTimePicker
               dateLabel="As of Date"
               timeLabel="As of Time"
-              onDateTimeMessage={onErrorMessage}
             />
-            {errorMessage}
+            { instancesContext.asOfDate === undefined &&
+              <div  style={{ color: "red" }}> Please input a date for histrorical queries  </div>
+            }
+
           </div>
         ) }
       </div>

diff --git a/cra-client/src/components/RepositoryExplorer/components/instance-retrieval/InstanceSearch.js b/cra-client/src/components/RepositoryExplorer/components/instance-retrieval/InstanceSearch.js
@@ -454,6 +454,18 @@ export default function InstanceSearch(props) {
       setStatus("cancelled");
     }
   };
+  const isQueryDisabled = () => {
+    let isDisabled = false;
+    if (instancesContext.useHistoricalQuery) {
+      if (
+        instancesContext.asOfDateTimeForQueries === undefined ||
+        instancesContext.invalidTime
+      ) {
+        isDisabled = true;
+      }
+    }
+    return isDisabled;
+  };
 
 
   /*
@@ -562,7 +574,7 @@ export default function InstanceSearch(props) {
                onChange = { updatedSearchResultLimit } >
         </input>
 
-        <button className="retrieval-button" onClick = { searchForInstances } >
+        <button disabled={isQueryDisabled()} className="retrieval-button" onClick = { searchForInstances } >
           Search for instances
         </button>
         </div>

diff --git a/cra-client/src/components/RepositoryExplorer/contexts/InstancesContext.js b/cra-client/src/components/RepositoryExplorer/contexts/InstancesContext.js
@@ -99,12 +99,7 @@ const InstancesContextProvider = (props) => {
    */
   const [gens, setGens] = useState([]);
   const [guidToGenId, setGuidToGenId] = useState({});
-  // /*
-  //  * As of Date  - the date part of date time as a string
-  //  */
-  // const [asOfDateStr, setAsOfDateStr] = useState();
-
-
+
 /**
  * Switch for using historical state
  */
@@ -1541,6 +1536,7 @@ const InstancesContextProvider = (props) => {
         invalidDate,
         isTimeDisabled,
         useHistoricalQuery,
+        asOfDate,
         onHistoricalQueryChange,
         setGuidToGenId,
         setFocus,