Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(Dashboard): add option to change length and filter files #2051

Merged
merged 3 commits into from
Nov 24, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 25 additions & 2 deletions src/components/panels/Status/Gcodefiles.vue
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,37 @@ export default class StatusPanelGcodefiles extends Mixins(BaseMixin, ControlMixi
filesGcodeCard: Vue
}

get filesLimit() {
return this.$store.state.gui.uiSettings.dashboardFilesLimit ?? 5
}

get filesFilter() {
return this.$store.state.gui.uiSettings.dashboardFilesFilter ?? []
}

get gcodeFiles() {
let gcodes = this.$store.getters['files/getAllGcodes'] ?? []

if (this.filesFilter.length > 0 && this.filesFilter.length < 3) {
gcodes = gcodes.filter((file: FileStateGcodefile) => {
if (this.filesFilter.includes('new') && file.last_status === null) return true
if (this.filesFilter.includes('completed') && file.last_status === 'completed') return true
if (
this.filesFilter.includes('failed') &&
file.last_status !== null &&
file.last_status !== 'completed'
)
return true

return false
})
}

gcodes = gcodes
.slice()
.sort((a: FileStateGcodefile, b: FileStateGcodefile) => {
return b.modified.getTime() - a.modified.getTime()
})
.slice(0, 5)
.slice(0, this.filesLimit)

const requestItems = gcodes.filter(
(file: FileStateGcodefile) => !file.metadataRequested && !file.metadataPulled
Expand Down
11 changes: 9 additions & 2 deletions src/components/panels/StatusPanel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
</template>
<v-tabs v-model="activeTab" fixed-tabs>
<v-tab v-if="current_filename" href="#status">{{ $t('Panels.StatusPanel.Status') }}</v-tab>
<v-tab href="#files">{{ $t('Panels.StatusPanel.Files') }}</v-tab>
<v-tab v-if="displayFilesTab" href="#files">{{ $t('Panels.StatusPanel.Files') }}</v-tab>
<v-tab href="#jobqueue">
<v-badge :color="jobQueueBadgeColor" :content="jobsCount.toString()" :inline="true">
{{ $t('Panels.StatusPanel.Jobqueue') }}
Expand All @@ -102,7 +102,7 @@
<v-tab-item v-if="current_filename" value="status">
<status-panel-printstatus />
</v-tab-item>
<v-tab-item value="files">
<v-tab-item v-if="displayFilesTab" value="files">
<status-panel-gcodefiles />
</v-tab-item>
<v-tab-item value="jobqueue">
Expand Down Expand Up @@ -362,8 +362,15 @@ export default class StatusPanel extends Mixins(BaseMixin) {
return this.layer_count !== null && (this.existsSetPauseAtLayer || this.existsSetPauseNextLayer)
}

get displayFilesTab() {
const count = this.$store.state.gui.uiSettings.dashboardFilesLimit ?? 5

return count > 0
}

mounted() {
if (this.current_filename !== '') this.activeTab = 'status'
if (!this.displayFilesTab) this.activeTab = 'jobqueue'
}

@Watch('current_filename')
Expand Down
59 changes: 59 additions & 0 deletions src/components/settings/SettingsUiSettingsTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,32 @@
:dynamic-slot-width="true">
<v-switch v-model="hideUpdateWarnings" hide-details class="mt-0" />
</settings-row>
<v-divider class="my-2" />
<settings-row
:title="$t('Settings.UiSettingsTab.DashboardFilesLimit')"
:sub-title="$t('Settings.UiSettingsTab.DashboardFilesLimitDescription')">
<v-slider
v-model.lazy="dashboardFilesLimit"
hide-details
:min="0"
:max="10"
:step="1"
:label="
$t('Settings.UiSettingsTab.DashboardFilesLimitLabel', { count: dashboardFilesLimit })
" />
</settings-row>
<v-divider class="my-2" />
<settings-row
:title="$t('Settings.UiSettingsTab.DashboardFilesFilter')"
:sub-title="$t('Settings.UiSettingsTab.DashboardFilesFilterDescription')">
<v-select
v-model="dashboardFilesFilter"
:items="dashboardFilesFilters"
multiple
hide-details
dense
outlined />
</settings-row>
</v-card-text>
</v-card>
</div>
Expand Down Expand Up @@ -615,6 +641,39 @@ export default class SettingsUiSettingsTab extends Mixins(BaseMixin, ThemeMixin)
this.$store.dispatch('gui/saveSetting', { name: 'uiSettings.hideUpdateWarnings', value: newVal })
}

get dashboardFilesLimit() {
return this.$store.state.gui.uiSettings.dashboardFilesLimit ?? 5
}

set dashboardFilesLimit(newVal) {
this.$store.dispatch('gui/saveSetting', { name: 'uiSettings.dashboardFilesLimit', value: newVal })
}

get dashboardFilesFilter() {
return this.$store.state.gui.uiSettings.dashboardFilesFilter ?? []
}

set dashboardFilesFilter(newVal) {
this.$store.dispatch('gui/saveSetting', { name: 'uiSettings.dashboardFilesFilter', value: newVal })
}

get dashboardFilesFilters() {
return [
{
text: this.$t('Settings.UiSettingsTab.DashboardFilesFilterNew'),
value: 'new',
},
{
text: this.$t('Settings.UiSettingsTab.DashboardFilesFilterFailed'),
value: 'failed',
},
{
text: this.$t('Settings.UiSettingsTab.DashboardFilesFilterCompleted'),
value: 'completed',
},
]
}

clearColorObject(color: any): string {
if (typeof color === 'object' && 'hex' in color) color = color.hex
if (color.length > 7) color = color.substr(0, 7)
Expand Down
8 changes: 8 additions & 0 deletions src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1229,6 +1229,14 @@
"ConfirmOnEmergencyStopDescription": "Show a confirmation dialog on Emergency Stop",
"ConfirmOnPowerDeviceChange": "Require confirm on Device Power changes",
"ConfirmOnPowerDeviceChangeDescription": "Show a confirmation dialog on Device Power changes",
"DashboardFilesFilter": "Dashboard Files Filter",
"DashboardFilesFilterCompleted": "Completed",
"DashboardFilesFilterDescription": "Select which files should be displayed on the dashboard in the Status Panel.",
meteyou marked this conversation as resolved.
Show resolved Hide resolved
"DashboardFilesFilterFailed": "Failed",
"DashboardFilesFilterNew": "New",
"DashboardFilesLimit": "Dashboard Files Limit",
"DashboardFilesLimitDescription": "Select the maximum number of files to display on the dashboard in the Status Panel. (0 will hide the files tab)",
meteyou marked this conversation as resolved.
Show resolved Hide resolved
"DashboardFilesLimitLabel": "{count} files",
"DefaultNavigationState": "Navigation default state",
"DefaultNavigationStateAlwaysClosed": "always closed",
"DefaultNavigationStateAlwaysOpen": "always open",
Expand Down
2 changes: 2 additions & 0 deletions src/store/gui/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,8 @@ export const getDefaultState = (): GuiState => {
tempchartHeight: 250,
hideUpdateWarnings: false,
printstatusThumbnailZoom: true,
dashboardFilesLimit: 5,
dashboardFilesFilter: ['new', 'failed', 'completed'],
},
view: {
blockFileUpload: false,
Expand Down
4 changes: 4 additions & 0 deletions src/store/gui/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@ export interface GuiState {
tempchartHeight: number
hideUpdateWarnings: boolean
printstatusThumbnailZoom: boolean
dashboardFilesLimit: number
dashboardFilesFilter: GuiStateUiSettingsDashboardFilesFilter[]
}
view: {
blockFileUpload: boolean
Expand Down Expand Up @@ -214,3 +216,5 @@ export interface GuiStateLayoutoption {
name: string
visible: boolean
}

export type GuiStateUiSettingsDashboardFilesFilter = 'new' | 'failed' | 'completed'
Loading