Skip to content

Commit aa2dda2

Browse files
committed
chore: Clean up outdated help tooltips
Signed-off-by: Michael Clelland <[email protected]>
1 parent a105d13 commit aa2dda2

File tree

3 files changed

+15
-75
lines changed

3 files changed

+15
-75
lines changed

src/js/components/devices/authorized-devices.js

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ import { getOnboardingComponentFor } from '../../utils/onboardingmanager';
5050
import useWindowSize from '../../utils/resizehook';
5151
import { clearAllRetryTimers, setRetryTimer } from '../../utils/retrytimer';
5252
import Loader from '../common/loader';
53-
import { HELPTOOLTIPS, MenderHelpTooltip } from '../helptips/helptooltips';
5453
import { defaultHeaders, defaultTextRender, getDeviceIdentityText, routes as states } from './base-devices';
5554
import DeviceList, { minCellWidth } from './devicelist';
5655
import ColumnCustomizationDialog from './dialogs/custom-columns-dialog';
@@ -464,24 +463,21 @@ export const Authorized = ({
464463
<Loader show={!isInitialized} />
465464
<div className="padding-bottom" ref={deviceListRef}>
466465
{devices.length > 0 ? (
467-
<>
468-
<DeviceList
469-
columnHeaders={columnHeaders}
470-
customColumnSizes={customColumnSizes}
471-
devices={devices}
472-
deviceListState={deviceListState}
473-
idAttribute={idAttribute}
474-
onChangeRowsPerPage={onPageLengthChange}
475-
onExpandClick={onExpandClick}
476-
onPageChange={handlePageChange}
477-
onResizeColumns={columns => dispatch(updateUserColumnSettings(columns))}
478-
onSelect={onSelectionChange}
479-
onSort={onSortChange}
480-
pageLoading={pageLoading}
481-
pageTotal={deviceCount}
482-
/>
483-
<MenderHelpTooltip id={HELPTOOLTIPS.expandDevice.id} style={{ position: 'absolute', right: 45 }} />
484-
</>
466+
<DeviceList
467+
columnHeaders={columnHeaders}
468+
customColumnSizes={customColumnSizes}
469+
devices={devices}
470+
deviceListState={deviceListState}
471+
idAttribute={idAttribute}
472+
onChangeRowsPerPage={onPageLengthChange}
473+
onExpandClick={onExpandClick}
474+
onPageChange={handlePageChange}
475+
onResizeColumns={columns => dispatch(updateUserColumnSettings(columns))}
476+
onSelect={onSelectionChange}
477+
onSort={onSortChange}
478+
pageLoading={pageLoading}
479+
pageTotal={deviceCount}
480+
/>
485481
) : (
486482
<EmptyState
487483
allCount={allCount}

src/js/components/helptips/__snapshots__/helptooltips.test.js.snap

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,6 @@ NodeList [
88
<p>
99
It is possible to create groups of devices. Once you have created a group and added one or more devices to it, you can deploy an update to that specific group only.
1010
</p>,
11-
<p>
12-
To avoid accidents, Mender only allows a device to be in one group at the time.
13-
</p>,
14-
<p>
15-
You can find out additional information about device groups in
16-
<a
17-
href="/help/devices"
18-
>
19-
the help section
20-
</a>
21-
.
22-
</p>,
2311
]
2412
`;
2513

@@ -371,30 +359,6 @@ NodeList [
371359
]
372360
`;
373361

374-
exports[`Helptooltips Components renders ExpandDevice correctly 1`] = `
375-
NodeList [
376-
<h3>
377-
Device inventory
378-
</h3>,
379-
<p>
380-
Mender automatically collects identity and inventory information from connected devices. You can view this information by clicking on a device to expand the row.
381-
</p>,
382-
<p>
383-
Which information is collected about devices is fully configurable;
384-
385-
<a
386-
class=""
387-
href="https://docs.mender.io/client-installation/identity"
388-
rel="noopener noreferrer"
389-
target="_blank"
390-
>
391-
see the documentation for how to configure this
392-
</a>
393-
.
394-
</p>,
395-
]
396-
`;
397-
398362
exports[`Helptooltips Components renders ForceDeployment correctly 1`] = `
399363
NodeList [
400364
<h3>

src/js/components/helptips/helptooltips.js

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
// limitations under the License.
1414
import React, { useCallback } from 'react';
1515
import { useDispatch, useSelector } from 'react-redux';
16-
import { Link } from 'react-router-dom';
1716

1817
import { setSnackbar } from '../../actions/appActions';
1918
import { setAllTooltipsReadState, setTooltipReadState } from '../../actions/userActions';
@@ -58,24 +57,6 @@ const AddGroup = () => (
5857
It is possible to create groups of devices. Once you have created a group and added one or more devices to it, you can deploy an update to that specific
5958
group only.
6059
</p>
61-
<p>To avoid accidents, Mender only allows a device to be in one group at the time.</p>
62-
<p>
63-
You can find out additional information about device groups in <Link to="/help/devices">the help section</Link>.
64-
</p>
65-
</>
66-
);
67-
68-
const ExpandDevice = () => (
69-
<>
70-
<h3>Device inventory</h3>
71-
<p>
72-
Mender automatically collects identity and inventory information from connected devices. You can view this information by clicking on a device to expand
73-
the row.
74-
</p>
75-
<p>
76-
Which information is collected about devices is fully configurable;{' '}
77-
<DocsLink path="client-installation/identity" title="see the documentation for how to configure this" />.
78-
</p>
7960
</>
8061
);
8162

@@ -289,7 +270,6 @@ export const HELPTOOLTIPS = {
289270
deviceSupportTip: { id: 'deviceSupportTip', Component: DeviceSupportTip },
290271
deviceTypeTip: { id: 'deviceTypeTip', Component: DeviceTypeTip },
291272
expandArtifact: { id: 'expandArtifact', Component: ExpandArtifact },
292-
expandDevice: { id: 'expandDevice', Component: ExpandDevice },
293273
forceDeployment: { id: 'forceDeployment', Component: ForceDeployment },
294274
globalSettings: { id: 'globalSettings', Component: GlobalSettings },
295275
groupDeployment: { id: 'groupDeployment', Component: GroupDeployment },

0 commit comments

Comments
 (0)