Skip to content
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

Merging feat/apcd react conversion into main #411

Merged
merged 115 commits into from
Jan 17, 2025

Conversation

chandra-tacc
Copy link
Contributor

Overview

React conversion for APCD

chandra-tacc and others added 30 commits February 27, 2024 14:26
…276)

* Initial commit - using react with APCD page

* remove visualizer

* Remove print statements

* Renamed shared-components to core-components
…276)

* Initial commit - using react with APCD page

* remove visualizer

* Remove print statements

* Renamed shared-components to core-components
…276)

* Initial commit - using react with APCD page

* remove visualizer

* Remove print statements

* Renamed shared-components to core-components
* apcd admin submissions react page version 1

* moved filter and sort functionality to react

* Added View logs modal using reactstrap modal

---------

Co-authored-by: Chandra Y <cyemparala@tacc.utexas.edu>
* feat: Add ViewUsers component

* chore: Update Docker Compose dev configuration for React

* refactor: Update ViewUsers component and related files

* refactor: Update ViewUsers component and related files

* feat: Add user action dropdown in ViewUsers component

* Filter by Status and Org now work

* URL updated w/ status and org

* URL updates to show status and/or organization

---------

Co-authored-by: Chandra Y <cyemparala@tacc.utexas.edu>
…react (#294)

* Setup vite local and template with react content

* Update Makefile
Modal windows not included
)

* List registrations: filters, pagination and view modal

* Add pending edit modal and fix org status
* first run at the react conversion

* Update list_admin_extension.html from merge feat branch

* Updated incorrect import

---------

Co-authored-by: Chandra Y <cyemparala@tacc.utexas.edu>
* feat: Add user action dropdown in ViewUsers component

* Add ViewRecordModal component and styles for user details modal

* Update ViewRecordModal component and styles for user details modal

* Update ViewRecordModal component and styles for user details modal

* Create Edit Record modal

* Add Success and Error modals

* Update EditRecordModal component and fix error handling

* Add support for fetchUtil request method and use it in EditRecordModal

* Add update user method

* Add pagination to ViewUsersTable component

* Update ViewUsersTable component with duplicate path in urls.py

* Update EditRecordModal component and fix error handling

* Remove link

---------

Co-authored-by: Chandra Y <cyemparala@tacc.utexas.edu>
* Update RegistrationList and ViewRegistrationModal to display 'None' when year, reg_status, fein, license, or naic is undefined or null

---------

Co-authored-by: Chandra Y <cyemparala@tacc.utexas.edu>
Co-authored-by: Chandra Y <cyemparala@tacc.utexas.edu>
chandra-tacc and others added 23 commits December 6, 2024 12:43
* Merge features from main to apcd feature branch

* Fix id field

---------

Co-authored-by: Garrett Edmonds <43251554+edmondsgarrett@users.noreply.github.com>
- Removes toggle from success and error message to mimic behavior in other edit modals
- Will revisit handling of success messages after React initial release
* react-strap buttons

* submit attribute for formik

* edit record modal submit attribute

---------

Co-authored-by: Chandra Y <cyemparala@tacc.utexas.edu>
* initial commit

* Validation Users Edit Record Modal

* Exception Modal

* ExtensionModal

* error above, succsess inline

* EditRecord QueryWrapper

* QueryWrapper ExceptionModal

* pill inline fix

* removed non required pills

---------

Co-authored-by: Chandra Y <cyemparala@tacc.utexas.edu>
* Fix syntax error in sql

* move left join before where
* Created new blank page at URL administration/view-submitter-users

* Began building of Submitter Users Page

* All Users shown on table; working on filtering by Submitter-User role

* Established SQL query to get submitter users; set up views.py

* Still working on getting the site to load the data

* Got table of submitter users to appear

* View modal opens and closes

* Edit Modal opens and closes; can't edit records yet

* Edit modal updates user names and emails correctly

* Added View Submitter Users site to navbar

* Linted client code

* Removed changes to apcd_cms/src/client/main.tsx

* Removed extraneous HTML files and commented-out portions

* Update apcd_cms/src/apps/utils/apcd_database.py

Simplify the database connection

Co-authored-by: Chandra Y <cyemparala@tacc.utexas.edu>

* Update apcd_cms/src/apps/utils/apcd_database.py

Sort users by user ID

Co-authored-by: Chandra Y <cyemparala@tacc.utexas.edu>

* Update apcd_cms/src/apps/utils/apcd_database.py

Co-authored-by: Chandra Y <cyemparala@tacc.utexas.edu>

---------

Co-authored-by: Jeff McMillen <jm63959@TACCs-MacBook-Pro.local>
Co-authored-by: Chandra Y <cyemparala@tacc.utexas.edu>
)

Co-authored-by: Chandra Y <cyemparala@tacc.utexas.edu>
* bug/WP-820-exp-date-exception-edit-modal

* - Adds new label for clarity
* Bugs from testing session

* revert testing change
* Reorganized Submitter Users table

* Added filters for status and payor code

* View Record shows all row data plus user email

* Edit Record shows editable fields and required data

* Payor codes now shown as organization names

* Linted client-side code

* Payor Code filter now shows organization names instead of codes

* Removed extraneous console logs

* Fix payor code filter to check against display value in view

* Edit submitter user modal adjustments: display success/error messages instead of modals, bring submit button to same style as like modals in portal

* Remove leftover logging

---------

Co-authored-by: Jeff McMillen <jm63959@TACCs-MacBook-Pro.local>
Co-authored-by: Garrett Edmonds <edmondsgarrett@gmail.com>
@chandra-tacc chandra-tacc marked this pull request as ready for review January 16, 2025 23:54
@chandra-tacc chandra-tacc merged commit d3ed1f4 into main Jan 17, 2025
@chandra-tacc chandra-tacc deleted the feat/apcd-react-conversion branch January 17, 2025 20:57
@chandra-tacc chandra-tacc restored the feat/apcd-react-conversion branch January 17, 2025 20:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.