remove params usage in UI fields

observatorycontrolsystem · Jun 17, 2020 · 5a798c8 · 5a798c8
1 parent e7a3111
commit 5a798c8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/static/js/components/configuration.vue b/static/js/components/configuration.vue
@@ -249,11 +249,9 @@
           let modes = this.available_instruments[this.selectedinstrument].modes.acquisition.modes;
           for (let i in modes) {
             requiredModeFields = [];          
-            if ('required_fields' in modes[i].params) {
-              for (let j in modes[i].params.required_fields) {
-                requiredModeFields.push(
-                  modes[i].params.required_fields[j]
-                )
+            if ('extra_params' in modes[i].validation_schema) {
+              for (let j in modes[i].validation_schema.extra_params.schema) {
+                requiredModeFields.push(j)
               }
             }          
             options.push({

diff --git a/static/js/components/instrumentconfig.vue b/static/js/components/instrumentconfig.vue
@@ -323,13 +323,11 @@ export default {
         let modes = this.available_instruments[this.selectedinstrument].modes.rotator.modes;
         for (let i in modes) {
           requiredModeFields = [];          
-          if ('required_fields' in modes[i].params) {
-            for (let j in modes[i].params.required_fields) {
-              requiredModeFields.push(
-                modes[i].params.required_fields[j]
-              )
+          if ('extra_params' in modes[i].validation_schema) {
+            for (let j in modes[i].validation_schema.extra_params.schema) {
+              requiredModeFields.push(j)
             }
-          }          
+          }         
           options.push({
             value: modes[i].code, 
             text: modes[i].name,