+
+
+ <%= hidden_field_tag :authenticity_token, form_authenticity_token %>
+
+
-
-
-
- *<%= required_research_org_tooltip %>
- <%= _('Select the primary research organisation') %>
-
-
-
- <%= research_org_tooltip %>
- <% dflt = @orgs.include?(current_user.org) ? current_user.org : nil %>
- <%= f.fields_for :org, @plan.org do |org_fields| %>
- <%= render partial: "shared/org_selectors/local_only",
- locals: {
- form: org_fields,
- id_field: :id,
- default_org: dflt,
- orgs: @orgs,
- required: false
- } %>
- <% end %>
-
-
- <%= _('or') %> -
-
+
+
+
-
+
diff --git a/db/seeds.rb b/db/seeds.rb
index 21f84bdfb2..e15070b38b 100755
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -451,8 +451,18 @@
is_default: false, locale: default_locale,
version: 0,
visibility: Template.visibilities[:organisationally_visible],
+ links: {"funder":[],"sample_plan":[]}},
+
+ {title: "UOS Organizational DMP Template",
+ published: true,
+ description: "Template for internal UOS organizational use",
+ org: Org.find_by(abbreviation: 'UOS'),
+ is_default: false, locale: default_locale,
+ version: 0,
+ visibility: Template.visibilities[:organisationally_visible],
links: {"funder":[],"sample_plan":[]}}
-]
+ ]
+
# Template creation calls defaults handler which sets is_default and
# published to false automatically, so update them after creation
templates.each { |atts| Template.find_or_create_by(atts) }
@@ -477,13 +487,19 @@
{title: "Detailed Overview",
number: 2,
modifiable: false,
- template: Template.find_by(title: "Department of Testing Award")}
+ template: Template.find_by(title: "Department of Testing Award")},
+
+ {title: "UOS Organizational DMP Phase 1",
+ number: 1,
+ modifiable: true,
+ template: Template.find_by(title: "UOS Organizational DMP Template")}
]
phases.each{ |p| Phase.find_or_create_by(p) }
generic_template_phase_1 = Phase.find_by(title: "Generic Data Management Planning Template")
funder_template_phase_1 = Phase.find_by(title: "Preliminary Statement of Work")
funder_template_phase_2 = Phase.find_by(title: "Detailed Overview")
+organizational_template_phase_1 = Phase.find_by(title: "UOS Organizational DMP Phase 1")
# Create sections for the 2 templates and their phases
# -------------------------------------------------------
@@ -558,7 +574,28 @@
number: 5,
modifiable: false,
phase: funder_template_phase_2
+ },
+
+ # Section for UOS organizational DMP Template
+ {
+ title: "Project Information",
+ number: 1,
+ modifiable: true,
+ phase: organizational_template_phase_1
+ },
+ {
+ title: "Project Data Description",
+ number: 2,
+ modifiable: true,
+ phase: organizational_template_phase_1
+ },
+ {
+ title: "Storage and Security",
+ number: 3,
+ modifiable: true,
+ phase: organizational_template_phase_1
}
+
]
sections.each{ |s| Section.find_or_create_by(s) }
@@ -714,10 +751,68 @@
section: Section.find_by(title: "Preservation and Reuse Policies"),
question_format: text_area,
modifiable: false,
- themes: [Theme.find_by(title: "Preservation"), Theme.find_by(title: "Data Sharing")]}
+ themes: [Theme.find_by(title: "Preservation"), Theme.find_by(title: "Data Sharing")]},
+
+ # Questions for UOS Organizational DMP Template
+ {
+ text: "What is the purpose of the data collection/generation and its relation to the objectives of the project?",
+ number: 1,
+ section: Section.find_by(title: "Project Information"),
+ question_format: QuestionFormat.find_by(title: "Text area"),
+ modifiable: true,
+ themes: [Theme.find_by(title: "Data Description")]
+ },
+ {
+ text: "What types of data will you collect and in what formats?",
+ number: 1,
+ section: Section.find_by(title: "Project Data Description"),
+ question_format: QuestionFormat.find_by(title: "Text area"),
+ modifiable: true,
+ themes: [Theme.find_by(title: "Data Format")]
+ },
+ {
+ text: "Where and how will the data be stored during the project?",
+ number: 1,
+ section: Section.find_by(title: "Storage and Security"),
+ question_format: QuestionFormat.find_by(title: "Text area"),
+ modifiable: true,
+ themes: [Theme.find_by(title: "Storage & Security")]
+ }
]
questions.each{ |q| Question.create!(q) unless Question.find_by(section: q[:section], text: q[:text]) }
+# Create guidance
+guidance_group = GuidanceGroup.create!(
+ name: "Organizational Template Guidance",
+ org: Org.find_by(abbreviation: Rails.configuration.x.organisation.abbreviation),
+ optional_subset: false,
+ published: true
+)
+
+guidances = [
+ {
+ text: "Clearly describe the purpose of data collection and how it relates to project goals",
+ guidance_group: guidance_group,
+ published: true,
+ themes: [Theme.find_by(title: "Data Description")]
+ },
+ {
+ text: "List file formats and explain why they were chosen",
+ guidance_group: guidance_group,
+ published: true,
+ themes: [Theme.find_by(title: "Data Format")]
+ },
+ {
+ text: "Detail storage location, backup procedures and access controls",
+ guidance_group: guidance_group,
+ published: true,
+ themes: [Theme.find_by(title: "Storage & Security")]
+ }
+]
+
+guidances.each { |g| Guidance.create!(g) }
+
+
radio_button = Question.new(
text: "Please select the appropriate formats.",
number: 2,
diff --git a/spec/controllers/plans_controller_templates_spec.rb b/spec/controllers/plans_controller_templates_spec.rb
new file mode 100644
index 0000000000..b5b6ce91fe
--- /dev/null
+++ b/spec/controllers/plans_controller_templates_spec.rb
@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe PlansController, type: :controller do
+ describe 'templates availability helpers' do
+ before do
+ @org = create(:org, :organisation, name: 'The User Org')
+ @org_id = @org.id
+
+ @org_template = create(:template, :default, :organisationally_visible, :published, org: @org,
+ title: 'Org Template')
+
+ @funder1 = create(:org, :funder, name: 'Funder1 Org')
+ @funder1_template = create(:template, :publicly_visible, :published,
+ org: @funder1, title: 'Funder1 Template')
+
+ @org_custom_funder1_template = create(:template, :organisationally_visible, :published,
+ org: @org, customization_of: @funder1_template.family_id,
+ title: 'Org Customised Funder1 Template')
+
+ @funder2 = create(:org, :funder, name: 'Funder2 Org')
+ @funder2_template = create(:template, :publicly_visible, :published, org: @funder2, title: 'Funder2 Template')
+
+ @global_template = create(:template, :default, :publicly_visible, :published, title: 'Global Template')
+
+ @other_org = create(:org, :organisation, name: 'The Other Org')
+ @other_org_template = create(:template, :organisationally_visible, :published,
+ org: @other_org, title: 'Other Org Template')
+ end
+
+ it 'returns a grouped hash containing the available templates' do
+ grouped = controller.send(:templates_available_to_org_user, @org_id)
+ expect(grouped).to be_a(Hash)
+ puts "Grouped templates available to org id #{@org_id}: #{grouped.keys.inspect}"
+
+ # flatten one level to inspect [title, id] entries across groups
+ entries = grouped.values.flatten(1)
+ puts entries.inspect
+ # Available templates
+ expect(entries).to include([@org_template.title, @org_template.id])
+ expect(entries).to include([@org_custom_funder1_template.title, @org_custom_funder1_template.id])
+ expect(entries).to include([@funder2_template.title, @funder2_template.id])
+ expect(entries).to include([@global_template.title, @global_template.id])
+ # Not available templates
+ # As the org has already customised funder1_template, it should not appear in the available list
+ expect(entries).not_to include([@funder1_template.title, @funder1_template.id])
+ # Templates from other orgs should not appear if only organisationally visible
+ expect(entries).not_to include([@other_org_template.title, @other_org_template.id])
+ end
+
+ it 'validates a template id that is available for the org' do
+ expect(controller.send(:validate_template_available_to_org_user?, @org_template.id, @org_id)).to be true
+ expect(controller.send(:validate_template_available_to_org_user?, @org_custom_funder1_template.id,
+ @org_id)).to be true
+ expect(controller.send(:validate_template_available_to_org_user?, @funder2_template.id, @org_id)).to be true
+ expect(controller.send(:validate_template_available_to_org_user?, @global_template.id, @org_id)).to be true
+ end
+
+ it 'returns false for a template id that is not available for the org' do
+ # As the org has already customised funder1_template, it should not be available
+ expect(controller.send(:validate_template_available_to_org_user?, @funder1_template.id, @org_id)).to be false
+ # Templates from other orgs should not be available if only organisationally visible
+ expect(controller.send(:validate_template_available_to_org_user?, @other_org_template.id, @org_id)).to be false
+ end
+ end
+end
diff --git a/spec/features/plans_spec.rb b/spec/features/plans_spec.rb
index eb7ba84a43..d7c1706325 100644
--- a/spec/features/plans_spec.rb
+++ b/spec/features/plans_spec.rb
@@ -6,13 +6,15 @@
include Webmocks
before do
- @default_template = create(:template, :default, :published)
+ # @default_template = create(:template, :default, :published)
@org = create(:org)
- @research_org = create(:org, :organisation, :research_institute,
- name: 'Test Research Org', templates: 1)
- @funding_org = create(:org, :funder, name: 'Test Funder Org', templates: 1)
- @template = create(:template, org: @org)
- @user = create(:user, org: @org)
+ @funding_org1 = create(:org, :funder, name: 'Test Funder Org1', templates: 1)
+ @funding_org2 = create(:org, :funder, name: 'Test Funder Org2', templates: 1)
+
+ @global_template = create(:template, :default, :published)
+ @org_template = create(:template, :published, org: @org)
+
+ @user = create(:user, org: @org)
sign_in(@user)
stub_openaire
@@ -33,16 +35,39 @@
end
it 'User creates a new Plan', :js do
- # TODO: Revisit this after we start refactoring/building out or tests for
- # the new create plan workflow. For some reason the plans/new.js isn't
- # firing here but works fine in the UI with manual testing
- # Action
click_link 'Create plan'
- fill_in :plan_title, with: 'My test plan'
- choose_suggestion('plan_org_org_name', @research_org)
- choose_suggestion('plan_funder_org_name', @funding_org)
- click_button 'Create plan'
+ # Expect to have 4 templates available
+ within(:xpath, "//fieldset[./legend[contains(., 'Select a DMP template')]]") do
+ expect(page).to have_css('.form-check-input', count: 4)
+ expect(page).to have_content(@global_template.title)
+ expect(page).to have_content(@org_template.title)
+
+ within(:xpath,
+ ".//div[contains(@class,'form-label')][contains(., 'Global Templates:')]/following-sibling::div[1]") do
+ expect(page).to have_css('.form-check-input', count: 1)
+ end
+ # Expect 1 template under form-label 'Your Organisation's Templates:'
+ # rubocop:disable Layout/LineLength
+ within(:xpath,
+ ".//div[contains(@class,'form-label')][contains(., \"Your Organisation's Templates:\")]/following-sibling::div[1]") do
+ expect(page).to have_css('.form-check-input', count: 1)
+ end
+ # rubocop:enable Layout/LineLength
+ # Expect 2 template under form-label 'Funder Templates:'
+ within(:xpath,
+ ".//div[contains(@class,'form-label')][contains(., \"Funder Templates:\")]/following-sibling::div[1]") do
+ expect(page).to have_css('.form-check-input', count: 1)
+ end
+ end
+
+ fill_in 'plan[title]', with: 'My test plan'
+
+ within(:xpath, "//fieldset[./legend[contains(., 'Select a DMP template')]]") do
+ find('.form-check-input', match: :first).click
+ end
+
+ click_button 'Create'
# Expectations
expect(@user.plans).to be_one
@@ -50,7 +75,5 @@
expect(current_path).to eql(plan_path(@plan))
expect(page).to have_css("input[type=text][value='#{@plan.title}']")
expect(@plan.title).to eql('My test plan')
- expect(@plan.org_id).to eql(@research_org.id)
- expect(@plan.funder_id).to eql(@funding_org.id)
end
end