mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 04:30:15 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-79041-master-2' of https://github.com/HuongNV13/moodle

Browse Source
This commit is contained in:
Jun Pataleta 2023-09-29 11:59:39 +08:00
commit 336ec5580a
No known key found for this signature in database
GPG Key ID: F83510526D99E2C7
9 changed files with 131 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/amd/build/moodlenet/send_resource.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
lib/amd/build/moodlenet/send_resource.min.js.map
View File

File diff suppressed because one or more lines are too long

2
lib/amd/src/moodlenet/send_resource.js
View File

@ -99,7 +99,7 @@ const responseFromMoodleNet = (status, resourceUrl = '') => {
if (status) {
currentModal.setFooter(Templates.render('core/moodlenet/send_activity_modal_footer_view', {
resourseurl: resourceUrl,
resourceurl: resourceUrl,
}));
currentModal.showFooter();
}

5
lib/classes/external/moodlenet_send_activity.php vendored
View File

@ -153,7 +153,10 @@ class moodlenet_send_activity extends external_api {
public static function execute_returns(): external_single_structure {
return new external_single_structure([
'status' => new external_value(PARAM_BOOL, 'Status: true if success'),
'resourceurl' => new external_value(PARAM_URL, 'Resource URL from MoodleNet'),
// We used PARAM_TEXT instead of PARAM_URL because the URL return from MoodleNet may contain some characters.
// It does not match with PARAM_URL, but the URL still works.
// Since we just show the response resource URL to the user for them to navigate to MoodleNet, it would be safe.
'resourceurl' => new external_value(PARAM_TEXT, 'Resource URL from MoodleNet'),
'warnings' => new external_warnings(),
]);
}

5
lib/classes/external/moodlenet_send_course.php vendored
View File

@ -212,7 +212,10 @@ class moodlenet_send_course extends external_api {
public static function execute_returns(): external_single_structure {
return new external_single_structure([
'status' => new external_value(PARAM_BOOL, 'Status: true if success'),
'resourceurl' => new external_value(PARAM_URL, 'Resource URL from MoodleNet'),
// We used PARAM_TEXT instead of PARAM_URL because the URL return from MoodleNet may contain some characters.
// It does not match with PARAM_URL, but the URL still works.
// Since we just show the response resource URL to the user for them to navigate to MoodleNet, it would be safe.
'resourceurl' => new external_value(PARAM_TEXT, 'Resource URL from MoodleNet'),
'warnings' => new external_warnings(),
]);
}

6
lib/classes/moodlenet/moodlenet_client.php
View File

@ -95,7 +95,9 @@ class moodlenet_client {
* Prepare the request data required for sharing a file to MoodleNet.
* This creates an array in the format used by \core\httpclient options to send a multipart request.
*
* @param array $filedata An array of data relating to the file being shared (as prepared by ::prepare_share_contents).
* @param string $filename Name of the file being shared.
* @param string $mimetype Mime type of the file being shared.
* @param StreamInterface $stream Stream of the file being shared.
* @param string $resourcename The name of the resource being shared.
* @param string $resourcedescription A description of the resource being shared.
* @return array Data in the format required to send a file to MoodleNet using \core\httpclient.
@ -105,7 +107,7 @@ class moodlenet_client {
string $mimetype,
StreamInterface $stream,
string $resourcename,
$resourcedescription,
string $resourcedescription,
): array {
return [
'headers' => [

4
lib/templates/moodlenet/send_activity_modal_footer_view.mustache
View File

@ -16,11 +16,11 @@
Render the footer for sharing activity
Example context (json):
{
"resourseurl": "https://moodlenet.test/draft/activity.mbz"
"resourceurl": "https://moodlenet.test/draft/activity.mbz"
}
}}
<div class="moodlenet-action-buttons">
<a class="btn btn-primary" href="{{resourseurl}}" target="_blank">
<a class="btn btn-primary" href="{{resourceurl}}" target="_blank" rel="noopener noreferrer">
{{#str}} moodlenet:gotomoodlenet, moodle {{/str}}
</a>
</div>

57
lib/tests/external/moodlenet_send_activity_test.php vendored
View File

@ -111,4 +111,61 @@ class moodlenet_send_activity_test extends externallib_advanced_testcase {
$this->assertEquals($issuer->get('id'), $result['warnings'][0]['item']);
$this->assertEquals(get_string('moodlenet:issuerisnotauthorized', 'moodle'), $result['warnings'][0]['message']);
}
/**
* Test execute_returns() method.
*
* @dataProvider return_resource_url_provider
* @covers ::execute_returns
*/
public function test_moodlenet_send_activity_return_resource_url(bool $state, string $resourceurl) {
$this->resetAfterTest();
// Create dummy result with the resourceurl.
$result = [
'status' => true,
'resourceurl' => $resourceurl,
'warnings' => [],
];
if (!$state) {
$this->expectException(\invalid_response_exception::class);
}
$result = external_api::clean_returnvalue(moodlenet_send_activity::execute_returns(), $result);
if ($state) {
$this->assertEquals($resourceurl, $result['resourceurl']);
}
}
/**
* Provider for test_moodlenet_send_activity_return_resource_url().
*
* @return array Test data.
*/
public function return_resource_url_provider(): array {
return [
'Success 1' => [
true,
'https://moodlenet.example.com/drafts/view/testactivity_backup.mbz',
],
'Success 2' => [
true,
'https://moodlenet.example.com/drafts/view/testactivity_backup with spaces.mbz',
],
'Success 3' => [
true,
'https://moodlenet.example.com/drafts/view/testactivity_backup with " character.mbz',
],
'Success 4' => [
true,
"https://moodlenet.example.com/drafts/view/testactivity_backup with ' character.mbz",
],
'Success 5' => [
true,
'https://moodlenet.example.com/drafts/view/testactivity_backup with < and > characters.mbz',
],
'Fail 1' => [
false,
'https://moodlenet.example.com/drafts/view/testactivity_backupwith<lang lang="en">a<a</lang>html.mbz',
],
];
}
}

57
lib/tests/external/moodlenet_send_course_test.php vendored
View File

@ -117,4 +117,61 @@ class moodlenet_send_course_test extends externallib_advanced_testcase {
$this->assertEquals($issuer->get('id'), $result['warnings'][0]['item']);
$this->assertEquals(get_string('moodlenet:issuerisnotauthorized', 'moodle'), $result['warnings'][0]['message']);
}
/**
* Test execute_returns() method.
*
* @dataProvider return_resource_url_provider
* @covers ::execute_returns
*/
public function test_moodlenet_send_course_return_resource_url(bool $state, string $resourceurl) {
$this->resetAfterTest();
// Create dummy result with the resourceurl.
$result = [
'status' => true,
'resourceurl' => $resourceurl,
'warnings' => [],
];
if (!$state) {
$this->expectException(\invalid_response_exception::class);
}
$result = external_api::clean_returnvalue(moodlenet_send_course::execute_returns(), $result);
if ($state) {
$this->assertEquals($resourceurl, $result['resourceurl']);
}
}
/**
* Provider for test_moodlenet_send_course_return_resource_url().
*
* @return array Test data.
*/
public function return_resource_url_provider(): array {
return [
'Success 1' => [
true,
'https://moodlenet.example.com/drafts/view/testcourse_backup.mbz',
],
'Success 2' => [
true,
'https://moodlenet.example.com/drafts/view/testcourse_backup with spaces.mbz',
],
'Success 3' => [
true,
'https://moodlenet.example.com/drafts/view/testcourse_backup with " character.mbz',
],
'Success 4' => [
true,
"https://moodlenet.example.com/drafts/view/testcourse_backup with ' character.mbz",
],
'Success 5' => [
true,
'https://moodlenet.example.com/drafts/view/testcourse_backup with < and > characters.mbz',
],
'Fail 1' => [
false,
'https://moodlenet.example.com/drafts/view/testcourse_backupwith<lang lang="en">a<a</lang>html.mbz',
],
];
}
}