Skip to content

Commit 7cd181d

Browse files
annehaleyannehaley
authored
Fix screenshots (again) & update dependencies (#346)
* Update vtk.js and other dependencies * Lint fixes on most vue files according to eslint update * Incorporate upstream changes to place camera correctly * Remove comments * TODO for fixing scale later
1 parent 115ab39 commit 7cd181d

26 files changed

Lines changed: 23223 additions & 3820 deletions

‎client/babel.config.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
module.exports = {
2-
presets: ['@vue/app'],
2+
presets: ['@vue/cli-plugin-babel/preset'],
3+
plugins: ['@babel/plugin-proposal-optional-chaining'],
34
};

‎client/package-lock.json‎

Lines changed: 23041 additions & 3631 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎client/package.json‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
"@mdi/font": "^6.5.95",
1313
"@sentry/vue": "^6.17.6",
1414
"@types/jest": "^27.0.1",
15-
"@typescript-eslint/eslint-plugin": "^4.31.0",
16-
"@typescript-eslint/parser": "^4.31.0",
15+
"@typescript-eslint/eslint-plugin": "^4.33.0",
16+
"@typescript-eslint/parser": "^4.0.0",
1717
"@vue/cli-plugin-typescript": "^4.5.13",
1818
"@vue/composition-api": "^1.1.4",
1919
"@vue/eslint-config-typescript": "^7.0.0",
@@ -27,43 +27,40 @@
2727
"mousetrap": "github:scottwittenburg/mousetrap#fix-listener-leak",
2828
"typescript": "^4.4.2",
2929
"uuid": "^3.4.0",
30-
"vtk.js": "14.16.5",
30+
"vtk.js": "22.5.7",
3131
"vue": "^2.6.14",
3232
"vue-async-computed": "^3.5.1",
3333
"vue-css-donut-chart": "^1.3.2",
3434
"vue-router": "3.4.3",
35-
"vuetify": "^2.3.22",
35+
"vuetify": "^2.6.3",
3636
"vuex": "^3.0.1"
3737
},
3838
"devDependencies": {
39-
"@babel/core": "^7.16.7",
40-
"@babel/parser": "^7.16.7",
41-
"@babel/runtime": "^7.16.7",
4239
"@types/lodash": "^4.14.172",
4340
"@types/uuid": "^8.3.1",
4441
"@vue/cli-plugin-babel": "^4.5.15",
45-
"@vue/cli-plugin-eslint": "^4.5.15",
42+
"@vue/cli-plugin-eslint": "^5.0.0",
4643
"@vue/cli-service": "^4.5.13",
4744
"@vue/eslint-config-airbnb": "^5.3.0",
4845
"@vue/eslint-config-prettier": "^4.0.1",
4946
"babel-eslint": "^10.0.1",
50-
"babel-loader": "^8.2.2",
5147
"copy-webpack-plugin": "^4.6.0",
5248
"core-js": "^3.20.2",
5349
"eslint": "^7.32.0",
5450
"eslint-plugin-import": "^2.24.2",
55-
"eslint-plugin-vue": "^5.0.0",
56-
"pug": "^3.0.1",
51+
"eslint-plugin-vue": "^7.0.0",
52+
"postcss-loader": "^3.0.0",
53+
"pug": "^2.0.1",
5754
"pug-loader": "^2.4.0",
5855
"pug-plain-loader": "^1.0.0",
59-
"sass": "^1.39.0",
60-
"sass-loader": "^7.0.1",
56+
"sass": "1.32.0",
57+
"sass-loader": "^10.0.0",
6158
"shader-loader": "^1.3.1",
6259
"vue-cli-plugin-vuetify": "^2.4.2",
6360
"vue-eslint-parser": "^8.0.1",
6461
"vue-template-compiler": "^2.6.14",
6562
"vuetify-loader": "^1.7.3",
6663
"webpack": "^4.46.0",
67-
"worker-loader": "^2.0.0"
64+
"worker-loader": "^3.0.8"
6865
}
6966
}

‎client/src/components/ControlPanel.vue‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -281,22 +281,22 @@ export default {
281281
</v-flex>
282282
<v-textarea
283283
v-model="currentViewData.experimentNote"
284-
@input="handleExperimentNoteChange"
285-
:disabled="!experimentIsEditable"
286284
filled
285+
:disabled="!experimentIsEditable"
287286
no-resize
288287
height="80px"
289288
hide-details
290289
class="mt-3"
291290
name="input-experiment-notes"
292291
label="Experiment Notes"
293292
placeholder="There are no notes on this experiment."
293+
@input="handleExperimentNoteChange"
294294
/>
295295
<v-row no-gutters>
296296
<v-col
297-
v-on:click="handleExperimentNoteSave()"
298297
:class="newExperimentNote.length > 0 ? 'blue--text' : 'grey--text'"
299298
style="text-align: right"
299+
@click="handleExperimentNoteSave()"
300300
>
301301
Save Note
302302
</v-col>
@@ -308,19 +308,19 @@ export default {
308308
<div style="flex-grow: 1">
309309
<v-switch
310310
:input-value="showCrosshairs"
311-
@change="setShowCrosshairs"
312311
label="Display crosshairs"
313312
hide-details
314313
class="shrink pa-0 ml-n2"
314+
@change="setShowCrosshairs"
315315
/>
316316
</div>
317317
<div style="flex-grow: 1">
318318
<v-switch
319319
:input-value="storeCrosshairs"
320-
@change="setStoreCrosshairs"
321320
label="Store crosshairs with decision"
322321
hide-details
323322
class="shrink pa-0 ml-n2"
323+
@change="setStoreCrosshairs"
324324
/>
325325
</div>
326326
</v-flex>
@@ -368,19 +368,19 @@ export default {
368368
>
369369
<v-btn
370370
:disabled="!currentViewData.upTo"
371-
@mousedown="handleKeyPress('previous')"
372371
small
373372
depressed
374373
class="transparent-btn"
374+
@mousedown="handleKeyPress('previous')"
375375
>
376376
<v-icon>fa-caret-up</v-icon>
377377
</v-btn>
378378
<v-btn
379379
:disabled="!currentViewData.downTo"
380-
@mousedown="handleKeyPress('next')"
381380
small
382381
depressed
383382
class="transparent-btn"
383+
@mousedown="handleKeyPress('next')"
384384
>
385385
<v-icon>fa-caret-down</v-icon>
386386
</v-btn>
@@ -403,19 +403,19 @@ export default {
403403
>
404404
<v-btn
405405
:disabled="!previousFrame"
406-
@mousedown="handleKeyPress('back')"
407406
small
408407
depressed
409408
class="transparent-btn"
409+
@mousedown="handleKeyPress('back')"
410410
>
411411
<v-icon>fa-caret-left</v-icon>
412412
</v-btn>
413413
<v-btn
414414
:disabled="!nextFrame"
415-
@mousedown="handleKeyPress('forward')"
416415
small
417416
depressed
418417
class="transparent-btn"
418+
@mousedown="handleKeyPress('forward')"
419419
>
420420
<v-icon>fa-caret-right</v-icon>
421421
</v-btn>
@@ -431,11 +431,11 @@ export default {
431431
>
432432
Window width
433433
<v-tooltip bottom>
434-
<template v-slot:activator="{ on, attrs }">
434+
<template #activator="{ on, attrs }">
435435
<v-icon
436436
v-bind="attrs"
437-
v-on="on"
438437
small
438+
v-on="on"
439439
>
440440
info
441441
</v-icon>
@@ -458,10 +458,10 @@ export default {
458458
class="align-center"
459459
hide-details
460460
>
461-
<template v-slot:prepend>
461+
<template #prepend>
462462
{{ winMin }}
463463
</template>
464-
<template v-slot:append>
464+
<template #append>
465465
<div class="pr-5 pt-2">
466466
{{ winMax }}
467467
</div>
@@ -485,11 +485,11 @@ export default {
485485
<v-col cols="4">
486486
Window level
487487
<v-tooltip bottom>
488-
<template v-slot:activator="{ on, attrs }">
488+
<template #activator="{ on, attrs }">
489489
<v-icon
490490
v-bind="attrs"
491-
v-on="on"
492491
small
492+
v-on="on"
493493
>
494494
info
495495
</v-icon>
@@ -511,10 +511,10 @@ export default {
511511
class="align-center"
512512
hide-details
513513
>
514-
<template v-slot:prepend>
514+
<template #prepend>
515515
{{ levMin }}
516516
</template>
517-
<template v-slot:append>
517+
<template #append>
518518
<div class="pr-5 pt-2">
519519
{{ levMax }}
520520
</div>
@@ -581,8 +581,8 @@ export default {
581581
v-if="editRights && (user.is_superuser || !lockOwner)"
582582
:loading="loadingLock"
583583
:disabled="loadingLock"
584-
@click="switchLock(experimentId, null, force=true)"
585584
color="primary"
585+
@click="switchLock(experimentId, null, force=true)"
586586
>
587587
{{ lockOwner ?"Steal edit access" :"Claim edit access" }}
588588
</v-btn>

‎client/src/components/DataImportExport.vue‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,13 @@ export default defineComponent({
111111
v-if="!exportOnly"
112112
top
113113
>
114-
<template v-slot:activator="{ on, attrs }">
114+
<template #activator="{ on, attrs }">
115115
<v-btn
116-
@click="importDialog = true"
117116
v-bind="attrs"
118-
v-on="on"
119117
text
120118
color="primary"
119+
v-on="on"
120+
@click="importDialog = true"
121121
>
122122
Import
123123
</v-btn>
@@ -129,14 +129,14 @@ export default defineComponent({
129129
v-if="!importOnly"
130130
top
131131
>
132-
<template v-slot:activator="{ on, attrs }">
132+
<template #activator="{ on, attrs }">
133133
<v-btn
134134
:disabled="exporting"
135-
@click="exportData"
136135
v-bind="attrs"
137-
v-on="on"
138136
text
139137
color="primary"
138+
v-on="on"
139+
@click="exportData"
140140
>
141141
<v-progress-circular
142142
v-if="exporting"
@@ -173,16 +173,16 @@ export default defineComponent({
173173
<v-spacer />
174174
<v-btn
175175
:disabled="importing"
176-
@click="importDialog = false"
177176
text
177+
@click="importDialog = false"
178178
>
179179
Cancel
180180
</v-btn>
181181
<v-btn
182182
:loading="importing"
183-
@click="importData"
184183
text
185184
color="primary"
185+
@click="importData"
186186
>
187187
Import
188188
</v-btn>
@@ -213,9 +213,9 @@ export default defineComponent({
213213
<v-card-actions>
214214
<v-spacer />
215215
<v-btn
216-
@click="importErrors = false"
217216
color="primary"
218217
text
218+
@click="importErrors = false"
219219
>
220220
Ok
221221
</v-btn>

‎client/src/components/DecisionButtons.vue‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import EvaluationResults from '@/components/EvaluationResults.vue';
77
88
export default {
99
name: 'DecisionButtons',
10-
inject: ['user', 'MIQAConfig'],
1110
components: {
1211
EvaluationResults,
1312
},
13+
inject: ['user', 'MIQAConfig'],
1414
data() {
1515
return {
1616
warnDecision: false,
@@ -238,12 +238,12 @@ export default {
238238
<v-subheader class="pa-0 ma-0">
239239
Indicate artifacts in this scan
240240
<v-tooltip bottom>
241-
<template v-slot:activator="{ on, attrs }">
241+
<template #activator="{ on, attrs }">
242242
<v-icon
243243
v-bind="attrs"
244-
v-on="on"
245244
small
246245
class="pl-2"
246+
v-on="on"
247247
>
248248
info
249249
</v-icon>
@@ -266,12 +266,12 @@ export default {
266266
Auto evaluation
267267
</v-subheader>
268268
<v-tooltip bottom>
269-
<template v-slot:activator="{ on, attrs }">
269+
<template #activator="{ on, attrs }">
270270
<v-icon
271271
v-bind="attrs"
272-
v-on="on"
273272
small
274273
style="height: 25px; padding: 5px"
274+
v-on="on"
275275
>
276276
info
277277
</v-icon>
@@ -296,12 +296,12 @@ export default {
296296
No Auto evaluation available
297297
</v-subheader>
298298
<v-tooltip bottom>
299-
<template v-slot:activator="{ on, attrs }">
299+
<template #activator="{ on, attrs }">
300300
<v-icon
301301
v-bind="attrs"
302-
v-on="on"
303302
small
304303
style="height: 25px; padding: 5px"
304+
v-on="on"
305305
>
306306
info
307307
</v-icon>
@@ -321,12 +321,12 @@ export default {
321321
v-for="([artifact, chipState]) in chips"
322322
v-bind="artifact"
323323
:key="artifact.value"
324-
@click="clickChip(artifact, chipState.state)"
325324
:outlined="chipState.outlined"
326325
:color="chipState.color"
327326
:text-color="chipState.textColor"
328327
:style="'text-decoration: '+chipState.textDecoration +'; margin-bottom: 3px;'"
329328
small
329+
@click="clickChip(artifact, chipState.state)"
330330
>
331331
{{ chipState.label }}
332332
</v-chip>
@@ -338,16 +338,16 @@ export default {
338338
class="pt-5"
339339
>
340340
<v-textarea
341-
@input="handleCommentChange"
341+
v-model="newComment"
342342
:counter="!warnDecision"
343343
:hide-details="warnDecision"
344-
v-model="newComment"
345344
filled
346345
no-resize
347346
height="75px"
348347
name="input-comment"
349348
label="Evaluation Comment"
350349
placeholder="Write a comment about the scan and submit a decision"
350+
@input="handleCommentChange"
351351
/>
352352
</v-col>
353353
</v-row>
@@ -372,8 +372,8 @@ export default {
372372
style="text-align: center"
373373
>
374374
<v-btn
375-
@click="handleCommentSave(option.code)"
376375
:color="option.color"
376+
@click="handleCommentSave(option.code)"
377377
>
378378
{{ option.label }}
379379
</v-btn>

0 commit comments

Comments
 (0)