Commit b770286f authored by Francis Renaud's avatar Francis Renaud Committed by Michel Roy
Browse files

Fixed condition to obtain pod phases

parent fb770286

js-apps/meep-frontend/src/js/containers/meep-container.js

+2 −2
Original line number Diff line number Diff line
@@ -71,8 +71,8 @@ import { 
} from '../state/ui';



// MEEP Controller REST API JS client

var basepath = 'http://' + location.host + location.pathname + 'v1';

// var basepath = 'http://10.3.16.73:30000/v1';

// var basepath = 'http://' + location.host + location.pathname + 'v1';

var basepath = 'http://10.3.16.73:30000/v1';



meepCtrlRestApiClient.ApiClient.instance.basePath = basepath.replace(/\/+$/, '');

js-apps/meep-frontend/src/js/meep-controller.js

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ function createState(meepObject) { 
}



// Initialize variables and listeners when document ready

var loadedState = loadState();

var loadedState = null; //loadState();

let meepState = loadedState ? loadedState : createState(meep);



// Uncomment if logger middleware is needed

js-apps/meep-frontend/src/js/state/exec/state-reducer.js

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ const corePodsErrors = createSelector(corePodsPhasesSelector, (phases) => { 
const scenarioPodsPending = createSelector(scenarioPodsPhasesSelector, (pods) => {

  var phasePending = false;

  _.each(pods, (pod) => {

    phasePending |= (pod.logicalState === SCENARIO_PODS_PHASE_PENDING);

    phasePending = phasePending || (pod.logicalState === SCENARIO_PODS_PHASE_PENDING);

  });



  return phasePending == true;
@@ -52,7 +52,7 @@ const scenarioPodsPending = createSelector(scenarioPodsPhasesSelector, (pods) => 
const scenarioPodsTerminating = createSelector(scenarioPodsPhasesSelector, (pods) => {

  var phaseTerminating = false;

  _.each(pods, (pod) => {

    phaseTerminating |= (pod.logicalState === SCENARIO_PODS_PHASE_TERMINATING);

    phaseTerminating = phaseTerminating || (pod.logicalState === SCENARIO_PODS_PHASE_TERMINATING);

  });



  return phaseTerminating == true;