Skip to content

IBX-10122: Fix misspelled includedIcon filename #1577

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.

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

Merged
merged 1 commit into from
Jun 23, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/bundle/ui-dev/src/modules/common/icon/icon.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { isExternalInstance } from '@ibexa-admin-ui/src/bundle/Resources/public/
import { createCssClassNames } from '../helpers/css.class.names';

import UrlIcon from './urlIcon';
import InculdedIcon from './inculdedIcon';
import IncludedIcon from './includedIcon';

const Icon = (props) => {
const cssClass = createCssClassNames({
Expand All @@ -18,7 +18,7 @@ const Icon = (props) => {
return (
<>
{isIconIncluded ? (
<InculdedIcon cssClass={cssClass} name={props.name} defaultIconName={props.defaultIconName} />
<IncludedIcon cssClass={cssClass} name={props.name} defaultIconName={props.defaultIconName} />
) : (
<UrlIcon cssClass={cssClass} name={props.name} customPath={props.customPath} />
)}
Expand Down
119 changes: 119 additions & 0 deletions src/bundle/ui-dev/src/modules/common/icon/includedIcon.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
import React from 'react';
import PropTypes from 'prop-types';

import About from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/about.svg';
import AboutInfo from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/about-info.svg';
import Approved from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/approved.svg';
import Article from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/article.svg';
import Back from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/back.svg';
import Blog from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/blog.svg';
import BlogPost from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/blog_post.svg';
import CaretDown from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/caret-down.svg';
import CaretUp from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/caret-up.svg';
import CircleClose from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/circle-close.svg';
import Create from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/create.svg';
import Checkmark from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/checkmark.svg';
import ContentTree from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/content-tree.svg';
import Date from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/date.svg';
import Discard from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/discard.svg';
import Drag from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/drag.svg';
import Download from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/download.svg';
import Duplicate from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/duplicate.svg';
import Edit from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/edit.svg';
import ExpandLeft from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/expand-left.svg';
import Fields from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/fields.svg';
import File from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/file.svg';
import Filters from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/filters.svg';
import Folder from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/folder.svg';
import Form from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/form.svg';
import Gallery from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/gallery.svg';
import Image from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/image.svg';
import LandingPage from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/landing_page.svg';
import Notice from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/notice.svg';
import Options from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/options.svg';
import Place from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/place.svg';
import Product from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/product.svg';
import QaForm from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/qa-form.svg';
import Search from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/search.svg';
import Spinner from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/spinner.svg';
import SystemInformation from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/system-information.svg';
import Trash from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/trash.svg';
import Video from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/video.svg';
import View from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/view.svg';
import ViewGrid from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/view-grid.svg';
import ViewList from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/view-list.svg';
import User from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/user.svg';
import UserGroup from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/user_group.svg';
import Upload from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/upload.svg';
import UploadImage from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/upload-image.svg';
import Warning from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/warning.svg';

const iconsMap = {
about: About,
'about-info': AboutInfo,
approved: Approved,
article: Article,
back: Back,
blog: Blog,
blog_post: BlogPost,
'caret-down': CaretDown,
'caret-up': CaretUp,
'circle-close': CircleClose,
create: Create,
checkmark: Checkmark,
'content-tree': ContentTree,
date: Date,
discard: Discard,
drag: Drag,
download: Download,
duplicate: Duplicate,
'expand-left': ExpandLeft,
edit: Edit,
file: File,
filters: Filters,
fields: Fields,
folder: Folder,
form: Form,
gallery: Gallery,
image: Image,
landing_page: LandingPage,
notice: Notice,
options: Options,
place: Place,
product: Product,
'qa-form': QaForm,
search: Search,
spinner: Spinner,
'system-information': SystemInformation,
trash: Trash,
video: Video,
view: View,
'view-grid': ViewGrid,
'view-list': ViewList,
user: User,
user_group: UserGroup,
upload: Upload,
'upload-image': UploadImage,
warning: Warning,
};

const IncludedIcon = (props) => {
const { name, cssClass, defaultIconName } = props;
const IconComponent = iconsMap[name] ?? iconsMap[defaultIconName];

return <IconComponent className={cssClass} />;
};

IncludedIcon.propTypes = {
cssClass: PropTypes.string,
name: PropTypes.string,
defaultIconName: PropTypes.string,
};

IncludedIcon.defaultProps = {
cssClass: '',
name: 'about-info',
defaultIconName: 'about-info',
};

export default IncludedIcon;
123 changes: 5 additions & 118 deletions src/bundle/ui-dev/src/modules/common/icon/inculdedIcon.js
Original file line number Diff line number Diff line change
@@ -1,119 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
/**
* @deprecated will be deleted in version 5.0. Use includedIcon instead.
*/
console.warn('You are using deprecated component. Use includedIcon instead.');

import About from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/about.svg';
import AboutInfo from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/about-info.svg';
import Approved from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/approved.svg';
import Article from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/article.svg';
import Back from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/back.svg';
import Blog from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/blog.svg';
import BlogPost from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/blog_post.svg';
import CaretDown from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/caret-down.svg';
import CaretUp from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/caret-up.svg';
import CircleClose from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/circle-close.svg';
import Create from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/create.svg';
import Checkmark from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/checkmark.svg';
import ContentTree from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/content-tree.svg';
import Date from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/date.svg';
import Discard from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/discard.svg';
import Drag from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/drag.svg';
import Download from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/download.svg';
import Duplicate from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/duplicate.svg';
import Edit from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/edit.svg';
import ExpandLeft from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/expand-left.svg';
import Fields from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/fields.svg';
import File from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/file.svg';
import Filters from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/filters.svg';
import Folder from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/folder.svg';
import Form from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/form.svg';
import Gallery from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/gallery.svg';
import Image from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/image.svg';
import LandingPage from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/landing_page.svg';
import Notice from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/notice.svg';
import Options from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/options.svg';
import Place from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/place.svg';
import Product from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/product.svg';
import QaForm from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/qa-form.svg';
import Search from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/search.svg';
import Spinner from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/spinner.svg';
import SystemInformation from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/system-information.svg';
import Trash from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/trash.svg';
import Video from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/video.svg';
import View from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/view.svg';
import ViewGrid from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/view-grid.svg';
import ViewList from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/view-list.svg';
import User from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/user.svg';
import UserGroup from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/user_group.svg';
import Upload from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/upload.svg';
import UploadImage from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/upload-image.svg';
import Warning from '@ibexa-admin-ui/src/bundle/Resources/public/img/icons/warning.svg';

const iconsMap = {
about: About,
'about-info': AboutInfo,
approved: Approved,
article: Article,
back: Back,
blog: Blog,
blog_post: BlogPost,
'caret-down': CaretDown,
'caret-up': CaretUp,
'circle-close': CircleClose,
create: Create,
checkmark: Checkmark,
'content-tree': ContentTree,
date: Date,
discard: Discard,
drag: Drag,
download: Download,
duplicate: Duplicate,
'expand-left': ExpandLeft,
edit: Edit,
file: File,
filters: Filters,
fields: Fields,
folder: Folder,
form: Form,
gallery: Gallery,
image: Image,
landing_page: LandingPage,
notice: Notice,
options: Options,
place: Place,
product: Product,
'qa-form': QaForm,
search: Search,
spinner: Spinner,
'system-information': SystemInformation,
trash: Trash,
video: Video,
view: View,
'view-grid': ViewGrid,
'view-list': ViewList,
user: User,
user_group: UserGroup,
upload: Upload,
'upload-image': UploadImage,
warning: Warning,
};

const InculdedIcon = (props) => {
const { name, cssClass, defaultIconName } = props;
const IconComponent = iconsMap[name] ?? iconsMap[defaultIconName];

return <IconComponent className={cssClass} />;
};

InculdedIcon.propTypes = {
cssClass: PropTypes.string,
name: PropTypes.string,
defaultIconName: PropTypes.string,
};

InculdedIcon.defaultProps = {
cssClass: '',
name: 'about-info',
defaultIconName: 'about-info',
};

export default InculdedIcon;
export { default } from './includedIcon';
Loading