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

Jkmarx/data set 2 tools param #1797

Merged
merged 11 commits into from Jun 15, 2017
Merged

Jkmarx/data set 2 tools param #1797

merged 11 commits into from Jun 15, 2017

Conversation

jkmarx
Copy link
Member

@jkmarx jkmarx commented Jun 14, 2017

Ref: #1649

  • Add parameters panel
  • Display parameters
  • Form to update parameters
  • Unit tests/Comments
  • Add form validation for integers and floats

parameters

@codecov-io
Copy link

codecov-io commented Jun 14, 2017

Codecov Report

Merging #1797 into develop will increase coverage by 0.07%.
The diff coverage is 96.96%.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #1797      +/-   ##
===========================================
+ Coverage    40.38%   40.46%   +0.07%     
===========================================
  Files          386      389       +3     
  Lines        25334    25367      +33     
  Branches      1271     1271              
===========================================
+ Hits         10232    10264      +32     
- Misses       15102    15103       +1
Impacted Files Coverage Δ
...ui/source/js/tool-launch/ctrls/tool-params-ctrl.js 100% <100%> (ø)
...rce/js/tool-launch/services/tool-launch-service.js 100% <100%> (ø) ⬆️
...ui/source/js/tool-launch/directives/tool-params.js 100% <100%> (ø)
...rce/js/tool-launch/services/tool-params-service.js 100% <100%> (ø)
...ui/source/js/tool-launch/ctrls/tool-select-ctrl.js 76.92% <50%> (-2.25%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7d4e36a...bdbeab6. Read the comment docs.

@jkmarx jkmarx self-assigned this Jun 14, 2017
@jkmarx jkmarx added this to the Release 1.5.7 milestone Jun 14, 2017
},
templateUrl: ['$window', function ($window) {
return $window.getStaticUrl('partials/tool-launch/partials/tool-params.html');
}]
Copy link
Member

Choose a reason for hiding this comment

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

Could you explain what's going on here, and why a plain string wouldn't work?

Copy link
Member Author

Choose a reason for hiding this comment

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

A plain string would work here. A few weeks ago Ilya added a method to generate the static url based on django settings. So we use that method to generate the static urls as seen above.

class="panel-group"
id="tool-info-display"
role="tablist"
aria-multiselectable="true">
Copy link
Member

Choose a reason for hiding this comment

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

Are the aria-* and role tags just here for accessibility or something else? How would I know if I was using them correctly?

placeholder="{{ param.default_value }}"
ng-model="$ctrl.paramsForm[param.uuid]"
ng-maxlength="32"
ng-pattern="/^\d+$/">
Copy link
Member

@mccalluc mccalluc Jun 15, 2017

Choose a reason for hiding this comment

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

Is this field allowed to be blank? Leading zeros probably won't cause problems? Do you want to accommodate negative values?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, there are default values for params. No idea, but this pattern can be changed once we have actual parameter specs.

placeholder="{{ param.default_value }}"
ng-model="$ctrl.paramsForm[param.uuid]"
ng-maxlength="32"
ng-pattern="/^[0-9]+(\.[0-9]{1,2})?$/">
Copy link
Member

Choose a reason for hiding this comment

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

should handle negatives? More than two decimal points? why [0-9] instead of \d?

Copy link
Member Author

Choose a reason for hiding this comment

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

No idea, but this pattern can be changed once we have actual parameter specs.

@@ -1838,3 +1838,9 @@ ul.paragraph {
float: left;
}
}

.form-validation-error {
border: solid 1px rgba(246, 36, 0, 1);
Copy link
Member

Choose a reason for hiding this comment

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

Should we pull the color from a variable?

Copy link
Member Author

Choose a reason for hiding this comment

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

consistency because the shadow needs a transparency.

Copy link
Member

@mccalluc mccalluc left a comment

Choose a reason for hiding this comment

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

The validation regexes don't seem to allow negative values? Beyond that, there are obviously things I don't understand, but no obvious problems. See comments.

output_files: [],
parameters: [
{
galaxy_workflow_step: 1,
Copy link
Member

Choose a reason for hiding this comment

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

Do we need this galaxy_workflow_step in tests?

Copy link
Member Author

Choose a reason for hiding this comment

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

I like to mock real-like data, but if we'd like to have a standard let's discuss.

) {
var paramsService = toolParamsService;
var vm = this;
vm.isToolParamsCollapsed = false; // tracks the parameters panel
Copy link
Member

Choose a reason for hiding this comment

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

Thoughts on starting this collapsed?
I think if people are really dying to edit a tools params they will, otherwise they'll probably run them with the defaults at first.

tool_type: 'WORKFLOW',
image_name: '',
container_input_path: '',
galaxy_workflow_id: 'c0279aab05812500',
Copy link
Member

Choose a reason for hiding this comment

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

Same forgalaxy_workflow_id

@jkmarx jkmarx merged commit 728054e into develop Jun 15, 2017
@jkmarx jkmarx deleted the jkmarx/data-set-2-tools-param branch June 15, 2017 16:39
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.

None yet

4 participants