From 8de9179ff2e9c3c6e7bb2f666c828adb60f399e0 Mon Sep 17 00:00:00 2001
From: Mathew <bibi.mathew@pnnl.gov>
Date: Wed, 24 Aug 2022 11:34:41 -0500
Subject: [PATCH 1/4] fixes dropdown menu for equipement types in Test config
 tab

---
 .../comm-outage/CommOutageEventForm.tsx       | 51 +++++++++++------
 .../fault/FaultEventForm.tsx                  | 55 +++++++++++++------
 .../ScheduledCommandEventForm.tsx             | 51 +++++++++++------
 3 files changed, 107 insertions(+), 50 deletions(-)

diff --git a/client/src/app/simulation/simulation-configuration-editor/views/test-configuration-tab/comm-outage/CommOutageEventForm.tsx b/client/src/app/simulation/simulation-configuration-editor/views/test-configuration-tab/comm-outage/CommOutageEventForm.tsx
index 4046fb68..d9ba8a82 100644
--- a/client/src/app/simulation/simulation-configuration-editor/views/test-configuration-tab/comm-outage/CommOutageEventForm.tsx
+++ b/client/src/app/simulation/simulation-configuration-editor/views/test-configuration-tab/comm-outage/CommOutageEventForm.tsx
@@ -65,23 +65,42 @@ export class CommOutageEventForm extends Component<Props, State> {
       previousModelDictionary = props.modelDictionary;
     }
 
+    const labels = [];
+    if (this.props.modelDictionary.capacitors.length > 0) {
+      labels.push({label: 'Capacitor', id: 'capacitors'});
+    }
+    if (this.props.modelDictionary.disconnectors.length > 0) {
+      labels.push({label: 'disconnectors', id: 'disconnectors'});
+    }
+    if (this.props.modelDictionary.switches.length > 0) {
+      labels.push({label: 'switches', id: 'switches'});
+    }
+    if (this.props.modelDictionary.batteries.length > 0) {
+      labels.push({label: 'Battery', id: 'batteries'});
+    }
+    if (this.props.modelDictionary.breakers.length > 0) {
+      labels.push({label: 'Breaker', id: 'breakers'});
+    }
+    if (this.props.modelDictionary.fuses.length > 0) {
+      labels.push({label: 'Fuse', id: 'fuses'});
+    }
+    if (this.props.modelDictionary.reclosers.length > 0) {
+      labels.push({label: 'Recloser', id: 'reclosers'});
+    }
+    if (this.props.modelDictionary.regulators.length > 0) {
+      labels.push({label: 'Regulator', id: 'regulators'});
+    }
+    if (this.props.modelDictionary.sectionalisers.length > 0) {
+      labels.push({label: 'Sectionaliser', id: 'sectionalisers'});
+    }
+    if (this.props.modelDictionary.solarpanels.length > 0) {
+      labels.push({label: 'Solar Panel', id: 'solarpanels'});
+    }
+    if (this.props.modelDictionary.synchronousmachines.length > 0) {
+      labels.push({label: 'Synchronous Machine', id: 'synchronousmachines'});
+    }
     this.state = {
-      inputEquipmentTypeOptionBuilder: new SelectionOptionBuilder(
-        [
-          { id: 'batteries', label: 'Battery' },
-          { id: 'breakers', label: 'Breaker' },
-          { id: 'capacitors', label: 'Capacitor' },
-          { id: 'disconnectors', label: 'Disconnector' },
-          { id: 'fuses', label: 'Fuse' },
-          { id: 'reclosers', label: 'Recloser' },
-          { id: 'regulators', label: 'Regulator' },
-          { id: 'sectionalisers', label: 'Sectionaliser' },
-          { id: 'solarpanels', label: 'Solar Panel' },
-          { id: 'switches', label: 'Switch' },
-          { id: 'synchronousmachines', label: 'Synchronous Machine' }
-        ],
-        type => type.label
-      ),
+      inputEquipmentTypeOptionBuilder: new SelectionOptionBuilder(labels, type => type.label),
       inputComponentOptionBuilder: SelectionOptionBuilder.defaultBuilder(),
       inputPhaseOptionBuilder: SelectionOptionBuilder.defaultBuilder(),
       inputAttributeOptionBuilder: SelectionOptionBuilder.defaultBuilder(),
diff --git a/client/src/app/simulation/simulation-configuration-editor/views/test-configuration-tab/fault/FaultEventForm.tsx b/client/src/app/simulation/simulation-configuration-editor/views/test-configuration-tab/fault/FaultEventForm.tsx
index ac0d9e70..f016a022 100644
--- a/client/src/app/simulation/simulation-configuration-editor/views/test-configuration-tab/fault/FaultEventForm.tsx
+++ b/client/src/app/simulation/simulation-configuration-editor/views/test-configuration-tab/fault/FaultEventForm.tsx
@@ -37,25 +37,44 @@ export class FaultEventForm extends Component<Props, State> {
 
   constructor(props: Props) {
     super(props);
+    const labels = [];
+    labels.push({label: 'ACLineSegment', id: 'ACLineSegment'});
+    labels.push({label: 'PowerTransformer', id: 'PowerTransformer'});
+    if (this.props.modelDictionary.capacitors.length > 0) {
+      labels.push({label: 'Capacitor', id: 'capacitors'});
+    }
+    if (this.props.modelDictionary.disconnectors.length > 0) {
+      labels.push({label: 'disconnectors', id: 'disconnectors'});
+    }
+    if (this.props.modelDictionary.switches.length > 0) {
+      labels.push({label: 'switches', id: 'switches'});
+    }
+    if (this.props.modelDictionary.batteries.length > 0) {
+      labels.push({label: 'Battery', id: 'batteries'});
+    }
+    if (this.props.modelDictionary.breakers.length > 0) {
+      labels.push({label: 'Breaker', id: 'breakers'});
+    }
+    if (this.props.modelDictionary.fuses.length > 0) {
+      labels.push({label: 'Fuse', id: 'fuses'});
+    }
+    if (this.props.modelDictionary.reclosers.length > 0) {
+      labels.push({label: 'Recloser', id: 'reclosers'});
+    }
+    if (this.props.modelDictionary.regulators.length > 0) {
+      labels.push({label: 'Regulator', id: 'regulators'});
+    }
+    if (this.props.modelDictionary.sectionalisers.length > 0) {
+      labels.push({label: 'Sectionaliser', id: 'sectionalisers'});
+    }
+    if (this.props.modelDictionary.solarpanels.length > 0) {
+      labels.push({label: 'Solar Panel', id: 'solarpanels'});
+    }
+    if (this.props.modelDictionary.synchronousmachines.length > 0) {
+      labels.push({label: 'Synchronous Machine', id: 'synchronousmachines'});
+    }
     this.state = {
-      equipmentTypeOptionBuilder: new SelectionOptionBuilder(
-        [
-          { label: 'ACLineSegment', id: 'ACLineSegment' },
-          { label: 'Battery', id: 'batteries' },
-          { label: 'Breaker', id: 'breakers' },
-          { label: 'Capacitor', id: 'capacitors' },
-          { label: 'Disconnector', id: 'disconnectors' },
-          { label: 'Fuse', id: 'fuses' },
-          { label: 'PowerTransformer', id: 'PowerTransformer' },
-          { label: 'Recloser', id: 'reclosers' },
-          { label: 'Regulator', id: 'regulators' },
-          { label: 'Sectionaliser', id: 'sectionalisers' },
-          { label: 'Solar Panel', id: 'solarpanels' },
-          { label: 'Switch', id: 'switches' },
-          { label: 'Synchronous Machine', id: 'synchronousmachines' }
-        ],
-        type => type.label
-      ),
+      equipmentTypeOptionBuilder: new SelectionOptionBuilder(labels, type => type.label),
       componentOptionBuilder: SelectionOptionBuilder.defaultBuilder(),
       phaseOptionBuilder: SelectionOptionBuilder.defaultBuilder(),
       faultKindOptionBuilder: new SelectionOptionBuilder(
diff --git a/client/src/app/simulation/simulation-configuration-editor/views/test-configuration-tab/scheduled-command/ScheduledCommandEventForm.tsx b/client/src/app/simulation/simulation-configuration-editor/views/test-configuration-tab/scheduled-command/ScheduledCommandEventForm.tsx
index 4c54cd2b..d209daf4 100644
--- a/client/src/app/simulation/simulation-configuration-editor/views/test-configuration-tab/scheduled-command/ScheduledCommandEventForm.tsx
+++ b/client/src/app/simulation/simulation-configuration-editor/views/test-configuration-tab/scheduled-command/ScheduledCommandEventForm.tsx
@@ -44,23 +44,42 @@ export class ScheduledCommandEventForm extends Component<Props, State> {
   constructor(props: Props) {
     super(props);
 
+    const labels = [];
+    if (this.props.modelDictionary.capacitors.length > 0) {
+      labels.push({label: 'Capacitor', id: 'capacitors'});
+    }
+    if (this.props.modelDictionary.disconnectors.length > 0) {
+      labels.push({label: 'disconnectors', id: 'disconnectors'});
+    }
+    if (this.props.modelDictionary.switches.length > 0) {
+      labels.push({label: 'switches', id: 'switches'});
+    }
+    if (this.props.modelDictionary.batteries.length > 0) {
+      labels.push({label: 'Battery', id: 'batteries'});
+    }
+    if (this.props.modelDictionary.breakers.length > 0) {
+      labels.push({label: 'Breaker', id: 'breakers'});
+    }
+    if (this.props.modelDictionary.fuses.length > 0) {
+      labels.push({label: 'Fuse', id: 'fuses'});
+    }
+    if (this.props.modelDictionary.reclosers.length > 0) {
+      labels.push({label: 'Recloser', id: 'reclosers'});
+    }
+    if (this.props.modelDictionary.regulators.length > 0) {
+      labels.push({label: 'Regulator', id: 'regulators'});
+    }
+    if (this.props.modelDictionary.sectionalisers.length > 0) {
+      labels.push({label: 'Sectionaliser', id: 'sectionalisers'});
+    }
+    if (this.props.modelDictionary.solarpanels.length > 0) {
+      labels.push({label: 'Solar Panel', id: 'solarpanels'});
+    }
+    if (this.props.modelDictionary.synchronousmachines.length > 0) {
+      labels.push({label: 'Synchronous Machine', id: 'synchronousmachines'});
+    }
     this.state = {
-      componentTypeOptionBuilder: new SelectionOptionBuilder(
-        [
-          { label: 'Battery', id: 'batteries' },
-          { label: 'Breaker', id: 'breakers' },
-          { label: 'Capacitor', id: 'capacitors' },
-          { label: 'Disconnector', id: 'disconnectors' },
-          { label: 'Fuse', id: 'fuses' },
-          { label: 'Recloser', id: 'reclosers' },
-          { label: 'Regulator', id: 'regulators' },
-          { label: 'Sectionaliser', id: 'sectionalisers' },
-          { label: 'Solar Panel', id: 'solarpanels' },
-          { label: 'Switch', id: 'switches' },
-          { label: 'Synchronous Machine', id: 'synchronousmachines' }
-        ],
-        type => type.label
-      ),
+      componentTypeOptionBuilder: new SelectionOptionBuilder(labels,type => type.label),
       componentOptionBuilder: SelectionOptionBuilder.defaultBuilder(),
       attributeOptionBuilder: SelectionOptionBuilder.defaultBuilder(),
       selectedComponentType: ''

From 92e738fe637c6f640126686cb41b47672a40c4fb Mon Sep 17 00:00:00 2001
From: Mathew <bibi.mathew@pnnl.gov>
Date: Wed, 14 Sep 2022 10:52:07 -0500
Subject: [PATCH 2/4]  fixed the attributes for synchronous machines

---
 .../models/component-attributes.ts                    |  4 ++++
 .../scheduled-command/ScheduledCommandEventForm.tsx   | 11 +++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/client/src/app/simulation/simulation-configuration-editor/models/component-attributes.ts b/client/src/app/simulation/simulation-configuration-editor/models/component-attributes.ts
index 6727e557..bbb64abf 100644
--- a/client/src/app/simulation/simulation-configuration-editor/models/component-attributes.ts
+++ b/client/src/app/simulation/simulation-configuration-editor/models/component-attributes.ts
@@ -21,5 +21,9 @@ export const COMPONENT_ATTRIBUTES = {
   ],
   switches: [
     'Switch.open'
+  ],
+  synchronousmachines: [
+    'RotatingMachine.p',
+    'RotatingMachine.q'
   ]
 };
diff --git a/client/src/app/simulation/simulation-configuration-editor/views/test-configuration-tab/scheduled-command/ScheduledCommandEventForm.tsx b/client/src/app/simulation/simulation-configuration-editor/views/test-configuration-tab/scheduled-command/ScheduledCommandEventForm.tsx
index d209daf4..a9504829 100644
--- a/client/src/app/simulation/simulation-configuration-editor/views/test-configuration-tab/scheduled-command/ScheduledCommandEventForm.tsx
+++ b/client/src/app/simulation/simulation-configuration-editor/views/test-configuration-tab/scheduled-command/ScheduledCommandEventForm.tsx
@@ -14,6 +14,7 @@ import {
 } from '@client:common/topology/model-dictionary';
 
 import { ScheduledCommandEventFormService } from '../../../services/ScheduledCommandEventFormService';
+import { COMPONENT_ATTRIBUTES } from '../../../models/component-attributes';
 
 import './ScheduledCommandEventForm.light.scss';
 import './ScheduledCommandEventForm.dark.scss';
@@ -166,7 +167,13 @@ export class ScheduledCommandEventForm extends Component<Props, State> {
               componentName,
               mRID: selectedComponent.mRID
             });
-            if (this.state.selectedComponentType !== 'Regulator') {
+            if (this.state.selectedComponentType === 'Synchronous Machine') {
+              this.setState({
+                attributeOptionBuilder: new SelectionOptionBuilder(
+                  COMPONENT_ATTRIBUTES['synchronousmachines']
+                )
+              });
+            } else if (this.state.selectedComponentType !== 'Regulator') {
               this._formService.fetchAttributes(
                 typeof selectedComponent.mRID === 'string' ? selectedComponent.mRID : selectedComponent.mRID[0],
                 this.props.modelDictionary.mRID,
@@ -220,7 +227,7 @@ export class ScheduledCommandEventForm extends Component<Props, State> {
           label='Component'
           selectionOptionBuilder={this.state.componentOptionBuilder}
           formControlModel={this.selectedComponentFormControl} />
-        {
+       {
           this.state.selectedComponentType !== 'Regulator'
             ? (
               <Select

From 346191ddb276f55b539fb9b9a63e860c3f6b7813 Mon Sep 17 00:00:00 2001
From: Mathew <bibi.mathew@pnnl.gov>
Date: Mon, 16 Jan 2023 15:28:42 -0600
Subject: [PATCH 3/4] fixed component attributes for scheduled commad in Test
 Config

---
 .../models/component-attributes.ts            | 16 ++----
 .../comm-outage/CommOutageEventForm.tsx       |  6 +-
 .../fault/FaultEventForm.tsx                  |  6 +-
 .../ScheduledCommandEventForm.tsx             | 56 +++++++++++++++++--
 4 files changed, 61 insertions(+), 23 deletions(-)

diff --git a/client/src/app/simulation/simulation-configuration-editor/models/component-attributes.ts b/client/src/app/simulation/simulation-configuration-editor/models/component-attributes.ts
index bbb64abf..df63e4d6 100644
--- a/client/src/app/simulation/simulation-configuration-editor/models/component-attributes.ts
+++ b/client/src/app/simulation/simulation-configuration-editor/models/component-attributes.ts
@@ -1,19 +1,9 @@
 export const COMPONENT_ATTRIBUTES = {
   capacitors: [
-    'RegulatingControl.mode',
-    'RegulatingControl.targetDeadband',
-    'RegulatingControl.targetValue',
-    'ShuntCompensator.aVRDelay',
     'ShuntCompensator.sections'
   ],
   regulators: [
-    'RegulatingControl.targetDeadband',
-    'RegulatingControl.targetValue',
-    'TapChanger.initialDelay',
-    'TapChanger.step',
-    'TapChanger.lineDropCompensation',
-    'TapChanger.lineDropR',
-    'TapChanger.lineDropX'
+    'TapChanger.step'
   ],
   inverters: [
     'PowerElectronicsConnection.p',
@@ -25,5 +15,9 @@ export const COMPONENT_ATTRIBUTES = {
   synchronousmachines: [
     'RotatingMachine.p',
     'RotatingMachine.q'
+  ],
+  der: [
+    'PowerElectronicsConnection.p',
+    'PowerElectronicsConnection.q'
   ]
 };
diff --git a/client/src/app/simulation/simulation-configuration-editor/views/test-configuration-tab/comm-outage/CommOutageEventForm.tsx b/client/src/app/simulation/simulation-configuration-editor/views/test-configuration-tab/comm-outage/CommOutageEventForm.tsx
index d9ba8a82..63b23622 100644
--- a/client/src/app/simulation/simulation-configuration-editor/views/test-configuration-tab/comm-outage/CommOutageEventForm.tsx
+++ b/client/src/app/simulation/simulation-configuration-editor/views/test-configuration-tab/comm-outage/CommOutageEventForm.tsx
@@ -70,10 +70,10 @@ export class CommOutageEventForm extends Component<Props, State> {
       labels.push({label: 'Capacitor', id: 'capacitors'});
     }
     if (this.props.modelDictionary.disconnectors.length > 0) {
-      labels.push({label: 'disconnectors', id: 'disconnectors'});
+      labels.push({label: 'Disconnector', id: 'disconnectors'});
     }
     if (this.props.modelDictionary.switches.length > 0) {
-      labels.push({label: 'switches', id: 'switches'});
+      labels.push({label: 'Switch', id: 'switches'});
     }
     if (this.props.modelDictionary.batteries.length > 0) {
       labels.push({label: 'Battery', id: 'batteries'});
@@ -94,7 +94,7 @@ export class CommOutageEventForm extends Component<Props, State> {
       labels.push({label: 'Sectionaliser', id: 'sectionalisers'});
     }
     if (this.props.modelDictionary.solarpanels.length > 0) {
-      labels.push({label: 'Solar Panel', id: 'solarpanels'});
+      labels.push({label: 'Solar PV', id: 'solarpanels'});
     }
     if (this.props.modelDictionary.synchronousmachines.length > 0) {
       labels.push({label: 'Synchronous Machine', id: 'synchronousmachines'});
diff --git a/client/src/app/simulation/simulation-configuration-editor/views/test-configuration-tab/fault/FaultEventForm.tsx b/client/src/app/simulation/simulation-configuration-editor/views/test-configuration-tab/fault/FaultEventForm.tsx
index f016a022..b05d0b6c 100644
--- a/client/src/app/simulation/simulation-configuration-editor/views/test-configuration-tab/fault/FaultEventForm.tsx
+++ b/client/src/app/simulation/simulation-configuration-editor/views/test-configuration-tab/fault/FaultEventForm.tsx
@@ -44,10 +44,10 @@ export class FaultEventForm extends Component<Props, State> {
       labels.push({label: 'Capacitor', id: 'capacitors'});
     }
     if (this.props.modelDictionary.disconnectors.length > 0) {
-      labels.push({label: 'disconnectors', id: 'disconnectors'});
+      labels.push({label: 'Disconnector', id: 'disconnectors'});
     }
     if (this.props.modelDictionary.switches.length > 0) {
-      labels.push({label: 'switches', id: 'switches'});
+      labels.push({label: 'Switch', id: 'switches'});
     }
     if (this.props.modelDictionary.batteries.length > 0) {
       labels.push({label: 'Battery', id: 'batteries'});
@@ -68,7 +68,7 @@ export class FaultEventForm extends Component<Props, State> {
       labels.push({label: 'Sectionaliser', id: 'sectionalisers'});
     }
     if (this.props.modelDictionary.solarpanels.length > 0) {
-      labels.push({label: 'Solar Panel', id: 'solarpanels'});
+      labels.push({label: 'Solar PV', id: 'solarpanels'});
     }
     if (this.props.modelDictionary.synchronousmachines.length > 0) {
       labels.push({label: 'Synchronous Machine', id: 'synchronousmachines'});
diff --git a/client/src/app/simulation/simulation-configuration-editor/views/test-configuration-tab/scheduled-command/ScheduledCommandEventForm.tsx b/client/src/app/simulation/simulation-configuration-editor/views/test-configuration-tab/scheduled-command/ScheduledCommandEventForm.tsx
index a9504829..b528e5e2 100644
--- a/client/src/app/simulation/simulation-configuration-editor/views/test-configuration-tab/scheduled-command/ScheduledCommandEventForm.tsx
+++ b/client/src/app/simulation/simulation-configuration-editor/views/test-configuration-tab/scheduled-command/ScheduledCommandEventForm.tsx
@@ -4,7 +4,6 @@ import { BasicButton } from '@client:common/buttons';
 import { Select, Input, SelectionOptionBuilder, FormGroupModel, FormControlModel } from '@client:common/form';
 import { ScheduledCommandEvent } from '@client:common/test-manager';
 import { Validators } from '@client:common/form/validation';
-import { Notification } from '@client:common/overlay/notification';
 import {
   ModelDictionary,
   ModelDictionaryCapacitor,
@@ -50,10 +49,10 @@ export class ScheduledCommandEventForm extends Component<Props, State> {
       labels.push({label: 'Capacitor', id: 'capacitors'});
     }
     if (this.props.modelDictionary.disconnectors.length > 0) {
-      labels.push({label: 'disconnectors', id: 'disconnectors'});
+      labels.push({label: 'Disconnector', id: 'disconnectors'});
     }
     if (this.props.modelDictionary.switches.length > 0) {
-      labels.push({label: 'switches', id: 'switches'});
+      labels.push({label: 'Switch', id: 'switches'});
     }
     if (this.props.modelDictionary.batteries.length > 0) {
       labels.push({label: 'Battery', id: 'batteries'});
@@ -74,7 +73,7 @@ export class ScheduledCommandEventForm extends Component<Props, State> {
       labels.push({label: 'Sectionaliser', id: 'sectionalisers'});
     }
     if (this.props.modelDictionary.solarpanels.length > 0) {
-      labels.push({label: 'Solar Panel', id: 'solarpanels'});
+      labels.push({label: 'Solar PV', id: 'solarpanels'});
     }
     if (this.props.modelDictionary.synchronousmachines.length > 0) {
       labels.push({label: 'Synchronous Machine', id: 'synchronousmachines'});
@@ -167,7 +166,52 @@ export class ScheduledCommandEventForm extends Component<Props, State> {
               componentName,
               mRID: selectedComponent.mRID
             });
-            if (this.state.selectedComponentType === 'Synchronous Machine') {
+            // Display attributes based on COMPONENT_ATTRIBUTES file
+            switch (this.state.selectedComponentType) {
+              case 'Synchronous Machine':
+                this.setState({
+                  attributeOptionBuilder: new SelectionOptionBuilder(
+                    COMPONENT_ATTRIBUTES['synchronousmachines']
+                  )
+                });
+                break;
+              case 'Capacitor':
+                this.setState({
+                  attributeOptionBuilder: new SelectionOptionBuilder(
+                    COMPONENT_ATTRIBUTES['capacitors']
+                  )
+                });
+                break;
+              case 'Switch':
+                this.setState({
+                  attributeOptionBuilder: new SelectionOptionBuilder(
+                    COMPONENT_ATTRIBUTES['switches']
+                  )
+                });
+                break;
+              case 'Solar PV':
+              case 'Battery':
+                this.setState({
+                  attributeOptionBuilder: new SelectionOptionBuilder(
+                    COMPONENT_ATTRIBUTES['der']
+                  )
+                });
+                break;
+              case 'Regulator':
+                this.setState({
+                  attributeOptionBuilder: new SelectionOptionBuilder(
+                    COMPONENT_ATTRIBUTES['regulators']
+                  )
+                });
+                break;
+              default:
+                this.setState({
+                  attributeOptionBuilder: SelectionOptionBuilder.defaultBuilder()
+                });
+            }
+
+            // Fetch attributes from platform
+            /* if (this.state.selectedComponentType === 'Synchronous Machine') {
               this.setState({
                 attributeOptionBuilder: new SelectionOptionBuilder(
                   COMPONENT_ATTRIBUTES['synchronousmachines']
@@ -196,7 +240,7 @@ export class ScheduledCommandEventForm extends Component<Props, State> {
                     Notification.open(reason);
                   }
                 });
-            }
+            }*/
           } else {
             this.eventFormGroupModel.setValue({
               componentName: '',

From 4eb12db2f2e692a3e77adb3da84da6bcdb1b7c47 Mon Sep 17 00:00:00 2001
From: Mathew <bibi.mathew@pnnl.gov>
Date: Tue, 28 Feb 2023 14:41:23 -0600
Subject: [PATCH 4/4] fixed attributes for regulator

---
 .../models/component-attributes.ts            |  6 +-
 .../ScheduledCommandEventForm.tsx             | 67 ++++---------------
 2 files changed, 17 insertions(+), 56 deletions(-)

diff --git a/client/src/app/simulation/simulation-configuration-editor/models/component-attributes.ts b/client/src/app/simulation/simulation-configuration-editor/models/component-attributes.ts
index df63e4d6..0bedf474 100644
--- a/client/src/app/simulation/simulation-configuration-editor/models/component-attributes.ts
+++ b/client/src/app/simulation/simulation-configuration-editor/models/component-attributes.ts
@@ -16,7 +16,11 @@ export const COMPONENT_ATTRIBUTES = {
     'RotatingMachine.p',
     'RotatingMachine.q'
   ],
-  der: [
+  batteries: [
+    'PowerElectronicsConnection.p',
+    'PowerElectronicsConnection.q'
+  ],
+  solarpanels: [
     'PowerElectronicsConnection.p',
     'PowerElectronicsConnection.q'
   ]
diff --git a/client/src/app/simulation/simulation-configuration-editor/views/test-configuration-tab/scheduled-command/ScheduledCommandEventForm.tsx b/client/src/app/simulation/simulation-configuration-editor/views/test-configuration-tab/scheduled-command/ScheduledCommandEventForm.tsx
index b528e5e2..a366153c 100644
--- a/client/src/app/simulation/simulation-configuration-editor/views/test-configuration-tab/scheduled-command/ScheduledCommandEventForm.tsx
+++ b/client/src/app/simulation/simulation-configuration-editor/views/test-configuration-tab/scheduled-command/ScheduledCommandEventForm.tsx
@@ -128,16 +128,7 @@ export class ScheduledCommandEventForm extends Component<Props, State> {
       .subscribe({
         next: selectedType => {
           if (selectedType) {
-            /*
-              If the new selected type is Regulator or the previous one was Regulator,
-              we want to add a new `FormControlModel` for the attribute
-            */
-            if (selectedType.label === 'Regulator' || this.state.selectedComponentType === 'Regulator') {
-              const newFormControl = new FormControlModel('', [Validators.checkNotEmpty('Attribute')]);
 
-              this.eventFormGroupModel.setControl('attribute', newFormControl);
-              newFormControl.dependsOn(this.selectedComponentFormControl);
-            }
             this.setState({
               componentOptionBuilder: new SelectionOptionBuilder(
                 this.props.modelDictionary[selectedType.id] || [],
@@ -190,10 +181,16 @@ export class ScheduledCommandEventForm extends Component<Props, State> {
                 });
                 break;
               case 'Solar PV':
+                this.setState({
+                  attributeOptionBuilder: new SelectionOptionBuilder(
+                    COMPONENT_ATTRIBUTES['solarpanels']
+                  )
+                });
+                break;
               case 'Battery':
                 this.setState({
                   attributeOptionBuilder: new SelectionOptionBuilder(
-                    COMPONENT_ATTRIBUTES['der']
+                    COMPONENT_ATTRIBUTES['batteries']
                   )
                 });
                 break;
@@ -210,37 +207,6 @@ export class ScheduledCommandEventForm extends Component<Props, State> {
                 });
             }
 
-            // Fetch attributes from platform
-            /* if (this.state.selectedComponentType === 'Synchronous Machine') {
-              this.setState({
-                attributeOptionBuilder: new SelectionOptionBuilder(
-                  COMPONENT_ATTRIBUTES['synchronousmachines']
-                )
-              });
-            } else if (this.state.selectedComponentType !== 'Regulator') {
-              this._formService.fetchAttributes(
-                typeof selectedComponent.mRID === 'string' ? selectedComponent.mRID : selectedComponent.mRID[0],
-                this.props.modelDictionary.mRID,
-                'LinearShuntCompensator'
-              ).then(attributes => {
-                if (attributes.length === 0) {
-                  Notification.open(
-                    <>
-                      <span>Attribute list is empty for&nbsp;</span>
-                      <strong style={{ color: '#ffa500' }}>{componentName}</strong>
-                    </>
-                  );
-                }
-                this.setState({
-                  attributeOptionBuilder: new SelectionOptionBuilder(attributes)
-                });
-              })
-                .catch(reason => {
-                  if (reason) {
-                    Notification.open(reason);
-                  }
-                });
-            }*/
           } else {
             this.eventFormGroupModel.setValue({
               componentName: '',
@@ -271,20 +237,11 @@ export class ScheduledCommandEventForm extends Component<Props, State> {
           label='Component'
           selectionOptionBuilder={this.state.componentOptionBuilder}
           formControlModel={this.selectedComponentFormControl} />
-       {
-          this.state.selectedComponentType !== 'Regulator'
-            ? (
-              <Select
-                optional
-                label='Attribute'
-                selectionOptionBuilder={this.state.attributeOptionBuilder}
-                formControlModel={this.eventFormGroupModel.findControl('attribute')} />
-            ) : (
-              <Input
-                label='Attribute'
-                formControlModel={this.eventFormGroupModel.findControl('attribute')} />
-            )
-        }
+        <Select
+          optional
+          label='Attribute'
+          selectionOptionBuilder={this.state.attributeOptionBuilder}
+          formControlModel={this.eventFormGroupModel.findControl('attribute')} />
         <Input
           label='Reverse difference value'
           formControlModel={this.eventFormGroupModel.findControl('reverseDifferenceValue')}