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

88.33

/src/js/components/header/header.js

// Copyright 2015 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, useState } from 'react';
import { useDispatch, useSelector } from 'react-redux';
import { Link } from 'react-router-dom';

import {
  AccountCircle as AccountCircleIcon,
  ArrowDropDown as ArrowDropDownIcon,
  ArrowDropUp as ArrowDropUpIcon,
  ExitToApp as ExitIcon
} from '@mui/icons-material';
import { Button, IconButton, ListItemSecondaryAction, ListItemText, Menu, MenuItem, Toolbar } from '@mui/material';
import { makeStyles } from 'tss-react/mui';

import moment from 'moment';
import Cookies from 'universal-cookie';

import enterpriseLogo from '../../../assets/img/headerlogo-enterprise.png';
import logo from '../../../assets/img/headerlogo.png';
import whiteEnterpriseLogo from '../../../assets/img/whiteheaderlogo-enterprise.png';
import whiteLogo from '../../../assets/img/whiteheaderlogo.png';
import { setFirstLoginAfterSignup, setSearchState } from '../../actions/appActions';
import { getAllDeviceCounts } from '../../actions/deviceActions';
import { initializeSelf, logoutUser, setAllTooltipsReadState, setHideAnnouncement } from '../../actions/userActions';
import { TIMEOUTS } from '../../constants/appConstants';
import { READ_STATES } from '../../constants/userConstants';
import { isDarkMode } from '../../helpers';
import {
  getAcceptedDevices,
  getCurrentSession,
  getCurrentUser,
  getDeviceCountsByStatus,
  getDeviceLimit,
  getFeatures,
  getIsEnterprise,
  getOrganization,
  getShowHelptips,
  getUserCapabilities,
  getUserSettings
} from '../../selectors';
import Tracking from '../../tracking';
import { useDebounce } from '../../utils/debouncehook';
import Search from '../common/search';
import Announcement from './announcement';
import DemoNotification from './demonotification';
import DeploymentNotifications from './deploymentnotifications';
import DeviceNotifications from './devicenotifications';
import OfferHeader from './offerheader';
import TrialNotification from './trialnotification';

// Change this when a new feature/offer is introduced
const currentOffer = {
  name: 'add-ons',
  expires: '2021-12-30',
  trial: true,
  os: true,
  professional: true,
  enterprise: true
};

const cookies = new Cookies();

const useStyles = makeStyles()(theme => ({
  header: {
    minHeight: 'unset',
    paddingLeft: theme.spacing(4),
    paddingRight: theme.spacing(5),
    width: '100%',
    borderBottom: `1px solid ${theme.palette.grey[100]}`,
    display: 'grid'
  },
  banner: { gridTemplateRows: `1fr ${theme.mixins.toolbar.minHeight}px` },
  buttonColor: { color: theme.palette.grey[600] },
  dropDown: { height: '100%', marginLeft: theme.spacing(0.5), textTransform: 'none' },
  exitIcon: { color: theme.palette.grey[600], fill: theme.palette.grey[600] },
  demoTrialAnnouncement: {
    fontSize: 14,
    height: 'auto'
  },
  demoAnnouncementIcon: {
    height: 16,
    color: theme.palette.primary.main,
    '&.MuiButton-textPrimary': {
      color: theme.palette.primary.main,
      height: 'inherit'
    }
  },
  redAnnouncementIcon: {
    color: theme.palette.error.dark
  }
}));

export const Header = ({ mode }) => {
  const { classes } = useStyles();
  const [anchorEl, setAnchorEl] = useState(null);
  const [gettingUser, setGettingUser] = useState(false);
  const [hasOfferCookie, setHasOfferCookie] = useState(false);

  const organization = useSelector(getOrganization);
  const { canManageUsers: allowUserManagement } = useSelector(getUserCapabilities);
  const { total: acceptedDevices = 0 } = useSelector(getAcceptedDevices);
  const announcement = useSelector(state => state.app.hostedAnnouncement);
  const deviceLimit = useSelector(getDeviceLimit);
  const firstLoginAfterSignup = useSelector(state => state.app.firstLoginAfterSignup);
  const { trackingConsentGiven: hasTrackingEnabled } = useSelector(getUserSettings);
  const inProgress = useSelector(state => state.deployments.byStatus.inprogress.total);
  const isEnterprise = useSelector(getIsEnterprise);
  const { isDemoMode: demo, hasMultitenancy, isHosted } = useSelector(getFeatures);
  const { isSearching, searchTerm, refreshTrigger } = useSelector(state => state.app.searchState);
  const multitenancy = hasMultitenancy || isEnterprise || isHosted;
  const { pending: pendingDevices } = useSelector(getDeviceCountsByStatus);
  const userSettingInitialized = useSelector(state => state.users.settingsInitialized);
  const user = useSelector(getCurrentUser);
  const { token } = useSelector(getCurrentSession);
  const userId = useDebounce(user.id, TIMEOUTS.debounceDefault);

  const dispatch = useDispatch();
  const deviceTimer = useRef();
  const showHelptips = useSelector(getShowHelptips);

  useEffect(() => {
    if ((!userId || !user.email?.length || !userSettingInitialized) && !gettingUser && token) {
      setGettingUser(true);
      dispatch(initializeSelf());
      return;
    }
    Tracking.setTrackingEnabled(hasTrackingEnabled);
    if (hasTrackingEnabled && user.id && organization.id) {
      Tracking.setOrganizationUser(organization, user);
      if (firstLoginAfterSignup) {
        Tracking.pageview('/signup/complete');
        dispatch(setFirstLoginAfterSignup(false));
      }
    }
  }, [dispatch, firstLoginAfterSignup, gettingUser, hasTrackingEnabled, organization, token, user, user.email, userId, userSettingInitialized]);

  useEffect(() => {
    const showOfferCookie = cookies.get('offer') === currentOffer.name;
    setHasOfferCookie(showOfferCookie);
    clearInterval(deviceTimer.current);
    deviceTimer.current = setInterval(() => dispatch(getAllDeviceCounts()), TIMEOUTS.refreshDefault);
    return () => {
      clearInterval(deviceTimer.current);
    };
  }, [dispatch]);

  const onLogoutClick = () => {
    setAnchorEl(null);
    dispatch(logoutUser()).then(() => window.location.replace('/ui/'));
  };

  const onSearch = useCallback((searchTerm, refreshTrigger) => dispatch(setSearchState({ refreshTrigger, searchTerm, page: 1 })), [dispatch]);

  const onToggleTooltips = () => dispatch(setAllTooltipsReadState(showHelptips ? READ_STATES.read : READ_STATES.unread));

  const setHideOffer = () => {
    cookies.set('offer', currentOffer.name, { path: '/', maxAge: 2629746 });
    setHasOfferCookie(true);
  };

  const handleClose = () => setAnchorEl(null);

  const showOffer =
    isHosted && moment().isBefore(currentOffer.expires) && (organization.trial ? currentOffer.trial : currentOffer[organization.plan]) && !hasOfferCookie;

  const headerLogo = isDarkMode(mode) ? (isEnterprise ? whiteEnterpriseLogo : whiteLogo) : isEnterprise ? enterpriseLogo : logo;

  return (
    <Toolbar id="fixedHeader" className={showOffer ? `${classes.header} ${classes.banner}` : classes.header}>
      {!!announcement && (
        <Announcement
          announcement={announcement}
          errorIconClassName={classes.redAnnouncementIcon}
          iconClassName={classes.demoAnnouncementIcon}
          sectionClassName={classes.demoTrialAnnouncement}
          onHide={() => dispatch(setHideAnnouncement(true))}
        />
      )}
      {showOffer && <OfferHeader onHide={setHideOffer} />}
      <div className="flexbox space-between">
        <div className="flexbox center-aligned">
          <Link to="/">
            <img id="logo" src={headerLogo} />
          </Link>
          {demo && <DemoNotification iconClassName={classes.demoAnnouncementIcon} sectionClassName={classes.demoTrialAnnouncement} />}
          {organization.trial && (
            <TrialNotification
              expiration={organization.trial_expiration}
              iconClassName={classes.demoAnnouncementIcon}
              sectionClassName={classes.demoTrialAnnouncement}
            />
          )}
        </div>
        <Search isSearching={isSearching} searchTerm={searchTerm} onSearch={onSearch} trigger={refreshTrigger} />
        <div className="flexbox center-aligned">
          <DeviceNotifications pending={pendingDevices} total={acceptedDevices} limit={deviceLimit} />
          <DeploymentNotifications inprogress={inProgress} />
          <Button
            className={`header-dropdown ${classes.dropDown}`}
            onClick={e => setAnchorEl(e.currentTarget)}
            startIcon={<AccountCircleIcon className={classes.buttonColor} />}
            endIcon={anchorEl ? <ArrowDropUpIcon /> : <ArrowDropDownIcon />}
          >
            {user.email}
          </Button>
          <Menu
            anchorEl={anchorEl}
            onClose={handleClose}
            open={Boolean(anchorEl)}
            anchorOrigin={{
              vertical: 'center',
              horizontal: 'center'
            }}
            transformOrigin={{
              vertical: 'bottom',
              horizontal: 'center'
            }}
          >
            <MenuItem component={Link} to="/settings" onClick={handleClose}>
              Settings
            </MenuItem>
            <MenuItem component={Link} to="/settings/my-profile" onClick={handleClose}>
              My profile
            </MenuItem>
            {multitenancy && (
              <MenuItem component={Link} to="/settings/organization-and-billing" onClick={handleClose}>
                My organization
              </MenuItem>
            )}
            {allowUserManagement && (
              <MenuItem component={Link} to="/settings/user-management" onClick={handleClose}>
                User management
              </MenuItem>
            )}
            <MenuItem onClick={onToggleTooltips}>{`Mark help tips as ${showHelptips ? '' : 'un'}read`}</MenuItem>
            <MenuItem component={Link} to="/help/get-started" onClick={handleClose}>
              Help & support
            </MenuItem>
            <MenuItem onClick={onLogoutClick}>
              <ListItemText primary="Log out" />
              <ListItemSecondaryAction>
                <IconButton>
                  <ExitIcon className={classes.exitIcon} />
                </IconButton>
              </ListItemSecondaryAction>
            </MenuItem>
          </Menu>
        </div>
      </div>
    </Toolbar>
  );
};

export default Header;

1	// Copyright 2015 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, useState } from 'react';
15	import { useDispatch, useSelector } from 'react-redux';
16	import { Link } from 'react-router-dom';
17
18	import {
19	AccountCircle as AccountCircleIcon,
20	ArrowDropDown as ArrowDropDownIcon,
21	ArrowDropUp as ArrowDropUpIcon,
22	ExitToApp as ExitIcon
23	} from '@mui/icons-material';
24	import { Button, IconButton, ListItemSecondaryAction, ListItemText, Menu, MenuItem, Toolbar } from '@mui/material';
25	import { makeStyles } from 'tss-react/mui';
26
27	import moment from 'moment';
28	import Cookies from 'universal-cookie';
29
30	import enterpriseLogo from '../../../assets/img/headerlogo-enterprise.png';
31	import logo from '../../../assets/img/headerlogo.png';
32	import whiteEnterpriseLogo from '../../../assets/img/whiteheaderlogo-enterprise.png';
33	import whiteLogo from '../../../assets/img/whiteheaderlogo.png';
34	import { setFirstLoginAfterSignup, setSearchState } from '../../actions/appActions';
35	import { getAllDeviceCounts } from '../../actions/deviceActions';
36	import { initializeSelf, logoutUser, setAllTooltipsReadState, setHideAnnouncement } from '../../actions/userActions';
37	import { TIMEOUTS } from '../../constants/appConstants';
38	import { READ_STATES } from '../../constants/userConstants';
39	import { isDarkMode } from '../../helpers';
40	import {
41	getAcceptedDevices,
42	getCurrentSession,
43	getCurrentUser,
44	getDeviceCountsByStatus,
45	getDeviceLimit,
46	getFeatures,
47	getIsEnterprise,
48	getOrganization,
49	getShowHelptips,
50	getUserCapabilities,
51	getUserSettings
52	} from '../../selectors';
53	import Tracking from '../../tracking';
54	import { useDebounce } from '../../utils/debouncehook';
55	import Search from '../common/search';
56	import Announcement from './announcement';
57	import DemoNotification from './demonotification';
58	import DeploymentNotifications from './deploymentnotifications';
59	import DeviceNotifications from './devicenotifications';
60	import OfferHeader from './offerheader';
61	import TrialNotification from './trialnotification';
62
63	// Change this when a new feature/offer is introduced
64	const currentOffer = {	2✔
65	name: 'add-ons',
66	expires: '2021-12-30',
67	trial: true,
68	os: true,
69	professional: true,
70	enterprise: true
71	};
72
73	const cookies = new Cookies();	2✔
74
75	const useStyles = makeStyles()(theme => ({	12✔
76	header: {
77	minHeight: 'unset',
78	paddingLeft: theme.spacing(4),
79	paddingRight: theme.spacing(5),
80	width: '100%',
81	borderBottom: `1px solid ${theme.palette.grey[100]}`,
82	display: 'grid'
83	},
84	banner: { gridTemplateRows: `1fr ${theme.mixins.toolbar.minHeight}px` },
85	buttonColor: { color: theme.palette.grey[600] },
86	dropDown: { height: '100%', marginLeft: theme.spacing(0.5), textTransform: 'none' },
87	exitIcon: { color: theme.palette.grey[600], fill: theme.palette.grey[600] },
88	demoTrialAnnouncement: {
89	fontSize: 14,
90	height: 'auto'
91	},
92	demoAnnouncementIcon: {
93	height: 16,
94	color: theme.palette.primary.main,
95	'&.MuiButton-textPrimary': {
96	color: theme.palette.primary.main,
97	height: 'inherit'
98	}
99	},
100	redAnnouncementIcon: {
101	color: theme.palette.error.dark
102	}
103	}));
104
105	export const Header = ({ mode }) => {	2✔
106	const { classes } = useStyles();	27✔
107	const [anchorEl, setAnchorEl] = useState(null);	27✔
108	const [gettingUser, setGettingUser] = useState(false);	27✔
109	const [hasOfferCookie, setHasOfferCookie] = useState(false);	27✔
110
111	const organization = useSelector(getOrganization);	27✔
112	const { canManageUsers: allowUserManagement } = useSelector(getUserCapabilities);	27✔
113	const { total: acceptedDevices = 0 } = useSelector(getAcceptedDevices);	27!
114	const announcement = useSelector(state => state.app.hostedAnnouncement);	1,600✔
115	const deviceLimit = useSelector(getDeviceLimit);	27✔
116	const firstLoginAfterSignup = useSelector(state => state.app.firstLoginAfterSignup);	1,600✔
117	const { trackingConsentGiven: hasTrackingEnabled } = useSelector(getUserSettings);	27✔
118	const inProgress = useSelector(state => state.deployments.byStatus.inprogress.total);	1,600✔
119	const isEnterprise = useSelector(getIsEnterprise);	27✔
120	const { isDemoMode: demo, hasMultitenancy, isHosted } = useSelector(getFeatures);	27✔
121	const { isSearching, searchTerm, refreshTrigger } = useSelector(state => state.app.searchState);	1,600✔
122	const multitenancy = hasMultitenancy \|\| isEnterprise \|\| isHosted;	27✔
123	const { pending: pendingDevices } = useSelector(getDeviceCountsByStatus);	27✔
124	const userSettingInitialized = useSelector(state => state.users.settingsInitialized);	1,600✔
125	const user = useSelector(getCurrentUser);	27✔
126	const { token } = useSelector(getCurrentSession);	27✔
127	const userId = useDebounce(user.id, TIMEOUTS.debounceDefault);	27✔
128
129	const dispatch = useDispatch();	27✔
130	const deviceTimer = useRef();	27✔
131	const showHelptips = useSelector(getShowHelptips);	27✔
132
133	useEffect(() => {	27✔
134	if ((!userId \|\| !user.email?.length \|\| !userSettingInitialized) && !gettingUser && token) {	10✔
135	setGettingUser(true);	1✔
136	dispatch(initializeSelf());	1✔
137	return;	1✔
138	}
139	Tracking.setTrackingEnabled(hasTrackingEnabled);	9✔
140	if (hasTrackingEnabled && user.id && organization.id) {	9!
UNCOV 141	Tracking.setOrganizationUser(organization, user);	×
UNCOV 142	if (firstLoginAfterSignup) {	×
UNCOV 143	Tracking.pageview('/signup/complete');	×
UNCOV 144	dispatch(setFirstLoginAfterSignup(false));	×
145	}
146	}
147	}, [dispatch, firstLoginAfterSignup, gettingUser, hasTrackingEnabled, organization, token, user, user.email, userId, userSettingInitialized]);
148
149	useEffect(() => {	27✔
150	const showOfferCookie = cookies.get('offer') === currentOffer.name;	6✔
151	setHasOfferCookie(showOfferCookie);	6✔
152	clearInterval(deviceTimer.current);	6✔
153	deviceTimer.current = setInterval(() => dispatch(getAllDeviceCounts()), TIMEOUTS.refreshDefault);	276✔
154	return () => {	6✔
155	clearInterval(deviceTimer.current);	6✔
156	};
157	}, [dispatch]);
158
159	const onLogoutClick = () => {	27✔
160	setAnchorEl(null);	1✔
161	dispatch(logoutUser()).then(() => window.location.replace('/ui/'));	1✔
162	};
163
164	const onSearch = useCallback((searchTerm, refreshTrigger) => dispatch(setSearchState({ refreshTrigger, searchTerm, page: 1 })), [dispatch]);	27✔
165
166	const onToggleTooltips = () => dispatch(setAllTooltipsReadState(showHelptips ? READ_STATES.read : READ_STATES.unread));	27!
167
168	const setHideOffer = () => {	27✔
UNCOV 169	cookies.set('offer', currentOffer.name, { path: '/', maxAge: 2629746 });	×
UNCOV 170	setHasOfferCookie(true);	×
171	};
172
173	const handleClose = () => setAnchorEl(null);	27✔
174
175	const showOffer =
176	isHosted && moment().isBefore(currentOffer.expires) && (organization.trial ? currentOffer.trial : currentOffer[organization.plan]) && !hasOfferCookie;	27!
177
178	const headerLogo = isDarkMode(mode) ? (isEnterprise ? whiteEnterpriseLogo : whiteLogo) : isEnterprise ? enterpriseLogo : logo;	27!
179
180	return (	27✔
181	<Toolbar id="fixedHeader" className={showOffer ? `${classes.header} ${classes.banner}` : classes.header}>	27!
182	{!!announcement && (	33✔
183	<Announcement
184	announcement={announcement}
185	errorIconClassName={classes.redAnnouncementIcon}
186	iconClassName={classes.demoAnnouncementIcon}
187	sectionClassName={classes.demoTrialAnnouncement}
UNCOV 188	onHide={() => dispatch(setHideAnnouncement(true))}	×
189	/>
190	)}
191	{showOffer && <OfferHeader onHide={setHideOffer} />}	27!
192	<div className="flexbox space-between">
193	<div className="flexbox center-aligned">
194	<Link to="/">
195	<img id="logo" src={headerLogo} />
196	</Link>
197	{demo && <DemoNotification iconClassName={classes.demoAnnouncementIcon} sectionClassName={classes.demoTrialAnnouncement} />}	27!
198	{organization.trial && (	27!
199	<TrialNotification
200	expiration={organization.trial_expiration}
201	iconClassName={classes.demoAnnouncementIcon}
202	sectionClassName={classes.demoTrialAnnouncement}
203	/>
204	)}
205	</div>
206	<Search isSearching={isSearching} searchTerm={searchTerm} onSearch={onSearch} trigger={refreshTrigger} />
207	<div className="flexbox center-aligned">
208	<DeviceNotifications pending={pendingDevices} total={acceptedDevices} limit={deviceLimit} />
209	<DeploymentNotifications inprogress={inProgress} />
210	<Button
211	className={`header-dropdown ${classes.dropDown}`}
212	onClick={e => setAnchorEl(e.currentTarget)}	1✔
213	startIcon={<AccountCircleIcon className={classes.buttonColor} />}
214	endIcon={anchorEl ? <ArrowDropUpIcon /> : <ArrowDropDownIcon />}	27✔
215	>
216	{user.email}
217	</Button>
218	<Menu
219	anchorEl={anchorEl}
220	onClose={handleClose}
221	open={Boolean(anchorEl)}
222	anchorOrigin={{
223	vertical: 'center',
224	horizontal: 'center'
225	}}
226	transformOrigin={{
227	vertical: 'bottom',
228	horizontal: 'center'
229	}}
230	>
231	<MenuItem component={Link} to="/settings" onClick={handleClose}>
232	Settings
233	</MenuItem>
234	<MenuItem component={Link} to="/settings/my-profile" onClick={handleClose}>
235	My profile
236	</MenuItem>
237	{multitenancy && (	44✔
238	<MenuItem component={Link} to="/settings/organization-and-billing" onClick={handleClose}>
239	My organization
240	</MenuItem>
241	)}
242	{allowUserManagement && (	50✔
243	<MenuItem component={Link} to="/settings/user-management" onClick={handleClose}>
244	User management
245	</MenuItem>
246	)}
247	<MenuItem onClick={onToggleTooltips}>{`Mark help tips as ${showHelptips ? '' : 'un'}read`}</MenuItem>	27!
248	<MenuItem component={Link} to="/help/get-started" onClick={handleClose}>
249	Help & support
250	</MenuItem>
251	<MenuItem onClick={onLogoutClick}>
252	<ListItemText primary="Log out" />
253	<ListItemSecondaryAction>
254	<IconButton>
255	<ExitIcon className={classes.exitIcon} />
256	</IconButton>
257	</ListItemSecondaryAction>
258	</MenuItem>
259	</Menu>
260	</div>
261	</div>
262	</Toolbar>
263	);
264	};
265
266	export default Header;

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