Skip to content

Commit 0501e93

Browse files
GrabowskiMGrabowskiM
authored
IBX-10122: Fixed misspelled IncludedIcon component (#1577)
1 parent 5c8bdda commit 0501e93

File tree

3 files changed

+126
-120
lines changed

3 files changed

+126
-120
lines changed

‎src/bundle/ui-dev/src/modules/common/icon/icon.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { isExternalInstance } from '@ibexa-admin-ui/src/bundle/Resources/public/
55
import { createCssClassNames } from '../helpers/css.class.names';
66

77
import UrlIcon from './urlIcon';
8-
import InculdedIcon from './inculdedIcon';
8+
import IncludedIcon from './includedIcon';
99

1010
const Icon = (props) => {
1111
const cssClass = createCssClassNames({
@@ -18,7 +18,7 @@ const Icon = (props) => {
1818
return (
1919
<>
2020
{isIconIncluded ? (
21-
<InculdedIcon cssClass={cssClass} name={props.name} defaultIconName={props.defaultIconName} />
21+
<IncludedIcon cssClass={cssClass} name={props.name} defaultIconName={props.defaultIconName} />
2222
) : (
2323
<UrlIcon cssClass={cssClass} name={props.name} customPath={props.customPath} />
2424
)}

‎src/bundle/ui-dev/src/modules/common/icon/includedIcon.js‎

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
import React from 'react';
2+
import PropTypes from 'prop-types';
3+
4+
import About from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/about.svg';
5+
import AboutInfo from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/about-info.svg';
6+
import Approved from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/approved.svg';
7+
import Article from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/article.svg';
8+
import Back from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/back.svg';
9+
import Blog from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/blog.svg';
10+
import BlogPost from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/blog_post.svg';
11+
import CaretDown from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/caret-down.svg';
12+
import CaretUp from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/caret-up.svg';
13+
import CircleClose from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/circle-close.svg';
14+
import Create from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/create.svg';
15+
import Checkmark from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/checkmark.svg';
16+
import ContentTree from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/content-tree.svg';
17+
import Date from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/date.svg';
18+
import Discard from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/discard.svg';
19+
import Drag from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/drag.svg';
20+
import Download from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/download.svg';
21+
import Duplicate from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/duplicate.svg';
22+
import Edit from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/edit.svg';
23+
import ExpandLeft from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/expand-left.svg';
24+
import Fields from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/fields.svg';
25+
import File from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/file.svg';
26+
import Filters from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/filters.svg';
27+
import Folder from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/folder.svg';
28+
import Form from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/form.svg';
29+
import Gallery from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/gallery.svg';
30+
import Image from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/image.svg';
31+
import LandingPage from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/landing_page.svg';
32+
import Notice from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/notice.svg';
33+
import Options from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/options.svg';
34+
import Place from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/place.svg';
35+
import Product from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/product.svg';
36+
import QaForm from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/qa-form.svg';
37+
import Search from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/search.svg';
38+
import Spinner from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/spinner.svg';
39+
import SystemInformation from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/system-information.svg';
40+
import Trash from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/trash.svg';
41+
import Video from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/video.svg';
42+
import View from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/view.svg';
43+
import ViewGrid from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/view-grid.svg';
44+
import ViewList from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/view-list.svg';
45+
import User from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/user.svg';
46+
import UserGroup from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/user_group.svg';
47+
import Upload from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/upload.svg';
48+
import UploadImage from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/upload-image.svg';
49+
import Warning from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/warning.svg';
50+
51+
const iconsMap = {
52+
about: About,
53+
'about-info': AboutInfo,
54+
approved: Approved,
55+
article: Article,
56+
back: Back,
57+
blog: Blog,
58+
blog_post: BlogPost,
59+
'caret-down': CaretDown,
60+
'caret-up': CaretUp,
61+
'circle-close': CircleClose,
62+
create: Create,
63+
checkmark: Checkmark,
64+
'content-tree': ContentTree,
65+
date: Date,
66+
discard: Discard,
67+
drag: Drag,
68+
download: Download,
69+
duplicate: Duplicate,
70+
'expand-left': ExpandLeft,
71+
edit: Edit,
72+
file: File,
73+
filters: Filters,
74+
fields: Fields,
75+
folder: Folder,
76+
form: Form,
77+
gallery: Gallery,
78+
image: Image,
79+
landing_page: LandingPage,
80+
notice: Notice,
81+
options: Options,
82+
place: Place,
83+
product: Product,
84+
'qa-form': QaForm,
85+
search: Search,
86+
spinner: Spinner,
87+
'system-information': SystemInformation,
88+
trash: Trash,
89+
video: Video,
90+
view: View,
91+
'view-grid': ViewGrid,
92+
'view-list': ViewList,
93+
user: User,
94+
user_group: UserGroup,
95+
upload: Upload,
96+
'upload-image': UploadImage,
97+
warning: Warning,
98+
};
99+
100+
const IncludedIcon = (props) => {
101+
const { name, cssClass, defaultIconName } = props;
102+
const IconComponent = iconsMap[name] ?? iconsMap[defaultIconName];
103+
104+
return <IconComponent className={cssClass} />;
105+
};
106+
107+
IncludedIcon.propTypes = {
108+
cssClass: PropTypes.string,
109+
name: PropTypes.string,
110+
defaultIconName: PropTypes.string,
111+
};
112+
113+
IncludedIcon.defaultProps = {
114+
cssClass: '',
115+
name: 'about-info',
116+
defaultIconName: 'about-info',
117+
};
118+
119+
export default IncludedIcon;

‎src/bundle/ui-dev/src/modules/common/icon/inculdedIcon.js‎

Lines changed: 5 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -1,119 +1,6 @@
1-
import React from 'react';
2-
import PropTypes from 'prop-types';
1+
/**
2+
* @deprecated will be deleted in version 5.0. Use includedIcon instead.
3+
*/
4+
console.warn('You are using deprecated component. Use includedIcon instead.');
35

4-
import About from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/about.svg';
5-
import AboutInfo from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/about-info.svg';
6-
import Approved from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/approved.svg';
7-
import Article from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/article.svg';
8-
import Back from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/back.svg';
9-
import Blog from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/blog.svg';
10-
import BlogPost from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/blog_post.svg';
11-
import CaretDown from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/caret-down.svg';
12-
import CaretUp from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/caret-up.svg';
13-
import CircleClose from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/circle-close.svg';
14-
import Create from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/create.svg';
15-
import Checkmark from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/checkmark.svg';
16-
import ContentTree from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/content-tree.svg';
17-
import Date from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/date.svg';
18-
import Discard from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/discard.svg';
19-
import Drag from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/drag.svg';
20-
import Download from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/download.svg';
21-
import Duplicate from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/duplicate.svg';
22-
import Edit from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/edit.svg';
23-
import ExpandLeft from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/expand-left.svg';
24-
import Fields from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/fields.svg';
25-
import File from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/file.svg';
26-
import Filters from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/filters.svg';
27-
import Folder from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/folder.svg';
28-
import Form from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/form.svg';
29-
import Gallery from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/gallery.svg';
30-
import Image from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/image.svg';
31-
import LandingPage from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/landing_page.svg';
32-
import Notice from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/notice.svg';
33-
import Options from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/options.svg';
34-
import Place from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/place.svg';
35-
import Product from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/product.svg';
36-
import QaForm from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/qa-form.svg';
37-
import Search from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/search.svg';
38-
import Spinner from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/spinner.svg';
39-
import SystemInformation from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/system-information.svg';
40-
import Trash from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/trash.svg';
41-
import Video from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/video.svg';
42-
import View from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/view.svg';
43-
import ViewGrid from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/view-grid.svg';
44-
import ViewList from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/view-list.svg';
45-
import User from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/user.svg';
46-
import UserGroup from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/user_group.svg';
47-
import Upload from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/upload.svg';
48-
import UploadImage from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/upload-image.svg';
49-
import Warning from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/warning.svg';
50-
51-
const iconsMap = {
52-
about: About,
53-
'about-info': AboutInfo,
54-
approved: Approved,
55-
article: Article,
56-
back: Back,
57-
blog: Blog,
58-
blog_post: BlogPost,
59-
'caret-down': CaretDown,
60-
'caret-up': CaretUp,
61-
'circle-close': CircleClose,
62-
create: Create,
63-
checkmark: Checkmark,
64-
'content-tree': ContentTree,
65-
date: Date,
66-
discard: Discard,
67-
drag: Drag,
68-
download: Download,
69-
duplicate: Duplicate,
70-
'expand-left': ExpandLeft,
71-
edit: Edit,
72-
file: File,
73-
filters: Filters,
74-
fields: Fields,
75-
folder: Folder,
76-
form: Form,
77-
gallery: Gallery,
78-
image: Image,
79-
landing_page: LandingPage,
80-
notice: Notice,
81-
options: Options,
82-
place: Place,
83-
product: Product,
84-
'qa-form': QaForm,
85-
search: Search,
86-
spinner: Spinner,
87-
'system-information': SystemInformation,
88-
trash: Trash,
89-
video: Video,
90-
view: View,
91-
'view-grid': ViewGrid,
92-
'view-list': ViewList,
93-
user: User,
94-
user_group: UserGroup,
95-
upload: Upload,
96-
'upload-image': UploadImage,
97-
warning: Warning,
98-
};
99-
100-
const InculdedIcon = (props) => {
101-
const { name, cssClass, defaultIconName } = props;
102-
const IconComponent = iconsMap[name] ?? iconsMap[defaultIconName];
103-
104-
return <IconComponent className={cssClass} />;
105-
};
106-
107-
InculdedIcon.propTypes = {
108-
cssClass: PropTypes.string,
109-
name: PropTypes.string,
110-
defaultIconName: PropTypes.string,
111-
};
112-
113-
InculdedIcon.defaultProps = {
114-
cssClass: '',
115-
name: 'about-info',
116-
defaultIconName: 'about-info',
117-
};
118-
119-
export default InculdedIcon;
6+
export { default } from './includedIcon';

0 commit comments

Comments
 (0)