4216 media editor and maps #4278
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
offtherailz
requested changes
Oct 3, 2019
offtherailz
reviewed
Oct 4, 2019
| @@ -92,7 +95,7 @@ export const openMediaEditorForNewMedia = action$ => | |||
| Observable.of( | |||
| update( | |||
| path, | |||
| { resourceId: resource.id, type: "image" }, // TODO take type from mediaEditor state or from resource | |||
| { resourceId: resource.id, type: currentMediaTypeSelector(store.getState()) }, // TODO take type from mediaEditor state or from resource | |||
There was a problem hiding this comment.
Suggested change
| { resourceId: resource.id, type: currentMediaTypeSelector(store.getState()) }, // TODO take type from mediaEditor state or from resource | |
| { resourceId: resource.id, type: currentMediaTypeSelector(store.getState()) }, |
offtherailz
reviewed
Oct 4, 2019
web/client/epics/geostory.js
Outdated
| const resourceAlreadyPresent = head(resourcesSelector(state).filter(r => r.data && (sourceId !== SourceTypes.GEOSTORY && r.data.id || r.id) === resource.id)); | ||
|
|
||
| let resourceId = resource.id; | ||
| if (!resourceAlreadyPresent && resource.type === MediaTypes.MAP && sourceId !== SourceTypes.GEOSTORY) { |
There was a problem hiding this comment.
Don't need to be a map. Every content from local source should not be added twice
Suggested change
| if (!resourceAlreadyPresent && resource.type === MediaTypes.MAP && sourceId !== SourceTypes.GEOSTORY) { | |
| if (!resourceAlreadyPresent && sourceId !== SourceTypes.GEOSTORY) { |
offtherailz
reviewed
Oct 4, 2019
web/client/epics/geostory.js
Outdated
|
|
||
| let resourceId = resource.id; | ||
| if (!resourceAlreadyPresent && resource.type === MediaTypes.MAP && sourceId !== SourceTypes.GEOSTORY) { | ||
| // if using a geostore map that is not present in the story => add it |
There was a problem hiding this comment.
Suggested change
| // if using a geostore map that is not present in the story => add it | |
| // if the resource is new, add it to the story resources list |
offtherailz
reviewed
Oct 4, 2019
offtherailz
reviewed
Oct 4, 2019
offtherailz
reviewed
Oct 4, 2019
web/client/utils/GeoStoryUtils.js
Outdated
| export const lists = { | ||
| StoryTypes: values(StoryTypes), | ||
| SectionTypes: values(SectionTypes), | ||
| MediaTypes: values(MediaTypes), | ||
| Modes: values(Modes) | ||
| }; | ||
|
|
||
| export const defaultLayerMapPreview = { |
There was a problem hiding this comment.
same here, in mediaeditor utils
offtherailz
reviewed
Oct 4, 2019
offtherailz
approved these changes
Oct 4, 2019
12 tasks
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.
Description
This pr add possibility to add maps to the background via the media editor
some additions:
Issues
Please check if the PR fulfills these requirements
What kind of change does this PR introduce? (check one with "x", remove the others)
What is the current behavior? (You can also link to an open issue here)
What is the new behavior?
Does this PR introduce a breaking change? (check one with "x", remove the other)
If this PR contains a breaking change, please describe the impact and migration path for existing applications: ...
Other information: