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

88.89

/src/js/components/common/enterpriseNotification.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';
import { useSelector } from 'react-redux';
import { Link } from 'react-router-dom';

import { Chip } from '@mui/material';
import { withStyles } from 'tss-react/mui';

import { ADDONS, BENEFITS, PLANS } from '../../constants/appConstants';
import { getTenantCapabilities } from '../../selectors';
import MenderTooltip, { MenderTooltipClickable } from './mendertooltip';

const PlansTooltip = withStyles(MenderTooltip, ({ palette }) => ({
  arrow: {
    color: palette.tooltip.tierTipBackground
  },
  tooltip: {
    backgroundColor: palette.tooltip.tierTipBackground,
    maxWidth: 300
  }
}));

const PlanChip = withStyles(Chip, ({ palette }) => ({
  root: {
    backgroundColor: palette.tooltip.tierTipBackground,
    color: palette.text.disabled,
    textTransform: 'uppercase',
    '&:hover': {
      fontWeight: 'bold'
    }
  }
}));

export const DefaultUpgradeNotification = props => (
  <div {...props}>
    This feature is not available on your plan. <Link to="/settings/upgrade">Upgrade</Link> to enable it
  </div>
);

const EnterpriseNotification = ({ className = '', id = BENEFITS.default.id }) => {
  const [isOpen, setIsOpen] = useState(false);
  const tenantCapabilities = useSelector(getTenantCapabilities);
  const { isEnterprise, plan: currentPlan } = tenantCapabilities;
  const { benefit, requiredAddon = '', requiredPlan = PLANS.os.id } = BENEFITS[id];
  const hasAddon = requiredAddon ? ADDONS[requiredAddon].needs.every(need => tenantCapabilities[need]) : false;

  const currentPlanIndex = Object.keys(PLANS).indexOf(currentPlan);
  const requiredPlanIndex = Object.keys(PLANS).indexOf(requiredPlan);
  const shouldShow = requiredPlanIndex > currentPlanIndex;
  // we have to explicitly check for the plan requirement here, since the default value prevents us from relying on the `shouldShow` result
  if (isEnterprise || (BENEFITS[id].requiredPlan && !shouldShow) || (requiredAddon && hasAddon)) {
    return null;
  }
  const content = requiredAddon ? (
    <>
      Add the <b>{ADDONS[requiredAddon].title}</b> add-on to {benefit}.
    </>
  ) : (
    <>
      Upgrade to the <b>{PLANS[requiredPlan].name}</b> plan {requiredPlanIndex === Object.keys(PLANS).length - 1 ? '' : 'or higher '}to gain access to {benefit}
      .
    </>
  );
  return (
    <MenderTooltipClickable
      onOpenChange={setIsOpen}
      title={
        <div>
          {content}
          <div className="flexbox space-between margin-top-small">
            <Link to="/settings/upgrade">Upgrade now</Link>
            <span className="link" onClick={() => setIsOpen(false)}>
              Close
            </span>
          </div>
        </div>
      }
      tooltipComponent={PlansTooltip}
      visibility={isOpen}
    >
      <PlanChip className={className} label={PLANS[requiredPlan].name} />
    </MenderTooltipClickable>
  );
};

export default EnterpriseNotification;

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	import { useSelector } from 'react-redux';
16	import { Link } from 'react-router-dom';
17
18	import { Chip } from '@mui/material';
19	import { withStyles } from 'tss-react/mui';
20
21	import { ADDONS, BENEFITS, PLANS } from '../../constants/appConstants';
22	import { getTenantCapabilities } from '../../selectors';
23	import MenderTooltip, { MenderTooltipClickable } from './mendertooltip';
24
25	const PlansTooltip = withStyles(MenderTooltip, ({ palette }) => ({	1,390✔
26	arrow: {
27	color: palette.tooltip.tierTipBackground
28	},
29	tooltip: {
30	backgroundColor: palette.tooltip.tierTipBackground,
31	maxWidth: 300
32	}
33	}));
34
35	const PlanChip = withStyles(Chip, ({ palette }) => ({	183✔
36	root: {
37	backgroundColor: palette.tooltip.tierTipBackground,
38	color: palette.text.disabled,
39	textTransform: 'uppercase',
40	'&:hover': {
41	fontWeight: 'bold'
42	}
43	}
44	}));
45
46	export const DefaultUpgradeNotification = props => (	183✔
47	<div {...props}>	×
48	This feature is not available on your plan. <Link to="/settings/upgrade">Upgrade</Link> to enable it
49	</div>
50	);
51
52	const EnterpriseNotification = ({ className = '', id = BENEFITS.default.id }) => {	183✔
53	const [isOpen, setIsOpen] = useState(false);	2,191✔
54	const tenantCapabilities = useSelector(getTenantCapabilities);	2,191✔
55	const { isEnterprise, plan: currentPlan } = tenantCapabilities;	2,191✔
56	const { benefit, requiredAddon = '', requiredPlan = PLANS.os.id } = BENEFITS[id];	2,191✔
57	const hasAddon = requiredAddon ? ADDONS[requiredAddon].needs.every(need => tenantCapabilities[need]) : false;	2,191✔
58
59	const currentPlanIndex = Object.keys(PLANS).indexOf(currentPlan);	2,191✔
60	const requiredPlanIndex = Object.keys(PLANS).indexOf(requiredPlan);	2,191✔
61	const shouldShow = requiredPlanIndex > currentPlanIndex;	2,191✔
62	// we have to explicitly check for the plan requirement here, since the default value prevents us from relying on the `shouldShow` result
63	if (isEnterprise \|\| (BENEFITS[id].requiredPlan && !shouldShow) \|\| (requiredAddon && hasAddon)) {	2,191✔
64	return null;	802✔
65	}
66	const content = requiredAddon ? (	1,389✔
67	<>
68	Add the <b>{ADDONS[requiredAddon].title}</b> add-on to {benefit}.
69	</>
70	) : (
71	<>
72	Upgrade to the <b>{PLANS[requiredPlan].name}</b> plan {requiredPlanIndex === Object.keys(PLANS).length - 1 ? '' : 'or higher '}to gain access to {benefit}	1,345✔
73	.
74	</>
75	);
76	return (	1,389✔
77	<MenderTooltipClickable
78	onOpenChange={setIsOpen}
79	title={
80	<div>
81	{content}
82	<div className="flexbox space-between margin-top-small">
83	<Link to="/settings/upgrade">Upgrade now</Link>
84	<span className="link" onClick={() => setIsOpen(false)}>	×
85	Close
86	</span>
87	</div>
88	</div>
89	}
90	tooltipComponent={PlansTooltip}
91	visibility={isOpen}
92	>
93	<PlanChip className={className} label={PLANS[requiredPlan].name} />
94	</MenderTooltipClickable>
95	);
96	};
97
98	export default EnterpriseNotification;

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