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
EZP-30525: Convert Browse Tab as a standalone ReactJS module #187
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,5 @@ | ||
@import './tabs/main'; | ||
|
||
.ez-udw-module { | ||
.c-popup__body { | ||
padding: calculateRem(16px); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
@import './browse/main'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
$browse-tab: '.ez-browse-tab'; | ||
#{$browse-tab} { | ||
display: grid; | ||
grid-template-areas: | ||
'finder finder' | ||
'items actions'; | ||
grid-template-columns: 1fr calculateRem(230px); | ||
grid-gap: calculateRem(16px); | ||
|
||
&--with-preview { | ||
grid-template-areas: | ||
'finder preview' | ||
'items actions'; | ||
} | ||
|
||
&__finder { | ||
grid-area: finder; | ||
} | ||
|
||
&__preview { | ||
grid-area: preview; | ||
} | ||
|
||
&__selected-items { | ||
grid-area: items; | ||
} | ||
|
||
&__actions { | ||
grid-area: actions; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
68 changes: 68 additions & 0 deletions
68
src/modules/udw/common/content-meta-preview/bookmark.icon.component.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
import React, { useState, useEffect } from 'react'; | ||
import PropTypes from 'prop-types'; | ||
import { checkIsBookmarked, addBookmark, removeBookmark } from '../../services/bookmark.service'; | ||
import Icon from '../../../common/icon/icon'; | ||
import LoadingSpinnerComponent from '../../../common/loading-spinner/loading.spinner.component'; | ||
import { showErrorNotification } from '../../../common/services/notification.service'; | ||
import { restInfo } from '../../../common/rest-info/rest.info'; | ||
|
||
const BookmarkIconComponent = ({ locationId }) => { | ||
const [isBookmarked, setIsBookmarked] = useState(false); | ||
const [isCheckingBookmarkedStatus, setIsCheckingBookmarkedStatus] = useState(false); | ||
/** | ||
* Required to change a bookmark state while in a location view of a bookmarked item | ||
* | ||
* @function dispatchBookmarkChangeEvent | ||
*/ | ||
const dispatchBookmarkChangeEvent = () => { | ||
const event = new CustomEvent('ez-bookmark-change', { detail: { bookmarked: isBookmarked, locationId } }); | ||
|
||
document.body.dispatchEvent(event); | ||
}; | ||
const toggleBookmark = () => { | ||
setIsCheckingBookmarkedStatus(true); | ||
|
||
const bookmarkAction = isBookmarked ? removeBookmark : addBookmark; | ||
const bookmarkToggled = new Promise((resolve) => bookmarkAction(restInfo, locationId, resolve)); | ||
|
||
bookmarkToggled | ||
.then(() => { | ||
setIsBookmarked(!isBookmarked); | ||
setIsCheckingBookmarkedStatus(false); | ||
}) | ||
.catch(showErrorNotification); | ||
}; | ||
const bookmarkIconId = isBookmarked ? 'bookmark-active' : 'bookmark'; | ||
const action = isBookmarked ? 'remove' : 'add'; | ||
const iconExtraClasses = 'ez-icon--medium ez-icon--secondary'; | ||
const btnAttrs = { | ||
type: 'button', | ||
className: `c-bookmark-icon c-bookmark-icon--${action}`, | ||
onClick: toggleBookmark, | ||
disabled: isCheckingBookmarkedStatus, | ||
}; | ||
|
||
useEffect(dispatchBookmarkChangeEvent, [isBookmarked]); | ||
useEffect(() => { | ||
setIsCheckingBookmarkedStatus(true); | ||
checkIsBookmarked(restInfo, locationId, (isBookmarked) => { | ||
setIsBookmarked(isBookmarked); | ||
setIsCheckingBookmarkedStatus(false); | ||
}); | ||
}, [locationId]); | ||
|
||
const icon = isCheckingBookmarkedStatus ? ( | ||
<LoadingSpinnerComponent extraClasses={iconExtraClasses} /> | ||
) : ( | ||
<Icon name={bookmarkIconId} extraClasses={iconExtraClasses} /> | ||
); | ||
|
||
return <button {...btnAttrs}>{icon}</button>; | ||
}; | ||
|
||
BookmarkIconComponent.propTypes = { | ||
locationId: PropTypes.string.isRequired, | ||
location: PropTypes.object.isRequired, | ||
}; | ||
|
||
export default BookmarkIconComponent; |
46 changes: 46 additions & 0 deletions
46
src/modules/udw/common/content-meta-preview/content.image.preview.component.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
import React, { Fragment } from 'react'; | ||
import PropTypes from 'prop-types'; | ||
import LoadingSpinnerComponent from '../../../common/loading-spinner/loading.spinner.component'; | ||
|
||
const TEXT_NO_PREVIEW = Translator.trans( | ||
/*@Desc("Content preview is not available")*/ 'content_meta_preview.image_preview_not_available.info', | ||
{}, | ||
'universal_discovery_widget' | ||
); | ||
const getImageUri = (version) => { | ||
if (!version) { | ||
return ''; | ||
} | ||
|
||
const imageField = version.Fields.field.find((field) => field.fieldTypeIdentifier === 'ezimage'); | ||
|
||
return imageField && imageField.fieldValue ? imageField.fieldValue.uri : ''; | ||
}; | ||
|
||
const ContentImagePreviewComponent = ({ version }) => { | ||
if (!version) { | ||
return <LoadingSpinnerComponent />; | ||
} | ||
|
||
const imageUri = getImageUri(version); | ||
|
||
if (!imageUri.length) { | ||
return <Fragment>{TEXT_NO_PREVIEW}</Fragment>; | ||
} | ||
|
||
return <img className="c-content-image-preview" src={imageUri} alt="" />; | ||
}; | ||
|
||
ContentImagePreviewComponent.propTypes = { | ||
version: PropTypes.shape({ | ||
Fields: PropTypes.shape({ | ||
field: PropTypes.array.isRequired, | ||
}).isRequired, | ||
}), | ||
}; | ||
|
||
ContentImagePreviewComponent.defaultProps = { | ||
version: null, | ||
}; | ||
|
||
export default ContentImagePreviewComponent; |
107 changes: 107 additions & 0 deletions
107
src/modules/udw/common/content-meta-preview/content.meta.preview.component.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,107 @@ | ||
import React from 'react'; | ||
import PropTypes from 'prop-types'; | ||
import ContentImagePreviewComponent from './content.image.preview.component'; | ||
import BookmarkIconComponent from './bookmark.icon.component'; | ||
import ContentTypeIconComponent from '../content-type-icon/content.type.icon.component'; | ||
|
||
const TEXT_LAST_MODIFIED = Translator.trans( | ||
/*@Desc("Last modified")*/ 'content_meta_preview.last_modified.label', | ||
{}, | ||
'universal_discovery_widget' | ||
); | ||
const TEXT_CREATION_DATE = Translator.trans( | ||
/*@Desc("Creation date")*/ 'content_meta_preview.creation_date.label', | ||
{}, | ||
'universal_discovery_widget' | ||
); | ||
const TEXT_TRANSLATIONS = Translator.trans( | ||
/*@Desc("Translations")*/ 'content_meta_preview.translations.label', | ||
{}, | ||
'universal_discovery_widget' | ||
); | ||
const TEXT_CONTAINER_TITLE = Translator.trans( | ||
/*@Desc("Content Meta Preview")*/ 'content_meta_preview.title', | ||
{}, | ||
'universal_discovery_widget' | ||
); | ||
const getTranslations = (location) => { | ||
if (!location || !location.CurrentVersion) { | ||
return []; | ||
} | ||
|
||
const languages = window.eZ.adminUiConfig.languages; | ||
const version = location.CurrentVersion.Version; | ||
const versionLanguages = version.VersionInfo.VersionTranslationInfo.Language; | ||
|
||
return versionLanguages.map((language) => languages.mappings[language.languageCode].name); | ||
}; | ||
|
||
const ContentMetaPreviewComponent = ({ location, maxHeight, isVisible }) => { | ||
if (!isVisible) { | ||
return null; | ||
} | ||
|
||
const renderTranslation = (translation, index) => { | ||
return ( | ||
<span key={index} className="c-meta-preview__translation"> | ||
{translation} | ||
</span> | ||
); | ||
}; | ||
const content = location.ContentInfo.Content; | ||
let contentTypeIdentifier = null; | ||
let contentTypeName = ''; | ||
|
||
if (content.ContentTypeInfo) { | ||
contentTypeIdentifier = content.ContentTypeInfo.identifier; | ||
contentTypeName = window.eZ.adminUiConfig.contentTypeNames[contentTypeIdentifier]; | ||
} | ||
|
||
const { formatShortDateTime } = window.eZ.helpers.timezone; | ||
const translations = getTranslations(location); | ||
const version = location.CurrentVersion ? location.CurrentVersion.Version : null; | ||
|
||
return ( | ||
<div className="c-meta-preview__wrapper" style={{ maxHeight: `${maxHeight}px` }}> | ||
<h3 className="c-meta-preview__title">{TEXT_CONTAINER_TITLE}</h3> | ||
<div className="c-meta-preview"> | ||
<div className="c-meta-preview__top-wrapper"> | ||
<div className="c-meta-preview__content-type"> | ||
<ContentTypeIconComponent identifier={contentTypeIdentifier} /> {contentTypeName} | ||
</div> | ||
<BookmarkIconComponent locationId={location.id} /> | ||
</div> | ||
<div className="c-meta-preview__meta-wrapper"> | ||
<div className="c-meta-preview__image-wrapper"> | ||
<ContentImagePreviewComponent version={version} /> | ||
</div> | ||
<div className="c-meta-preview__name">{content.Name}</div> | ||
<div className="c-meta-preview__content-info"> | ||
<h3 className="c-meta-preview__subtitle">{TEXT_LAST_MODIFIED}:</h3> | ||
{formatShortDateTime(new Date(content.lastModificationDate))} | ||
</div> | ||
<div className="c-meta-preview__content-info"> | ||
<h3 className="c-meta-preview__subtitle">{TEXT_CREATION_DATE}:</h3> | ||
{formatShortDateTime(new Date(content.publishedDate))} | ||
</div> | ||
<div className="c-meta-preview__content-info"> | ||
<h3 className="c-meta-preview__subtitle">{TEXT_TRANSLATIONS}:</h3> | ||
{translations.map(renderTranslation)} | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
); | ||
}; | ||
|
||
ContentMetaPreviewComponent.propTypes = { | ||
location: PropTypes.object.isRequired, | ||
maxHeight: PropTypes.number.isRequired, | ||
isVisible: PropTypes.bool, | ||
}; | ||
|
||
ContentMetaPreviewComponent.defaultProps = { | ||
isVisible: false, | ||
}; | ||
|
||
export default ContentMetaPreviewComponent; |
23 changes: 23 additions & 0 deletions
23
src/modules/udw/common/content-type-icon/content.type.icon.component.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
import React from 'react'; | ||
import PropTypes from 'prop-types'; | ||
import Icon from '../../../common/icon/icon'; | ||
|
||
const ContentTypeIconComponent = ({ identifier }) => { | ||
if (!identifier) { | ||
return null; | ||
} | ||
|
||
const contentTypeIconUrl = eZ.helpers.contentType.getContentTypeIconUrl(identifier); | ||
|
||
return <Icon customPath={contentTypeIconUrl} extraClasses="c-content-type-icon ez-icon--small" />; | ||
}; | ||
|
||
ContentTypeIconComponent.propTypes = { | ||
identifier: PropTypes.string, | ||
}; | ||
|
||
ContentTypeIconComponent.defaultProps = { | ||
identifier: null, | ||
}; | ||
|
||
export default ContentTypeIconComponent; |
74 changes: 74 additions & 0 deletions
74
src/modules/udw/common/select-content-button/select.content.button.component.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
import React, { useState, useEffect, useCallback } from 'react'; | ||
import PropTypes from 'prop-types'; | ||
import Icon from '../../../common/icon/icon'; | ||
import { createCssClassNames } from '../../../common/css-class-names/css.class.names'; | ||
|
||
const SelectContentButtonComponent = ({ checkCanSelectContent, location, onSelect, onDeselect, isSelected }) => { | ||
const [isSelectContentEnabled, setIsSelectContentEnabled] = useState(true); | ||
const handleSelect = useCallback( | ||
(event) => { | ||
event.stopPropagation(); | ||
|
||
onSelect(location); | ||
}, | ||
[location, onSelect] | ||
); | ||
const handleDeselect = useCallback( | ||
(event) => { | ||
event.stopPropagation(); | ||
|
||
onDeselect(location.id); | ||
}, | ||
[location, onDeselect] | ||
); | ||
const toggleEnabledState = useCallback( | ||
(selectContentEnabled) => { | ||
if (isSelectContentEnabled === selectContentEnabled) { | ||
return; | ||
} | ||
|
||
setIsSelectContentEnabled(selectContentEnabled); | ||
}, | ||
[isSelectContentEnabled] | ||
); | ||
|
||
useEffect(() => { | ||
checkCanSelectContent(location, toggleEnabledState); | ||
}, [checkCanSelectContent, location, toggleEnabledState]); | ||
|
||
const iconId = isSelected ? 'checkmark' : 'create'; | ||
const attrs = { | ||
type: 'button', | ||
className: createCssClassNames({ | ||
'c-select-content-button': true, | ||
'c-select-content-button--selected': isSelected, | ||
}), | ||
onClick: isSelected ? handleDeselect : handleSelect, | ||
}; | ||
|
||
if (!isSelected && !isSelectContentEnabled) { | ||
return null; | ||
} | ||
|
||
return ( | ||
<button {...attrs}> | ||
<Icon name={iconId} extraClasses="ez-icon--small" /> | ||
</button> | ||
); | ||
}; | ||
|
||
SelectContentButtonComponent.propTypes = { | ||
checkCanSelectContent: PropTypes.func.isRequired, | ||
location: PropTypes.shape({ | ||
id: PropTypes.string.isRequired, | ||
}).isRequired, | ||
onSelect: PropTypes.func.isRequired, | ||
onDeselect: PropTypes.func.isRequired, | ||
isSelected: PropTypes.bool, | ||
}; | ||
|
||
SelectContentButtonComponent.defaultProps = { | ||
isSelected: false, | ||
}; | ||
|
||
export default SelectContentButtonComponent; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we
setIsSelectContentEnabled(false)
beforecheckCanSelectContent
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is not the best idea in the world, because it will cause extra re-renders of a component. Another effect is basing on changes of
isSelectContentEnabled
flag.