1493849842

Committed 13 Oct 2024 07:39AM UTC coverage: 83.457% (-16.5%) from 99.965%

Build # 1493849842

Build Type

Pull #4531

gitlab-ci

Committed by

web-flow

Commit Message

chore: Bump send and express in /tests/e2e_tests

Bumps [send](https://github.com/pillarjs/send) and [express](https://github.com/expressjs/express). These dependencies needed to be updated together.

Updates `send` from 0.18.0 to 0.19.0
- [Release notes](https://github.com/pillarjs/send/releases)
- [Changelog](https://github.com/pillarjs/send/blob/master/HISTORY.md)
- [Commits](https://github.com/pillarjs/send/compare/0.18.0...0.19.0)

Updates `express` from 4.19.2 to 4.21.1
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/4.21.1/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.19.2...4.21.1)

---
updated-dependencies:
- dependency-name: send
  dependency-type: indirect
- dependency-name: express
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Pull Request Pull Request #4531: chore: Bump send and express in /tests/e2e_tests

Run Details

4486 of 6422 branches covered (69.85%)

8551 of 10246 relevant lines covered (83.46%)

151.3 hits per line

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

58.82

/src/js/components/settings/organization/organizationpaymentsettings.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 { useDispatch, useSelector } from 'react-redux';

// material ui
import { Error as ErrorIcon } from '@mui/icons-material';

import { setSnackbar } from '../../../actions/appActions';
import { confirmCardUpdate, getCurrentCard, startCardUpdate } from '../../../actions/organizationActions';
import CardSection from '../cardsection';
import OrganizationSettingsItem from './organizationsettingsitem';

export const OrganizationPaymentSettings = () => {
  const [isUpdatingPaymentDetails, setIsUpdatingPaymentDetails] = useState(false);
  const card = useSelector(state => state.organization.card);
  const hasUnpaid = useSelector(state => state.organization.billing);
  const dispatch = useDispatch();

  useEffect(() => {
    dispatch(getCurrentCard());
  }, [dispatch]);

  const onCardConfirm = async () => {
    await dispatch(confirmCardUpdate());
    dispatch(getCurrentCard());
    setIsUpdatingPaymentDetails(false);
  };

  const { last4, expiration, brand } = card;
  return (
    <OrganizationSettingsItem
      title="Payment card"
      content={{
        action: { title: `${last4 ? 'Update' : 'Enter'} payment card`, internal: true, action: () => setIsUpdatingPaymentDetails(true) },
        description: last4 ? (
          <div>
            <div>
              {brand} ending in {last4}
            </div>
            <div>
              Expires {`0${expiration.month}`.slice(-2)}/{`${expiration.year}`.slice(-2)}
            </div>
          </div>
        ) : (
          <div>
            The introduction of the PSD2 regulation in Europe requires re-entering your card details before we can allow the modification of payment details or
            access to the payment history.
          </div>
        )
      }}
      secondary={
        isUpdatingPaymentDetails && (
          <CardSection
            onCancel={() => setIsUpdatingPaymentDetails(false)}
            onComplete={onCardConfirm}
            onSubmit={() => dispatch(startCardUpdate())}
            setSnackbar={text => dispatch(setSnackbar(text))}
          />
        )
      }
      notification={
        hasUnpaid && (
          <div className="red flexbox centered">
            <ErrorIcon fontSize="small" />
            <span className="margin-left-small">You have an unpaid invoice. Please check your payment card details</span>
          </div>
        )
      }
    />
  );
};

export default OrganizationPaymentSettings;

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 { useDispatch, useSelector } from 'react-redux';
16
17	// material ui
18	import { Error as ErrorIcon } from '@mui/icons-material';
19
20	import { setSnackbar } from '../../../actions/appActions';
21	import { confirmCardUpdate, getCurrentCard, startCardUpdate } from '../../../actions/organizationActions';
22	import CardSection from '../cardsection';
23	import OrganizationSettingsItem from './organizationsettingsitem';
24
25	export const OrganizationPaymentSettings = () => {	7✔
26	const [isUpdatingPaymentDetails, setIsUpdatingPaymentDetails] = useState(false);	2✔
27	const card = useSelector(state => state.organization.card);	4✔
28	const hasUnpaid = useSelector(state => state.organization.billing);	4✔
29	const dispatch = useDispatch();	2✔
30
31	useEffect(() => {	2✔
32	dispatch(getCurrentCard());	1✔
33	}, [dispatch]);
34
35	const onCardConfirm = async () => {	2✔
36	await dispatch(confirmCardUpdate());	×
37	dispatch(getCurrentCard());	×
38	setIsUpdatingPaymentDetails(false);	×
39	};
40
41	const { last4, expiration, brand } = card;	2✔
42	return (	2✔
43	<OrganizationSettingsItem
44	title="Payment card"
45	content={{
46	action: { title: `${last4 ? 'Update' : 'Enter'} payment card`, internal: true, action: () => setIsUpdatingPaymentDetails(true) },	×
47	description: last4 ? (	2!
48	<div>
49	<div>
50	{brand} ending in {last4}
51	</div>
52	<div>
53	Expires {`0${expiration.month}`.slice(-2)}/{`${expiration.year}`.slice(-2)}
54	</div>
55	</div>
56	) : (
57	<div>
58	The introduction of the PSD2 regulation in Europe requires re-entering your card details before we can allow the modification of payment details or
59	access to the payment history.
60	</div>
61	)
62	}}
63	secondary={
64	isUpdatingPaymentDetails && (	2!
65	<CardSection
66	onCancel={() => setIsUpdatingPaymentDetails(false)}	×
67	onComplete={onCardConfirm}
68	onSubmit={() => dispatch(startCardUpdate())}	×
69	setSnackbar={text => dispatch(setSnackbar(text))}	×
70	/>
71	)
72	}
73	notification={
74	hasUnpaid && (	2!
75	<div className="red flexbox centered">
76	<ErrorIcon fontSize="small" />
77	<span className="margin-left-small">You have an unpaid invoice. Please check your payment card details</span>
78	</div>
79	)
80	}
81	/>
82	);
83	};
84
85	export default OrganizationPaymentSettings;

mendersoftware / gui / 1493849842

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