Skip to content

Commit 58fc52c

Browse files
pstaabppstaabp
committed
change : Ref<T> = ref (...) to = ref<T>(...)
1 parent d3a6a6a commit 58fc52c

File tree

15 files changed

+57
-67
lines changed

15 files changed

+57
-67
lines changed

‎src/components/admin/AddCourse.vue‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
</template>
5757

5858
<script lang="ts">
59-
import type { Ref } from 'vue';
6059
import { defineComponent, ref } from 'vue';
6160
import { useQuasar } from 'quasar';
6261
@@ -80,11 +79,11 @@ export default defineComponent({
8079
const $q = useQuasar();
8180
const store = useStore();
8281
83-
const course: Ref<Course> = ref(new Course({}));
84-
const user: Ref<User> = ref(new User());
85-
const username: Ref<string> = ref('');
82+
const course = ref<Course>(new Course());
83+
const user = ref<User>(new User());
84+
const username = ref<string>('');
8685
const instructor_exists = ref(false);
87-
const course_dates: Ref<DateRange> = ref({ to: '', from: '' });
86+
const course_dates = ref<DateRange>({ to: '', from: '' });
8887
8988
return {
9089
course,

‎src/components/admin/CourseManager.vue‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
</template>
4646

4747
<script lang="ts">
48-
import { defineComponent, computed, Ref, ref } from 'vue';
48+
import { defineComponent, computed, ref } from 'vue';
4949
import { useStore } from 'src/store';
5050
5151
import { Course } from 'src/store/models/courses';
@@ -97,9 +97,9 @@ export default defineComponent({
9797
sortable: true
9898
}
9999
];
100-
const filter: Ref<string> = ref('');
101-
const selected: Ref<Array<Course>> = ref([]);
102-
const new_course_dialog: Ref<boolean> = ref(false);
100+
const filter = ref<string>('');
101+
const selected = ref<Array<Course>>([]);
102+
const new_course_dialog = ref<boolean>(false);
103103
104104
return {
105105
columns,

‎src/components/instructor/ClasslistManager.vue‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555

5656
<script lang="ts">
5757
import { useQuasar } from 'quasar';
58-
import type { Ref } from 'vue';
5958
import { defineComponent, computed, ref } from 'vue';
6059
6160
import { pick } from 'lodash-es';
@@ -79,11 +78,11 @@ export default defineComponent({
7978
setup() {
8079
const $q = useQuasar();
8180
const store = useStore();
82-
const selected: Ref<Array<MergedUser>> = ref([]);
83-
const filter: Ref<string> = ref('');
84-
const open_users_manually: Ref<boolean> = ref(false);
85-
const open_users_from_file: Ref<boolean> = ref(false);
86-
const open_edit_dialog: Ref<boolean> = ref(false);
81+
const selected = ref<Array<MergedUser>>([]);
82+
const filter = ref<string>('');
83+
const open_users_manually = ref<boolean>(false);
84+
const open_users_from_file = ref<boolean>(false);
85+
const open_edit_dialog = ref<boolean>(false);
8786
8887
const columns = [
8988
{

‎src/components/instructor/ClasslistManagerComponents/AddUsersFromFile.vue‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@
9292
</template>
9393

9494
<script lang="ts">
95-
import type { Ref } from 'vue';
9695
import { defineComponent, ref, computed, watch } from 'vue';
9796
import { useQuasar } from 'quasar';
9897
import { parse } from 'papaparse';
@@ -102,8 +101,7 @@ import { logger } from 'boot/logger';
102101
import { useStore } from 'src/store';
103102
import type { Dictionary, ResponseError } from 'src/store/models';
104103
import { MergedUser, CourseUser, User, ParseableMergedUser } from 'src/store/models/users';
105-
import { pick, fromPairs, values, invert, mapValues, clone, isUndefined,
106-
assign, filter } from 'lodash-es';
104+
import { pick, fromPairs, values, invert, mapValues, clone, assign, filter } from 'lodash-es';
107105
108106
interface ParseError {
109107
type: string;
@@ -124,21 +122,21 @@ export default defineComponent({
124122
setup(props, context) {
125123
const store = useStore();
126124
const $q = useQuasar();
127-
const file: Ref<File> = ref(new File([], ''));
125+
const file = ref<File>(new File([], ''));
128126
// stores all users from the file as well as parsing errors
129-
const merged_users: Ref<Array<UserFromFile>> = ref([]);
130-
const selected: Ref<Array<UserFromFile>> = ref([]); // stores the selected users
131-
const column_headers: Ref<Dictionary<string>> = ref({});
132-
const user_param_map: Ref<Dictionary<string>> = ref({}); // provides a map from column number to field name
133-
const use_single_role: Ref<boolean> = ref(false);
134-
const common_role: Ref<string|null> = ref(null);
135-
const loading: Ref<boolean> = ref(false); // used to indicate parsing is occurring
136-
137-
const first_row_header: Ref<boolean> = ref(false);
138-
const header_row: Ref<UserFromFile> = ref({});
139-
const merged_users_to_add: Ref<Array<MergedUser>> = ref([]);
140-
const selected_user_error: Ref<boolean> = ref(false);
141-
const users_already_in_course: Ref<boolean> = ref(false);
127+
const merged_users = ref<Array<UserFromFile>>([]);
128+
const selected = ref<Array<UserFromFile>>([]); // stores the selected users
129+
const column_headers = ref<Dictionary<string>>({});
130+
const user_param_map = ref<Dictionary<string>>({}); // provides a map from column number to field name
131+
const use_single_role = ref<boolean>(false);
132+
const common_role = ref<string|null>(null);
133+
const loading = ref<boolean>(false); // used to indicate parsing is occurring
134+
135+
const first_row_header = ref<boolean>(false);
136+
const header_row = ref<UserFromFile>({});
137+
const merged_users_to_add = ref<Array<MergedUser>>([]);
138+
const selected_user_error = ref<boolean>(false);
139+
const users_already_in_course = ref<boolean>(false);
142140
143141
const user_fields = [
144142
{ label: 'Username', field: 'username', regexp: /(user)|(login)/i },
@@ -243,9 +241,9 @@ export default defineComponent({
243241
(user_fields.indexOf(err.field)>=0 || course_user_fields.indexOf(err.field)>=0)) {
244242
assign(parse_error, {
245243
col: user_param_map.value[err.field],
246-
entire_row: isUndefined(user_param_map.value[err.field])
244+
entire_row: user_param_map.value[err.field] == undefined
247245
});
248-
} else if (isUndefined(err.field)) { // missing field
246+
} else if (err.field != undefined) { // missing field
249247
assign(parse_error, { entire_row: true });
250248
}
251249
}

‎src/components/instructor/ClasslistManagerComponents/AddUsersManually.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
</template>
4747

4848
<script lang="ts">
49-
import type { Ref } from 'vue';
49+
5050
import { defineComponent, ref, computed } from 'vue';
5151
import { useQuasar } from 'quasar';
5252
import { logger } from 'src/boot/logger';
@@ -64,8 +64,8 @@ export default defineComponent({
6464
emits: ['closeDialog'],
6565
setup(props, context) {
6666
const $q = useQuasar();
67-
const merged_user: Ref<ParseableMergedUser> = ref({ username: '__NEW__' });
68-
const user_exists: Ref<boolean> = ref(true);
67+
const merged_user = ref<ParseableMergedUser>({ username: '__NEW__' });
68+
const user_exists = ref<boolean>(true);
6969
const store = useStore();
7070
7171
return {

‎src/components/instructor/LibraryComponents/LibPanelOPL.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ export default defineComponent({
7676
const subject: Ref<SelectItem|null> = ref(null);
7777
const chapter: Ref<SelectItem|null> = ref(null);
7878
const section: Ref<SelectItem|null> = ref(null);
79-
const problems: Ref<Array<LibraryProblem>> = ref([]);
79+
const problems = ref<Array<LibraryProblem>>([]);
8080
8181
watch([discipline], async () => {
8282
void store.dispatch('library/resetSections');

‎src/components/instructor/ProblemSetsManager.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
</template>
4646

4747
<script lang="ts">
48-
import { defineComponent, computed, ref, Ref } from 'vue';
48+
import { defineComponent, computed, ref } from 'vue';
4949
import { useStore } from 'src/store';
5050
import { ProblemSet, QuizDates } from 'src/store/models/problem_sets';
5151
import { formatDate } from 'src/common';
@@ -54,8 +54,8 @@ export default defineComponent({
5454
name: 'ProblemSetsManager',
5555
setup() {
5656
const store = useStore();
57-
const selected: Ref<Array<ProblemSet>> = ref([]);
58-
const filter: Ref<string> = ref('');
57+
const selected = ref<Array<ProblemSet>>([]);
58+
const filter = ref<string>('');
5959
const columns = [
6060
{ name: 'set_name', label: 'Set Name', field: 'set_name', sortable: true },
6161
{ name: 'set_id', label: 'set_id', field: 'set_id', sortable: true },

‎src/components/instructor/SetDetails/HomeworkSet.vue‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
</template>
3838

3939
<script lang="ts">
40-
import type { Ref } from 'vue';
4140
import { defineComponent, ref, watch, toRefs } from 'vue';
4241
import { useQuasar } from 'quasar';
4342
import { cloneDeep } from 'lodash-es';
@@ -57,14 +56,14 @@ export default defineComponent({
5756
const $q = useQuasar();
5857
5958
const { set_id } = toRefs(props);
60-
const hw: Ref<HomeworkSet> = ref(new HomeworkSet());
59+
const hw = ref<HomeworkSet>(new HomeworkSet());
6160
6261
const set = ref(hw);
6362
6463
const updateSet = () => {
6564
const s = store.state.problem_sets.problem_sets.find((_set) => _set.set_id === set_id.value) ||
6665
new HomeworkSet();
67-
set.value = cloneDeep(s as HomeworkSet);
66+
set.value = new HomeworkSet(s.toObject());
6867
};
6968
7069
watch(()=>set_id.value, updateSet);
@@ -74,7 +73,7 @@ export default defineComponent({
7473
// for why we need to do a cloneDeep here
7574
watch(() => cloneDeep(set.value), (new_set, old_set) => {
7675
if (new_set.set_id == old_set.set_id) {
77-
void store.dispatch('problem_sets/updateSet', new_set);
76+
void store.dispatch('problem_sets/updateSet', hw.value);
7877
$q.notify({
7978
message: `The problem set '${new_set.set_name ?? ''}' was successfully updated.`,
8079
color: 'green'

‎src/components/instructor/SetDetails/Quiz.vue‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
</template>
3838

3939
<script lang="ts">
40-
import type { Ref } from 'vue';
4140
import { defineComponent, ref, watch, toRefs } from 'vue';
4241
import { useQuasar } from 'quasar';
4342
import { cloneDeep } from 'lodash-es';
@@ -58,7 +57,7 @@ export default defineComponent({
5857
5958
const { set_id } = toRefs(props);
6059
61-
const set: Ref<Quiz> = ref(new Quiz());
60+
const set = ref<Quiz>(new Quiz());
6261
6362
const updateSet = () => {
6463
const s = store.state.problem_sets.problem_sets.find((_set) => _set.set_id == set_id.value) ||

‎src/components/instructor/SetDetails/ReviewSet.vue‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
</template>
3030

3131
<script lang="ts">
32-
import type { Ref } from 'vue';
3332
import { defineComponent, ref, watch, toRefs } from 'vue';
3433
import { useQuasar } from 'quasar';
3534
import { cloneDeep } from 'lodash-es';
@@ -50,12 +49,12 @@ export default defineComponent({
5049
5150
const { set_id } = toRefs(props);
5251
53-
const set: Ref<ReviewSet> = ref(new ReviewSet());
52+
const set = ref<ReviewSet>(new ReviewSet());
5453
5554
const updateSet = () => {
5655
const s = store.state.problem_sets.problem_sets.find((_set) => _set.set_id == set_id.value) ||
5756
new ReviewSet();
58-
set.value = cloneDeep(s);
57+
set.value = new ReviewSet(s.toObject());
5958
};
6059
6160
watch(()=>set_id.value, updateSet);

0 commit comments

Comments
 (0)