Skip to content

Commit a9cb3ad

Browse files
committed
fix: "license text modified" overlaps license text
- replace end adornment label by end adornment icon in order to save space closes #2529 Signed-off-by: Maxim Stykow <maxim.stykow@tngtech.com>
1 parent 3b74e4f commit a9cb3ad

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

src/Frontend/Components/AttributionColumn/LicenseSubPanel.tsx

+11-11
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,22 @@
22
// SPDX-FileCopyrightText: TNG Technology Consulting GmbH <https://www.tngtech.com>
33
//
44
// SPDX-License-Identifier: Apache-2.0
5+
import EditNoteIcon from '@mui/icons-material/EditNote';
56
import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
67
import MuiAccordion from '@mui/material/Accordion';
78
import MuiAccordionDetails from '@mui/material/AccordionDetails';
89
import MuiAccordionSummary from '@mui/material/AccordionSummary';
910
import MuiBox from '@mui/material/Box';
10-
import MuiInputAdornment from '@mui/material/InputAdornment';
11+
import MuiTooltip from '@mui/material/Tooltip';
1112
import { sortBy } from 'lodash';
12-
import { ReactElement, useMemo, useState } from 'react';
13+
import { useMemo, useState } from 'react';
1314

1415
import {
1516
AutocompleteSignal,
1617
DisplayPackageInfo,
1718
} from '../../../shared/shared-types';
1819
import { text } from '../../../shared/text';
19-
import { OpossumColors } from '../../shared-styles';
20+
import { baseIcon, OpossumColors } from '../../shared-styles';
2021
import { setTemporaryDisplayPackageInfo } from '../../state/actions/resource-actions/all-views-simple-actions';
2122
import { useAppDispatch, useAppSelector } from '../../state/hooks';
2223
import { getFrequentLicensesNameOrder } from '../../state/selectors/all-views-resource-selectors';
@@ -59,10 +60,6 @@ const classes = {
5960
licenseText: {
6061
marginTop: '12px',
6162
},
62-
endAdornment: {
63-
paddingRight: '6px',
64-
paddingTop: '2px',
65-
},
6663
};
6764

6865
interface LicenseSubPanelProps {
@@ -75,7 +72,7 @@ export function LicenseSubPanel({
7572
displayPackageInfo,
7673
showHighlight,
7774
onEdit,
78-
}: LicenseSubPanelProps): ReactElement {
75+
}: LicenseSubPanelProps) {
7976
const dispatch = useAppDispatch();
8077
const [expanded, setExpanded] = useState(false);
8178
const frequentLicensesNames = useAppSelector(getFrequentLicensesNameOrder);
@@ -124,9 +121,12 @@ export function LicenseSubPanel({
124121
onEdit={onEdit}
125122
endAdornment={
126123
displayPackageInfo.licenseText ? (
127-
<MuiInputAdornment position="end" sx={classes.endAdornment}>
128-
{text.attributionColumn.licenseTextModified}
129-
</MuiInputAdornment>
124+
<MuiTooltip title={text.attributionColumn.licenseTextModified}>
125+
<EditNoteIcon
126+
color={'warning'}
127+
sx={{ ...baseIcon, cursor: 'default' }}
128+
/>
129+
</MuiTooltip>
130130
) : undefined
131131
}
132132
defaults={defaultLicenses}

src/shared/text.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export const text = {
3131
invalidPurl: 'INVALID PURL',
3232
legalInformation: 'Legal Information',
3333
licenseName: 'License Name',
34-
licenseTextModified: '(License text modified)',
34+
licenseTextModified: 'License text modified',
3535
manualAttributions: 'Manual Attributions',
3636
occurrence: 'occurrence',
3737
openSourceInsights: 'Open Source Insights',

0 commit comments

Comments
 (0)