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

Bug/WA-314: Input file fixes for hidden and FIXED types #880

Merged
merged 4 commits into from
Oct 10, 2023

Conversation

chandra-tacc
Copy link
Collaborator

@chandra-tacc chandra-tacc commented Oct 9, 2023

Overview

Handle file input related fixes. Apps now need hidden file input to include wrapper with app.

Related

  • WP-313 - Hidden input are shown in UI, when it should not be shown.
  • WP-314 - Read only file inputs are causing job submission to fail

Changes

  • Check for hidden file inputs in the notes field and do not include them in the app form.
  • After filtering for read only file inputs, check for nulls and do not include them.

Testing

  1. Setup ngrok and v3 portal in local env.
  2. Test the following apps are shown, job submission works and UI is available :
    https://cep.test/workbench/applications/opensees-sp-v35?appVersion=0.0.1
    https://cep.test/workbench/applications/rstudio?appVersion=4.3
    https://cep.test/workbench/applications/jupyter-hpc-mpi?appVersion=1.0.1

Unit Tests

Also included in this PR are unit tests, which check the following:
Submit a job and check the action does not have the file input for

  • hidden
  • read only inputs

For all other file inputs, check if:

  • file input is actually sent
  • target path captures the target path.

App testing screenshots:

OpenSees:

Screenshot 2023-10-09 at 3 40 42 PM

Screenshot 2023-10-09 at 3 14 13 PM

RStudio:
Screenshot 2023-10-09 at 3 01 44 PM

Jupyter:
Screenshot 2023-10-09 at 3 18 07 PM

UI

None

Notes

I have seen usage of "FIXED" file input use case yet in apps, but that is available option in tapis.

@codecov
Copy link

codecov bot commented Oct 9, 2023

Codecov Report

Merging #880 (f66bb34) into main (4cacf32) will increase coverage by 0.49%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #880      +/-   ##
==========================================
+ Coverage   62.95%   63.44%   +0.49%     
==========================================
  Files         427      427              
  Lines       12211    12215       +4     
  Branches     2509     2510       +1     
==========================================
+ Hits         7687     7750      +63     
+ Misses       4315     4259      -56     
+ Partials      209      206       -3     
Flag Coverage Δ
javascript 69.67% <100.00%> (+0.98%) ⬆️
unittests 57.20% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Coverage Δ
...nt/src/components/Applications/AppForm/AppForm.jsx 83.62% <100.00%> (+19.11%) ⬆️
...c/components/Applications/AppForm/AppFormSchema.js 87.09% <100.00%> (+12.09%) ⬆️
...plications/AppForm/fixtures/AppForm.app.fixture.js 100.00% <100.00%> (ø)

... and 1 file with indirect coverage changes

asimregmi and others added 3 commits October 9, 2023 15:44
…876)

* Refactored some variables and props to include proptypes

* fixed linting errors
…nment (#878)

* small UI change to align dropdown

* linting issues fixed

---------

Co-authored-by: Chandra Y <[email protected]>
@chandra-tacc chandra-tacc marked this pull request as ready for review October 9, 2023 20:48
Copy link
Member

@rstijerina rstijerina left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

Copy link
Contributor

@shayanaijaz shayanaijaz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Tested the apps on LS6

Copy link
Contributor

@edmondsgarrett edmondsgarrett left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, tested via LS6 apps

@chandra-tacc chandra-tacc merged commit e47ea96 into main Oct 10, 2023
6 checks passed
@chandra-tacc chandra-tacc deleted the bug/WA-314-ReadOnlyInputs branch October 10, 2023 15:01
chandra-tacc added a commit that referenced this pull request Oct 10, 2023
* WA-314: Input file fixes for hidden and fixed

* Task/WP-66: Refactored some variables and props to include proptypes (#876)

* Refactored some variables and props to include proptypes

* fixed linting errors

* WP-299: Add Data Files button dropdown needs minor adjustment in alignment (#878)

* small UI change to align dropdown

* linting issues fixed

---------

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

---------

Co-authored-by: Asim Regmi <[email protected]>
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.

5 participants