-
-
Notifications
You must be signed in to change notification settings - Fork 389
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into feature/improve_chunking
- Loading branch information
Showing
52 changed files
with
1,822 additions
and
245 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| # Set update schedule for GitHub Actions | ||
|
|
||
| version: 2 | ||
| updates: | ||
| - package-ecosystem: 'github-actions' | ||
| directory: '/' | ||
| schedule: | ||
| # Check for updates to GitHub Actions every week | ||
| interval: 'weekly' | ||
|
|
||
| - package-ecosystem: 'npm' | ||
| directory: '/' | ||
| schedule: | ||
| interval: 'weekly' | ||
| allow: | ||
| # Ignore major updates to all dependencies. We're using old versions of some packages that are incompatible with newer versions of other packages. | ||
| - dependency-name: '*' | ||
| update-type: 'semver:non-major' | ||
| dependency-type: 'direct' | ||
| assignees: | ||
| - 'meteyou' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,174 @@ | ||
| <template> | ||
| <div> | ||
| <v-dialog v-model="showDialog" width="800" persistent :fullscreen="isMobile"> | ||
| <panel | ||
| :title="$t('Panels.SpoolmanPanel.ChangeSpool')" | ||
| :icon="mdiAdjust" | ||
| card-class="spoolman-change-spool-dialog" | ||
| :margin-bottom="false"> | ||
| <template #buttons> | ||
| <v-btn icon tile @click="close"> | ||
| <v-icon>{{ mdiCloseThick }}</v-icon> | ||
| </v-btn> | ||
| </template> | ||
| <v-card-title> | ||
| <v-text-field | ||
| v-model="search" | ||
| :append-icon="mdiMagnify" | ||
| :label="$t('Panels.SpoolmanPanel.Search')" | ||
| outlined | ||
| dense | ||
| hide-details | ||
| style="max-width: 300px" /> | ||
| <v-spacer /> | ||
| <v-btn | ||
| :title="$t('Panels.SpoolmanPanel.Refresh')" | ||
| class="px-2 minwidth-0 ml-3" | ||
| :loading="loadings.includes('refreshSpools')" | ||
| @click="refreshSpools"> | ||
| <v-icon>{{ mdiRefresh }}</v-icon> | ||
| </v-btn> | ||
| <v-btn | ||
| :title="$t('Panels.SpoolmanPanel.OpenSpoolManager')" | ||
| class="px-2 minwidth-0 ml-3" | ||
| @click="openSpoolManager"> | ||
| <v-icon>{{ mdiDatabase }}</v-icon> | ||
| </v-btn> | ||
| </v-card-title> | ||
| <v-card-text class="px-0 pb-0"> | ||
| <v-data-table | ||
| :headers="headers" | ||
| :items="spools" | ||
| item-key="id" | ||
| :search="search" | ||
| sort-by="last_used" | ||
| :sort-desc="true" | ||
| :custom-filter="customFilter"> | ||
| <template #no-data> | ||
| <div class="text-center">{{ $t('Panels.SpoolmanPanel.NoSpools') }}</div> | ||
| </template> | ||
| <template #no-results> | ||
| <div class="text-center">{{ $t('Panels.SpoolmanPanel.NoResults') }}</div> | ||
| </template> | ||
|
|
||
| <template #item="{ item }"> | ||
| <SpoolmanChangeSpoolDialogRow :key="item.id" :spool="item" @set-spool="setSpool" /> | ||
| </template> | ||
| </v-data-table> | ||
| </v-card-text> | ||
| </panel> | ||
| </v-dialog> | ||
| </div> | ||
| </template> | ||
|
|
||
| <script lang="ts"> | ||
| import Component from 'vue-class-component' | ||
| import { Mixins, Prop, Watch } from 'vue-property-decorator' | ||
| import BaseMixin from '@/components/mixins/base' | ||
| import Panel from '@/components/ui/Panel.vue' | ||
| import { mdiCloseThick, mdiAdjust, mdiDatabase, mdiMagnify, mdiRefresh } from '@mdi/js' | ||
| import { ServerSpoolmanStateSpool } from '@/store/server/spoolman/types' | ||
| import SpoolmanChangeSpoolDialogRow from '@/components/dialogs/SpoolmanChangeSpoolDialogRow.vue' | ||
| @Component({ | ||
| components: { SpoolmanChangeSpoolDialogRow, Panel }, | ||
| }) | ||
| export default class SpoolmanChangeSpoolDialog extends Mixins(BaseMixin) { | ||
| mdiAdjust = mdiAdjust | ||
| mdiCloseThick = mdiCloseThick | ||
| mdiDatabase = mdiDatabase | ||
| mdiMagnify = mdiMagnify | ||
| mdiRefresh = mdiRefresh | ||
| @Prop({ required: true }) declare readonly showDialog: boolean | ||
| search = '' | ||
| get spools(): ServerSpoolmanStateSpool[] { | ||
| return this.$store.state.server.spoolman.spools ?? [] | ||
| } | ||
| get headers() { | ||
| return [ | ||
| { | ||
| text: ' ', | ||
| align: 'start', | ||
| sortable: false, | ||
| }, | ||
| { | ||
| text: this.$t('Panels.SpoolmanPanel.Filament'), | ||
| align: 'start', | ||
| value: 'filament.name', | ||
| sortable: false, | ||
| }, | ||
| { | ||
| text: this.$t('Panels.SpoolmanPanel.Material'), | ||
| align: 'center', | ||
| value: 'filament.material', | ||
| }, | ||
| { | ||
| text: this.$t('Panels.SpoolmanPanel.LastUsed'), | ||
| align: 'end', | ||
| value: 'last_used', | ||
| }, | ||
| { | ||
| text: this.$t('Panels.SpoolmanPanel.Weight'), | ||
| align: 'end', | ||
| value: 'remaining_weight', | ||
| }, | ||
| ] | ||
| } | ||
| get spoolManagerUrl() { | ||
| return this.$store.state.server.config.config?.spoolman?.server ?? null | ||
| } | ||
| openSpoolManager() { | ||
| window.open(this.spoolManagerUrl, '_blank') | ||
| } | ||
| mounted() { | ||
| this.refresh() | ||
| } | ||
| refresh() { | ||
| this.$store.dispatch('server/spoolman/refreshSpools') | ||
| } | ||
| close() { | ||
| this.$emit('close') | ||
| } | ||
| refreshSpools() { | ||
| this.$store.dispatch('server/spoolman/refreshSpools') | ||
| } | ||
| customFilter(value: any, search: string, item: ServerSpoolmanStateSpool): boolean { | ||
| const querySplits = search.toLowerCase().split(' ') | ||
| const searchArray = [ | ||
| item.comment, | ||
| item.filament.name, | ||
| item.filament.vendor.name, | ||
| item.filament.material, | ||
| item.location, | ||
| ] | ||
| for (const query of querySplits) { | ||
| const result = searchArray.some((q) => q?.toLowerCase().includes(query)) | ||
| if (!result) return false | ||
| } | ||
| return true | ||
| } | ||
| setSpool(spool: ServerSpoolmanStateSpool) { | ||
| this.$store.dispatch('server/spoolman/setActiveSpool', spool.id) | ||
| this.close() | ||
| } | ||
| @Watch('showDialog') | ||
| onShowDialogChanged(newVal: boolean) { | ||
| if (newVal) this.search = '' | ||
| } | ||
| } | ||
| </script> |
Oops, something went wrong.