Przeglądaj źródła

Fixed values not being populated properly

jnfrati 4 lat temu
rodzic
commit
f288bf9d3f

+ 3 - 14
dashboard/src/main/home/cluster-dashboard/expanded-chart/ExpandedJobChart.tsx

@@ -88,20 +88,14 @@ export const ExpandedJobChartFC: React.FC<{
   ) => {
   ) => {
     // return "";
     // return "";
     let conf: string;
     let conf: string;
-    let values = {} as any;
-
-    set(values, "paused", true);
+    let values = currentChart.config;
 
 
     if (!newConfig) {
     if (!newConfig) {
       set(values, "paused", true);
       set(values, "paused", true);
 
 
-      conf = yaml.dump({
-        ...merge(currentChart.config, values),
-      });
+      conf = yaml.dump(values, { forceQuotes: true });
     } else {
     } else {
       // Convert dotted keys to nested objects
       // Convert dotted keys to nested objects
-      values = {};
-
       for (let key in newConfig) {
       for (let key in newConfig) {
         set(values, key, newConfig[key]);
         set(values, key, newConfig[key]);
       }
       }
@@ -109,12 +103,7 @@ export const ExpandedJobChartFC: React.FC<{
       set(values, "paused", true);
       set(values, "paused", true);
 
 
       // Weave in preexisting values and convert to yaml
       // Weave in preexisting values and convert to yaml
-      conf = yaml.dump(
-        {
-          ...merge(currentChart.config, values),
-        },
-        { forceQuotes: true }
-      );
+      conf = yaml.dump(values, { forceQuotes: true });
     }
     }
 
 
     return conf;
     return conf;