<% if can_do(@context.context_modules.temp_record, @current_user, :create) %>
diff --git a/lib/lti/content_item_selection_request.rb b/lib/lti/content_item_selection_request.rb
index ca3e8ca3b13..10a0dc99069 100644
--- a/lib/lti/content_item_selection_request.rb
+++ b/lib/lti/content_item_selection_request.rb
@@ -139,7 +139,7 @@ module Lti
collaboration_params
when 'homework_submission'
homework_submission_params(assignment)
- when 'wiki_index_menu'
+ when 'wiki_index_menu', 'module_index_menu'
{}
else
# TODO: we _could_, if configured, have any other placements return to the content migration page...
diff --git a/lib/lti/variable_expander.rb b/lib/lti/variable_expander.rb
index 467a080fe49..2e5e807fd9c 100644
--- a/lib/lti/variable_expander.rb
+++ b/lib/lti/variable_expander.rb
@@ -1304,17 +1304,20 @@ module Lti
USAGE_RIGHTS_GUARD
# Returns the types of resources that can be imported to the current page, forwarded from the request.
- # Value is an array of one or more values of: ["assignment", "assignment_group", "audio",
+ # Value is a comma-separated array of one or more values of: ["assignment", "assignment_group", "audio",
# "discussion_topic", "document", "image", "module", "quiz", "page", "video"]
#
# @example
# ```
- # ["page"]
- # ["module"]
- # ["assignment", "discussion_topic", "page", "quiz", "module"]
+ # "page"
+ # "module"
+ # "assignment,discussion_topic,page,quiz,module"
# ```
register_expansion 'com.instructure.Course.accept_canvas_resource_types', [],
- -> { @request.parameters['com_instructure_course_accept_canvas_resource_types'] },
+ -> {
+ val = @request.parameters['com_instructure_course_accept_canvas_resource_types']
+ val.is_a?(Array) ? val.join(",") : val
+ },
default_name: 'com_instructure_course_accept_canvas_resource_types'
# Returns the target resource type for the current page, forwarded from the request.
diff --git a/public/javascripts/context_modules.js b/public/javascripts/context_modules.js
index 810cf493674..80ff0178bd7 100644
--- a/public/javascripts/context_modules.js
+++ b/public/javascripts/context_modules.js
@@ -40,6 +40,9 @@ import Publishable from 'compiled/models/Publishable'
import PublishButtonView from 'compiled/views/PublishButtonView'
import htmlEscape from './str/htmlEscape'
import setupContentIds from 'jsx/modules/utils/setupContentIds'
+import ContentTypeExternalToolTray from 'jsx/shared/ContentTypeExternalToolTray'
+import {ltiState} from './lti/post_message/handleLtiPostMessage'
+import {monitorLtiMessages} from 'lti/messages'
import get from 'lodash/get'
import axios from 'axios'
import {showFlashError} from 'jsx/shared/FlashAlert'
@@ -2500,6 +2503,63 @@ $(document).ready(function() {
$contextModules.each(function() {
modules.updateProgressionState($(this))
})
+
+ function setExternalToolTray(tool, returnFocusTo) {
+ const handleDismiss = () => {
+ setExternalToolTray(null)
+ returnFocusTo.focus()
+ if (ltiState?.tray?.refreshOnClose) {
+ window.location.reload()
+ }
+ }
+
+ const moduleData = []
+ $('#context_modules .context_module').each(function() {
+ moduleData.push({
+ id: $(this)
+ .attr('id')
+ .substring('context_module_'.length),
+ name: $(this)
+ .find('.name')
+ .attr('title')
+ })
+ })
+
+ ReactDOM.render(
+ ,
+ $('#external-tool-mount-point')[0]
+ )
+ }
+
+ function openExternalTool(ev) {
+ if (ev != null) {
+ ev.preventDefault()
+ }
+ const tool = ENV.MODULE_INDEX_TOOLS.find(t => t.id === ev.target.dataset.toolId)
+ setExternalToolTray(tool, $('.al-trigger')[0])
+ }
+
+ $('.module_index_tools .menu_tool_link').click(openExternalTool)
+ monitorLtiMessages()
})
export default modules
diff --git a/spec/apis/v1/external_tools_api_spec.rb b/spec/apis/v1/external_tools_api_spec.rb
index c9be3ecff34..e0150b78b6b 100644
--- a/spec/apis/v1/external_tools_api_spec.rb
+++ b/spec/apis/v1/external_tools_api_spec.rb
@@ -545,6 +545,7 @@ describe ExternalToolsController, type: :request do
et.discussion_topic_menu = {:url=>"http://www.example.com/ims/lti/resource", :text => "discussion topic menu", display_type: 'full_width', visibility: 'admins'}
et.file_menu = {:url=>"http://www.example.com/ims/lti/resource", :text => "module menu", display_type: 'full_width', visibility: 'admins'}
et.module_menu = {:url=>"http://www.example.com/ims/lti/resource", :text => "module menu", display_type: 'full_width', visibility: 'admins'}
+ et.module_index_menu = {:url=>"http://www.example.com/ims/lti/resource", :text => "modules index menu", display_type: 'full_width', visibility: 'admins'}
et.quiz_menu = {:url=>"http://www.example.com/ims/lti/resource", :text => "quiz menu", display_type: 'full_width', visibility: 'admins'}
et.wiki_page_menu = {:url=>"http://www.example.com/ims/lti/resource", :text => "wiki page menu", display_type: 'full_width', visibility: 'admins'}
et.wiki_index_menu = {:url=>"http://www.example.com/ims/lti/resource", :text => "wiki index menu", display_type: 'full_width', visibility: 'admins'}
@@ -722,6 +723,14 @@ describe ExternalToolsController, type: :request do
"display_type"=>'full_width',
"selection_height"=>400,
"selection_width"=>800},
+ "module_index_menu"=>
+ {"text"=>"modules index menu",
+ "label"=>"modules index menu",
+ "url"=>"http://www.example.com/ims/lti/resource",
+ "visibility"=>'admins',
+ "display_type"=>'full_width',
+ "selection_height"=>400,
+ "selection_width"=>800},
"quiz_menu"=>
{"text"=>"quiz menu",
"label"=>"quiz menu",
diff --git a/spec/lib/lti/variable_expander_spec.rb b/spec/lib/lti/variable_expander_spec.rb
index cf661dfa979..0a89dec3a0f 100644
--- a/spec/lib/lti/variable_expander_spec.rb
+++ b/spec/lib/lti/variable_expander_spec.rb
@@ -675,7 +675,7 @@ module Lti
it 'has substitution for $com.instructure.Course.accept_canvas_resource_types' do
exp_hash = {test: '$com.instructure.Course.accept_canvas_resource_types'}
variable_expander.expand_variables!(exp_hash)
- expect(exp_hash[:test]).to eq ["page", "module"]
+ expect(exp_hash[:test]).to eq "page,module"
end
it 'has substitution for $com.instructure.Course.canvas_resource_type' do
diff --git a/spec/selenium/context_modules_menu_tools_spec.rb b/spec/selenium/context_modules_menu_tools_spec.rb
index 0b83e013f34..247ebb0ddbd 100644
--- a/spec/selenium/context_modules_menu_tools_spec.rb
+++ b/spec/selenium/context_modules_menu_tools_spec.rb
@@ -168,4 +168,41 @@ describe "context modules" do
expect(link).not_to be_displayed
end
end
+
+ context "module index tool placement" do
+ before do
+ course_with_teacher_logged_in
+
+ @tool = Account.default.context_external_tools.new(:name => "a", :domain => "google.com", :consumer_key => '12345', :shared_secret => 'secret')
+ @tool.module_index_menu = {:url => "http://www.example.com", :text => "Import Stuff"}
+ @tool.save!
+ @module1 = @course.context_modules.create!(:name => "module1")
+ @module2 = @course.context_modules.create!(:name => "module2")
+
+ Account.default.enable_feature!(:commons_favorites)
+ end
+
+ it "should be able to launch the index menu tool via the tray", custom_timeout: 60 do
+ get "/courses/#{@course.id}/modules"
+
+ gear = f(".header-bar .al-trigger")
+ gear.click
+ tool_link = f(".header-bar li.ui-menu-item a.menu_tool_link")
+ expect(tool_link).to include_text("Import Stuff")
+
+ tool_link.click
+ wait_for_ajaximations
+ tray = f("[role='dialog']")
+ expect(tray['aria-label']).to eq "Import Stuff"
+ iframe = tray.find_element(:css, "iframe")
+ expect(iframe['src']).to include("/courses/#{@course.id}/external_tools/#{@tool.id}")
+ query_params = Rack::Utils.parse_nested_query(URI.parse(iframe['src']).query)
+ expect(query_params["launch_type"]).to eq "module_index_menu"
+ expect(query_params["com_instructure_course_allow_canvas_resource_selection"]).to eq "true"
+ expect(query_params["com_instructure_course_accept_canvas_resource_types"]).to match_array(
+ ["assignment", "audio", "discussion_topic", "document", "image", "module", "quiz", "page", "video"])
+ module_data = [@module1, @module2].map{|m| {"id" => m.id.to_s, "name" => m.name}}
+ expect(query_params["com_instructure_course_available_canvas_resources"].values).to match_array(module_data)
+ end
+ end
end