1350829378

Committed 27 Jun 2024 01:46PM UTC coverage: 83.494% (-16.5%) from 99.965%

Build # 1350829378

Build Type

Pull #4465

gitlab-ci

Committed by

mzedel

Commit Message

chore: test fixes

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

Pull Request Pull Request #4465: MEN-7169 - feat: added multi sorting capabilities to devices view

Run Details

4506 of 6430 branches covered (70.08%)

81 of 100 new or added lines in 14 files covered. (81.0%)

1661 existing lines in 163 files now uncovered.

8574 of 10269 relevant lines covered (83.49%)

160.6 hits per line

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

94.59

/src/js/components/dashboard/devices.js

// Copyright 2019 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, { useCallback, useEffect, useRef } from 'react';
import { useDispatch, useSelector } from 'react-redux';
import { useNavigate } from 'react-router-dom';

import { getDeviceCount } from '../../actions/deviceActions';
import { getIssueCountsByType } from '../../actions/monitorActions';
import { advanceOnboarding } from '../../actions/onboardingActions';
import { setShowConnectingDialog } from '../../actions/userActions';
import { DEVICE_STATES } from '../../constants/deviceConstants';
import { onboardingSteps } from '../../constants/onboardingConstants';
import {
  getAcceptedDevices,
  getAvailableIssueOptionsByType,
  getDeviceCountsByStatus,
  getOnboardingState,
  getTenantCapabilities,
  getUserCapabilities
} from '../../selectors';
import { getOnboardingComponentFor } from '../../utils/onboardingmanager';
import useWindowSize from '../../utils/resizehook';
import AcceptedDevices from './widgets/accepteddevices';
import ActionableDevices from './widgets/actionabledevices';
import PendingDevices from './widgets/pendingdevices';
import RedirectionWidget from './widgets/redirectionwidget';

export const Devices = ({ clickHandle }) => {
  // eslint-disable-next-line no-unused-vars
  const size = useWindowSize();
  const anchor = useRef();
  const pendingsRef = useRef();
  const navigate = useNavigate();
  const dispatch = useDispatch();
  const { total: acceptedDevicesCount } = useSelector(getAcceptedDevices);
  const availableIssueOptions = useSelector(getAvailableIssueOptionsByType);
  const { canManageDevices } = useSelector(getUserCapabilities);
  const { hasReporting, plan } = useSelector(getTenantCapabilities);
  const onboardingState = useSelector(getOnboardingState);
  const { pending: pendingDevicesCount } = useSelector(getDeviceCountsByStatus);

  const refreshDevices = useCallback(() => {
    const issueRequests = Object.keys(availableIssueOptions).map(key => dispatch(getIssueCountsByType(key, { filters: [], selectedIssues: [key] })));
    return Promise.all([dispatch(getDeviceCount(DEVICE_STATES.accepted)), dispatch(getDeviceCount(DEVICE_STATES.pending)), ...issueRequests]);
    // eslint-disable-next-line react-hooks/exhaustive-deps
  }, [JSON.stringify(availableIssueOptions), dispatch]);

  const showDismissHelptipsDialog = useSelector(state => !state.onboarding.complete && state.onboarding.showTipsDialog);
  const showDeviceConnectionDialog = useSelector(state => state.users.showConnectDeviceDialog);
  const showsDialog = showDismissHelptipsDialog || showDeviceConnectionDialog;

  useEffect(() => {
    // on render the store might not be updated so we resort to the API and let all later request go through the store
    // to be in sync with the rest of the UI
    refreshDevices();
  }, [refreshDevices]);

  useEffect(() => {
    refreshDevices();
    // eslint-disable-next-line react-hooks/exhaustive-deps
  }, [JSON.stringify(availableIssueOptions), refreshDevices]);

  const onConnectClick = () => {
    dispatch(setShowConnectingDialog(true));
    navigate('/devices/accepted');
  };

  let onboardingComponent = null;
  if (anchor.current && !showsDialog) {
    const element = anchor.current.children[anchor.current.children.length - 1];
    const deviceConnectionAnchor = { left: element.offsetLeft + element.offsetWidth / 2, top: element.offsetTop + element.offsetHeight - 50 };
    onboardingComponent = getOnboardingComponentFor(onboardingSteps.DASHBOARD_ONBOARDING_START, onboardingState, { anchor: deviceConnectionAnchor });
    if (pendingsRef.current) {
      const element = pendingsRef.current.lastChild;
      const pendingsAnchor = {
        left: pendingsRef.current.offsetLeft + element.offsetWidth / 2,
        top: pendingsRef.current.offsetTop + element.offsetHeight
      };
      onboardingComponent = getOnboardingComponentFor(onboardingSteps.DASHBOARD_ONBOARDING_PENDINGS, onboardingState, { anchor: pendingsAnchor });
    }
  }
  const shouldShowActionableDevices = plan !== 'os';
  return (
    <>
      <div className="dashboard" ref={anchor}>
        <AcceptedDevices devicesCount={acceptedDevicesCount} onClick={clickHandle} />
        {!!acceptedDevicesCount && shouldShowActionableDevices && <ActionableDevices issues={availableIssueOptions} />}
        {!!pendingDevicesCount && !(acceptedDevicesCount && hasReporting) && (
          <PendingDevices
            advanceOnboarding={step => dispatch(advanceOnboarding(step))}
            innerRef={pendingsRef}
            isActive={pendingDevicesCount > 0}
            onboardingState={onboardingState}
            onClick={clickHandle}
            pendingDevicesCount={pendingDevicesCount}
          />
        )}
        {canManageDevices && (
          <RedirectionWidget content={acceptedDevicesCount || pendingDevicesCount ? '+ connect more devices' : 'Connect a device'} onClick={onConnectClick} />
        )}
      </div>
      {onboardingComponent}
    </>
  );
};

export default Devices;

1	// Copyright 2019 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, { useCallback, useEffect, useRef } from 'react';
15	import { useDispatch, useSelector } from 'react-redux';
16	import { useNavigate } from 'react-router-dom';
17
18	import { getDeviceCount } from '../../actions/deviceActions';
19	import { getIssueCountsByType } from '../../actions/monitorActions';
20	import { advanceOnboarding } from '../../actions/onboardingActions';
21	import { setShowConnectingDialog } from '../../actions/userActions';
22	import { DEVICE_STATES } from '../../constants/deviceConstants';
23	import { onboardingSteps } from '../../constants/onboardingConstants';
24	import {
25	getAcceptedDevices,
26	getAvailableIssueOptionsByType,
27	getDeviceCountsByStatus,
28	getOnboardingState,
29	getTenantCapabilities,
30	getUserCapabilities
31	} from '../../selectors';
32	import { getOnboardingComponentFor } from '../../utils/onboardingmanager';
33	import useWindowSize from '../../utils/resizehook';
34	import AcceptedDevices from './widgets/accepteddevices';
35	import ActionableDevices from './widgets/actionabledevices';
36	import PendingDevices from './widgets/pendingdevices';
37	import RedirectionWidget from './widgets/redirectionwidget';
38
39	export const Devices = ({ clickHandle }) => {	4✔
40	// eslint-disable-next-line no-unused-vars
41	const size = useWindowSize();	35✔
42	const anchor = useRef();	35✔
43	const pendingsRef = useRef();	35✔
44	const navigate = useNavigate();	35✔
45	const dispatch = useDispatch();	35✔
46	const { total: acceptedDevicesCount } = useSelector(getAcceptedDevices);	35✔
47	const availableIssueOptions = useSelector(getAvailableIssueOptionsByType);	35✔
48	const { canManageDevices } = useSelector(getUserCapabilities);	35✔
49	const { hasReporting, plan } = useSelector(getTenantCapabilities);	35✔
50	const onboardingState = useSelector(getOnboardingState);	35✔
51	const { pending: pendingDevicesCount } = useSelector(getDeviceCountsByStatus);	35✔
52
53	const refreshDevices = useCallback(() => {	35✔
54	const issueRequests = Object.keys(availableIssueOptions).map(key => dispatch(getIssueCountsByType(key, { filters: [], selectedIssues: [key] })));	20✔
55	return Promise.all([dispatch(getDeviceCount(DEVICE_STATES.accepted)), dispatch(getDeviceCount(DEVICE_STATES.pending)), ...issueRequests]);	20✔
56	// eslint-disable-next-line react-hooks/exhaustive-deps
57	}, [JSON.stringify(availableIssueOptions), dispatch]);
58
59	const showDismissHelptipsDialog = useSelector(state => !state.onboarding.complete && state.onboarding.showTipsDialog);	2,223✔
60	const showDeviceConnectionDialog = useSelector(state => state.users.showConnectDeviceDialog);	2,223✔
61	const showsDialog = showDismissHelptipsDialog \|\| showDeviceConnectionDialog;	35✔
62
63	useEffect(() => {	35✔
64	// on render the store might not be updated so we resort to the API and let all later request go through the store
65	// to be in sync with the rest of the UI
66	refreshDevices();	10✔
67	}, [refreshDevices]);
68
69	useEffect(() => {	35✔
70	refreshDevices();	10✔
71	// eslint-disable-next-line react-hooks/exhaustive-deps
72	}, [JSON.stringify(availableIssueOptions), refreshDevices]);
73
74	const onConnectClick = () => {	35✔
UNCOV 75	dispatch(setShowConnectingDialog(true));	×
UNCOV 76	navigate('/devices/accepted');	×
77	};
78
79	let onboardingComponent = null;	35✔
80	if (anchor.current && !showsDialog) {	35✔
81	const element = anchor.current.children[anchor.current.children.length - 1];	25✔
82	const deviceConnectionAnchor = { left: element.offsetLeft + element.offsetWidth / 2, top: element.offsetTop + element.offsetHeight - 50 };	25✔
83	onboardingComponent = getOnboardingComponentFor(onboardingSteps.DASHBOARD_ONBOARDING_START, onboardingState, { anchor: deviceConnectionAnchor });	25✔
84	if (pendingsRef.current) {	25✔
85	const element = pendingsRef.current.lastChild;	19✔
86	const pendingsAnchor = {	19✔
87	left: pendingsRef.current.offsetLeft + element.offsetWidth / 2,
88	top: pendingsRef.current.offsetTop + element.offsetHeight
89	};
90	onboardingComponent = getOnboardingComponentFor(onboardingSteps.DASHBOARD_ONBOARDING_PENDINGS, onboardingState, { anchor: pendingsAnchor });	19✔
91	}
92	}
93	const shouldShowActionableDevices = plan !== 'os';	35✔
94	return (	35✔
95	<>
96	<div className="dashboard" ref={anchor}>
97	<AcceptedDevices devicesCount={acceptedDevicesCount} onClick={clickHandle} />
98	{!!acceptedDevicesCount && shouldShowActionableDevices && <ActionableDevices issues={availableIssueOptions} />}	63✔
99	{!!pendingDevicesCount && !(acceptedDevicesCount && hasReporting) && (	149✔
100	<PendingDevices
101	advanceOnboarding={step => dispatch(advanceOnboarding(step))}	1✔
102	innerRef={pendingsRef}
103	isActive={pendingDevicesCount > 0}
104	onboardingState={onboardingState}
105	onClick={clickHandle}
106	pendingDevicesCount={pendingDevicesCount}
107	/>
108	)}
109	{canManageDevices && (	66✔
110	<RedirectionWidget content={acceptedDevicesCount \|\| pendingDevicesCount ? '+ connect more devices' : 'Connect a device'} onClick={onConnectClick} />	66✔
111	)}
112	</div>
113	{onboardingComponent}
114	</>
115	);
116	};
117
118	export default Devices;

mendersoftware / gui / 1350829378

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