Feat/display collection in nav bar #362
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
kwajiehao
force-pushed
the
feat/display-collections-nav-bar
branch
from
b861d0a to
8672b5c
Compare
This commit refactors the `EditNavBar` component to use react-query to retrieve nav bar data from the backend. This includes moving the API call into a callback function defined in the api.js file.
Previously, we used the GET /v1/sites/:siteName/collections endpoint to retrieve data on collections. However, this endpoint is outdated - it retrieves data on collections based on the _config.yml file. This won't work with our Jekyll 4.2 repos going forward, since information on collection data will be stored in each individual collection directory. This commit updates the GET request to retrieve from the GET v1/sites/:siteName/folders/all endpoint instead. This endpoint returns not just information on what collections exist in the repo, but also returns information on the order of pages within each collection, which we need for rendering the collection page dropdown in the NavBar template.
This commit adds a util function which parses the folder order for each folder/collection and returns them in an array of deslugified elements in accordance with the nav bar dropdown requirements.
This commit updates the EditNavBar layout with a new folderDropdowns state variable, which is passed to the TemplateNavBar as the collectionsInfo prop. This gives the TemplateNavBar component the necessary information to render the dropdown items for collections/folders
kwajiehao
force-pushed
the
feat/display-collection-in-nav-bar
branch
from
9b95f7d to
b25e6a1
Compare
gweiying
reviewed
Mar 3, 2021
gweiying
suggested changes
Mar 3, 2021
| } | ||
|
|
||
| if (pathArr.length === 2 && pathArr[0] !== acc[acc.length - 1]) { | ||
| acc.push(deslugifyDirectory(pathArr[0])) |
There was a problem hiding this comment.
Should check if deslugifyDirectory(pathArr[0]) already exists or use Set()
There was a problem hiding this comment.
Good catch, fixed with 5a34a49
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.
Note: this PR is to be reviewed with PR #117 on the backend
Overview
This PR builds on #358, and makes modifications to the
EditNavBarlayout so that it stores afoldersDropdownstate variable, which it passes to theTemplateNavBarcomponent so that the dropdown elements for a collections/folder entry in the nav bar are rendered.Before
After