From 4405537fe78a62085b3d3e57b46d8ad2bb3b2e87 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Wed, 12 Aug 2020 03:15:59 +0300
Subject: [PATCH 1/5] Implement pagination for banned MediaProxy URLs

---
 src/api/mediaProxyCache.js           |  4 ++--
 src/store/modules/mediaProxyCache.js | 19 ++++++++++---------
 src/views/mediaProxyCache/index.vue  | 28 +++++++++++++++++++++++++++-
 3 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/src/api/mediaProxyCache.js b/src/api/mediaProxyCache.js
index 0822d984..8c19a791 100644
--- a/src/api/mediaProxyCache.js
+++ b/src/api/mediaProxyCache.js
@@ -2,10 +2,10 @@ import request from '@/utils/request'
 import { getToken } from '@/utils/auth'
 import { baseName } from './utils'
 
-export async function listBannedUrls(page, authHost, token) {
+export async function listBannedUrls(page, pageSize, authHost, token) {
   return await request({
     baseURL: baseName(authHost),
-    url: `/api/pleroma/admin/media_proxy_caches?page=${page}`,
+    url: `/api/pleroma/admin/media_proxy_caches?page=${page}&page_size=${pageSize}`,
     method: 'get',
     headers: authHeaders(token)
   })
diff --git a/src/store/modules/mediaProxyCache.js b/src/store/modules/mediaProxyCache.js
index 815c14e4..8e675a44 100644
--- a/src/store/modules/mediaProxyCache.js
+++ b/src/store/modules/mediaProxyCache.js
@@ -5,16 +5,17 @@ import i18n from '@/lang'
 const mediaProxyCache = {
   state: {
     bannedUrls: [],
-    bannedUrlsCount: 0,
     currentPage: 1,
-    loading: false
+    loading: false,
+    pageSize: 50,
+    totalUrlsCount: 0
   },
   mutations: {
     SET_BANNED_URLS: (state, urls) => {
       state.bannedUrls = urls.map(el => { return { url: el } })
     },
-    SET_BANNED_URLS_COUNT: (state, count) => {
-      state.bannedUrlsCount = count
+    SET_TOTAL_URLS_COUNT: (state, count) => {
+      state.totalUrlsCount = count
     },
     SET_LOADING: (state, status) => {
       state.loading = status
@@ -24,11 +25,11 @@ const mediaProxyCache = {
     }
   },
   actions: {
-    async ListBannedUrls({ commit, getters }, page) {
+    async ListBannedUrls({ commit, getters, state }, { page }) {
       commit('SET_LOADING', true)
-      const response = await listBannedUrls(page, getters.authHost, getters.token)
+      const response = await listBannedUrls(page, state.pageSize, getters.authHost, getters.token)
       commit('SET_BANNED_URLS', response.data.urls)
-      // commit('SET_BANNED_URLS_COUNT', count)
+      commit('SET_TOTAL_URLS_COUNT', response.data.count)
       commit('SET_PAGE', page)
       commit('SET_LOADING', false)
     },
@@ -40,12 +41,12 @@ const mediaProxyCache = {
         duration: 5 * 1000
       })
       if (ban) {
-        dispatch('ListBannedUrls', state.currentPage)
+        dispatch('ListBannedUrls', { page: state.currentPage })
       }
     },
     async RemoveBannedUrls({ dispatch, getters, state }, urls) {
       await removeBannedUrls(urls, getters.authHost, getters.token)
-      dispatch('ListBannedUrls', state.currentPage)
+      dispatch('ListBannedUrls', { page: state.currentPage })
     }
   }
 }
diff --git a/src/views/mediaProxyCache/index.vue b/src/views/mediaProxyCache/index.vue
index 6c37082b..cecfa74e 100644
--- a/src/views/mediaProxyCache/index.vue
+++ b/src/views/mediaProxyCache/index.vue
@@ -46,6 +46,16 @@
         </template>
       </el-table-column>
     </el-table>
+    <div v-if="!loading" class="pagination">
+      <el-pagination
+        :total="urlsCount"
+        :current-page="currentPage"
+        :page-size="pageSize"
+        hide-on-single-page
+        layout="prev, pager, next"
+        @current-change="handlePageChange"
+      />
+    </div>
   </div>
 </template>
 
@@ -66,20 +76,29 @@ export default {
     bannedUrls() {
       return this.$store.state.mediaProxyCache.bannedUrls
     },
+    currentPage() {
+      return this.$store.state.mediaProxyCache.currentPage
+    },
     isDesktop() {
       return this.$store.state.app.device === 'desktop'
     },
     loading() {
       return this.$store.state.mediaProxyCache.loading
     },
+    pageSize() {
+      return this.$store.state.mediaProxyCache.pageSize
+    },
     removeSelectedDisabled() {
       return this.selectedUrls.length === 0
+    },
+    urlsCount() {
+      return this.$store.state.mediaProxyCache.totalUrlsCount
     }
   },
   mounted() {
     this.$store.dispatch('GetNodeInfo')
     this.$store.dispatch('NeedReboot')
-    this.$store.dispatch('ListBannedUrls', 1)
+    this.$store.dispatch('ListBannedUrls', { page: 1 })
   },
   methods: {
     evictURL() {
@@ -87,6 +106,9 @@ export default {
       this.$store.dispatch('PurgeUrls', { urls, ban: this.ban })
       this.urls = ''
     },
+    handlePageChange(page) {
+      this.$store.dispatch('ListBannedUrls', { page })
+    },
     handleSelectionChange(value) {
       this.$data.selectedUrls = value
     },
@@ -133,6 +155,10 @@ h1 {
   justify-content: space-between;
   margin: 10px 15px;
 }
+.pagination {
+  margin: 25px 0;
+  text-align: center;
+}
 .remove-url-button {
   width: 150px;
 }

From 997a9a6d4796542b22c3d47eff5e7195ed70d6c4 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Thu, 13 Aug 2020 15:37:25 +0300
Subject: [PATCH 2/5] Add search input

---
 src/views/mediaProxyCache/index.vue | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/views/mediaProxyCache/index.vue b/src/views/mediaProxyCache/index.vue
index cecfa74e..1141ccc0 100644
--- a/src/views/mediaProxyCache/index.vue
+++ b/src/views/mediaProxyCache/index.vue
@@ -27,9 +27,16 @@
         type="selection"
         align="center"
         width="55"/>
-      <el-table-column
-        :min-width="isDesktop ? 320 : 120"
-        prop="url"/>
+      <el-table-column :min-width="isDesktop ? 320 : 120" prop="url">
+        <template slot="header">
+          <el-input
+            :placeholder="$t('users.search')"
+            v-model="search"
+            size="mini"
+            prefix-icon="el-icon-search"
+            @input="handleDebounceSearchInput"/>
+        </template>
+      </el-table-column>
       <el-table-column>
         <template slot="header">
           <el-button
@@ -60,6 +67,7 @@
 </template>
 
 <script>
+import debounce from 'lodash.debounce'
 import RebootButton from '@/components/RebootButton'
 
 export default {
@@ -69,6 +77,7 @@ export default {
     return {
       urls: '',
       ban: false,
+      search: '',
       selectedUrls: []
     }
   },
@@ -95,6 +104,10 @@ export default {
       return this.$store.state.mediaProxyCache.totalUrlsCount
     }
   },
+  created() {
+    this.handleDebounceSearchInput = debounce((query) => {
+    }, 500)
+  },
   mounted() {
     this.$store.dispatch('GetNodeInfo')
     this.$store.dispatch('NeedReboot')

From 7638fa71bdc17164ce3e11b825b5923048f99058 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Fri, 14 Aug 2020 03:06:51 +0300
Subject: [PATCH 3/5] Implement Search for MediaproxyCache

---
 src/api/mediaProxyCache.js           |  9 +++++++++
 src/store/modules/mediaProxyCache.js | 17 ++++++++++++++++-
 src/views/mediaProxyCache/index.vue  |  3 ++-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/api/mediaProxyCache.js b/src/api/mediaProxyCache.js
index 8c19a791..30b63798 100644
--- a/src/api/mediaProxyCache.js
+++ b/src/api/mediaProxyCache.js
@@ -31,4 +31,13 @@ export async function removeBannedUrls(urls, authHost, token) {
   })
 }
 
+export async function searchBannedUrls(query, page, pageSize, authHost, token) {
+  return await request({
+    baseURL: baseName(authHost),
+    url: `/api/pleroma/admin/media_proxy_caches?query=${query}&page=${page}&page_size=${pageSize}`,
+    method: 'get',
+    headers: authHeaders(token)
+  })
+}
+
 const authHeaders = (token) => token ? { 'Authorization': `Bearer ${getToken()}` } : {}
diff --git a/src/store/modules/mediaProxyCache.js b/src/store/modules/mediaProxyCache.js
index 8e675a44..b15fdb34 100644
--- a/src/store/modules/mediaProxyCache.js
+++ b/src/store/modules/mediaProxyCache.js
@@ -1,4 +1,4 @@
-import { listBannedUrls, purgeUrls, removeBannedUrls } from '@/api/mediaProxyCache'
+import { listBannedUrls, purgeUrls, removeBannedUrls, searchBannedUrls } from '@/api/mediaProxyCache'
 import { Message } from 'element-ui'
 import i18n from '@/lang'
 
@@ -47,6 +47,21 @@ const mediaProxyCache = {
     async RemoveBannedUrls({ dispatch, getters, state }, urls) {
       await removeBannedUrls(urls, getters.authHost, getters.token)
       dispatch('ListBannedUrls', { page: state.currentPage })
+    },
+    async SearchUrls({ commit, dispatch, getters, state }, { query, page }) {
+      if (query.length === 0) {
+        commit('SET_SEARCH_QUERY', query)
+        dispatch('ListBannedUrls', { page })
+      } else {
+        commit('SET_LOADING', true)
+        commit('SET_SEARCH_QUERY', query)
+
+        const response = await searchBannedUrls(query, page, state.pageSize, getters.authHost, getters.token)
+        commit('SET_BANNED_URLS', response.data.urls)
+        commit('SET_TOTAL_URLS_COUNT', response.data.count)
+        commit('SET_PAGE', page)
+        commit('SET_LOADING', false)
+      }
     }
   }
 }
diff --git a/src/views/mediaProxyCache/index.vue b/src/views/mediaProxyCache/index.vue
index 1141ccc0..64dbe184 100644
--- a/src/views/mediaProxyCache/index.vue
+++ b/src/views/mediaProxyCache/index.vue
@@ -28,7 +28,7 @@
         align="center"
         width="55"/>
       <el-table-column :min-width="isDesktop ? 320 : 120" prop="url">
-        <template slot="header">
+        <template slot="header" slot-scope="scope">
           <el-input
             :placeholder="$t('users.search')"
             v-model="search"
@@ -106,6 +106,7 @@ export default {
   },
   created() {
     this.handleDebounceSearchInput = debounce((query) => {
+      this.$store.dispatch('SearchUrls', { query, page: 1 })
     }, 500)
   },
   mounted() {

From e4ba720a7d6dae0ef8358d10ad3e9580e1204e97 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Fri, 14 Aug 2020 03:17:50 +0300
Subject: [PATCH 4/5] Fix width

---
 src/views/invites/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/invites/index.vue b/src/views/invites/index.vue
index dceddc8c..5ed51462 100644
--- a/src/views/invites/index.vue
+++ b/src/views/invites/index.vue
@@ -49,7 +49,7 @@
         <div slot="header" class="clearfix">
           <span>{{ $t('invites.tokenCreated') }}</span>
         </div>
-        <el-form label-width="80px" class="new-token-card">
+        <el-form label-width="85px" class="new-token-card">
           <el-form-item :label="$t('invites.inviteLink')">
             <el-link :href="inviteLink" :underline="false" target="_blank">
               {{ inviteLink }}
@@ -186,7 +186,7 @@ export default {
       'authHost'
     ]),
     getLabelWidth() {
-      return this.isDesktop ? '100px' : '80px'
+      return this.isDesktop ? '100px' : '85px'
     },
     inviteLink() {
       return `${baseName(this.authHost)}/registration/${this.newToken.token}`

From 8dc408c5111252760fb26e072a3ea8ae7a3ab511 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Fri, 14 Aug 2020 03:26:05 +0300
Subject: [PATCH 5/5] Update Changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 116b247e..76fea781 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Ability to configure S3 settings on Upload tab
 - Show number of open reports in Sidebar Menu
 - Add confirmation message when deleting a user
+- Add new MediaProxy Cache with ability to evict and ban objects from the MediaProxy cache
 
 ### Changed
 
@@ -42,6 +43,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 - Send `true` and `false` as booleans if they are values of single selects on the Settings page
 - Fix sorting users on Users page if there is an acount with missing nickname or ID
+- Fix display `Pending` tag and filter by Pending Approval status
 
 ## [2.0.3] - 2020-04-29