Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use type info instead of id type as icon title in the folder contents #3456

Merged
merged 3 commits into from
Jul 13, 2022
+4 −2
Merged

Use type info instead of id type as icon title in the folder contents #3456

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e8c6c62
type info in folder contents items
mamico Jul 2, 2022
72c0933
changelog
mamico Jul 2, 2022
dcf604e
Merge branch 'master' into mamico/translate_type_in_foldercontents
mamico Jul 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

### Feature

- Use type info instead of id type as icon title in the folder contents. @mamico

### Bugfix

### Internal
Expand Down
2 changes: 1 addition & 1 deletion src/components/manage/Contents/ContentsItem.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ export const ContentsItemComponent = ({
size="20px"
className="icon-margin"
color="#878f93"
title={item['@type']}
title={item['Type'] || item['@type']}
/>{' '}
<span title={item.title}> {item.title}</span>
</div>
Expand Down
1 change: 1 addition & 0 deletions src/components/manage/Contents/ContentsItem.test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ describe('ContentsItem', () => {
title: 'Blog',
is_folderish: false,
'@type': 'Document',
Type: 'Pagina',
}}
selected={false}
onClick={() => {}}
Expand Down
2 changes: 1 addition & 1 deletion src/components/manage/Contents/__snapshots__/ContentsItem.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ exports[`ContentsItem renders a contents item component 1`] = `
className="icon icon-margin"
dangerouslySetInnerHTML={
Object {
"__html": "<title>Document</title>undefined",
"__html": "<title>Pagina</title>undefined",
}
}
onClick={null}
Expand Down