EZP-31571: Content tree view in UDW #1361
Merged
Conversation
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
|
|
dew326
requested changes
Apr 30, 2020
| @@ -156,6 +166,12 @@ export default class ContentTreeModule extends Component { | |||
| } | |||
|
|
|||
| readSubtree() { | |||
| const { readSubtree } = this.props; | |||
|
|
|||
| if (readSubtree) { | |||
There was a problem hiding this comment.
I would check if it is a function
| @@ -28,8 +28,13 @@ export const loadLocationItems = ({ siteaccess }, parentLocationId, callback, li | |||
| .catch(showErrorNotification); | |||
| }; | |||
|
|
|||
| export const loadSubtree = ({ token, siteaccess }, subtree, callback) => { | |||
| const request = new Request(`${ENDPOINT_LOAD_SUBTREE}`, { | |||
| export const loadSubtree = ({ restInfo: { token, siteaccess }, subtree, sortClause, sortOrder }, callback) => { | |||
There was a problem hiding this comment.
Suggested change
| export const loadSubtree = ({ restInfo: { token, siteaccess }, subtree, sortClause, sortOrder }, callback) => { | |
| export const loadSubtree = ({ token, siteaccess, subtree, sortClause, sortOrder }, callback) => { |
Do not pass restInfo object just pass the token and siteaccess this is more consistent with other places.
src/bundle/ui-dev/src/modules/content-tree/services/content.tree.service.js
Show resolved
Hide resolved
| dispatchLoadedLocationsAction({ type: 'SET_LOCATIONS', data: locationsMap }); | ||
|
|
||
| if (!multiple && !isNotSelectable) { | ||
| dispatchSelectedLocationsAction({ type: 'CLEAR_SELECTED_LOCATIONS' }); |
There was a problem hiding this comment.
You can use REPLACE_SELECTED_LOCATIONS
| loadedLocationsMap.forEach((location) => { | ||
| leafs.push({ | ||
| children: [], | ||
| limit: 30, |
| const tree = []; | ||
| let leafs = tree; | ||
|
|
||
| loadedLocationsMap.forEach((location) => { |
There was a problem hiding this comment.
This whole method deserves to be refactored.
| <div className="c-tree"> | ||
| {contentTreeVisible && ( | ||
| <ContentTreeModule | ||
| userId={14} |
There was a problem hiding this comment.
Why user id is hardcoded to admin?
dew326
reviewed
Apr 30, 2020
| (containersOnly && !isContainer) || (allowedContentTypes && !allowedContentTypes.includes(contentTypeInfo.identifier)); | ||
|
|
||
| setMarkedLocationId(locationId); | ||
| dispatchLoadedLocationsAction({ type: 'CUT_LOCATIONS', locationId: markedLocationId }); |
There was a problem hiding this comment.
Why do you CUT and in next line you do SET which replace the whole loadedLocations?
dew326
reviewed
May 4, 2020
src/bundle/ui-dev/src/modules/universal-discovery/bookmarks.tab.module.js
Outdated
Show resolved
Hide resolved
…b.module.js Co-authored-by: Dariusz Szut <dew326@gmail.com>
lucasOsti
approved these changes
May 4, 2020
dew326
approved these changes
May 6, 2020
katarzynazawada
requested changes
May 7, 2020
katarzynazawada
approved these changes
May 8, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
BC: changed parameters for loadSubtree function to object: 810d10b#diff-d555737827e39c2e1490479db6f96e76R31
Checklist:
$ composer fix-cs)