Skip to content

Commit

Permalink
Merge pull request #14007 from mrtracy/mtracy/timespan_utc
Browse files Browse the repository at this point in the history
ui: Fixes for various small UI bugs
  • Loading branch information
Matt Tracy authored Mar 9, 2017
2 parents 92fb129 + 4356ef3 commit 3674a3a
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion pkg/ui/app/components/dropdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export default class Dropdown extends React.Component<DropdownOwnProps, {}> {
onClick={() => this.props.onArrowClick(ArrowDirection.LEFT)}>
</span>
<span className="dropdown__title">{this.props.title}{this.props.title ? ":" : ""}</span>
<Select className="dropdown__select" clearable={false} options={options} value={selected} onChange={onChange} />
<Select className="dropdown__select" clearable={false} searchable={false} options={options} value={selected} onChange={onChange} />
<span
className="dropdown__side-arrow"
disabled={_.includes(disabledArrows, ArrowDirection.RIGHT)}
Expand Down
2 changes: 1 addition & 1 deletion pkg/ui/app/containers/nodeGraphs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ class NodeGraphs extends React.Component<NodeGraphsProps, {}> {
</Axis>
</LineGraph>
<LineGraph title="Capacity" sources={storeSources} tooltip={`Summary of total and available capacity ${specifier}.`}>
<Axis>
<Axis units={AxisUnits.Bytes}>
<Metric name="cr.store.capacity" title="Capacity" />
{
// TODO(mrtracy): We really want to display a used capacity
Expand Down
4 changes: 2 additions & 2 deletions pkg/ui/app/containers/timescale.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ interface TimeRangeProps {
// TimeRange is a prettified string representation of the current timescale.
class TimeRange extends React.Component<TimeRangeProps, {}> {
render() {
let s = this.props.start;
let e = this.props.end;
let s = this.props.start.clone().utc();
let e = this.props.end.clone().utc();
let startTimeSpan = <span className="time-range__time">{s.format("HH:mm:SS")}</span>;
let endTimeSpan = <span className="time-range__time">{e.format("HH:mm:SS")}</span>;
let startDateSpan = <span className="time-range__date">{s.format("MMM DD, YYYY")}</span>;
Expand Down
2 changes: 1 addition & 1 deletion pkg/ui/embedded.go

Large diffs are not rendered by default.

0 comments on commit 3674a3a

Please sign in to comment.