StatsHouse UI: fix encode remove params

Author: vauweb

statshouse-ui/src/url2/urlEncode.ts

@@ -41,9 +41,13 @@ export function urlEncodeGlobalParam(
     paramArr.push([GET_PARAMS.metricTabNum, params.tabNum]);
   }
   if (!dequal(defaultParams.timeShifts, params.timeShifts)) {
-    params.timeShifts.forEach((shift) => {
-      paramArr.push([GET_PARAMS.metricTimeShifts, shift.toString()]);
-    });
+    if (params.timeShifts.length === 0 && defaultParams.timeShifts.length > 0) {
+      paramArr.push([GET_PARAMS.metricTimeShifts, removeValueChar]);
+    } else {
+      params.timeShifts.forEach((shift) => {
+        paramArr.push([GET_PARAMS.metricTimeShifts, shift.toString()]);
+      });
+    }
   }
   if (defaultParams.eventFrom !== params.eventFrom) {
     paramArr.push([GET_PARAMS.metricEventFrom, params.eventFrom.toString()]);

statshouse-ui/src/url2/widgetsParams/metric/metricEncode.ts

@@ -94,21 +94,36 @@ export function metricEncode(plot: PlotParams, defaultPlot: PlotParams = getNewM
   }
 
   if (!dequal(defaultPlot.events, plot.events)) {
-    plot.events.forEach((e) => {
-      paramArr.push([prefix + GET_PARAMS.metricEvent, e]);
-    });
+    //remove metric event
+    if (plot.events.length === 0 && defaultPlot.events.length > 0) {
+      paramArr.push([prefix + GET_PARAMS.metricEvent, removeValueChar]);
+    } else {
+      plot.events.forEach((e) => {
+        paramArr.push([prefix + GET_PARAMS.metricEvent, e]);
+      });
+    }
   }
 
   if (!dequal(defaultPlot.eventsBy, plot.eventsBy)) {
-    plot.eventsBy.forEach((e) => {
-      paramArr.push([prefix + GET_PARAMS.metricEventBy, e]);
-    });
+    //remove event by
+    if (plot.eventsBy.length === 0 && defaultPlot.eventsBy.length > 0) {
+      paramArr.push([prefix + GET_PARAMS.metricEventBy, removeValueChar]);
+    } else {
+      plot.eventsBy.forEach((e) => {
+        paramArr.push([prefix + GET_PARAMS.metricEventBy, e]);
+      });
+    }
   }
 
   if (!dequal(defaultPlot.eventsHide, plot.eventsHide)) {
-    plot.eventsHide.forEach((e) => {
-      paramArr.push([prefix + GET_PARAMS.metricEventHide, e]);
-    });
+    //remove event hide
+    if (plot.eventsHide.length === 0 && defaultPlot.eventsHide.length > 0) {
+      paramArr.push([prefix + GET_PARAMS.metricEventHide, removeValueChar]);
+    } else {
+      plot.eventsHide.forEach((e) => {
+        paramArr.push([prefix + GET_PARAMS.metricEventHide, e]);
+      });
+    }
   }
 
   if (defaultPlot.totalLine !== plot.totalLine) {
@@ -128,9 +143,14 @@ export function metricEncode(plot: PlotParams, defaultPlot: PlotParams = getNewM
   }
 
   if (!dequal(defaultPlot.timeShifts, plot.timeShifts)) {
-    plot.timeShifts.forEach((t) => {
-      paramArr.push([prefix + GET_PARAMS.metricLocalTimeShifts, t.toString()]);
-    });
+    //remove local time shifts
+    if (plot.timeShifts.length === 0 && defaultPlot.timeShifts.length > 0) {
+      paramArr.push([prefix + GET_PARAMS.metricLocalTimeShifts, removeValueChar]);
+    } else {
+      plot.timeShifts.forEach((t) => {
+        paramArr.push([prefix + GET_PARAMS.metricLocalTimeShifts, t.toString()]);
+      });
+    }
   }
   if (!paramArr.length && !defaultPlot.id) {
     if (plot.metricName === promQLMetric) {