From 6bb7d6f6da3a7bc66268d63201395380677e77fc Mon Sep 17 00:00:00 2001
From: Glenn Rice <grice1@missouriwestern.edu>
Date: Tue, 16 Nov 2021 20:44:10 -0600
Subject: [PATCH 1/3] Fix the remaining incorrect Ref usages.

Update the remaining import statements to use the provided quasar
webpack alias.

Fix my mistake with the jest configuration.  I seem to have mixed the
two methods I suggested, instead of only using one.  I installed
require-json5, but didn't use it.  I did intend to use that, rather than
adding all of the aliases in jest.config.js, and so that is done here.
---
 .eslintrc.js                                  |  1 +
 jest.config.js                                | 14 +++-----
 src/components/common/DateTimeInput.vue       |  5 ++-
 src/components/common/Problem.vue             |  2 +-
 .../instructor/ClasslistManager.vue           |  2 +-
 .../AddUsersManually.vue                      |  2 +-
 .../ClasslistManagerComponents/EditUsers.vue  | 11 +++---
 .../LibraryComponents/LibPanelOPL.vue         | 13 ++++---
 .../instructor/SetDetails/HomeworkSet.vue     |  2 +-
 src/components/instructor/SetDetails/Quiz.vue |  2 +-
 .../instructor/SetDetails/ReviewSet.vue       |  2 +-
 src/router/routes.ts                          | 36 +++++++++----------
 12 files changed, 45 insertions(+), 47 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 6bce4d3b..607fca8e 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -46,6 +46,7 @@ module.exports = {
 		__statics: 'readonly',
 		process: 'readonly'
 	},
+
 	rules: baseRules,
 
 	overrides: [{
diff --git a/jest.config.js b/jest.config.js
index 29137f6f..de9622b8 100644
--- a/jest.config.js
+++ b/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?)$',
 };
diff --git a/src/components/common/DateTimeInput.vue b/src/components/common/DateTimeInput.vue
index 2244b6e2..bf2ad99e 100644
--- a/src/components/common/DateTimeInput.vue
+++ b/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,
diff --git a/src/components/common/Problem.vue b/src/components/common/Problem.vue
index d407d927..a9f91309 100644
--- a/src/components/common/Problem.vue
+++ b/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';
 
diff --git a/src/components/instructor/ClasslistManager.vue b/src/components/instructor/ClasslistManager.vue
index f7eabf4f..33beed57 100644
--- a/src/components/instructor/ClasslistManager.vue
+++ b/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';
diff --git a/src/components/instructor/ClasslistManagerComponents/AddUsersManually.vue b/src/components/instructor/ClasslistManagerComponents/AddUsersManually.vue
index 1a5a4d9b..e2fc4490 100644
--- a/src/components/instructor/ClasslistManagerComponents/AddUsersManually.vue
+++ b/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';
 
diff --git a/src/components/instructor/ClasslistManagerComponents/EditUsers.vue b/src/components/instructor/ClasslistManagerComponents/EditUsers.vue
index 159b89f4..f1c56509 100644
--- a/src/components/instructor/ClasslistManagerComponents/EditUsers.vue
+++ b/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 () => {
diff --git a/src/components/instructor/LibraryComponents/LibPanelOPL.vue b/src/components/instructor/LibraryComponents/LibPanelOPL.vue
index 0a7d3c0e..856237e9 100644
--- a/src/components/instructor/LibraryComponents/LibPanelOPL.vue
+++ b/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 () => {
diff --git a/src/components/instructor/SetDetails/HomeworkSet.vue b/src/components/instructor/SetDetails/HomeworkSet.vue
index 7b87d2d5..82d7c553 100644
--- a/src/components/instructor/SetDetails/HomeworkSet.vue
+++ b/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';
 
diff --git a/src/components/instructor/SetDetails/Quiz.vue b/src/components/instructor/SetDetails/Quiz.vue
index 125ad408..36e5960b 100644
--- a/src/components/instructor/SetDetails/Quiz.vue
+++ b/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';
 
diff --git a/src/components/instructor/SetDetails/ReviewSet.vue b/src/components/instructor/SetDetails/ReviewSet.vue
index 404c98d9..0cea79b0 100644
--- a/src/components/instructor/SetDetails/ReviewSet.vue
+++ b/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';
 
diff --git a/src/router/routes.ts b/src/router/routes.ts
index 8e77ce31..658d7d0b 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -7,14 +7,14 @@ const routes: RouteRecordRaw[] = [
 	},
 	{
 		path: '/',
-		component: () => import(/* webpackChunkName: "MainLayout" */ 'src/layouts/MainLayout.vue'),
+		component: () => import(/* webpackChunkName: "MainLayout" */ 'layouts/MainLayout.vue'),
 		children: [
 			{
 				path: 'welcome',
 				component: () =>
 					import(
 						/* webpackChunkName: "Welcome" */
-						'src/components/common/Welcome.vue'
+						'components/common/Welcome.vue'
 					),
 				name: 'welcome'
 			},
@@ -23,7 +23,7 @@ const routes: RouteRecordRaw[] = [
 				component: () =>
 					import(
 						/* webpackChunkName: "Login" */
-						'src/components/common/Login.vue'
+						'components/common/Login.vue'
 					)
 			},
 			{
@@ -31,7 +31,7 @@ const routes: RouteRecordRaw[] = [
 				component: () =>
 					import(
 						/* webpackChunkName: "UserCourses" */
-						'src/components/common/UserCourses.vue'
+						'components/common/UserCourses.vue'
 					)
 			},
 			{
@@ -39,7 +39,7 @@ const routes: RouteRecordRaw[] = [
 				component: () =>
 					import(
 						/* webpackChunkName: "Student" */
-						'src/components/student/Student.vue'
+						'components/student/Student.vue'
 					),
 				name: 'student',
 				props: true,
@@ -50,7 +50,7 @@ const routes: RouteRecordRaw[] = [
 				component: () =>
 					import(
 						/* webpackChunkName: "Instructor" */
-						'src/components/instructor/Instructor.vue'
+						'components/instructor/Instructor.vue'
 					),
 				name: 'instructor',
 				props: true,
@@ -62,7 +62,7 @@ const routes: RouteRecordRaw[] = [
 						component: () =>
 							import(
 								/* webpackChunkName: "Settings" */
-								'src/components/instructor/Settings.vue'
+								'components/instructor/Settings.vue'
 							)
 					},
 					{
@@ -71,7 +71,7 @@ const routes: RouteRecordRaw[] = [
 						component: () =>
 							import(
 								/* webpackChunkName: "Calendar" */
-								'src/components/instructor/Calendar.vue'
+								'components/instructor/Calendar.vue'
 							)
 					},
 					{
@@ -80,7 +80,7 @@ const routes: RouteRecordRaw[] = [
 						component: () =>
 							import(
 								/* webpackChunkName: "ProblemViewer" */
-								'src/components/common/ProblemViewer.vue'
+								'components/common/ProblemViewer.vue'
 							)
 					},
 					{
@@ -89,7 +89,7 @@ const routes: RouteRecordRaw[] = [
 						component: () =>
 							import(
 								/* webpackChunkName: "ClasslistManager" */
-								'src/components/instructor/ClasslistManager.vue'
+								'components/instructor/ClasslistManager.vue'
 							)
 					},
 					{
@@ -98,7 +98,7 @@ const routes: RouteRecordRaw[] = [
 						component: () =>
 							import(
 								/* webpackChunkName: "SetDetailContainer" */
-								'src/components/instructor/SetDetails/SetDetailContainer.vue'
+								'components/instructor/SetDetails/SetDetailContainer.vue'
 							),
 						children: [
 							{
@@ -107,7 +107,7 @@ const routes: RouteRecordRaw[] = [
 								component: () =>
 									import(
 										/* webpackChunkName: "ProblemSetDetails" */
-										'src/components/instructor/SetDetails/ProblemSetDetails.vue'
+										'components/instructor/SetDetails/ProblemSetDetails.vue'
 									)
 							}
 						]
@@ -119,7 +119,7 @@ const routes: RouteRecordRaw[] = [
 						component: () =>
 							import(
 								/* webpackChunkName: "LibraryBrowser" */
-								'src/components/instructor/LibraryBrowser.vue'
+								'components/instructor/LibraryBrowser.vue'
 							)
 					},
 
@@ -129,7 +129,7 @@ const routes: RouteRecordRaw[] = [
 						component: () =>
 							import(
 								/* webpackChunkName: "ProblemSetsManager" */
-								'src/components/instructor/ProblemSetsManager.vue'
+								'components/instructor/ProblemSetsManager.vue'
 							)
 					},
 
@@ -139,7 +139,7 @@ const routes: RouteRecordRaw[] = [
 						component: () =>
 							import(
 								/* webpackChunkName: "ProblemEditor" */
-								'src/components/instructor/ProblemEditor.vue'
+								'components/instructor/ProblemEditor.vue'
 							)
 					},
 
@@ -149,7 +149,7 @@ const routes: RouteRecordRaw[] = [
 						component: () =>
 							import(
 								/* webpackChunkName: "Statistics" */
-								'src/components/instructor/Statistics.vue'
+								'components/instructor/Statistics.vue'
 							)
 					}
 				]
@@ -159,7 +159,7 @@ const routes: RouteRecordRaw[] = [
 				component: () =>
 					import(
 						/* webpackChunkName: "Admin" */
-						'src/components/admin/Admin.vue'
+						'components/admin/Admin.vue'
 					),
 				children: [
 					{
@@ -167,7 +167,7 @@ const routes: RouteRecordRaw[] = [
 						component: () =>
 							import(
 								/* webpackChunkName: "CourseMananger" */
-								'src/components/admin/CourseManager.vue'
+								'components/admin/CourseManager.vue'
 							),
 						name: 'CourseManager'
 					}

From fb597cffc017beb4d2439342d815612bc2b96dbd Mon Sep 17 00:00:00 2001
From: Glenn Rice <grice1@missouriwestern.edu>
Date: Tue, 16 Nov 2021 20:53:12 -0600
Subject: [PATCH 2/3] Add the eslint space-infix-ops rule, and run `npm run
 lint` to fix the issues it shows.

---
 .eslintrc.js                                                | 1 +
 src/components/common/DateTimeInput.vue                     | 2 +-
 .../ClasslistManagerComponents/AddUsersFromFile.vue         | 6 +++---
 .../ClasslistManagerComponents/AddUsersManually.vue         | 2 +-
 .../instructor/ClasslistManagerComponents/EditUsers.vue     | 2 +-
 src/components/instructor/SetDetails/Quiz.vue               | 2 +-
 src/layouts/MainLayout.vue                                  | 4 ++--
 src/store/models/index.ts                                   | 2 +-
 src/store/modules/session.ts                                | 2 +-
 src/store/modules/users.ts                                  | 4 ++--
 10 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 607fca8e..674c68a9 100644
--- a/.eslintrc.js
+++ b/.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',
diff --git a/src/components/common/DateTimeInput.vue b/src/components/common/DateTimeInput.vue
index bf2ad99e..f9306ee7 100644
--- a/src/components/common/DateTimeInput.vue
+++ b/src/components/common/DateTimeInput.vue
@@ -40,7 +40,7 @@ export default defineComponent({
 	},
 	emits: ['update:modelValue'],
 	setup (props, { emit }) {
-		const date_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,
diff --git a/src/components/instructor/ClasslistManagerComponents/AddUsersFromFile.vue b/src/components/instructor/ClasslistManagerComponents/AddUsersFromFile.vue
index 2c971c20..c2da0bff 100644
--- a/src/components/instructor/ClasslistManagerComponents/AddUsersFromFile.vue
+++ b/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);
 						});
diff --git a/src/components/instructor/ClasslistManagerComponents/AddUsersManually.vue b/src/components/instructor/ClasslistManagerComponents/AddUsersManually.vue
index e2fc4490..2389685e 100644
--- a/src/components/instructor/ClasslistManagerComponents/AddUsersManually.vue
+++ b/src/components/instructor/ClasslistManagerComponents/AddUsersManually.vue
@@ -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) => {
diff --git a/src/components/instructor/ClasslistManagerComponents/EditUsers.vue b/src/components/instructor/ClasslistManagerComponents/EditUsers.vue
index f1c56509..4931046d 100644
--- a/src/components/instructor/ClasslistManagerComponents/EditUsers.vue
+++ b/src/components/instructor/ClasslistManagerComponents/EditUsers.vue
@@ -83,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;
 			}),
 		};
diff --git a/src/components/instructor/SetDetails/Quiz.vue b/src/components/instructor/SetDetails/Quiz.vue
index 36e5960b..38aa2d3a 100644
--- a/src/components/instructor/SetDetails/Quiz.vue
+++ b/src/components/instructor/SetDetails/Quiz.vue
@@ -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: [
diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue
index 83c5d744..ac4e53b7 100644
--- a/src/layouts/MainLayout.vue
+++ b/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 {
diff --git a/src/store/models/index.ts b/src/store/models/index.ts
index ec1c39ca..8123cc95 100644
--- a/src/store/models/index.ts
+++ b/src/store/models/index.ts
@@ -215,7 +215,7 @@ export const Model = <Bool extends string, Num extends string, Str extends strin
 		_dictionary_field_names: Array<Dic> = dictionary_fields;
 		_fields: F = fields;
 
-		constructor(params: Dictionary<generic | Dictionary<generic>>= {}) {
+		constructor(params: Dictionary<generic | Dictionary<generic>> = {}) {
 			// check that required fields are present
 
 			const common_fields = intersection(this.required_fields, Object.keys(params));
diff --git a/src/store/modules/session.ts b/src/store/modules/session.ts
index 5ce6b4f2..32cc8ca3 100644
--- a/src/store/modules/session.ts
+++ b/src/store/modules/session.ts
@@ -36,7 +36,7 @@ const getters: GetterTree<SessionState, StateInterface> & Getters = {
 	logged_in: (state) => state.logged_in,
 	user: (state) => state.user,
 	full_name: (state) => {
-		return `${state.user.first_name|| ''}  ${state.user.last_name || ''}`;
+		return `${state.user.first_name || ''}  ${state.user.last_name || ''}`;
 	},
 	course: (state) => state.course
 };
diff --git a/src/store/modules/users.ts b/src/store/modules/users.ts
index 2ea8e94f..59638a99 100644
--- a/src/store/modules/users.ts
+++ b/src/store/modules/users.ts
@@ -189,12 +189,12 @@ export default {
 			state. merged_users.push(_merged_user);
 		},
 		UPDATE_MERGED_USER(state: UserState, _merged_user: MergedUser): void {
-			const index = state. merged_users.findIndex((u) => u.course_user_id ===_merged_user.course_user_id);
+			const index = state. merged_users.findIndex((u) => u.course_user_id === _merged_user.course_user_id);
 			// splice is used so vue3 reacts to changes.
 			state. merged_users.splice(index, 1, _merged_user);
 		},
 		DELETE_COURSE_USER(state: UserState, _course_user: CourseUser): void {
-			remove(state.course_users, (u) => u.course_user_id ===_course_user.course_user_id);
+			remove(state.course_users, (u) => u.course_user_id === _course_user.course_user_id);
 		},
 		DELETE_MERGED_USER(state: UserState, _merged_user: MergedUser): void {
 			remove(state. merged_users, (u) => u.course_user_id === _merged_user.course_user_id);

From 41abe478d93aadb6869b6a304e0b9fcea3f02081 Mon Sep 17 00:00:00 2001
From: Glenn Rice <grice1@missouriwestern.edu>
Date: Tue, 16 Nov 2021 21:22:40 -0600
Subject: [PATCH 3/3] Remove the
 @typescript-eslint/restrict-template-expressions rule exceptions.  Those
 aren't needed.

---
 .eslintrc.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 674c68a9..4e8734ed 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -83,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 }],
 		}
 
 	}],