Feature: My Projects Redo #4240
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
…209-my-projects-redo # Conflicts: # jsapp/js/projects/customViewStore.ts
…209-my-projects-redo
…209-my-projects-redo # Conflicts: # jsapp/js/projects/projectViews/constants.ts
# Conflicts: # jsapp/js/lists/forms.es6 # jsapp/js/lists/forms.module.scss
also update backend response type
# Conflicts: # jsapp/js/mixins.tsx
# Conflicts: # jsapp/js/components/assetrow.es6 # jsapp/js/components/assetsTable/assetActionButtons.tsx # jsapp/js/components/header.es6 # jsapp/js/mixins.tsx
…roject-route split top tabs from `formViewTabs` file and remove x button
…roject-row-a-link
Make project row name a normal link
# Conflicts: # jsapp/js/api.ts # jsapp/js/components/common/button.tsx
- jsapp/js/app.js - jsapp/js/components/drawer.es6 - jsapp/js/components/header/searchBoxStore.ts - jsapp/js/components/library/myLibraryStore.ts - jsapp/js/components/library/publicCollectionsStore.ts - jsapp/js/lists/forms.js - jsapp/js/mixins.tsx - jsapp/js/router/allRoutes.es6 - jsapp/js/components/map.es6 …in an attempt to reduce merge conflicts between diverging branches (beta after react router 6.14 upgrade, feature/my-projects)
jnm: > 0051_add_deployment_status_to_asset will have to be renamed to 0052… > and have its dependencies updated to the new 0051_set_free… that's > already in beta. > > Before doing this, people working on feature/my-projects should roll > their database back to 0050 with `./manage.py migrate kpi 0050`. After > the migration shuffle is done, then migrate (forward) normally: > ./manage.py migrate
…ter-6-14 Resolve conflicts and api changes from react-router-6-13 branch
…ponent # Conflicts: # jsapp/js/app.js # jsapp/js/components/header/mainHeader.component.tsx
…omponent Typescriptize MainHeader component
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
Uses new UI for My Projects route, allowing for better filtering and ordering of the list of projects. Adds focus styles for radios and checkboxes, and many little improvements throughout the code.
Code Review Notes
This is a feature PR - it gathers reviewed and tested code in a single PR. We do smaller branches that are based in
feature/my-projectsbranch.Includes code from:
date_deployedto /api/v2/assets endpoint #4389