1301920191

Committed 23 May 2024 07:13AM UTC coverage: 83.42% (-16.5%) from 99.964%

Build # 1301920191

Build Type

Pull #4421

gitlab-ci

Committed by

mzedel

Commit Message

fix: fixed an issue that sometimes prevented reopening paginated auditlog links

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

Pull Request Pull Request #4421: MEN-7034 - device information in auditlog entries

Run Details

4456 of 6367 branches covered (69.99%)

34 of 35 new or added lines in 7 files covered. (97.14%)

1668 existing lines in 162 files now uncovered.

8473 of 10157 relevant lines covered (83.42%)

140.52 hits per line

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

73.33

/src/js/components/common/forms/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, { useEffect, useState } from 'react';
import { Controller, useFormContext } from 'react-hook-form';

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

import moment from 'moment';

const ensureStartOfDay = date => {
  const momentDate = typeof date === 'string' ? moment(date.replace('Z', '')) : moment(date);
  return `${momentDate.format().split('T')[0]}T00:00:00.000`;
};

const ensureEndOfDay = date => {
  const momentDate = typeof date === 'string' ? moment(date.replace('Z', '')) : moment(date);
  return `${momentDate.format().split('T')[0]}T23:59:59.999`;
};

export const TimeframePicker = ({ tonight: propsTonight }) => {
  const [tonight] = useState(moment(propsTonight));
  const [maxStartDate, setMaxStartDate] = useState(tonight);
  const [minEndDate, setMinEndDate] = useState(tonight);

  const { control, setValue, watch, getValues } = useFormContext();

  const startDate = watch('startDate');
  const endDate = watch('endDate');

  useEffect(() => {
    let currentEndDate = getValues('endDate');
    if (startDate > currentEndDate) {
      setValue('endDate', ensureEndOfDay(startDate));
    }
    setMinEndDate(moment(startDate));
  }, [startDate, getValues, setValue]);

  useEffect(() => {
    let currentStartDate = getValues('startDate');
    if (endDate < currentStartDate) {
      setValue('startDate', ensureStartOfDay(endDate));
    }
    setMaxStartDate(moment(endDate));
  }, [endDate, getValues, setValue]);

  const handleChangeStartDate = date => ensureStartOfDay(date);

  const handleChangeEndDate = date => ensureEndOfDay(date);

  return (
    <div className="flexbox" style={{ flexWrap: 'wrap', gap: 15 }}>
      <Controller
        name="startDate"
        control={control}
        render={({ field: { onChange, value } }) => (
          <DatePicker
            disabled={!value}
            disableFuture
            format="MMMM Do"
            label="From"
            maxDate={maxStartDate}
            onChange={e => onChange(handleChangeStartDate(e))}
            value={value ? moment(value) : moment()}
          />
        )}
      />
      <Controller
        name="endDate"
        control={control}
        render={({ field: { onChange, value } }) => (
          <DatePicker
            disableFuture
            format="MMMM Do"
            label="To"
            minDate={minEndDate}
            onChange={e => onChange(handleChangeEndDate(e))}
            value={value ? moment(value) : moment()}
          />
        )}
      />
    </div>
  );
};

export default TimeframePicker;

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, { useEffect, useState } from 'react';
15	import { Controller, useFormContext } from 'react-hook-form';
16
17	import { DatePicker } from '@mui/x-date-pickers/DatePicker';
18
19	import moment from 'moment';
20
21	const ensureStartOfDay = date => {	8✔
UNCOV 22	const momentDate = typeof date === 'string' ? moment(date.replace('Z', '')) : moment(date);	×
UNCOV 23	return `${momentDate.format().split('T')[0]}T00:00:00.000`;	×
24	};
25
26	const ensureEndOfDay = date => {	8✔
UNCOV 27	const momentDate = typeof date === 'string' ? moment(date.replace('Z', '')) : moment(date);	×
UNCOV 28	return `${momentDate.format().split('T')[0]}T23:59:59.999`;	×
29	};
30
31	export const TimeframePicker = ({ tonight: propsTonight }) => {	8✔
32	const [tonight] = useState(moment(propsTonight));	73✔
33	const [maxStartDate, setMaxStartDate] = useState(tonight);	73✔
34	const [minEndDate, setMinEndDate] = useState(tonight);	73✔
35
36	const { control, setValue, watch, getValues } = useFormContext();	73✔
37
38	const startDate = watch('startDate');	73✔
39	const endDate = watch('endDate');	73✔
40
41	useEffect(() => {	73✔
42	let currentEndDate = getValues('endDate');	22✔
43	if (startDate > currentEndDate) {	22!
UNCOV 44	setValue('endDate', ensureEndOfDay(startDate));	×
45	}
46	setMinEndDate(moment(startDate));	22✔
47	}, [startDate, getValues, setValue]);
48
49	useEffect(() => {	73✔
50	let currentStartDate = getValues('startDate');	17✔
51	if (endDate < currentStartDate) {	17!
UNCOV 52	setValue('startDate', ensureStartOfDay(endDate));	×
53	}
54	setMaxStartDate(moment(endDate));	17✔
55	}, [endDate, getValues, setValue]);
56
57	const handleChangeStartDate = date => ensureStartOfDay(date);	73✔
58
59	const handleChangeEndDate = date => ensureEndOfDay(date);	73✔
60
61	return (	73✔
62	<div className="flexbox" style={{ flexWrap: 'wrap', gap: 15 }}>
63	<Controller
64	name="startDate"
65	control={control}
66	render={({ field: { onChange, value } }) => (
67	<DatePicker	73✔
68	disabled={!value}
69	disableFuture
70	format="MMMM Do"
71	label="From"
72	maxDate={maxStartDate}
UNCOV 73	onChange={e => onChange(handleChangeStartDate(e))}	×
74	value={value ? moment(value) : moment()}	73✔
75	/>
76	)}
77	/>
78	<Controller
79	name="endDate"
80	control={control}
81	render={({ field: { onChange, value } }) => (
82	<DatePicker	73✔
83	disableFuture
84	format="MMMM Do"
85	label="To"
86	minDate={minEndDate}
UNCOV 87	onChange={e => onChange(handleChangeEndDate(e))}	×
88	value={value ? moment(value) : moment()}	73✔
89	/>
90	)}
91	/>
92	</div>
93	);
94	};
95
96	export default TimeframePicker;

mendersoftware / gui / 1301920191

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