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

CHANGELOG.md

@@ -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
 - 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
+- Active and Local filters are applied by default on the Users tab
 
 ### Fixed
 

src/views/reports/components/Report.vue

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

src/views/users/components/UsersFilter.vue

@@ -21,7 +21,7 @@
 export default {
   data() {
     return {
-      value: []
+      value: ['local', 'active']
     }
   },
   computed: {
@@ -29,6 +29,10 @@ export default {
       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: {
     removeOppositeFilters() {
       const filtersQuantity = Object.keys(this.$store.state.users.filters).length

src/views/users/index.vue

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