Merge pull request #66 from drgrice1/cleanup

Add the eslint space-infix-ops rule and general clean up

.eslintrc.js

@@ -19,6 +19,7 @@ const baseRules = {
 	'one-var': 'off',
 	'no-void': 'off',
 	'multiline-ternary': 'off',
+	'space-infix-ops': ['error'],
 
 	// allow console and debugger during development only
 	'no-console': process.env.NODE_ENV === 'development' ? 'off' : 'error',
@@ -46,6 +47,7 @@ module.exports = {
 		__statics: 'readonly',
 		process: 'readonly'
 	},
+
 	rules: baseRules,
 
 	overrides: [{
@@ -81,7 +83,6 @@ module.exports = {
 			// TypeScript
 			'@typescript-eslint/explicit-function-return-type': 'off',
 			'@typescript-eslint/explicit-module-boundary-types': 'off',
-			'@typescript-eslint/restrict-template-expressions': ['error', {allowBoolean: true, allNumbers: true }],
 		}
 
 	}],

jest.config.js

@@ -1,5 +1,9 @@
 /* eslint-env node */
 
+const { pathsToModuleNameMapper } = require('ts-jest/utils');
+const requireJSON5 = require('require-json5');
+const { compilerOptions } = requireJSON5('./node_modules/@quasar/app/tsconfig-preset.json');
+
 module.exports = {
 	preset: 'ts-jest',
 	testEnvironment: 'node',
@@ -9,14 +13,6 @@ module.exports = {
 			'diagnostics': true
 		}
 	},
-	moduleNameMapper: {
-		'^src/(.*)$': '<rootDir>/src/$1',
-		'^app/(.*)$': '<rootDir>/$1',
-		'^components/(.*)$': '<rootDir>/src/components/$1',
-		'^layouts/(.*)$': '<rootDir>/src/layouts/$1',
-		'^pages/(.*)$': '<rootDir>/src/pages/$1',
-		'^assets/(.*)$': '<rootDir>/src/assets/$1',
-		'^boot/(.*)$': '<rootDir>/src/boot/$1'
-	},
+	moduleNameMapper: pathsToModuleNameMapper(compilerOptions.paths, { prefix: '<rootDir>/' }),
 	testRegex: '(/tests/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$',
 };

src/components/common/DateTimeInput.vue

@@ -29,7 +29,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, watch, ref, Ref } from 'vue';
+import { defineComponent, watch, ref } from 'vue';
 import { date } from 'quasar';
 
 export default defineComponent({
@@ -40,8 +40,7 @@ export default defineComponent({
 	},
 	emits: ['update:modelValue'],
 	setup (props, { emit }) {
-		const date_string: Ref<string>
-			= ref(date.formatDate((props.modelValue || Date.now())*1000, 'YYYY-MM-DD HH:mm'));
+		const date_string = ref(date.formatDate((props.modelValue || Date.now()) * 1000, 'YYYY-MM-DD HH:mm'));
 
 		watch(
 			() => date_string.value,

src/components/common/Problem.vue

@@ -34,7 +34,7 @@ import { RENDER_URL } from 'src/constants';
 import * as bootstrap from 'bootstrap';
 import type JQueryStatic from 'jquery';
 import JQuery from 'jquery';
-import { logger } from 'src/boot/logger';
+import { logger } from 'boot/logger';
 
 import typeset from './mathjax-config';
 

src/components/instructor/ClasslistManager.vue

@@ -59,7 +59,7 @@ import { defineComponent, computed, ref } from 'vue';
 
 import { pick } from 'lodash-es';
 import { useStore } from 'src/store';
-import { api } from 'src/boot/axios';
+import { api } from 'boot/axios';
 import { MergedUser, CourseUser } from 'src/store/models/users';
 import { UserCourse } from 'src/store/models/courses';
 import { ResponseError } from 'src/store/models';

src/components/instructor/ClasslistManagerComponents/AddUsersFromFile.vue

@@ -218,7 +218,7 @@ export default defineComponent({
 						parse_error = {
 							type: 'warn',
 							message: `The user with username '${merged_user.username ?? ''}'`
-								+' is already enrolled in the course.',
+								+ ' is already enrolled in the course.',
 							entire_row: true
 						};
 					} else {
@@ -238,7 +238,7 @@ export default defineComponent({
 					if (err.field === '_all') {
 						assign(parse_error, { entire_row: true });
 					} else if (err.field &&
-						(user_fields.indexOf(err.field)>=0 || course_user_fields.indexOf(err.field)>=0)) {
+						(user_fields.indexOf(err.field) >= 0 || course_user_fields.indexOf(err.field) >= 0)) {
 						assign(parse_error, {
 							col: user_param_map.value[err.field],
 							entire_row: user_param_map.value[err.field] == undefined
@@ -285,7 +285,7 @@ export default defineComponent({
 							};
 							d._row = index;
 							row.forEach((v: string, i: number) => {
-								d[`col${i+1}`] = v;
+								d[`col${i + 1}`] = v;
 							});
 							users.push(d);
 						});

src/components/instructor/ClasslistManagerComponents/AddUsersManually.vue

@@ -49,7 +49,7 @@
 
 import { defineComponent, ref, computed } from 'vue';
 import { useQuasar } from 'quasar';
-import { logger } from 'src/boot/logger';
+import { logger } from 'boot/logger';
 
 import { useStore } from 'src/store';
 
@@ -96,7 +96,7 @@ export default defineComponent({
 					(_setting: CourseSetting) => _setting.var === 'roles'
 				);
 				const r = clone(all_roles?.value as Array<string>);
-				remove(r, (v)=> v==='admin'); // don't allow to set admin level here.
+				remove(r, (v)=> v === 'admin'); // don't allow to set admin level here.
 				return r;
 			}),
 			addUser: async (close: boolean) => {

src/components/instructor/ClasslistManagerComponents/EditUsers.vue

@@ -41,14 +41,13 @@
 </template>
 
 <script lang="ts">
-import type { Ref } from 'vue';
 import { defineComponent, ref, computed } from 'vue';
 import { cloneDeep, clone, remove, pick } from 'lodash-es';
 
 import { MergedUser } from 'src/store/models/users';
 import { CourseSetting } from 'src/store/models/settings';
 import { useStore } from 'src/store';
-import { logger } from 'src/boot/logger';
+import { logger } from 'boot/logger';
 import { CourseUser } from 'src/store/models/users';
 
 export default defineComponent({
@@ -57,8 +56,12 @@ export default defineComponent({
 	},
 	emits: ['closeDialog'],
 	setup(props, context) {
-		const merged_users: Ref<Array<MergedUser>> = props.users_to_edit ?
-			ref(cloneDeep(props.users_to_edit) as unknown as Array<MergedUser>) : ref([]);
+		const merged_users =
+			ref<Array<MergedUser>>(
+				props.users_to_edit
+					? cloneDeep(props.users_to_edit) as unknown as Array<MergedUser>
+					: []
+			);
 		const store = useStore();
 
 		const updateUsers = async () => {
@@ -80,7 +83,7 @@ export default defineComponent({
 					(_setting: CourseSetting) => _setting.var === 'roles'
 				);
 				const r = clone(all_roles?.value as Array<string>);
-				remove(r, v => v==='admin'); // don't allow to set admin level here.
+				remove(r, v => v === 'admin'); // don't allow to set admin level here.
 				return r;
 			}),
 		};

src/components/instructor/LibraryComponents/LibPanelOPL.vue

@@ -44,12 +44,11 @@
 import axios from 'axios';
 import { api } from 'boot/axios';
 
-import type { Ref } from 'vue';
 import { defineComponent, ref, computed, watch } from 'vue';
 import { useStore } from 'src/store';
 // import { Discipline, LibrarySubject } from 'src/store/models';
-import Problem from 'src/components/common/Problem.vue';
-import { logger } from 'src/boot/logger';
+import Problem from 'components/common/Problem.vue';
+import { logger } from 'boot/logger';
 
 interface SelectItem {
 	label?: string;
@@ -72,10 +71,10 @@ export default defineComponent({
 	},
 	setup() {
 		const store = useStore();
-		const discipline: Ref<SelectItem|null>     = ref(null); // start with the select field to be empty.
-		const subject: Ref<SelectItem|null>        = ref(null);
-		const chapter: Ref<SelectItem|null>        = ref(null);
-		const section: Ref<SelectItem|null>        = ref(null);
+		const discipline = ref<SelectItem | null>(null); // start with the select field to be empty.
+		const subject = ref<SelectItem | null>(null);
+		const chapter = ref<SelectItem | null>(null);
+		const section = ref<SelectItem | null>(null);
 		const problems = ref<Array<LibraryProblem>>([]);
 
 		watch([discipline], async () => {

src/components/instructor/SetDetails/HomeworkSet.vue

@@ -41,7 +41,7 @@ import { defineComponent, ref, watch, toRefs } from 'vue';
 import { useQuasar } from 'quasar';
 import { cloneDeep } from 'lodash-es';
 
-import DateTimeInput from 'src/components/common/DateTimeInput.vue';
+import DateTimeInput from 'components/common/DateTimeInput.vue';
 import { HomeworkSet } from 'src/store/models/problem_sets';
 import { useStore } from 'src/store';
 

src/components/instructor/SetDetails/Quiz.vue

@@ -41,7 +41,7 @@ import { defineComponent, ref, watch, toRefs } from 'vue';
 import { useQuasar } from 'quasar';
 import { cloneDeep } from 'lodash-es';
 
-import DateTimeInput from 'src/components/common/DateTimeInput.vue';
+import DateTimeInput from 'components/common/DateTimeInput.vue';
 import { Quiz } from 'src/store/models/problem_sets';
 import { useStore } from 'src/store';
 
@@ -91,7 +91,7 @@ export default defineComponent({
 			checkDates: [
 				() => {
 					const d = set.value.set_dates;
-					return d.open <= d.due && d.due <=d.answer || 'The dates must be in order';
+					return d.open <= d.due && d.due <= d.answer || 'The dates must be in order';
 				}
 			],
 			quizDuration: [

src/components/instructor/SetDetails/ReviewSet.vue

@@ -33,7 +33,7 @@ import { defineComponent, ref, watch, toRefs } from 'vue';
 import { useQuasar } from 'quasar';
 import { cloneDeep } from 'lodash-es';
 
-import DateTimeInput from 'src/components/common/DateTimeInput.vue';
+import DateTimeInput from 'components/common/DateTimeInput.vue';
 import { ReviewSet } from 'src/store/models/problem_sets';
 import { useStore } from 'src/store';
 

src/layouts/MainLayout.vue

@@ -66,13 +66,13 @@ export default defineComponent({
 
 			if (! current_view) { // it may be a child component
 				current_view = views.find((view: ViewInfo) =>
-				 view.children ? view.children?.indexOf(route.name as string)> -1 : false);
+				 view.children ? view.children?.indexOf(route.name as string) > -1 : false);
 			}
 
 			logger.debug(`[MainLayout/updateViews] name: ${current_view?.name || 'no name!'}`);
 			if (current_view) {
 				sidebars.value = current_view.sidebars;
-				if (current_view.sidebars.length>0) {
+				if (current_view.sidebars.length > 0) {
 					logger.debug(`[MainLayout/updateViews] sidebar: ${current_view.sidebars.join(', ')}`);
 					right_sidebar_open.value = true;
 				} else {