updated info icons and fixed cancel button login

sandialabs · Jul 16, 2020 · 38d92bf · 38d92bf
1 parent 73293fc
commit 38d92bf
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 35 deletions.
diff --git a/web-server/plugins/slycat-timeseries-model/plugin-components/LoadButton.tsx b/web-server/plugins/slycat-timeseries-model/plugin-components/LoadButton.tsx
@@ -9,18 +9,11 @@ const LoadButton: React.FC<LoadButtonProps> = (props) => (
     className={`btn btn btn-outline-primary`}
     id={"pullbtn"}
     type="button"
-    title={"load data"}
+    title={"Send a command to try manually pulling the data from the HPC and loading it the server"}
     disabled={props.disabled}
     onClick={() => props.onClick()}
   >
     {"Load"}
-    <i
-      style={{ paddingLeft: "5px" }}
-      className="fa fa-info-circle"
-      data-toggle="tooltip"
-      data-placement="bottom"
-      title="Send a command to try manually pulling the data from the HPC and loading it the server"
-    />
   </button>
 );
 

diff --git a/web-server/plugins/slycat-timeseries-model/plugin-components/LoadingPage.tsx b/web-server/plugins/slycat-timeseries-model/plugin-components/LoadingPage.tsx
@@ -141,7 +141,7 @@ export default class LoadingPage extends React.Component<LoadingPageProps, Loadi
   private appendLog = (resJson: any) => {
     this.state.log.logLineArray = resJson.logFile.split("\n");
     this.setState({
-      jobStatus: `Job Status: ${resJson.status.state}`,
+      jobStatus: `${resJson.status.state}`,
       log: this.state.log,
     });
     switch (resJson.status.state) {

diff --git a/web-server/plugins/slycat-timeseries-model/plugin-components/LoadingPageButtons.tsx b/web-server/plugins/slycat-timeseries-model/plugin-components/LoadingPageButtons.tsx
@@ -28,34 +28,21 @@ const LoadingPageButtons: React.FC<LoadingPageButtonsProps> = (props) => {
         data-target="#collapseJobCodes"
         aria-expanded="false"
         aria-controls="collapseJobCodes"
+        title="Job status will be in the grey info block below after loading from HPC"
       >
         Job status meanings
-        <i
-          style={{ paddingLeft: "5px" }}
-          className="fa fa-info-circle"
-          data-toggle="tooltip"
-          data-placement="bottom"
-          title="Job status will be in the grey info block below after loading from HPC"
-        />
       </button>
       <button
         className={`btn btn btn-outline-primary`}
         id={"pullbtn"}
         type="button"
-        title={"load data"}
+        title={"Send command to the HPC to cancel the current job if the status is pending or running"}
         disabled={
-          !props.jobStatus.includes("PENDING") || !props.jobStatus.includes("RUNNING")
+          !props.jobStatus.includes("PENDING") && !props.jobStatus.includes("RUNNING")
         }
         onClick={() => props.cancelJob()}
       >
         {"Cancel job"}
-        <i
-          style={{ paddingLeft: "5px" }}
-          className="fa fa-info-circle"
-          data-toggle="tooltip"
-          data-placement="bottom"
-          title="Send command to the HPC to cancel the current job if the status is pending or running"
-        />
       </button>
       <LoadButton
         disabled={!props.jobStatus.includes("COMPLETED")}
@@ -64,20 +51,11 @@ const LoadingPageButtons: React.FC<LoadingPageButtonsProps> = (props) => {
       {props.modelShow && !props.sessionExists && (
         <ControlsButton
           label="Connect"
-          title={"Connect button"}
+          title={"Connect to HPC"}
           data_toggle="modal"
           data_target={"#" + props.modalId}
           button_style={"btn btn-outline-primary"}
           id="controls-button-death"
-          tooltip={(
-            <i
-            style={{ paddingLeft: "5px" }}
-            className="fa fa-info-circle"
-            data-toggle="tooltip"
-            data-placement="bottom"
-            title="Connect to HPC"
-          />
-          )}
         />
       )}
     </React.Fragment>