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

Task/wc 201 drp merge main #1076

Merged
merged 71 commits into from
Mar 7, 2025
Merged

Conversation

shayanaijaz
Copy link
Contributor

Overview

Merging main into the digital rocks branch to pick up new changes. Updated and added new packages as a result

Related

Changes

Testing

UI

Notes

jmcmillenmusic and others added 30 commits October 17, 2024 12:22
* Created systems.sagas.test.js, created a test for pushSystemKeys()

* Updated expect() statement to correctly look for action.payload.onSuccess

---------

Co-authored-by: Jeff McMillen <[email protected]>
Co-authored-by: Jacob Lowe <[email protected]>
* WP-53: Rename loading status fix

* Fix undefined 'FilesListing' in DataFilesUploadModal

* useRename state fix

* Removed extra operation status call, added prettier,linting
* index based styling fix for alternating user rows

* WP-417: Test for multiple actions per user have correct formatting

* WP-417: Test for multiple actions per user have correct formatting + prettier

* WP-417: Test for multiple actions per user have correct formatting + unused import removed
…tories (#989)

* Changed from Root in placeholder to System Display Name

* client side linting

* Update client/src/components/DataFiles/DataFilesListing/DataFilesListing.jsx

Co-authored-by: Sal Tijerina <[email protected]>

---------

Co-authored-by: Sal Tijerina <[email protected]>
Bumps [werkzeug](https://github.com/pallets/werkzeug) from 3.0.3 to 3.0.6.
- [Release notes](https://github.com/pallets/werkzeug/releases)
- [Changelog](https://github.com/pallets/werkzeug/blob/main/CHANGES.rst)
- [Commits](pallets/werkzeug@3.0.3...3.0.6)

---
updated-dependencies:
- dependency-name: werkzeug
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Chandra Y <[email protected]>
* dependency updates

* styling/test fixes

* address security vulnerabilities in deps

* regenerate package-lock.json

* stylelint fixes

* ignore css files when checking formatting

* fix nav link flash on hover

* fix for input-group and apps-grid styles

* update react-query

---------

Co-authored-by: Chandra Y <[email protected]>
* refactor useRename to use react-query

* fix tests

* replace fetch call with axios client
* initial mock project create tests w/ formatting changes

* test_project_init

* Pivot to behavior based testing versus implementation based

* test_project_init with mock tapis

* prettier and pyright changes

* test_project_create and generalized init mock

* start listing

* service account linting

* todo comments

* test_add_member

* test formatting to match test_add_member

* updated mock tapis for storage, disabled some tests temporarily later tests need the mock storage

* linting and formatting

* mock get for project storage

* test_listing with storage

* test_add_member init

* update permissions in mock tapis

* start rewrite from dict object to tapisresult object (simplify)

* test_project_create new assert calls

* test_project_create with TapisResult assertion

* test_listing with TapisResult

* add_member TapisResult

* add_member - Mock updated project assertions

* add_member_unauthorized TapisResult

* new tests init

* linting

* workspace and patch helper functions

* test_get_workspace_role

* helper function 2 user shared workspace

* change role, remove user, transfer owner, update

* variable added for new username to add to system

---------

Co-authored-by: Garrett Edmonds <[email protected]>
* Found settings that overruled font-size and adjusted font-size accordingly

* Linted code to standardize code structure

* Found root cause of button sizing issues and adjusted font-size accordingly

* Added new CSS rule that only resizes as-link buttons to 1 rem

* Update client/src/components/History/History.module.scss

Removing commented-out code per Frank's recommendation

Co-authored-by: fnets <[email protected]>

* Update client/src/components/_common/Button/Button.module.css

Removing commented-out code per Frank's recommendation

Co-authored-by: fnets <[email protected]>

* Update client/src/components/History/History.module.scss

Removed commented-out code per Frank's recommendation

Co-authored-by: fnets <[email protected]>

---------

Co-authored-by: Jeff McMillen <[email protected]>
Co-authored-by: fnets <[email protected]>
Co-authored-by: Sal Tijerina <[email protected]>
Co-authored-by: Garrett Edmonds <[email protected]>
… files (#981)

* Task/WP-509: Added functionality that prevents users from downloading files greater than 2 GB directly through TAPIS

* Linted all code to pass linting tests

* Fixed test that tests for alert preventing large downloads through TAPIS directly

* Removed timestamped vite file, removed commented import statements

* Ran Prettier again

* Pushing up a failed test; can't get this to pass

* Roll back jest-dom package update (out of scope of this PR)

* Corrected test that verifies direct downloads of small files

* Updated numbers in my code and tests to make them more readable

* Added feature that prevents compression of files totaling more than 2 GB (but not folders)

* Added functionality that prevents folder downloads altogether

* Working on test for most recent code, test is incomplete

* Added test that successfully prevents folder downloads

* Still working on the final test, not passing yet

* Successfully got all tests to pass

* Linted front-end code

* Created new large download modal, work in progress

* Refined comments to push up new modal for debugging

* Large Download Modal now properly closes as intended

* Triggers Large Download Modal when user attempts to download multiple files totaling more than 2 GB

* Added No Folders Modal to prevent folder downloads

* Corrected failing test to prevent large file downloads

* Added new tests to increase coverage, re-styled new modals

* Increased test coverage even further

* Even further increased test covered again

* Update client/src/components/DataFiles/DataFilesModals/DataFilesNoFoldersModal.jsx

Co-authored-by: Chandra Y <[email protected]>

* Update client/src/components/DataFiles/DataFilesModals/DataFilesNoFoldersModal.jsx

Co-authored-by: Chandra Y <[email protected]>

* Update client/src/components/DataFiles/DataFilesModals/DataFilesNoFoldersModal.jsx

Co-authored-by: Chandra Y <[email protected]>

* Update client/src/components/DataFiles/DataFilesModals/DataFilesNoFoldersModal.jsx

Co-authored-by: Chandra Y <[email protected]>

* Update client/src/components/DataFiles/DataFilesModals/DataFilesDownloadMessageModal.jsx

Co-authored-by: Chandra Y <[email protected]>

* Update client/src/components/DataFiles/DataFilesModals/DataFilesDownloadMessageModal.jsx

Co-authored-by: Chandra Y <[email protected]>

* Update client/src/components/DataFiles/DataFilesModals/DataFilesDownloadMessageModal.jsx

Co-authored-by: Chandra Y <[email protected]>

* Removed superfluous comments

* Removed whitespace to pass linting tests

---------

Co-authored-by: Jeff McMillen <[email protected]>
Co-authored-by: Garrett Edmonds <[email protected]>
Co-authored-by: Jeff McMillen <[email protected]>
Co-authored-by: Garrett Edmonds <[email protected]>
Co-authored-by: Chandra Y <[email protected]>
Co-authored-by: Sal Tijerina <[email protected]>
…ad of enabled (#991)

* Changed enabled.eq.true to versionEnabled.eq.true

* Searches for versionEnabled on public apps

* Ensured that tests still passed

* Added versionEnabled to getPrivateApps

* Corrected comments

---------

Co-authored-by: Jeff McMillen <[email protected]>
Co-authored-by: Jeff McMillen <[email protected]>
Co-authored-by: Sal Tijerina <[email protected]>
* disabling google drive integration and test assertions

* Test for No Integrations Available

* added test for other 3rd party apps other than google drive

* Update client/src/components/DataFiles/DataFilesListing/DataFilesListingCells.jsx

Co-authored-by: fnets <[email protected]>

* Update client/src/components/DataFiles/fixtures/DataFiles.systems.fixture.js

Co-authored-by: fnets <[email protected]>

* copy modal filter google drive

* Revert changes in opt for settings_custom.py

* settings_default drive removal

* test revision keep additional 3rd party test

* rm vite config push

* getByText and custom example revert

---------

Co-authored-by: fnets <[email protected]>
Co-authored-by: Garrett Edmonds <[email protected]>
* file fix starting point

* header margin styling change

* linting

* linting

* conditional styling on combinedbreadcrumbs

* remove breadcrumbs changes

* PublicData contentLayoutName pass in to Section

* section module readdition

* whitespace dif

* lint

* layout as oneColumn
* initial typescript

* saga logic move

* url param undefined fix

* linting

* axios update

* mutateAsync changes

* onSuccess, onError with async

* copyCalls as an array of Promises on return
* WP-778: Fix infinite loop for state update in useEffect

* remove unnecessary changes
* initial conversion to ts

* liniting/formating

* dispatch type change

* extra dispatch removals

* 500 error fix

* removed redux test
* initial ts convert

* for each file and manual headers

* removed unused dispatch

* axios replacing fetch

* mutateAsync

---------

Co-authored-by: Jake Rosenberg <[email protected]>
* WP-68: Initial update of datafiles unit tests

* WP-68: Investigation into System Definition and State

* showViewPath Coverage

* unauth init

* attribute error test coverage

* put unauth request test

* post unauth and handler exception tests

* LinkView Exception Tests

* post handler exception coverage fix

* restore original mocks

* linting
…listing access. (#1005)

* file fix starting point

* ssh_op_err1 exception addition and test

* comment fix

* linting
* Converted useMove mutation to use React Query and TypeScript

* Linted code to meet quality standards

* Removed superfluous comments

* Removed unnecessary dispatches to use React Query to properly move files

* Linted client code

* Edited request to use apiClient, removed console logs

* Corrected body of PUT request

* Working on test for mutation, still in progress

* Update client/src/hooks/datafiles/mutations/useMove.ts

Co-authored-by: Sal Tijerina <[email protected]>

* Adjusted Dispatch calls

* Update client/src/hooks/datafiles/mutations/useMove.ts

Adding closing dispatch calls at the end

Co-authored-by: Sal Tijerina <[email protected]>

* Commenting out useMove.test.ts until React Query move mutation is 100% working

* Corrected dispatch calls

* Linted client-side code

* Removed test file temporarily

* Added more asynchronous calls to refine process

* Removed extraneous console.log()

---------

Co-authored-by: Jeff McMillen <[email protected]>
Co-authored-by: Sal Tijerina <[email protected]>
Co-authored-by: Chandra Y <[email protected]>
Bumps [django](https://github.com/django/django) from 4.2.16 to 4.2.17.
- [Commits](django/django@4.2.16...4.2.17)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
chandra-tacc and others added 28 commits January 23, 2025 16:26
* resource json update

* update settings
…#1045)

* WP-835: Fix site search and data files usage of compress and extract

* handle no allocation scenario
* To update ACLs on shared systems outside of the root project's directory (community data), the target of updating ACLs needs to be the system itself rather than the parent root system.

* In the case where a user is added to a project but doesn’t have file permissions assigned, this function would fail which blocks the portal from getting the project at all.

* Resolving issues with root directory hardcoding and refactoring function to use the system terminology instead of project terminology

* minor refactoring

* Changed ACL job to submit with the user's client, so that we know the system will have the credentials needed for the job. Truncated the job name to fit with Tapis JSON requirements. And changed the client used to add a user to a shared system so that we know the system will have the credentials needed to make the change.

* Adding path back into logger statement.

* Fixed unit tests to work with code changes.

* Fixed linting errors

* Minor cleanup, setting the set_facl_job to run by default
* switching to tms for credentials

* lint fix

* Address review comments

* Update server/portal/apps/workspace/api/utils.py

Co-authored-by: fnets <[email protected]>

* Client adjustments for Keys

* linting and onboarding adjustment

* Update to latest tapipy

* fixing poetry error

* Fix testing credentials

---------

Co-authored-by: fnets <[email protected]>
Bumps [vitest](https://github.com/vitest-dev/vitest/tree/HEAD/packages/vitest) and [@vitest/coverage-v8](https://github.com/vitest-dev/vitest/tree/HEAD/packages/coverage-v8). These dependencies needed to be updated together.

Updates `vitest` from 2.1.2 to 2.1.9
- [Release notes](https://github.com/vitest-dev/vitest/releases)
- [Commits](https://github.com/vitest-dev/vitest/commits/v2.1.9/packages/vitest)

Updates `@vitest/coverage-v8` from 2.1.2 to 2.1.9
- [Release notes](https://github.com/vitest-dev/vitest/releases)
- [Commits](https://github.com/vitest-dev/vitest/commits/v2.1.9/packages/coverage-v8)

---
updated-dependencies:
- dependency-name: vitest
  dependency-type: direct:development
- dependency-name: "@vitest/coverage-v8"
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Chandra Y <[email protected]>
Bumps [cryptography](https://github.com/pyca/cryptography) from 43.0.1 to 44.0.1.
- [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst)
- [Commits](pyca/cryptography@43.0.1...44.0.1)

---
updated-dependencies:
- dependency-name: cryptography
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Chandra Y <[email protected]>
* add audit logs for datafiles/projects endpoints

* unit test fixes

* linting fixes

* more linting fixes

* unit test fixes

* pass tracking id to shared workspace mkdir

* WI-240: auth, apps, jobs audit logs (#1052)

* auth, apps, jobs audit logs

* fix test

* fix test

* fix tests

* fix tests

---------

Co-authored-by: Sal Tijerina <[email protected]>
Bumps [dompurify](https://github.com/cure53/DOMPurify) from 2.5.7 to 3.2.4.
- [Release notes](https://github.com/cure53/DOMPurify/releases)
- [Commits](cure53/DOMPurify@2.5.7...3.2.4)

---
updated-dependencies:
- dependency-name: dompurify
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Chandra Y <[email protected]>
…for running jobs (#1057)

* Added changes to remove TAS projects that are purely administrative from default allocations, as they were preventing a few users from running jobs.

* Update server/portal/apps/users/views.py

---------

Co-authored-by: Chandra Y <[email protected]>
Co-authored-by: Garrett Edmonds <[email protected]>
* WP-878: upload to root fix

* fix unit test
* Revert TMS change

This reverts commit f4b5b90, reversing
changes made to a2ba0dc.
* Fix: Workbench drop down is cut off on the right.

* Revert custom CSS
Update Dropdown menu class

---------

Co-authored-by: Chandra Y <[email protected]>
@shayanaijaz shayanaijaz merged commit c0eb836 into task/digital-rocks Mar 7, 2025
0 of 4 checks passed
@shayanaijaz shayanaijaz deleted the task/WC-201--DRP-Merge-Main branch March 7, 2025 18:55
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.

9 participants