task/wg-76-project-listing-query #265
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
taoteg
reviewed
Sep 30, 2024
| @@ -1,11 +1,7 @@ | |||
| import React, { useState } from 'react'; | |||
| import { Project, DesignSafeProject } from '../../types'; | |||
taoteg
reviewed
Sep 30, 2024
| <th>Project</th> | ||
| <th> | ||
| <CreateMapModal isOpen={isModalOpen} toggle={toggleModal} /> | ||
| <Button |
There was a problem hiding this comment.
Just a linter preference in syntax formatting (prefers one line apparently).
taoteg
approved these changes
Sep 30, 2024
| apiService: ApiService.DesignSafe, | ||
| }); | ||
| return query; | ||
| }; | ||
|
|
||
| export const mergeDesignSafeProject = ( |
There was a problem hiding this comment.
- Could useProjects be used like useDsProject within mergeDesignSafeProject to reduce complexity when using the hook in components?
- follow on suggestion: could this be renamed to something like useProjectsWithDesignSafeInformation 🤔
- there is an issue currently where ProjectListing component is rendering table even though data isn't completely loaded and processed (will move to slack to discuss).
There was a problem hiding this comment.
Thanks for the suggestion! That was exactly what I was going for but couldn't get right. Appreciate the feedback and have updated the PR.
requests into one hook
nathanfranklin
added a commit
that referenced
this pull request
Oct 18, 2024
* Update config files * task/wg-76-project-listing-query (#265) * task/wg-76-project-listing-query * Address linting errors * - Combines DesignSafe and Hazmapper project get requests into one hook * - Linting * Add local version of QueryNavItem to illustrate issue * Use @tacc/core-components version 0.0.3-beta.0 * Fix prettier issues * Update package lock * Update package-lock.json again * hotfix: simplify imports in react app (#260) * Simplify imports in react app * Fix linting * Revert changes to core-wrappers * Add maping to jest * Fix linting * Fix pretty issues * Remove unused imports from mistake in conflict resolution * Update as core-components is now installed from package --------- Co-authored-by: sophia-massie <96220951+sophia-massie@users.noreply.github.com>
nathanfranklin
added a commit
that referenced
this pull request
Oct 21, 2024
* feat: tup-700 replace core-components + /wrappers * fix: FieldWrapperFormik not found Problem was forgetting to build core-components before packing. * fix: FieldWrapper… fields crashed form Problem was… core-components not coded/tested for external usage. Fixes in TACC/tup-ui: TACC/tup-ui@cb73d54 TACC/tup-ui@836f372 * chore: save latest core-components hash * Feat/tup 700 core components node pkg use pkg fixes (#272) * Update config files * task/wg-76-project-listing-query (#265) * task/wg-76-project-listing-query * Address linting errors * - Combines DesignSafe and Hazmapper project get requests into one hook * - Linting * Add local version of QueryNavItem to illustrate issue * Use @tacc/core-components version 0.0.3-beta.0 * Fix prettier issues * Update package lock * Update package-lock.json again * hotfix: simplify imports in react app (#260) * Simplify imports in react app * Fix linting * Revert changes to core-wrappers * Add maping to jest * Fix linting * Fix pretty issues * Remove unused imports from mistake in conflict resolution * Update as core-components is now installed from package --------- Co-authored-by: sophia-massie <96220951+sophia-massie@users.noreply.github.com> * Bump package-lock.json * Remove local QueryNavItem --------- Co-authored-by: Nathan Franklin <nathan.franklin@gmail.com> Co-authored-by: sophia-massie <96220951+sophia-massie@users.noreply.github.com>
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.
Overview:
PR Status:
Related Jira tickets:
Summary of Changes:
Updates project type and hook so that the merged response from DesignSafe and Hazmapper load before loading the project listing
Testing Steps:
if (isError)orif {isLoading}toif (!isError)orif (isLoading)to check the display of those states.UI Photos:
Notes:
TODO:
Edit and Trash buttons just open the map at this point. A delete and edit request have not been added yet.