For duplicates, search in series list without initial series. (#642)

allegro · Jun 20, 2020 · 7f7a0d5 · 7f7a0d5
1 parent eb9d532
commit 7f7a0d5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/client/components/series-menu/arithmetic-series-menu.tsx b/src/client/components/series-menu/arithmetic-series-menu.tsx
@@ -87,7 +87,8 @@ export const ArithmeticSeriesMenu: React.SFC<ArithmeticOperationSeriesMenuProps>
     onSeriesChange(series.setIn(["expression", "reference"], name));
   }
 
-  const duplicate = !series.equals(initialSeries) && seriesList.getSeriesWithKey(series.key());
+  const otherSeries = seriesList.removeSeries(initialSeries);
+  const duplicate = otherSeries.getSeriesWithKey(series.key());
   const expression = series.expression as ArithmeticExpression;
   const operation = OPERATIONS.find(op => op.id === expression.operation);
   const operand = measures.getMeasureByName(expression.reference);

diff --git a/src/client/components/series-menu/quantile-series-menu.tsx b/src/client/components/series-menu/quantile-series-menu.tsx
@@ -44,11 +44,13 @@ const percentiles: Array<Preset<number>> = [
 
 export const QuantileSeriesMenu: React.SFC<QuantileSeriesMenuProps> = ({ seriesList, initialSeries, measure, series, onChange }) => {
 
+  const otherSeries = seriesList.removeSeries(initialSeries);
+
   function validateSeries(series: QuantileSeries): string | null {
     if (series.percentile <= 0 || series.percentile >= 100) {
       return "Percentile must be a number greater than 0 and lower than 100";
     }
-    if (!series.equals(initialSeries) && seriesList.hasSeries(series)) {
+    if (otherSeries.hasSeriesWithKey(series.key())) {
       return "This percentile is already define for this measure";
     }
     return null;