FIX: update code/tests after rebase with main.

Author: pstaabp

conf/permissions.dist.yml

@@ -164,7 +164,9 @@ db_permissions:
       allowed_roles: ['*']
     getCourseSettings:
       allowed_roles: ['*']
-    updateCourseSettings:
+    updateCourseSetting:
+      allowed_roles: ['course_admin', 'instructor']
+    deleteCourseSetting:
       allowed_roles: ['course_admin', 'instructor']
 
 # This defines the permisions for each role for the frontend/UI layer.

lib/DB/Utils.pm

@@ -6,8 +6,8 @@ use feature 'signatures';
 no warnings qw/experimental::signatures/;
 
 require Exporter;
-use base qw/Exporter/;
-our @EXPORT_OK = qw/getCourseInfo getUserInfo getSetInfo updateAllFields
+use base qw(Exporter);
+our @EXPORT_OK = qw/getCourseInfo getUserInfo getSetInfo updateAllFields updatePermissions
 	getPoolInfo getProblemInfo getPoolProblemInfo getSettingInfo removeLoginParams/;
 
 use Clone qw/clone/;

lib/WeBWorK3.pm

@@ -216,16 +216,13 @@ sub problemRoutes ($app, $course_routes) {
 	return;
 }
 
-sub settingsRoutes ($self) {
+sub settingsRoutes ($self, $course_routes) {
 	$self->routes->get('/webwork3/api/global-settings')->requires(authenticated => 1)->to('Settings#getGlobalSettings');
 	$self->routes->get('/webwork3/api/global-setting/:setting_id')->requires(authenticated => 1)
 		->to('Settings#getGlobalSetting');
-	$self->routes->get('/webwork3/api/courses/:course_id/settings')->requires(authenticated => 1)
-		->to('Settings#getCourseSettings');
-	$self->routes->put('/webwork3/api/courses/:course_id/settings/:setting_id')->requires(authenticated => 1)
-		->to('Settings#updateCourseSetting');
-	$self->routes->delete('/webwork3/api/courses/:course_id/settings/:setting_id')->requires(authenticated => 1)
-		->to('Settings#deleteCourseSetting');
+	$course_routes->get('/settings')->to('Settings#getCourseSettings');
+	$course_routes->put('/settings/:setting_id')->to('Settings#updateCourseSetting');
+	$course_routes->delete('/settings/:setting_id')->to('Settings#deleteCourseSetting');
 	return;
 }
 

src/pages/instructor/Instructor.vue

@@ -44,9 +44,10 @@ export default defineComponent({
 		await users.fetchGlobalCourseUsers(course_id);
 		await users.fetchCourseUsers(course_id);
 		await problem_sets.fetchProblemSets(course_id);
-		await settings.fetchDefaultSettings(course_id)
-			.then(() => settings.fetchCourseSettings(course_id))
-			.then(() => void setI18nLanguage(settings.getCourseSetting('language').value as string))
+		await settings_store.fetchGlobalSettings();
+		await settings_store.fetchCourseSettings(course_id)
+			.then(() => settings_store.fetchCourseSettings(course_id))
+			.then(() => void setI18nLanguage(settings_store.getCourseSetting('language').value as string))
 			.catch((err) => logger.error(`${JSON.stringify(err)}`));
 
 	},

t/db/build_db.pl

@@ -57,14 +57,15 @@ BEGIN
 # The permissions need to be loaded into the DB before the rest of the script is run.
 updatePermissions($config_file, $role_perm_file);
 
-my $course_rs       = $schema->resultset('Course');
-my $user_rs         = $schema->resultset('User');
-my $course_user_rs  = $schema->resultset('CourseUser');
-my $problem_set_rs  = $schema->resultset('ProblemSet');
-my $problem_pool_rs = $schema->resultset('ProblemPool');
-my $set_problem_rs  = $schema->resultset('SetProblem');
-my $user_set_rs     = $schema->resultset('UserSet');
-my $role_rs         = $schema->resultset('Role');
+my $course_rs         = $schema->resultset('Course');
+my $user_rs           = $schema->resultset('User');
+my $course_user_rs    = $schema->resultset('CourseUser');
+my $problem_set_rs    = $schema->resultset('ProblemSet');
+my $problem_pool_rs   = $schema->resultset('ProblemPool');
+my $set_problem_rs    = $schema->resultset('SetProblem');
+my $user_set_rs       = $schema->resultset('UserSet');
+my $role_rs           = $schema->resultset('Role');
+my $global_setting_rs = $schema->resultset('GlobalSetting');
 
 my $strp_date = DateTime::Format::Strptime->new(pattern => '%F', on_error => 'croak');
 

t/mojolicious/002_courses.t

@@ -113,12 +113,6 @@ $t->post_ok('/webwork3/api/login' => json => { username => 'lisa', password => '
 # an instructor can get information about the given course.
 $t->get_ok('/webwork3/api/courses/4')->status_is(200)->json_is('/course_name' => 'Arithmetic');
 
-# and also the settings for the course.
-
-$t->get_ok('/webwork3/api/courses/4/default_settings')->status_is(200)
-	->content_type_is('application/json;charset=UTF-8');
-$t->get_ok('/webwork3/api/courses/4/settings')->status_is(200)->content_type_is('application/json;charset=UTF-8');
-
 # The user with role instructor should not have permissions for the following routes.
 
 $t->post_ok('/webwork3/api/courses' => json => $new_course)->status_is(403)->json_is('/has_permission' => 0);

tests/unit-tests/parsing.spec.ts

@@ -2,7 +2,7 @@
 
 import { parseNonNegInt, parseBoolean, parseEmail, parseUsername, EmailParseException,
 	NonNegIntException, BooleanParseException, UsernameParseException,
-	parseUserRole, parseNonNegDecimal, NonNegDecimalException, isTime, isTimeDuration
+	parseNonNegDecimal, NonNegDecimalException, isTime, isTimeDuration
 } from 'src/common/models/parsers';
 
 describe('Testing Parsers and Regular Expressions', () => {
@@ -68,13 +68,6 @@ describe('Testing Parsers and Regular Expressions', () => {
 
 	});
 
-	test('parsing user roles', () => {
-		expect(parseUserRole('instructor')).toBe('INSTRUCTOR');
-		expect(parseUserRole('TA')).toBe('TA');
-		expect(parseUserRole('student')).toBe('STUDENT');
-		expect(parseUserRole('not_existent')).toBe('UNKNOWN');
-	});
-
 	test('testing time regular expressions.', () => {
 		expect(isTime('00:00')).toBe(true);
 		expect(isTime('01:00')).toBe(true);