-
Notifications
You must be signed in to change notification settings - Fork 9
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
Feat/nested images modal #424
Merged
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
This commit updates the FolderCard component to accept a `linkPath` prop so that we can pass in a custom URL for the FolderCard component to link to. This is necessary for images and files which are nested in at least one layer of directories.
This commit modifies the frontend routing to create a /sites/:siteName/images/:customPath path, which will allow users to access nested image folders on the Images layout. The Images layout has also been modified to allow navigation to the parent image folder using the Header component's back button.
The frontend paths that we use for Images are: - /sites/:siteName/images - /sites/:siteName/images/:customPath The second path, /sites/:siteName/images/:customPath, is responsible for handling all other nested levels. For example, if the repo path to the nested image folder is /images/features/2013, then the CMS URL would be /sites/:siteName/images/features/2013. The problem with this is that this URL does not actually match the allocated URL, since there are `/` characters in the route param. Therefore, we need to modify the `customPath` variables to be encoded URI components so that the accessed URLs match the frontend route.
This commit adds the FolderOptionButton components for image upload and directory creation. This commit also fixes a bug where the pending image upload state was not correctly set when refactoring the Image layout from a class component to a functional component.
This commit fixes the back navigation for nested images directories. Previously, we failed to account for the fact that the custom path provided as part of the route would be URI encoded. As such, we were splitting on the `/` character instead of the encoded equivalent, `%2F`. This commit fixes this issue by using the encoded character instead.
This commit modifies the endpoint for the GET call to retrieve images from nested directories instead of just the top level 'images' directory by encoding the path of the nested file.
…rectories This commit adds an `imageDirectory` attribute to the request body to specify the creation of a new image in that nested directory
gweiying
approved these changes
Apr 22, 2021
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.
lgtm!
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.
This is a duplicate of #370, as we do not want to merge this into prod yet.