Use limits in Split menu

allegro · Jun 7, 2021 · 83ba348 · 83ba348
1 parent 7c33eaf
commit 83ba348
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/src/client/components/split-menu/limit-dropdown.tsx b/src/client/components/split-menu/limit-dropdown.tsx
@@ -15,7 +15,6 @@
  */
 
 import * as React from "react";
-import { DEFAULT_LIMITS } from "../../../common/limit/limit";
 import { Unary } from "../../../common/utils/functional/functional";
 import { STRINGS } from "../../config/constants";
 import { Dropdown } from "../dropdown/dropdown";
@@ -24,22 +23,24 @@ function formatLimit(limit: number): string {
   return limit === null ? "None" : String(limit);
 }
 
-function calculateLimits(includeNone: boolean) {
-  if (!includeNone) return DEFAULT_LIMITS;
-  return [...DEFAULT_LIMITS, null];
+// TODO: Review again when fixing time split menu in #756
+function calculateLimits(limits: number[], includeNone: boolean) {
+  if (!includeNone) return limits;
+  return [...limits, null];
 }
 
 export interface LimitDropdownProps {
-  limit: number;
+  selectedLimit: number;
+  limits: number[];
   includeNone: boolean;
   onLimitSelect: Unary<number, void>;
 }
 
-export const LimitDropdown: React.SFC<LimitDropdownProps> = ({ onLimitSelect, limit, includeNone }) => {
+export const LimitDropdown: React.SFC<LimitDropdownProps> = ({ onLimitSelect, limits, selectedLimit, includeNone }) => {
   return <Dropdown<number | string>
     label={STRINGS.limit}
-    items={calculateLimits(includeNone)}
-    selectedItem={limit}
+    items={calculateLimits(limits, includeNone)}
+    selectedItem={selectedLimit}
     renderItem={formatLimit}
     onSelect={onLimitSelect}
   />;

diff --git a/src/client/components/split-menu/split-menu.tsx b/src/client/components/split-menu/split-menu.tsx
@@ -157,8 +157,9 @@ export class SplitMenu extends React.Component<SplitMenuProps, SplitMenuState> {
       {this.renderSortDropdown()}
       <LimitDropdown
         onLimitSelect={this.saveLimit}
-        limit={limit}
-        includeNone={isContinuous(dimension)} />
+       selectedLimit={limit}
+        includeNone={isContinuous(dimension)}
+        limits={dimension.limits}/>
       <div className="button-bar">
         <Button className="ok" type="primary" disabled={!this.validate()} onClick={this.onOkClick} title={STRINGS.ok} />
         <Button type="secondary" onClick={this.onCancelClick} title={STRINGS.cancel} />