Merge branch 'feature/apply-filters-on-users-tab' into 'develop'

Apply default 'local' and 'active' filters on users tab

Closes #133

See merge request pleroma/admin-fe!148
This commit is contained in:
Angelina Filippova 2020-07-28 19:21:01 +00:00
commit e8e43c236d
4 changed files with 18 additions and 15 deletions

View file

@ -36,6 +36,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Move rendering Crontab setting from a separate component to EditableKeyword component - Move rendering Crontab setting from a separate component to EditableKeyword component
- Show only those MRF settings that have been enabled in MRF Policies setting - Show only those MRF settings that have been enabled in MRF Policies setting
- Move Auto Linker settings to Link Formatter Tab as its configuration was moved to :pleroma, Pleroma.Formatter - Move Auto Linker settings to Link Formatter Tab as its configuration was moved to :pleroma, Pleroma.Formatter
- Active and Local filters are applied by default on the Users tab
### Fixed ### Fixed

View file

@ -245,10 +245,6 @@ export default {
.el-icon-arrow-right { .el-icon-arrow-right {
margin-right: 6px; margin-right: 6px;
} }
.el-icon-close {
padding: 10px 5px 10px 10px;
cursor: pointer;
}
.id { .id {
color: gray; color: gray;
margin-top: 6px; margin-top: 6px;

View file

@ -21,7 +21,7 @@
export default { export default {
data() { data() {
return { return {
value: [] value: ['local', 'active']
} }
}, },
computed: { computed: {
@ -29,6 +29,10 @@ export default {
return this.$store.state.app.device === 'desktop' return this.$store.state.app.device === 'desktop'
} }
}, },
created() {
const currentFilters = this.$data.value.reduce((acc, filter) => ({ ...acc, [filter]: true }), {})
this.$store.dispatch('ToggleUsersFilter', currentFilters)
},
methods: { methods: {
removeOppositeFilters() { removeOppositeFilters() {
const filtersQuantity = Object.keys(this.$store.state.users.filters).length const filtersQuantity = Object.keys(this.$store.state.users.filters).length

View file

@ -329,16 +329,18 @@ export default {
flex-direction: column; flex-direction: column;
margin: 0 10px margin: 0 10px
} }
.el-tag { .el-table__row {
width: 30px; .el-tag {
display: inline-block; width: 30px;
margin-bottom: 4px; display: inline-block;
font-weight: bold; margin-bottom: 4px;
&.el-tag--success { font-weight: bold;
padding-left: 8px; &.el-tag--success {
} padding-left: 8px;
&.el-tag--danger { }
padding-left: 8px; &.el-tag--danger {
padding-left: 8px;
}
} }
} }
.reboot-button { .reboot-button {