901187442

pending completion

Build # 901187442

Build Type

Pull #3795

gitlab-ci

Committed by

mzedel

Commit Message

feat: increased chances of adopting our intended navigation patterns instead of unsupported browser navigation

Ticket: None
Changelog: None
Signed-off-by: Manuel Zedel <manuel.zedel@northern.tech>

Pull Request Pull Request #3795: feat: increased chances of adopting our intended navigation patterns instead of unsupported browser navigation

Run Details

4389 of 6365 branches covered (68.96%)

5 of 5 new or added lines in 1 file covered. (100.0%)

1729 existing lines in 165 files now uncovered.

8274 of 10019 relevant lines covered (82.58%)

144.86 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

47.22

/src/js/components/common/timeframe-picker.js

// Copyright 2020 Northern.tech AS
//
//    Licensed under the Apache License, Version 2.0 (the "License");
//    you may not use this file except in compliance with the License.
//    You may obtain a copy of the License at
//
//        http://www.apache.org/licenses/LICENSE-2.0
//
//    Unless required by applicable law or agreed to in writing, software
//    distributed under the License is distributed on an "AS IS" BASIS,
//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
//    See the License for the specific language governing permissions and
//    limitations under the License.
import React, { memo, useEffect, useState } from 'react';

import { DatePicker } from '@mui/x-date-pickers/DatePicker';

import moment from 'moment';

export const TimeframePicker = ({ onChange, ...props }) => {
  const [tonight] = useState(moment().endOf('day'));
  const [endDate, setEndDate] = useState(moment(props.endDate) > tonight ? tonight : moment(props.endDate));
  const [startDate, setStartDate] = useState(moment(props.startDate));

  useEffect(() => {
    setEndDate(moment(props.endDate) > tonight ? tonight : moment(props.endDate));
    setStartDate(moment(props.startDate));
  }, [props.tonight, props.endDate, props.startDate]);

  const handleChangeStartDate = date => {
    let currentEndDate = endDate.clone();
    if (date > currentEndDate) {
      currentEndDate = date;
      currentEndDate.endOf('day');
    }
    date.startOf('day');
    onChange(date.toISOString(), currentEndDate.toISOString());
  };

  const handleChangeEndDate = date => {
    let currentStartDate = startDate.clone();
    if (date < currentStartDate) {
      currentStartDate = date;
      currentStartDate.startOf('day');
    }
    date.endOf('day');
    onChange(currentStartDate.toISOString(), date.toISOString());
  };

  return (
    <>
      <DatePicker onChange={handleChangeStartDate} label="From" format="MMMM Do" value={startDate} maxDate={props.endDate ? endDate : tonight} />
      <DatePicker className="margin-left-small" onChange={handleChangeEndDate} label="To" format="MMMM Do" value={endDate} maxDate={tonight} />
    </>
  );
};

const areEqual = (prevProps, nextProps) => {
  return !(prevProps.endDate != nextProps.endDate || prevProps.startDate != nextProps.startDate);
};

export default memo(TimeframePicker, areEqual);

1	// Copyright 2020 Northern.tech AS
2	//
3	// Licensed under the Apache License, Version 2.0 (the "License");
4	// you may not use this file except in compliance with the License.
5	// You may obtain a copy of the License at
6	//
7	// http://www.apache.org/licenses/LICENSE-2.0
8	//
9	// Unless required by applicable law or agreed to in writing, software
10	// distributed under the License is distributed on an "AS IS" BASIS,
11	// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12	// See the License for the specific language governing permissions and
13	// limitations under the License.
14	import React, { memo, useEffect, useState } from 'react';
15
16	import { DatePicker } from '@mui/x-date-pickers/DatePicker';
17
18	import moment from 'moment';
19
20	export const TimeframePicker = ({ onChange, ...props }) => {	9✔
21	const [tonight] = useState(moment().endOf('day'));	16✔
22	const [endDate, setEndDate] = useState(moment(props.endDate) > tonight ? tonight : moment(props.endDate));	16!
23	const [startDate, setStartDate] = useState(moment(props.startDate));	16✔
24
25	useEffect(() => {	16✔
26	setEndDate(moment(props.endDate) > tonight ? tonight : moment(props.endDate));	8!
27	setStartDate(moment(props.startDate));	8✔
28	}, [props.tonight, props.endDate, props.startDate]);
29
30	const handleChangeStartDate = date => {	16✔
UNCOV 31	let currentEndDate = endDate.clone();	×
UNCOV 32	if (date > currentEndDate) {	×
UNCOV 33	currentEndDate = date;	×
UNCOV 34	currentEndDate.endOf('day');	×
35	}
UNCOV 36	date.startOf('day');	×
UNCOV 37	onChange(date.toISOString(), currentEndDate.toISOString());	×
38	};
39
40	const handleChangeEndDate = date => {	16✔
UNCOV 41	let currentStartDate = startDate.clone();	×
UNCOV 42	if (date < currentStartDate) {	×
UNCOV 43	currentStartDate = date;	×
UNCOV 44	currentStartDate.startOf('day');	×
45	}
UNCOV 46	date.endOf('day');	×
UNCOV 47	onChange(currentStartDate.toISOString(), date.toISOString());	×
48	};
49
50	return (	16✔
51	<>
52	<DatePicker onChange={handleChangeStartDate} label="From" format="MMMM Do" value={startDate} maxDate={props.endDate ? endDate : tonight} />	16!
53	<DatePicker className="margin-left-small" onChange={handleChangeEndDate} label="To" format="MMMM Do" value={endDate} maxDate={tonight} />
54	</>
55	);
56	};
57
58	const areEqual = (prevProps, nextProps) => {	9✔
59	return !(prevProps.endDate != nextProps.endDate \|\| prevProps.startDate != nextProps.startDate);	70✔
60	};
61
62	export default memo(TimeframePicker, areEqual);

mendersoftware / gui / 901187442

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous