From ce0a8147fbff710ec5f8dda8eaec4109db99824f Mon Sep 17 00:00:00 2001
From: unknown <n.santhanam@redkarma.eu>
Date: Fri, 5 Feb 2021 17:23:05 +0530
Subject: [PATCH] TMSS-488
Changes Updated
---
SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/index.js | 7 ++++++-
.../tmss_webapp/src/routes/Workflow/qa.reporting.js | 1 -
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/index.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/index.js
index 80e2e42c89e..7b613cbb32e 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/index.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/index.js
@@ -13,6 +13,7 @@ import Ingesting from './ingesting';
import _ from 'lodash';
import DataProduct from './unpin.data';
import UnitConverter from '../../utils/unit.converter';
+import AppLoader from '../../layout/components/AppLoader';
const RedirectionMap = {
'wait scheduled': 1,
@@ -31,6 +32,7 @@ const pageTitle = ['Scheduled','Processing Done','QA Reporting (TO)', 'QA Report
export default (props) => {
let growl;
const [disableNextButton, setDisableNextButton] = useState(false);
+ const [loader, setLoader] = useState(false);
const [state, setState] = useState({});
const [tasks, setTasks] = useState([]);
const [currentStep, setCurrentStep] = useState();
@@ -39,6 +41,7 @@ export default (props) => {
useEffect(() => {
// Clearing Localstorage on start of the page to load fresh
clearLocalStorage();
+ setLoader(true);
ScheduleService.getSchedulingUnitBlueprintById(props.match.params.id)
.then(schedulingUnit => {
setSchedulingUnit(schedulingUnit);
@@ -94,6 +97,7 @@ export default (props) => {
});
setTasks(response);
setInjestTask(response.find(task => task.template.type_value==='observation'));
+ setLoader(false);
});
});
});
@@ -131,7 +135,8 @@ export default (props) => {
<>
<Growl ref={(el) => growl = el} />
{currentStep && <PageHeader location={props.location} title={`${pageTitle[currentStep - 1]}`} actions={[{ icon: 'fa-window-close', link: props.history.goBack, title: 'Click to Close Workflow', props: { pathname: '/schedulingunit/1/workflow' } }]} />}
- {schedulingUnit &&
+ {loader && <AppLoader />}
+ {!loader && schedulingUnit &&
<>
<div className="p-fluid">
{currentStep && <div className="p-field p-grid">
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/qa.reporting.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/qa.reporting.js
index 94900245fb1..414e797fd92 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/qa.reporting.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/qa.reporting.js
@@ -40,7 +40,6 @@ class QAreporting extends Component{
Promise.all(promise).then(() => {
this.props.onNext({ report: this.state.content });
});
-
}
/**
--
GitLab