Fixes bug that prevented rendering field model charts

client/src/app/AppContainer.tsx

@@ -90,10 +90,10 @@ export class AppContainer extends Component<Props, State> {
           this._fetchFeederModels();
         }
       });
-    zip(
-      this.simulationManagementService.selectSimulationSnapshotState('stateStore'),
-      this.simulationManagementService.selectSimulationSnapshotState('topologyModel')
-    )
+      zip(
+        this.simulationManagementService.selectSimulationSnapshotState('stateStore'),
+        this.simulationManagementService.selectSimulationSnapshotState('topologyModel')
+      )
       .subscribe({
         next: (tuple: [ApplicationState, TopologyModel]) => {
           const modelMRID = tuple[1].feeders[0].mRID;
@@ -119,7 +119,7 @@ export class AppContainer extends Component<Props, State> {
     this._stompClientService.readOnceFrom<GetAvailableApplicationsRequestPayload>(destination)
       .subscribe({
         next: payload => {
-          // Todo - For Field Model to receive Min/Avg/Max Voltages chart, fieldModelMrid needs to be '_C1C3E687-6FFD-C753-582B-632A27E28507'
+          // * You can hard code mRID that you wanted to use here.
           // payload.fieldModelMrid = '_C1C3E687-6FFD-C753-582B-632A27E28507';
           this._stateStore.update({
             applications: payload.applications,

client/src/app/common/field-model-datastream/FieldModelManagementService.ts

@@ -174,7 +174,7 @@ export class FieldModelManagementService {
   }
 
   private _broadcastFieldModelOutputMeasurements(payload: FieldModelOutputPayload) {
-    this._outputTimestamp = payload.timestamp;
+    this._outputTimestamp = payload.message.timestamp;
     const measurementMap = new Map<string, FieldModelOutputMeasurement>();
     for (const [mrid,rawFieldModelOutputMeasurement] of Object.entries(payload.message.measurements)) {
       const measurementInModelDictionary = this._modelDictionaryMeasurementMap.get(mrid);

client/src/app/common/field-model-datastream/FieldModelOutputPayload.ts

@@ -5,6 +5,6 @@ export interface FieldModelOutputPayload {
       measurements: {
         [mrid: string]: { magnitude: number; angle: number; mrid: string };
       };
+      timestamp: number;
     };
-    timestamp: number;
   }

client/src/app/simulation/measurement-chart/MeasurementChartContainer.tsx

@@ -57,7 +57,7 @@ export class MeasurementChartContainer extends Component<Props, State> {
       this._observeActiveFieldModelChangeEvent();
       this._subscribeToPlotModelsStateStore();
       this._subscribeToFieldModelOutputMeasurementMapStream();
-      this._fetchLimitsFileWhenSimulationIdChanges();
+      // this._fetchLimitsFileWhenSimulationIdChanges(); // * Looks like Field Model doesn't need it
       this._resetRenderableChartModelsWhenFieldModelStarts();
     } else {
       this._observeActiveSimulationChangeEvent();

client/src/app/simulation/topology-renderer/TopologyRenderer.tsx

@@ -554,8 +554,9 @@ export class TopologyRenderer extends Component<Props, State> {
     nodeMap.forEach(node => {
       node.y1 = minYCoordinate + (maxYCoordinate - node.y1);
       if ('y2' in node) {
+        const nodey2 = node['y2'] as any;
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        (node as any).y2 = minYCoordinate + (maxYCoordinate - node['y2']);
+        (node as any).y2 = minYCoordinate + (maxYCoordinate - nodey2);
       }
     });
   }