Redesigned plan-creation page to enforce template access rules and simplify UI #3580
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,55 @@ | ||
| @use '../variables/colours' as *; | ||
|
|
||
|
|
||
|
|
||
| .form-control input, | ||
| .form-control textarea, | ||
| .form-control select { | ||
| border: 2px solid $color-border-light; | ||
| } | ||
|
|
||
| .form-check { | ||
| padding-left: 0rem; | ||
| } | ||
|
|
||
| .form-inline { | ||
| margin-bottom: 5px; | ||
| } | ||
|
|
||
| .form-check-label { | ||
| padding-left: 5px; | ||
| } | ||
|
|
||
| // Added for new plan create page app/views/plans/new.html.erb | ||
| .roadmap-form { | ||
| margin-bottom: 1rem; | ||
|
|
||
| legend { | ||
| padding-inline: 2px; | ||
| float: none; | ||
| width: auto; | ||
| padding: 0.5rem; | ||
| font-size: 1rem; | ||
| background-color: $color-primary-background; | ||
| color: $color-primary-text; | ||
| } | ||
|
|
||
| fieldset { | ||
| border: 2px solid #555555; | ||
| padding: 1rem; | ||
| margin-bottom: 1rem; | ||
| } | ||
|
|
||
| .form-row { | ||
| margin-bottom: 1rem; | ||
| } | ||
|
|
||
| .form-row:last-child { | ||
| margin-bottom: 0; | ||
| } | ||
|
|
||
| .form-check .form-check-input { | ||
| float: left; | ||
| margin-left: 0.5rem; | ||
| } | ||
| } |
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,125 +1,90 @@ | ||
| <form action="<%= plans_path %>" method="post" class="roadmap-form"> | ||
| <div class="row form-row"> | ||
| <div class="col-12"> | ||
| <h1><%= _('Create a new plan') %></h1> | ||
| <p> | ||
| <%= _("Before you get started, we need some information about your research project to set you up with the best DMP template for your needs.") %> | ||
| </p> | ||
| </div> | ||
| </div> | ||
| <fieldset> | ||
| <div class="row form-row"> | ||
| <div class="col-12"> | ||
| <!-- Rails form authenticity token --> | ||
| <%= hidden_field_tag :authenticity_token, form_authenticity_token %> | ||
| <label for="plan_title" id="project-title" class="form-label"> | ||
| <%= _('Enter project title') %> | ||
| </label> | ||
| <input type="text" | ||
| id="plan_title" | ||
| name="plan[title]" | ||
| class="form-control" | ||
| required | ||
| aria-labelledby="project-title" | ||
| aria-required="true" | ||
| aria-label="project-title" | ||
| data-toggle="tooltip" | ||
| data-placement="bottom" | ||
| spellcheck="true"> | ||
| </div> | ||
| </div> | ||
| <div class="row form-row"> | ||
| <div class="col-12"> | ||
| <div class="form-check"> | ||
| <input type="checkbox" | ||
| class="form-check-input" | ||
| id="is_test" | ||
| value="1"> | ||
| <label class="form-check-label" for="is_test"> | ||
| <%= _('Mock project for testing, practice, or educational purposes') %> | ||
| </label> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </fieldset> | ||
| <fieldset class="form-group"> | ||
| <legend> | ||
| <%= _('Select a DMP template') %> | ||
| </legend> | ||
| <div class="row form-row"> | ||
| <div class="col-12"> | ||
| <% @templates_grouped.each do |group_label, group_templates| %> | ||
|
Contributor
There was a problem hiding this comment. I like the label grouping. Maybe we should also be ordering the templates by title? |
||
| <div class="mb-3"> | ||
| <div class="form-label fw-bold"> | ||
| <%= group_label %> | ||
| </div> | ||
| <% group_templates.each do |template_title, template_id| %> | ||
| <div class="form-check"> | ||
| <input | ||
| class="form-check-input" | ||
| type="radio" | ||
| id="template_<%= template_id %>" | ||
| name="plan[template_id]" | ||
| value="<%= template_id %>" | ||
| required | ||
| aria-labelledby="template_<%= template_id %>" | ||
| > | ||
| <label | ||
| class="form-check-label fw-normal" | ||
| id="template_<%= template_id %>" | ||
| for="template_<%= template_id %>" | ||
| > | ||
| <%= template_title %> | ||
| </label> | ||
| </div> | ||
| <% end %> | ||
| </div> | ||
| <% end %> | ||
|
|
||
| </div> | ||
| </div> | ||
| </fieldset> | ||
| <div class="row form-row"> | ||
| <div class="col-12"> | ||
| <button type="submit" class="btn btn-primary"> | ||
| <%= _('Create') %> | ||
| </button> | ||
| <%= link_to _('Cancel'), plans_path, class: 'btn btn-secondary' %> | ||
| </div> | ||
| </div> | ||
| </form> | ||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The newly added commits appear to address some of my earlier concerns regarding duplicate templates, so thank you for that.
That said, I still notice that the
upgrade_customization?handling fromTemplateOptionsControllerisn’t being used here, and it’s unclear what other behavioural differences now exist compared to that controller.I am wondering if, instead of a complete rework of the template selection logic, we could instead pass
user.orgtoTemplateOptionsController. And if there is in fact any required behavioural changes (e.g. always return default/global templates, grouping the templates into the three categories, etc.) then the code could be changed there. Re-using the existing logic could also help mitigate any further regressions or follow-up fixes, and keep template-selection behaviour consistent.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will look at this.