Skip to content

Commit 687ede4

Browse files
committed
Merge branch 'develop'
Signed-off-by: Pedro Lamas <pedrolamas@gmail.com>
2 parents a4b4652 + c2b90bd commit 687ede4

19 files changed

+308
-202
lines changed

package-lock.json

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

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
"vue-router": "^3.6.5",
7070
"vue-virtual-scroller": "^1.1.2",
7171
"vuedraggable": "^2.24.3",
72-
"vuetify": "^2.6.15",
72+
"vuetify": "^2.7.1",
7373
"vuetify-confirm": "^2.0.6",
7474
"vuex": "^3.6.2"
7575
},
@@ -80,7 +80,7 @@
8080
"@types/jsdom": "^21.1.1",
8181
"@types/lodash-es": "^4.17.8",
8282
"@types/md5": "^2.3.2",
83-
"@types/node": "^18.17.3",
83+
"@types/node": "^18.17.4",
8484
"@types/semver": "^7.5.0",
8585
"@types/sortablejs": "^1.15.1",
8686
"@types/uuid": "^9.0.2",
@@ -92,7 +92,7 @@
9292
"@vue/test-utils": "^1.3.6",
9393
"@vue/tsconfig": "^0.1.3",
9494
"eslint": "^8.46.0",
95-
"eslint-plugin-vue": "^9.16.1",
95+
"eslint-plugin-vue": "^9.17.0",
9696
"husky": "^8.0.3",
9797
"jsdom": "^22.1.0",
9898
"madge": "^5.0.1",
@@ -103,7 +103,7 @@
103103
"standard-version": "^9.5.0",
104104
"typescript": "^5.1.6",
105105
"unplugin-vue-components": "^0.25.1",
106-
"vite": "^4.4.8",
106+
"vite": "^4.4.9",
107107
"vite-plugin-checker": "^0.6.1",
108108
"vite-plugin-monaco-editor": "^1.1.0",
109109
"vite-plugin-pwa": "^0.16.4",

src/components/layout/AppUploadAndPrintBtn.vue

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
</template>
3333

3434
<script lang="ts">
35+
import { RootProperties } from '@/store/files/types'
3536
import { Component, Vue, Ref, Prop } from 'vue-property-decorator'
3637
3738
@Component({})
@@ -42,8 +43,12 @@ export default class AppUploadAndPrintBtn extends Vue {
4243
@Ref('uploadFile')
4344
readonly uploadFile!: HTMLInputElement
4445
46+
get rootProperties (): RootProperties {
47+
return this.$store.getters['files/getRootProperties']('gcodes') as RootProperties
48+
}
49+
4550
get accepts () {
46-
return this.$store.getters['files/getRootProperties']('gcodes').accepts.join(',')
51+
return this.rootProperties.accepts.join(',')
4752
}
4853
4954
fileChanged (e: Event) {

src/components/widgets/filesystem/FileEditorDialog.vue

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -204,10 +204,6 @@ export default class FileEditorDialog extends Mixins(StateMixin, BrowserMixin) {
204204
return this.$store.state.files.uploads.length > 0
205205
}
206206
207-
get rootProperties () {
208-
return this.$store.getters['files/getRootProperties'](this.root)
209-
}
210-
211207
get configMap () {
212208
return this.$store.getters['server/getConfigMapByFilename'](this.filename)
213209
}

0 commit comments

Comments
 (0)