Draft
Conversation
* created test datasets geojson file with 10 samples * Created new test dataset file with full polygon geometry coordinates * corrected the geometry type in full geometry data file * Added description field data from OtCatalog into test dataset files
…and generate a … (#1330) * Add python script to fetch the Opentopo data from git and generate a centerpoint geojson * Update designsafe/apps/rapid/openTopo_Data/scripts/centerpoint_Requirements.txt Co-authored-by: Nathan Franklin <nfranklin@tacc.utexas.edu> * Add empty __init__.py files to openTopo_Data and scripts directories * Add README.md with installation and run instructions * change Readme.md formatting * change centerpoint_datagenerator.py as per pylint * black reformat centerpoint_datagenerator.py * add pylint ignore to datagenerator script and __init__ * add pylint import errors ignore to centerpoint_datagenerator.py * fix dir name to adhere with snake case * remove pylint file name igonre from init file * rename script file dir to snake case * Add GeoJSON aggregation for original geometries and improve code readability * Fix reformatting - black --------- Co-authored-by: Sajith Alapati <sajithalapati16@wireless-10-150-132-67.public.utexas.edu> Co-authored-by: Nathan Franklin <nfranklin@tacc.utexas.edu> Co-authored-by: Sajith Alapati <sajithalapati16@wireless-10-148-39-204.public.utexas.edu> Co-authored-by: Sajith Alapati <sajithalapati16@wireless-10-148-0-115.public.utexas.edu>
…enTopo api(OtCatalog) data to construct the complete geojson files. (#1337) * Add python script to fetch the Opentopo data from git and generate a centerpoint geojson * Updated script to fetch required geojson fields from otCatalog API endpoint * increasing the bounding bx height and width to accommodate few data exceptions * Update centerpoint_datagenerator.py * Update designsafe/apps/rapid/openTopo_Data/scripts/centerpoint_Requirements.txt Co-authored-by: Nathan Franklin <nfranklin@tacc.utexas.edu> * Add empty __init__.py files to openTopo_Data and scripts directories * Add README.md with installation and run instructions * change Readme.md formatting * change centerpoint_datagenerator.py as per pylint * black reformat centerpoint_datagenerator.py * add pylint ignore to datagenerator script and __init__ * add pylint import errors ignore to centerpoint_datagenerator.py * fix dir name to adhere with snake case * remove pylint file name igonre from init file * rename script file dir to snake case * Update designsafe/apps/rapid/openTopo_Data/scripts/centerpoint_Requirements.txt Co-authored-by: Nathan Franklin <nfranklin@tacc.utexas.edu> * Add empty __init__.py files to openTopo_Data and scripts directories * Add README.md with installation and run instructions * change Readme.md formatting * change centerpoint_datagenerator.py as per pylint * add pylint ignore to datagenerator script and __init__ * add pylint import errors ignore to centerpoint_datagenerator.py * remove pylint file name igonre from init file * rename script file dir to snake case * Optimized API calls to otcatalog to fetch world data at once * resolving merge conflicts with task/DES-3004 * Updated API response handling to throw exception for missing datasets * pylint and black formatting updates * Script to fetch otcatalog data into the full geometry geojson * black formatting updates --------- Co-authored-by: Sajith Alapati <sajithalapati16@wireless-10-150-132-67.public.utexas.edu> Co-authored-by: sajithalapati16 <sajith.alapati@austin.utexas.edu> Co-authored-by: Nathan Franklin <nfranklin@tacc.utexas.edu> Co-authored-by: Sajith Alapati <sajithalapati16@wireless-10-148-39-204.public.utexas.edu>
* created test datasets geojson file with 10 samples Resolve the merge conflict * Created new test dataset file with full polygon geometry coordinates Resolve merge conflict * corrected the geometry type in full geometry data file * Added enpoints to opentopo data in views.py * Refactor os.path.join statements for Pythonic style * Add unit tests for new endpoints * update the test data geojson files Resolve merge conflict --------- Co-authored-by: Beulah Karrolla <beulah.karrolla@gmail.com> Co-authored-by: Sajith Alapati <sajithalapati16@wireless-10-150-132-67.public.utexas.edu> Co-authored-by: Sajith Alapati <sajithalapati16@wireless-10-148-72-80.public.utexas.edu> Co-authored-by: Sajith Alapati <sajithalapati16@wireless-10-148-0-115.public.utexas.edu>
* Added endpoints to fetch OtData through tapipy * Using tapis service credentials to run the client * Package and version changes related to tapipy * Test fix using MagicMock * Test fixes using mock patch * Update the requirements for tapipy installation
* temp * Integrate opentopography api data through opentopo api * fix opentopo data event-listing * fix leaflet marker tooltip * modified rapid main-ctrl test file * trail and error - test file fixes * trail and error - test file fixes * trail and error - test file fixes * add color mapping to leaflet markers and riseonhover to opentopo markers * Disabling Recon Portal Tests These will need to be converted to react anyway * Task/des 3030 color mapped leaflet markers (#1363) - Do not show OpenTopography markers by default (DES-3034) - Add additional text to popups to indicate Data Source (DES-3035) - Color map Leaflet markers based on data type for better visualization (DES-3030) - Cache the OpenTopography Api results (DES-3044) --------- Co-authored-by: Sajith Alapati <sajithalapati16@wireless-10-150-91-13.public.utexas.edu> Co-authored-by: Sajith Alapati <sajithalapati16@wireless-10-148-84-78.public.utexas.edu> Co-authored-by: Sajith Alapati <sajithalapati16@wireless-10-148-35-146.public.utexas.edu> * fix: PR comments * fix: polygon pop-up content * fix: rapid-data-service formating * fix: remove url search param for opentopo and clear search param along with reset * fix: remove opentopo data listing and search from event-listing --------- Co-authored-by: Sajith Alapati <sajithalapati16@wireless-10-148-72-80.public.utexas.edu> Co-authored-by: Sajith Alapati <sajithalapati16@wireless-10-148-0-115.public.utexas.edu> Co-authored-by: Sajith Alapati <sajithalapati16@wireless-10-150-132-67.public.utexas.edu> Co-authored-by: Sajith Alapati <sajithalapati16@wireless-10-148-35-93.public.utexas.edu> Co-authored-by: fnets <fnetscher@tacc.utexas.edu> Co-authored-by: Sajith Alapati <sajithalapati16@wireless-10-150-91-13.public.utexas.edu> Co-authored-by: Sajith Alapati <sajithalapati16@wireless-10-148-84-78.public.utexas.edu> Co-authored-by: Sajith Alapati <sajithalapati16@wireless-10-148-35-146.public.utexas.edu> Co-authored-by: Sajith Alapati <sajithalapati16@wireless-10-155-166-93.public.utexas.edu> Co-authored-by: Sajith Alapati <sajithalapati16@wireless-10-148-105-160.public.utexas.edu> Co-authored-by: Sajith Alapati <sajithalapati16@wireless-10-147-72-148.public.utexas.edu>
…opoData (#1384) * temp * Integrate opentopography api data through opentopo api * fix opentopo data event-listing * fix leaflet marker tooltip * modified rapid main-ctrl test file * trail and error - test file fixes * trail and error - test file fixes * trail and error - test file fixes * add color mapping to leaflet markers and riseonhover to opentopo markers * Disabling Recon Portal Tests These will need to be converted to react anyway * Task/des 3030 color mapped leaflet markers (#1363) - Do not show OpenTopography markers by default (DES-3034) - Add additional text to popups to indicate Data Source (DES-3035) - Color map Leaflet markers based on data type for better visualization (DES-3030) - Cache the OpenTopography Api results (DES-3044) --------- Co-authored-by: Sajith Alapati <sajithalapati16@wireless-10-150-91-13.public.utexas.edu> Co-authored-by: Sajith Alapati <sajithalapati16@wireless-10-148-84-78.public.utexas.edu> Co-authored-by: Sajith Alapati <sajithalapati16@wireless-10-148-35-146.public.utexas.edu> * fix: PR comments * fix: polygon pop-up content * fix: rapid-data-service formating * fix: remove url search param for opentopo and clear search param along with reset * Moved current event filters to the top and added new filters for opentopodata * Update views.py * UI filters arrangement * Filtering functionality included for title and name search, start and end date, key word search for ot data * Added tool-tip information on filters * Hiding the filters in a selected event view --------- Co-authored-by: Sajith Alapati <sajithalapati16@wireless-10-148-72-80.public.utexas.edu> Co-authored-by: Sajith Alapati <sajithalapati16@wireless-10-148-0-115.public.utexas.edu> Co-authored-by: Sajith Alapati <sajithalapati16@wireless-10-150-132-67.public.utexas.edu> Co-authored-by: Sajith Alapati <sajithalapati16@wireless-10-148-35-93.public.utexas.edu> Co-authored-by: fnets <fnetscher@tacc.utexas.edu> Co-authored-by: sajithalapati16 <sajith.alapati@austin.utexas.edu> Co-authored-by: Sajith Alapati <sajithalapati16@wireless-10-150-91-13.public.utexas.edu> Co-authored-by: Sajith Alapati <sajithalapati16@wireless-10-148-84-78.public.utexas.edu> Co-authored-by: Sajith Alapati <sajithalapati16@wireless-10-148-35-146.public.utexas.edu> Co-authored-by: Sajith Alapati <sajithalapati16@wireless-10-155-166-93.public.utexas.edu> Co-authored-by: Sajith Alapati <sajithalapati16@wireless-10-148-105-160.public.utexas.edu> Co-authored-by: Nathan Franklin <nfranklin@tacc.utexas.edu>
* Rework filter methods This is to address comment in review: #1384 (comment) * Fix tests * Fix tests
* Use cache_page * Decrease memcached item size to 5M * Add unit test
* Rework filter methods This is to address comment in review: #1384 (comment) * Fix tests * Fix tests * - Removes Recon Portal check box - Changes format so each dataset layer is on its own row - WIP: Stills needs additional UI tweaks * - Fixes merge error that prevents OpenTopo markers from appearing when checkbox is selected. * - Adds tiered list of external data source filters * - Remove cache nx --------- Co-authored-by: Nathan Franklin <nathan.franklin@gmail.com>
* task/WG-375-Recon-Portal-UI-changes - Removes external dataset header and toggle and associated styles - Changes order of Clear and Hide buttons, adds filter to the wording in the button - Adds search button in button row - Adds checkbox to hide and add Recon Portal data - Removes escape character sanitation now that API handles this through the service - Search button uses search method on click rather than debouncing
* Add module and placeholder components * Add missing router/layout * Fix recon portal lint errors
* Add module and placeholder components * Add missing router/layout * Add: getEvents, getEventTypes,getOpentopo hooks. add django reuest to opentopo data * Fix formatting * Fix linting --------- Co-authored-by: Nathan Franklin <nathan.franklin@gmail.com> Co-authored-by: Sajith Alapati <sajithalapati16@wireless-10-147-72-148.public.utexas.edu> Co-authored-by: Nathan Franklin <nfranklin@tacc.utexas.edu>
Feat/recon portal react
* Refactor types and hooks in recon-portal * Fix linting
* - First pass of layout for ReconPortal * Linting
…tal (#1542) * Add react-leaflet node package * Add leaflet map * Remove ReconPortalHeader * Tweak zooms and attribution * Fix linting * Remove duplicated height
* added side panel with filters and event listing * added event details * linting * linting update
…#1558) * added side panel with filters and event listing * added event details * linting * linting update * Add hook/context to select DS event * Add hook/context to select DS event * Fix query param name * Refactor to just rely on query param instead of state * Refactor to a general context to also shared filtered events * Fix formatting issues * Remove unused import * Add test * Fix formatting --------- Co-authored-by: shayanaijaz <shayanaijaz@gmail.com>
* task/wg-521-recon-add-missing-event-types * task/wg-521-recon-add-missing-event-types --------- Co-authored-by: Sophia Massie-Perez <smassie@smassie-mbp25.local>
Co-authored-by: TACC Staff <taccstaff@TACCs-MacBook-Pro-2.local> Co-authored-by: Sal Tijerina <r.sal.tijerina@gmail.com>
* Supported extentions used from common settings * Updated unit test --------- Co-authored-by: TACC Staff <taccstaff@TACCs-MacBook-Pro-2.local>
* Universal pill styling * Styling to formfield and format check * Remove unneccesary comments * Update client/modules/workspace/src/components/SystemStatusModal/SystemStatusModal.module.css * Removed comment --------- Co-authored-by: TACC Staff <taccstaff@TACCs-MacBook-Pro-2.local> Co-authored-by: fnets <fnetscher@tacc.utexas.edu> Co-authored-by: TACC Staff <taccstaff@Mac.lan>
* add back NH Type, Year Pub, and Clear filters * cert-updates * Updated wording * Remove portal directory * DS Wording UPdates * update for compatability * revert one more line * update BaseProjectDetails.tsx so that when assoc.type is "Linked Dataset" it displays "Linked Dataset of Software".
* add back NH Type, Year Pub, and Clear filters * cert-updates * update to fetch and sum both Web of Knowledge and Preprint Network citations * update --------- Co-authored-by: Jake Rosenberg <jrosenberg@tacc.utexas.edu>
* add back NH Type, Year Pub, and Clear filters * cert-updates * redesign Metrics Modal, add Clarivate citations * linting * error in type any * linting * Revert unintended change to designsafe.dev.ext * address frequency of API requests and added logging * added logic to address citation list and citation count mismatch * linting * updated changes * update DOI link. Also put in handling for error return --------- Co-authored-by: Jake Rosenberg <jrosenberg@tacc.utexas.edu>
* Message to attend office hours * Format fix * Dismissable messages permenant --------- Co-authored-by: TACC Staff <taccstaff@TACCs-MacBook-Pro-2.local> Co-authored-by: fnets <fnetscher@tacc.utexas.edu> Co-authored-by: Sal Tijerina <r.sal.tijerina@gmail.com>
… message shows instead of project error message (#1667) Co-authored-by: Sal Tijerina <r.sal.tijerina@gmail.com>
* Add pipeline step to archive publications to Ranch via Jenkins webhook * add utils and pipeline integration for sha512 manifests
https://developers.google.com/youtube/terms/required-minimum-functionality#embedded-player-api-client-identity Co-authored-by: Jake Rosenberg <jrosenberg@tacc.utexas.edu>
Co-authored-by: Jake Rosenberg <jrosenberg@tacc.utexas.edu>
… message as well for unsuccessful to match rest of codebase
Contributor
|
Looks like main got merged in here instead of feat/react-dashboard, causing a giant diff. Working on doing some surgery to resolve. Please don't merge before then. |
Contributor
|
Reverted the merge from main, Erik's original commits are still there. |
Member
|
Marking as draft until revisited |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
14 participants
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:
This PR introduces updates related to the WP-709 ticket, addressing enhancements or fixes to the WordPress integration within the application.
PR Status:
Related Jira tickets:
WP-709
Summary of Changes:
Implemented feature as described in WP-709.
Refactored related components for consistency.
Minor style and behavior updates to UI as needed.
Testing Steps:
Pull this branch and run the application.
Run migrations:
$ docker exec -it des_django bash $ ./manage.py migrate workspaceNavigate to the section impacted by WP-709.
Verify that the issue described in the Jira ticket has been resolved.
Confirm that no regressions occur in related features.
UI Photos:
Notes: