1081664682

Committed 22 Nov 2023 02:11PM UTC coverage: 82.798% (-17.2%) from 99.964%

Build # 1081664682

Build Type

Pull #4214

gitlab-ci

Committed by

tranchitella

Commit Message

fix: Fixed the infinite page redirects when the back button is pressed

Remove the location and navigate from the useLocationParams.setValue callback
dependencies as they change the set function that is presented in other
useEffect dependencies. This happens when the back button is clicked, which
leads to the location changing infinitely.

Changelog: Title
Ticket: MEN-6847
Ticket: MEN-6796

Signed-off-by: Ihor Aleksandrychiev <ihor.aleksandrychiev@northern.tech>
Signed-off-by: Fabio Tranchitella <fabio.tranchitella@northern.tech>

Pull Request Pull Request #4214: fix: Fixed the infinite page redirects when the back button is pressed

Run Details

4319 of 6292 branches covered (0.0%)

8332 of 10063 relevant lines covered (82.8%)

191.0 hits per line

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

97.37

/src/js/components/deployments/deploymentitem.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, { useState } from 'react';

// material ui
import { CancelOutlined as CancelOutlinedIcon } from '@mui/icons-material';
import { Button, IconButton, Tooltip } from '@mui/material';
import { makeStyles } from 'tss-react/mui';

import { DEPLOYMENT_STATES, DEPLOYMENT_TYPES } from '../../constants/deploymentConstants';
import { FileSize, getDeploymentState } from '../../helpers';
import { useDeploymentDevice } from '../../utils/deploymentdevicehook';
import Confirm from '../common/confirm';
import { RelativeTime } from '../common/time';
import { PhaseProgressDisplay } from './deployment-report/phaseprogress';
import { getDeploymentTargetText } from './deployment-wizard/softwaredevices';
import DeploymentStats from './deploymentstatus';
import ProgressDisplay, { DeploymentStatusNotification } from './progressChart';

export const deploymentTypeClasses = {
  [DEPLOYMENT_STATES.finished]: 'past-item',
  [DEPLOYMENT_STATES.pending]: 'pending-item',
  [DEPLOYMENT_STATES.inprogress]: 'progress-item',
  [DEPLOYMENT_STATES.scheduled]: 'scheduled-item'
};

export const DeploymentDeviceCount = ({ className, deployment }) => (
  <div className={className} key="DeploymentDeviceCount">
    {Math.max(deployment.device_count || 0, deployment.max_devices || 0)}
  </div>
);
export const DeploymentDeviceGroup = ({ deployment, devicesById, idAttribute, wrappingClass }) => {
  const deploymentName = getDeploymentTargetText({ deployment, devicesById, idAttribute });
  return (
    <div className={wrappingClass} key="DeploymentDeviceGroup" title={deploymentName}>
      {deploymentName}
    </div>
  );
};
export const DeploymentEndTime = ({ deployment }) => <RelativeTime key="DeploymentEndTime" updateTime={deployment.finished} shouldCount="none" />;
export const DeploymentPhases = ({ deployment }) => <div key="DeploymentPhases">{deployment.phases ? deployment.phases.length : '-'}</div>;
export const DeploymentProgress = ({ deployment, minimal = false }) => {
  const { phases = [], update_control_map } = deployment;
  const status = getDeploymentState(deployment);
  if (status === 'queued') {
    return <DeploymentStatusNotification status={status} />;
  } else if (phases.length > 1 || !update_control_map) {
    return <ProgressDisplay key="DeploymentProgress" deployment={deployment} status={status} minimal={minimal} />;
  }
  return <PhaseProgressDisplay key="DeploymentProgress" deployment={deployment} status={status} minimal={minimal} />;
};
export const DeploymentRelease = ({ deployment: { artifact_name, type = DEPLOYMENT_TYPES.software }, wrappingClass }) => {
  const deploymentRelease = type === DEPLOYMENT_TYPES.configuration ? type : artifact_name;
  return (
    <div className={wrappingClass} key="DeploymentRelease" title={deploymentRelease}>
      {deploymentRelease}
    </div>
  );
};
export const DeploymentStartTime = ({ direction = 'both', started }) => <RelativeTime key="DeploymentStartTime" updateTime={started} shouldCount={direction} />;

export const DeploymentStatus = ({ deployment }) => <DeploymentStats key="DeploymentStatus" deployment={deployment} />;

export const DeploymentSize = ({ deployment: { total_size } }) => <div className="align-right">{total_size ? <FileSize fileSize={total_size} /> : '-'}</div>;

const useStyles = makeStyles()(theme => ({
  detailsButton: {
    backgroundColor: 'transparent',
    color: theme.palette.text.primary,
    justifySelf: 'center',
    textTransform: 'none',
    [`&:hover`]: {
      backgroundColor: 'transparent',
      color: theme.palette.text.primary
    }
  },
  textWrapping: { whiteSpace: 'initial' }
}));

export const DeploymentItem = ({
  abort: abortDeployment,
  canConfigure,
  canDeploy,
  columnHeaders,
  deployment,
  devices,
  idAttribute,
  isEnterprise,
  openReport,
  type
}) => {
  const [abort, setAbort] = useState(null);
  useDeploymentDevice(deployment.name);

  const { classes } = useStyles();

  const toggleConfirm = id => setTimeout(() => setAbort(abort ? null : id), 150);

  const { created, id, phases } = deployment;

  let confirmation;
  if (abort === id) {
    confirmation = <Confirm classes="flexbox centered confirmation-overlay" cancel={() => toggleConfirm(id)} action={() => abortDeployment(id)} type="abort" />;
  }
  const started = isEnterprise && phases?.length >= 1 ? phases[0].start_ts || created : created;
  const wrappingClass = `text-overflow ${type === DEPLOYMENT_STATES.inprogress ? classes.textWrapping : ''}`;
  return (
    <div className={`deployment-item ${deploymentTypeClasses[type]}`}>
      {!!confirmation && confirmation}
      {columnHeaders.map((column, i) => {
        const ColumnComponent = column.renderer;
        return (
          <div className={column.class} key={`deploy-item-${i}`}>
            {column.title && <span className="deployment-item-title muted">{column.title}</span>}
            <ColumnComponent
              className={column.class || ''}
              idAttribute={idAttribute}
              deployment={deployment}
              devicesById={devices}
              started={started}
              wrappingClass={wrappingClass}
              {...column.props}
            />
          </div>
        );
      })}
      <Button className={classes.detailsButton} variant="contained" onClick={() => openReport(type, deployment.id)}>
        View details
      </Button>
      {(canDeploy || (canConfigure && deployment.type === DEPLOYMENT_TYPES.configuration)) && type !== DEPLOYMENT_STATES.finished && (
        <Tooltip className="columnHeader" title="Abort" placement="top-start">
          <IconButton onClick={() => toggleConfirm(id)} size="large">
            <CancelOutlinedIcon className="cancelButton muted" />
          </IconButton>
        </Tooltip>
      )}
    </div>
  );
};

export default DeploymentItem;

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, { useState } from 'react';
15
16	// material ui
17	import { CancelOutlined as CancelOutlinedIcon } from '@mui/icons-material';
18	import { Button, IconButton, Tooltip } from '@mui/material';
19	import { makeStyles } from 'tss-react/mui';
20
21	import { DEPLOYMENT_STATES, DEPLOYMENT_TYPES } from '../../constants/deploymentConstants';
22	import { FileSize, getDeploymentState } from '../../helpers';
23	import { useDeploymentDevice } from '../../utils/deploymentdevicehook';
24	import Confirm from '../common/confirm';
25	import { RelativeTime } from '../common/time';
26	import { PhaseProgressDisplay } from './deployment-report/phaseprogress';
27	import { getDeploymentTargetText } from './deployment-wizard/softwaredevices';
28	import DeploymentStats from './deploymentstatus';
29	import ProgressDisplay, { DeploymentStatusNotification } from './progressChart';
30
31	export const deploymentTypeClasses = {	11✔
32	[DEPLOYMENT_STATES.finished]: 'past-item',
33	[DEPLOYMENT_STATES.pending]: 'pending-item',
34	[DEPLOYMENT_STATES.inprogress]: 'progress-item',
35	[DEPLOYMENT_STATES.scheduled]: 'scheduled-item'
36	};
37
38	export const DeploymentDeviceCount = ({ className, deployment }) => (	11✔
39	<div className={className} key="DeploymentDeviceCount">	1,110✔
40	{Math.max(deployment.device_count \|\| 0, deployment.max_devices \|\| 0)}	3,337✔
41	</div>
42	);
43	export const DeploymentDeviceGroup = ({ deployment, devicesById, idAttribute, wrappingClass }) => {	11✔
44	const deploymentName = getDeploymentTargetText({ deployment, devicesById, idAttribute });	3,519✔
45	return (	3,519✔
46	<div className={wrappingClass} key="DeploymentDeviceGroup" title={deploymentName}>
47	{deploymentName}
48	</div>
49	);
50	};
51	export const DeploymentEndTime = ({ deployment }) => <RelativeTime key="DeploymentEndTime" updateTime={deployment.finished} shouldCount="none" />;	1,110✔
52	export const DeploymentPhases = ({ deployment }) => <div key="DeploymentPhases">{deployment.phases ? deployment.phases.length : '-'}</div>;	11!
53	export const DeploymentProgress = ({ deployment, minimal = false }) => {	11✔
54	const { phases = [], update_control_map } = deployment;	1,835✔
55	const status = getDeploymentState(deployment);	1,835✔
56	if (status === 'queued') {	1,835✔
57	return <DeploymentStatusNotification status={status} />;	913✔
58	} else if (phases.length > 1 \|\| !update_control_map) {	922!
59	return <ProgressDisplay key="DeploymentProgress" deployment={deployment} status={status} minimal={minimal} />;	922✔
60	}
61	return <PhaseProgressDisplay key="DeploymentProgress" deployment={deployment} status={status} minimal={minimal} />;	×
62	};
63	export const DeploymentRelease = ({ deployment: { artifact_name, type = DEPLOYMENT_TYPES.software }, wrappingClass }) => {	11✔
64	const deploymentRelease = type === DEPLOYMENT_TYPES.configuration ? type : artifact_name;	1,110!
65	return (	1,110✔
66	<div className={wrappingClass} key="DeploymentRelease" title={deploymentRelease}>
67	{deploymentRelease}
68	</div>
69	);
70	};
71	export const DeploymentStartTime = ({ direction = 'both', started }) => <RelativeTime key="DeploymentStartTime" updateTime={started} shouldCount={direction} />;	1,110✔
72
73	export const DeploymentStatus = ({ deployment }) => <DeploymentStats key="DeploymentStatus" deployment={deployment} />;	76✔
74
75	export const DeploymentSize = ({ deployment: { total_size } }) => <div className="align-right">{total_size ? <FileSize fileSize={total_size} /> : '-'}</div>;	76!
76
77	const useStyles = makeStyles()(theme => ({	34✔
78	detailsButton: {
79	backgroundColor: 'transparent',
80	color: theme.palette.text.primary,
81	justifySelf: 'center',
82	textTransform: 'none',
83	[`&:hover`]: {
84	backgroundColor: 'transparent',
85	color: theme.palette.text.primary
86	}
87	},
88	textWrapping: { whiteSpace: 'initial' }
89	}));
90
91	export const DeploymentItem = ({	11✔
92	abort: abortDeployment,
93	canConfigure,
94	canDeploy,
95	columnHeaders,
96	deployment,
97	devices,
98	idAttribute,
99	isEnterprise,
100	openReport,
101	type
102	}) => {
103	const [abort, setAbort] = useState(null);	1,110✔
104	useDeploymentDevice(deployment.name);	1,110✔
105
106	const { classes } = useStyles();	1,110✔
107
108	const toggleConfirm = id => setTimeout(() => setAbort(abort ? null : id), 150);	1,110✔
109
110	const { created, id, phases } = deployment;	1,110✔
111
112	let confirmation;
113	if (abort === id) {	1,110✔
114	confirmation = <Confirm classes="flexbox centered confirmation-overlay" cancel={() => toggleConfirm(id)} action={() => abortDeployment(id)} type="abort" />;	7✔
115	}
116	const started = isEnterprise && phases?.length >= 1 ? phases[0].start_ts \|\| created : created;	1,110✔
117	const wrappingClass = `text-overflow ${type === DEPLOYMENT_STATES.inprogress ? classes.textWrapping : ''}`;	1,110✔
118	return (	1,110✔
119	<div className={`deployment-item ${deploymentTypeClasses[type]}`}>
120	{!!confirmation && confirmation}	1,117✔
121	{columnHeaders.map((column, i) => {
122	const ColumnComponent = column.renderer;	6,736✔
123	return (	6,736✔
124	<div className={column.class} key={`deploy-item-${i}`}>
125	{column.title && <span className="deployment-item-title muted">{column.title}</span>}	13,472✔
126	<ColumnComponent
127	className={column.class \|\| ''}	12,362✔
128	idAttribute={idAttribute}
129	deployment={deployment}
130	devicesById={devices}
131	started={started}
132	wrappingClass={wrappingClass}
133	{...column.props}
134	/>
135	</div>
136	);
137	})}
138	<Button className={classes.detailsButton} variant="contained" onClick={() => openReport(type, deployment.id)}>	1✔
139	View details
140	</Button>
141	{(canDeploy \|\| (canConfigure && deployment.type === DEPLOYMENT_TYPES.configuration)) && type !== DEPLOYMENT_STATES.finished && (	3,251!
142	<Tooltip className="columnHeader" title="Abort" placement="top-start">
143	<IconButton onClick={() => toggleConfirm(id)} size="large">	1✔
144	<CancelOutlinedIcon className="cancelButton muted" />
145	</IconButton>
146	</Tooltip>
147	)}
148	</div>
149	);
150	};
151
152	export default DeploymentItem;

mendersoftware / gui / 1081664682

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