diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d64836a..e03f5f56 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,8 +15,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Filter users by actor type: Person, Bot or Application - Add ability to configure Media Preview Proxy, User Backup, Websocket based federation and Pleroma.Web.Endpoint.MetricsExporter settings - Mobile and Tablet UI for Single Report show page +- Ability to set rules and conditions for rendering settings (e.g. `:proxy_remote` setting is hidden if `:uploader` setting is set to `Pleroma.Uploaders.Local`) ### Changed +- **Breaking**: AdminAPI changed User field `confirmation_pending` to `is_confirmed` +- **Breaking**: AdminAPI changed User field `approval_pending` to `is_approved` +- **Breaking**: AdminAPI changed User field `deactivated` to `is_active` - Hide Tag actions on Users tab if MRF TagPolicy is disabled. Add ability to enable TagPolicy from Moderation menu - Move `:restrict_unauthenticated` settings from Authentication tab to Instance tab - Replace regular inputs with textareas for setting welcome messages in the Settings section @@ -24,6 +28,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Remove Websocket based federation settings - Move Settings tab navigation from the tabbed menu to the main sidebar menu. A separate route is created for each tab. - Move Emoji packs configuration to the Emoji tab in the Settings section +- 401 and 404 error pages updated +- Remove unused components ### Fixed @@ -32,7 +38,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Fix wrapping `:icons` setting and parsing tuples in settings with key `:headers` - Update keys for Pleroma.Web.Plugs.RemoteIp and PurgeExpiredActivity settings - Update switching between local and remote emoji packs panels: the panel with the pack's metadata will be closed when another panel is opened - +- Fix displaying messages for multiple errors ## [2.2] - 2020-11-18 ### Added diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 1b6d4d75..85086449 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -48,7 +48,7 @@ const devWebpackConfig = merge(baseWebpackConfig, { poll: config.dev.poll }, headers: { - 'content-security-policy': "base-uri 'self'; frame-ancestors 'none'; img-src 'self' data: https: http:; media-src 'self' https:; style-src 'self' 'unsafe-inline'; font-src 'self'; manifest-src 'self'; script-src 'self';" + 'content-security-policy': "script-src 'self' 'unsafe-eval'; base-uri 'self'; frame-ancestors 'none'; img-src 'self' data: https: http:; media-src 'self' https:; style-src 'self' 'unsafe-inline'; font-src 'self'; manifest-src 'self'" } }, plugins: [ @@ -67,7 +67,12 @@ const devWebpackConfig = merge(baseWebpackConfig, { BASE_URL: devEnv.ASSETS_PUBLIC_PATH + config.dev.assetsSubDirectory, }, }), - ] + ], + resolve: { + alias: { + vue: 'vue/dist/vue.js' + } + } }) module.exports = new Promise((resolve, reject) => { diff --git a/src/api/__mocks__/chat.js b/src/api/__mocks__/chat.js index 946673b1..75692ea7 100644 --- a/src/api/__mocks__/chat.js +++ b/src/api/__mocks__/chat.js @@ -44,7 +44,7 @@ export const userChats = [ accepts_chat_messages: true, ap_id: 'http://localhost:4000/users/test10', background_image: null, - confirmation_pending: false, + is_confirmed: true, favicon: null, hide_favorites: true, hide_followers: false, @@ -99,7 +99,7 @@ export const userChats = [ accepts_chat_messages: true, ap_id: 'https://localhost/users/mk', background_image: null, - confirmation_pending: false, + is_confirmed: true, favicon: null, hide_favorites: true, hide_followers: false, @@ -168,7 +168,7 @@ export const userChats = [ accepts_chat_messages: true, ap_id: 'http://localhost:4000/users/user2', background_image: null, - confirmation_pending: true, + is_confirmed: false, favicon: null, hide_favorites: true, hide_followers: false, @@ -222,7 +222,7 @@ export const userChats = [ accepts_chat_messages: true, ap_id: 'https://localhost/users/mk', background_image: null, - confirmation_pending: false, + is_confirmed: true, favicon: null, hide_favorites: true, hide_followers: false, @@ -286,7 +286,7 @@ export const userChats = [ accepts_chat_messages: true, ap_id: 'https://localhost/users/mk', background_image: null, - confirmation_pending: false, + is_confirmed: true, favicon: null, hide_favorites: true, hide_followers: false, @@ -344,7 +344,7 @@ export const userChats = [ accepts_chat_messages: true, ap_id: 'https://localhost/users/mk', background_image: null, - confirmation_pending: false, + is_confirmed: true, favicon: null, hide_favorites: true, hide_followers: false, diff --git a/src/api/__mocks__/login.js b/src/api/__mocks__/login.js index a980f88b..d03d7ca3 100644 --- a/src/api/__mocks__/login.js +++ b/src/api/__mocks__/login.js @@ -43,7 +43,7 @@ export function getUserInfo(token, authHost) { 'statuses_count': 0, 'cover_photo': '', 'hide_follows': false, - 'pleroma': { 'confirmation_pending': false, 'deactivated': false, 'tags': ['force_nsfw'], 'is_admin': true }, + 'pleroma': { 'is_confirmed': true, 'is_active': true, 'tags': ['force_nsfw'], 'is_admin': true }, 'profile_image_url_original': '', 'created_at': 'Fri Mar 01 15:15:19 +0000 2019', 'fields': [], diff --git a/src/api/__mocks__/users.js b/src/api/__mocks__/users.js index a389d7f4..b419ff3d 100644 --- a/src/api/__mocks__/users.js +++ b/src/api/__mocks__/users.js @@ -1,12 +1,12 @@ import userChats from './chat' export let users = [ - { active: true, approval_pending: false, deactivated: false, id: '2', nickname: 'allis', local: true, external: false, roles: { admin: true, moderator: false }, tags: [], actor_type: 'Person' }, - { active: true, approval_pending: false, deactivated: false, id: '10', nickname: 'bob', local: true, external: false, roles: { admin: false, moderator: false }, tags: ['mrf_tag:sandbox'], actor_type: 'Person' }, - { active: true, approval_pending: true, deactivated: false, id: '567', nickname: 'ded', local: false, external: true, roles: { admin: false, moderator: false }, tags: [], actor_type: 'Person' }, - { active: false, approval_pending: false, deactivated: true, id: 'abc', nickname: 'john', local: true, external: false, roles: { admin: false, moderator: false }, tags: ['mrf_tag:media-strip'], actor_type: 'Person' }, - { active: true, approval_pending: true, deactivated: false, id: '100', nickname: 'sally', local: true, external: false, roles: { admin: false, moderator: false }, tags: [], actor_type: 'Service' }, - { active: true, approval_pending: true, deactivated: false, id: '123', nickname: 'bot', local: true, external: false, roles: { admin: false, moderator: false }, tags: [], actor_type: 'Application' } + { is_confirmed: true, is_approved: true, is_active: true, id: '2', nickname: 'allis', local: true, external: false, roles: { admin: true, moderator: false }, tags: [], actor_type: 'Person' }, + { is_confirmed: true, is_approved: true, is_active: true, id: '10', nickname: 'bob', local: true, external: false, roles: { admin: false, moderator: false }, tags: ['mrf_tag:sandbox'], actor_type: 'Person' }, + { is_confirmed: true, is_approved: false, is_active: true, id: '567', nickname: 'ded', local: false, external: true, roles: { admin: false, moderator: false }, tags: [], actor_type: 'Person' }, + { is_confirmed: true, is_approved: true, is_active: false, id: 'abc', nickname: 'john', local: true, external: false, roles: { admin: false, moderator: false }, tags: ['mrf_tag:media-strip'], actor_type: 'Person' }, + { is_confirmed: true, is_approved: false, is_active: true, id: '100', nickname: 'sally', local: true, external: false, roles: { admin: false, moderator: false }, tags: [], actor_type: 'Service' }, + { is_confirmed: true, is_approved: false, is_active: true, id: '123', nickname: 'bot', local: true, external: false, roles: { admin: false, moderator: false }, tags: [], actor_type: 'Application' } ] const userProfile = { avatar: 'avatar.jpg', nickname: 'allis', id: '2', tags: [], roles: { admin: true, moderator: false }, local: true, external: false } @@ -17,26 +17,6 @@ const userStatuses = [ { account: { id: '9n1bySks25olxWrku0', nickname: 'dolin' }, content: 'what is yout favorite pizza?', id: '9jop82OBXeFPYulVjM', created_at: '2020-05-22T17:34:34.000Z', visibility: 'public' } ] -const filterUsers = (str) => { - const filters = str.split(',').filter(item => item.length > 0) - if (filters.length === 0) { - return users - } - const applyFilters = (acc, filters, users) => { - if (filters.length === 0) { - return acc - } - const filteredUsers = users.filter(user => user[filters[0]]) - const newAcc = [...filteredUsers] - return applyFilters(newAcc, filters.slice(1), filteredUsers) - } - return applyFilters([], filters, users) -} - -const filterUsersByActorType = filters => { - return users.filter(user => filters.includes(user.actor_type)) -} - export async function fetchUser(id, authHost, token) { return Promise.resolve({ data: userProfile }) } @@ -46,12 +26,9 @@ export async function fetchUserCredentials(nickname, authHost, token) { } export async function fetchUsers(filters, actorTypeFilters, authHost, token, page = 1) { - const filteredUsers = filterUsers(filters) - const filteredByActorTypeUsers = filterUsersByActorType(actorTypeFilters) - const response = actorTypeFilters.length === 0 ? filteredUsers : filteredByActorTypeUsers return Promise.resolve({ data: { - users: response, - count: response.length, + users, + count: users.length, page_size: 50 }}) } @@ -69,12 +46,10 @@ export async function getPasswordResetToken(nickname, authHost, token) { } export async function searchUsers(query, filters, actorTypeFilters, authHost, token, page = 1) { - const filteredUsers = filterUsers(filters) - const filteredByActorTypeUsers = filterUsersByActorType(actorTypeFilters) - const response = actorTypeFilters.length === 0 ? filteredUsers : filteredByActorTypeUsers + const response = users.filter(user => user.nickname === query) return Promise.resolve({ data: { - users: response.filter(user => user.nickname === query), - count: response.filter(user => user.nickname === query).length, + users: response, + count: response.length, page_size: 50 }}) } @@ -82,7 +57,7 @@ export async function searchUsers(query, filters, actorTypeFilters, authHost, to export async function activateUsers(nicknames, authHost, token) { const response = nicknames.map(nickname => { const currentUser = users.find(user => user.nickname === nickname) - return { ...currentUser, deactivated: false } + return { ...currentUser, is_active: true } }) return Promise.resolve({ data: response }) } @@ -96,7 +71,7 @@ export async function addRight(nicknames, right, authHost, token) { export async function deactivateUsers(nicknames, authHost, token) { const response = nicknames.map(nickname => { const currentUser = users.find(user => user.nickname === nickname) - return { ...currentUser, deactivated: true } + return { ...currentUser, is_active: false } }) return Promise.resolve({ data: response }) } @@ -104,7 +79,7 @@ export async function deactivateUsers(nicknames, authHost, token) { export async function approveUserAccount(nicknames, authHost, token) { const response = nicknames.map(nickname => { const currentUser = users.find(user => user.nickname === nickname) - return { ...currentUser, approval_pending: false } + return { ...currentUser, is_approved: true } }) return Promise.resolve({ data: response }) } @@ -130,7 +105,7 @@ export async function untagUser(nickname, tag, authHost, token) { } export async function createNewAccount(nickname, email, password, authHost, token) { - const newUser = { active: true, deactivated: false, id: '15', nickname, local: true, external: false, roles: { admin: false, moderator: false }, tags: [] } + const newUser = { active: true, is_active: true, id: '15', nickname, local: true, external: false, roles: { admin: false, moderator: false }, tags: [] } users = [...users, newUser] return Promise.resolve() } diff --git a/src/lang/en.js b/src/lang/en.js index 8b5578e4..69c1fe82 100644 --- a/src/lang/en.js +++ b/src/lang/en.js @@ -74,6 +74,16 @@ export default { mediaProxyCache: 'MediaProxy Cache', 'emoji-packs': 'Emoji packs' }, + errLog: { + error401: 'Oops! 401 Error', + error404: 'Oops! 404 Error', + pageNotFound: 'Page not found', + correctUrl: 'Please make sure you URL is correct', + unauth: 'Unauthorized', + back: 'Back', + login: 'Login', + homePage: 'Home Page' + }, navbar: { logOut: 'Log Out', dashboard: 'Dashboard', @@ -87,7 +97,7 @@ export default { logInViaPleromaFE: 'Log in via PleromaFE', username: 'username@host', password: 'password', - omitHostname: 'omit hostname if Pleroma is located on this domain', + omitHostname: 'Omit hostname if Pleroma is located on this domain', errorMessage: 'Username must contain username and host, e.g. john@pleroma.social', any: 'any', thirdparty: 'Or connect with', @@ -159,11 +169,6 @@ export default { confirm: 'Confirm', unfollow: 'Unfollow' }, - errorLog: { - tips: 'Please click the bug icon in the upper right corner', - description: 'Now the management system are basically the form of the spa, it enhances the user experience, but it also increases the possibility of page problems, a small negligence may lead to the entire page deadlock. Fortunately Vue provides a way to catch handling exceptions, where you can handle errors or report exceptions.', - documentation: 'Document introduction' - }, excel: { export: 'Export', selectedExport: 'Export Selected Items', @@ -486,7 +491,8 @@ export default { invalidEmailError: 'Please input valid e-mail', emailSent: 'Invite was sent', submitFormError: 'There are invalid values in the form. Please fix them before continuing.', - inviteViaEmailAlert: 'To send invite via email make sure to enable `invites_enabled` and disable `registrations_open`' + inviteViaEmailAlert: 'To send invite via email make sure to enable `invites_enabled` and disable `registrations_open`', + copyLink: 'Copy link' }, emoji: { emojiPacks: 'Emoji packs', diff --git a/src/lang/es.js b/src/lang/es.js index 25231eca..fd094b36 100755 --- a/src/lang/es.js +++ b/src/lang/es.js @@ -127,11 +127,6 @@ export default { cancel: 'Cancelar', confirm: 'Confirmar' }, - errorLog: { - tips: 'Please click the bug icon in the upper right corner', - description: 'Now the management system are basically the form of the spa, it enhances the user experience, but it also increases the possibility of page problems, a small negligence may lead to the entire page deadlock. Fortunately Vue provides a way to catch handling exceptions, where you can handle errors or report exceptions.', - documentation: 'Documento de introducción' - }, excel: { export: 'Exportar', selectedExport: 'Exportar seleccionados', diff --git a/src/lang/oc.js b/src/lang/oc.js index 088f5acb..e181ab86 100644 --- a/src/lang/oc.js +++ b/src/lang/oc.js @@ -128,11 +128,6 @@ export default { cancel: 'Anullar', confirm: 'Confirmar' }, - errorLog: { - tips: 'Mercés de clicar l’’icòna del babau amont a man drecha', - description: 'Ara que lo sistèma de gestion es coma un spa, melhora l’experiéncia dels utilizaire mas aumenta tanben lo risc de problèmas sus la pagina, una pichona negligéncia pòt menar a un blocatge complèt de la pagina. Urosament Vue fornís de manièras per gerir las excepcions, trobar las errors o senhalar las excepcions.', - documentation: 'Presentacion del document' - }, excel: { export: 'Exportar', selectedExport: 'Exportar los elements seleccionats', diff --git a/src/lang/zh.js b/src/lang/zh.js index a28771c5..7933d584 100644 --- a/src/lang/zh.js +++ b/src/lang/zh.js @@ -127,11 +127,6 @@ export default { cancel: '取 消', confirm: '确 定' }, - errorLog: { - tips: '请点击右上角bug小图标', - description: '现在的管理后台基本都是spa的形式了,它增强了用户体验,但同时也会增加页面出问题的可能性,可能一个小小的疏忽就导致整个页面的死锁。好在 Vue 官网提供了一个方法来捕获处理异常,你可以在其中进行错误处理或者异常上报。', - documentation: '文档介绍' - }, excel: { export: '导出', selectedExport: '导出已选择项', diff --git a/src/router/index.js b/src/router/index.js index 60b39bfe..4d046318 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -104,7 +104,7 @@ const moderationLog = { children: [ { path: 'index', - component: () => import('@/views/moderation_log/index'), + component: () => import('@/views/moderationLog/index'), name: 'Moderation Log', meta: { title: 'moderationLog', icon: 'el-icon-notebook-2', noCache: true } } diff --git a/src/store/modules/reports.js b/src/store/modules/reports.js index 2589daa4..7c45070b 100644 --- a/src/store/modules/reports.js +++ b/src/store/modules/reports.js @@ -56,7 +56,7 @@ const reports = { return } finally { const updatedReports = state.fetchedReports.map(report => { - const updatedAccount = { ...user, deactivated: false } + const updatedAccount = { ...user, is_active: true } return report.id === reportId ? { ...report, account: updatedAccount } : report }) commit('SET_REPORTS', updatedReports) @@ -69,7 +69,7 @@ const reports = { } catch (_e) { return } finally { - const updatedReport = { ...state.singleReport, account: { ...user, deactivated: false }} + const updatedReport = { ...state.singleReport, account: { ...user, is_active: true }} commit('SET_SINGLE_REPORT', updatedReport) } dispatch('SuccessMessage') @@ -124,7 +124,7 @@ const reports = { return } finally { const updatedReports = state.fetchedReports.map(report => { - const updatedAccount = { ...user, deactivated: true } + const updatedAccount = { ...user, is_active: false } return report.id === reportId ? { ...report, account: updatedAccount } : report }) commit('SET_REPORTS', updatedReports) @@ -137,7 +137,7 @@ const reports = { } catch (_e) { return } finally { - const updatedReport = { ...state.singleReport, account: { ...user, deactivated: true }} + const updatedReport = { ...state.singleReport, account: { ...user, is_active: false }} commit('SET_SINGLE_REPORT', updatedReport) } dispatch('SuccessMessage') @@ -149,7 +149,7 @@ const reports = { return } finally { const updatedReports = state.fetchedReports.map(report => { - const updatedAccount = { ...user, deactivated: true } + const updatedAccount = { ...user, is_active: false } return report.id === reportId ? { ...report, account: updatedAccount } : report }) commit('SET_REPORTS', updatedReports) diff --git a/src/store/modules/users.js b/src/store/modules/users.js index 29b98fcf..0ba8c998 100644 --- a/src/store/modules/users.js +++ b/src/store/modules/users.js @@ -88,7 +88,7 @@ const users = { actions: { async ActivateUsers({ dispatch, getters }, { users, _userId }) { const updatedUsers = users.map(user => { - return { ...user, deactivated: false } + return { ...user, is_active: true } }) const nicknames = users.map(user => user.nickname) const callApiFn = async() => await activateUsers(nicknames, getters.authHost, getters.token) @@ -132,7 +132,7 @@ const users = { }, async ApproveUsersAccount({ dispatch, getters }, { users, _userId, _statusId }) { const updatedUsers = users.map(user => { - return { ...user, approval_pending: false } + return { ...user, is_approved: true } }) const nicknames = users.map(user => user.nickname) const callApiFn = async() => await approveUserAccount(nicknames, getters.authHost, getters.token) @@ -149,7 +149,7 @@ const users = { }, async ConfirmUsersEmail({ dispatch, getters }, { users, _userId, _statusId }) { const updatedUsers = users.map(user => { - return { ...user, confirmation_pending: false } + return { ...user, is_confirmed: true } }) const nicknames = users.map(user => user.nickname) const callApiFn = async() => await confirmUserEmail(nicknames, getters.authHost, getters.token) @@ -168,7 +168,7 @@ const users = { }, async DeactivateUsers({ dispatch, getters }, { users, _userId }) { const updatedUsers = users.map(user => { - return { ...user, deactivated: true } + return { ...user, is_active: false } }) const nicknames = users.map(user => user.nickname) const callApiFn = async() => await deactivateUsers(nicknames, getters.authHost, getters.token) @@ -200,7 +200,7 @@ const users = { return } const updatedUsers = users.map(user => { - return { ...user, deactivated: true } + return { ...user, is_active: false } }) commit('SWAP_USERS', updatedUsers) diff --git a/src/styles/index.scss b/src/styles/index.scss index b35df6ad..82e4b94a 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -171,32 +171,3 @@ code { background: #d0d0d0; } } - -.link-type, -.link-type:focus { - color: #337ab7; - cursor: pointer; - - &:hover { - color: rgb(32, 160, 255); - } -} - -.filter-container { - padding-bottom: 10px; - - .filter-item { - display: inline-block; - vertical-align: middle; - margin-bottom: 10px; - } -} - -//refine vue-multiselect plugin -.multiselect { - line-height: 16px; -} - -.multiselect--active { - z-index: 1000 !important; -} diff --git a/src/utils/clipboard.js b/src/utils/clipboard.js index e916a44d..66f018ec 100644 --- a/src/utils/clipboard.js +++ b/src/utils/clipboard.js @@ -3,7 +3,7 @@ import Clipboard from 'clipboard' function clipboardSuccess() { Vue.prototype.$message({ - message: 'Copy successfully', + message: 'Copied!', type: 'success', duration: 1500 }) diff --git a/src/utils/request.js b/src/utils/request.js index b7e3d5f1..163ce872 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -6,27 +6,32 @@ const service = axios.create({ timeout: 60000 // request timeout }) +const isJson = ({ headers }) => headers['content-type'].includes('application/json') + // response interceptor service.interceptors.response.use( response => response, error => { - let errorMessage console.log(`Error ${error}`) - if (error.response) { - const edata = error.response.data.error ? error.response.data.error : error.response.data - errorMessage = !error.response.headers['content-type'].includes('application/json') - ? `${error.message}` - : `${error.message} - ${edata}` + if (!error.response) { + Message({ + message: error, + type: 'error', + duration: 5 * 1000 + }) } else { - errorMessage = error + const errors = Array.isArray(error.response.data) ? error.response.data : [error.response.data] + errors.forEach(errorData => { + const edata = errorData.error || errorData + Message({ + message: isJson(error.response) ? `${error.message} - ${edata}` : `${error.message}`, + type: 'error', + duration: 5 * 1000 + }) + }) } - Message({ - message: errorMessage, - type: 'error', - duration: 5 * 1000 - }) return Promise.reject(error) } ) diff --git a/src/views/charts/keyboard.vue b/src/views/charts/keyboard.vue deleted file mode 100644 index 47952fa1..00000000 --- a/src/views/charts/keyboard.vue +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - diff --git a/src/views/charts/line.vue b/src/views/charts/line.vue deleted file mode 100644 index c07ce1b6..00000000 --- a/src/views/charts/line.vue +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - diff --git a/src/views/charts/mixChart.vue b/src/views/charts/mixChart.vue deleted file mode 100644 index 16aed3b8..00000000 --- a/src/views/charts/mixChart.vue +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - diff --git a/src/views/clipboard/index.vue b/src/views/clipboard/index.vue deleted file mode 100644 index 0801e345..00000000 --- a/src/views/clipboard/index.vue +++ /dev/null @@ -1,45 +0,0 @@ - - - - diff --git a/src/views/dashboard/admin/components/BarChart.vue b/src/views/dashboard/admin/components/BarChart.vue deleted file mode 100644 index cf75dfb2..00000000 --- a/src/views/dashboard/admin/components/BarChart.vue +++ /dev/null @@ -1,106 +0,0 @@ - - - diff --git a/src/views/dashboard/admin/components/BoxCard.vue b/src/views/dashboard/admin/components/BoxCard.vue deleted file mode 100644 index 26bb1198..00000000 --- a/src/views/dashboard/admin/components/BoxCard.vue +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - diff --git a/src/views/dashboard/admin/components/LineChart.vue b/src/views/dashboard/admin/components/LineChart.vue deleted file mode 100644 index 0043d21b..00000000 --- a/src/views/dashboard/admin/components/LineChart.vue +++ /dev/null @@ -1,156 +0,0 @@ - - - diff --git a/src/views/dashboard/admin/components/PanelGroup.vue b/src/views/dashboard/admin/components/PanelGroup.vue deleted file mode 100644 index 8125b846..00000000 --- a/src/views/dashboard/admin/components/PanelGroup.vue +++ /dev/null @@ -1,138 +0,0 @@ - - - - - diff --git a/src/views/dashboard/admin/components/PieChart.vue b/src/views/dashboard/admin/components/PieChart.vue deleted file mode 100644 index f0c8e6f3..00000000 --- a/src/views/dashboard/admin/components/PieChart.vue +++ /dev/null @@ -1,84 +0,0 @@ - - - diff --git a/src/views/dashboard/admin/components/RaddarChart.vue b/src/views/dashboard/admin/components/RaddarChart.vue deleted file mode 100644 index 40fc7067..00000000 --- a/src/views/dashboard/admin/components/RaddarChart.vue +++ /dev/null @@ -1,120 +0,0 @@ - - - diff --git a/src/views/dashboard/admin/components/TodoList/Todo.vue b/src/views/dashboard/admin/components/TodoList/Todo.vue deleted file mode 100644 index bfc98339..00000000 --- a/src/views/dashboard/admin/components/TodoList/Todo.vue +++ /dev/null @@ -1,79 +0,0 @@ - - - diff --git a/src/views/dashboard/admin/components/TodoList/index.scss b/src/views/dashboard/admin/components/TodoList/index.scss deleted file mode 100644 index 74ce0d54..00000000 --- a/src/views/dashboard/admin/components/TodoList/index.scss +++ /dev/null @@ -1,320 +0,0 @@ -.todoapp { - font: 14px 'Helvetica Neue', Helvetica, Arial, sans-serif; - line-height: 1.4em; - color: #4d4d4d; - min-width: 230px; - max-width: 550px; - margin: 0 auto ; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - font-weight: 300; - background: #fff; - z-index: 1; - position: relative; - button { - margin: 0; - padding: 0; - border: 0; - background: none; - font-size: 100%; - vertical-align: baseline; - font-family: inherit; - font-weight: inherit; - color: inherit; - -webkit-appearance: none; - appearance: none; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - } - :focus { - outline: 0; - } - .hidden { - display: none; - } - .todoapp { - background: #fff; - margin: 130px 0 40px 0; - position: relative; - box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2), 0 25px 50px 0 rgba(0, 0, 0, 0.1); - } - .todoapp input::-webkit-input-placeholder { - font-style: italic; - font-weight: 300; - color: #e6e6e6; - } - .todoapp input::-moz-placeholder { - font-style: italic; - font-weight: 300; - color: #e6e6e6; - } - .todoapp input::input-placeholder { - font-style: italic; - font-weight: 300; - color: #e6e6e6; - } - .todoapp h1 { - position: absolute; - top: -155px; - width: 100%; - font-size: 100px; - font-weight: 100; - text-align: center; - color: rgba(175, 47, 47, 0.15); - -webkit-text-rendering: optimizeLegibility; - -moz-text-rendering: optimizeLegibility; - text-rendering: optimizeLegibility; - } - .new-todo, - .edit { - position: relative; - margin: 0; - width: 100%; - font-size: 18px; - font-family: inherit; - font-weight: inherit; - line-height: 1.4em; - border: 0; - color: inherit; - padding: 6px; - border: 1px solid #999; - box-shadow: inset 0 -1px 5px 0 rgba(0, 0, 0, 0.2); - box-sizing: border-box; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - } - .new-todo { - padding: 10px 16px 16px 60px; - border: none; - background: rgba(0, 0, 0, 0.003); - box-shadow: inset 0 -2px 1px rgba(0, 0, 0, 0.03); - } - .main { - position: relative; - z-index: 2; - border-top: 1px solid #e6e6e6; - } - .toggle-all { - text-align: center; - border: none; - /* Mobile Safari */ - opacity: 0; - position: absolute; - } - .toggle-all+label { - width: 60px; - height: 34px; - font-size: 0; - position: absolute; - top: -52px; - left: -13px; - -webkit-transform: rotate(90deg); - transform: rotate(90deg); - } - .toggle-all+label:before { - content: '❯'; - font-size: 22px; - color: #e6e6e6; - padding: 10px 27px 10px 27px; - } - .toggle-all:checked+label:before { - color: #737373; - } - .todo-list { - margin: 0; - padding: 0; - list-style: none; - } - .todo-list li { - position: relative; - font-size: 24px; - border-bottom: 1px solid #ededed; - } - .todo-list li:last-child { - border-bottom: none; - } - .todo-list li.editing { - border-bottom: none; - padding: 0; - } - .todo-list li.editing .edit { - display: block; - width: 506px; - padding: 12px 16px; - margin: 0 0 0 43px; - } - .todo-list li.editing .view { - display: none; - } - .todo-list li .toggle { - text-align: center; - width: 40px; - /* auto, since non-WebKit browsers doesn't support input styling */ - height: auto; - position: absolute; - top: 0; - bottom: 0; - margin: auto 0; - border: none; - /* Mobile Safari */ - -webkit-appearance: none; - appearance: none; - } - .todo-list li .toggle { - opacity: 0; - } - .todo-list li .toggle+label { - /* - Firefox requires `#` to be escaped - https://bugzilla.mozilla.org/show_bug.cgi?id=922433 - IE and Edge requires *everything* to be escaped to render, so we do that instead of just the `#` - https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/7157459/ - */ - background-image: url('data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%20width%3D%2240%22%20height%3D%2240%22%20viewBox%3D%22-10%20-18%20100%20135%22%3E%3Ccircle%20cx%3D%2250%22%20cy%3D%2250%22%20r%3D%2250%22%20fill%3D%22none%22%20stroke%3D%22%23ededed%22%20stroke-width%3D%223%22/%3E%3C/svg%3E'); - background-repeat: no-repeat; - background-position: center left; - background-size: 36px; - } - .todo-list li .toggle:checked+label { - background-size: 36px; - background-image: url('data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%20width%3D%2240%22%20height%3D%2240%22%20viewBox%3D%22-10%20-18%20100%20135%22%3E%3Ccircle%20cx%3D%2250%22%20cy%3D%2250%22%20r%3D%2250%22%20fill%3D%22none%22%20stroke%3D%22%23bddad5%22%20stroke-width%3D%223%22/%3E%3Cpath%20fill%3D%22%235dc2af%22%20d%3D%22M72%2025L42%2071%2027%2056l-4%204%2020%2020%2034-52z%22/%3E%3C/svg%3E'); - } - .todo-list li label { - word-break: break-all; - padding: 15px 15px 15px 50px; - display: block; - line-height: 1.0; - font-size: 14px; - transition: color 0.4s; - } - .todo-list li.completed label { - color: #d9d9d9; - text-decoration: line-through; - } - .todo-list li .destroy { - display: none; - position: absolute; - top: 0; - right: 10px; - bottom: 0; - width: 40px; - height: 40px; - margin: auto 0; - font-size: 30px; - color: #cc9a9a; - transition: color 0.2s ease-out; - cursor: pointer; - } - .todo-list li .destroy:hover { - color: #af5b5e; - } - .todo-list li .destroy:after { - content: '×'; - } - .todo-list li:hover .destroy { - display: block; - } - .todo-list li .edit { - display: none; - } - .todo-list li.editing:last-child { - margin-bottom: -1px; - } - .footer { - color: #777; - position: relative; - padding: 10px 15px; - height: 40px; - text-align: center; - border-top: 1px solid #e6e6e6; - } - .footer:before { - content: ''; - position: absolute; - right: 0; - bottom: 0; - left: 0; - height: 40px; - overflow: hidden; - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2), 0 8px 0 -3px #f6f6f6, 0 9px 1px -3px rgba(0, 0, 0, 0.2), 0 16px 0 -6px #f6f6f6, 0 17px 2px -6px rgba(0, 0, 0, 0.2); - } - .todo-count { - float: left; - text-align: left; - } - .todo-count strong { - font-weight: 300; - } - .filters { - margin: 0; - padding: 0; - position: relative; - z-index: 1; - list-style: none; - } - .filters li { - display: inline; - } - .filters li a { - color: inherit; - font-size: 12px; - padding: 3px 7px; - text-decoration: none; - border: 1px solid transparent; - border-radius: 3px; - } - .filters li a:hover { - border-color: rgba(175, 47, 47, 0.1); - } - .filters li a.selected { - border-color: rgba(175, 47, 47, 0.2); - } - .clear-completed, - html .clear-completed:active { - float: right; - position: relative; - line-height: 20px; - text-decoration: none; - cursor: pointer; - } - .clear-completed:hover { - text-decoration: underline; - } - .info { - margin: 65px auto 0; - color: #bfbfbf; - font-size: 10px; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); - text-align: center; - } - .info p { - line-height: 1; - } - .info a { - color: inherit; - text-decoration: none; - font-weight: 400; - } - .info a:hover { - text-decoration: underline; - } - /* - Hack to remove background from Mobile Safari. - Can't use it globally since it destroys checkboxes in Firefox -*/ - @media screen and (-webkit-min-device-pixel-ratio:0) { - .toggle-all, - .todo-list li .toggle { - background: none; - } - .todo-list li .toggle { - height: 40px; - } - } - @media (max-width: 430px) { - .footer { - height: 50px; - } - .filters { - bottom: 10px; - } - } -} diff --git a/src/views/dashboard/admin/components/TodoList/index.vue b/src/views/dashboard/admin/components/TodoList/index.vue deleted file mode 100644 index 1f59b2dc..00000000 --- a/src/views/dashboard/admin/components/TodoList/index.vue +++ /dev/null @@ -1,126 +0,0 @@ - - - - - diff --git a/src/views/dashboard/admin/components/TransactionTable.vue b/src/views/dashboard/admin/components/TransactionTable.vue deleted file mode 100644 index 459a98c1..00000000 --- a/src/views/dashboard/admin/components/TransactionTable.vue +++ /dev/null @@ -1,53 +0,0 @@ - - - diff --git a/src/views/dashboard/admin/index.vue b/src/views/dashboard/admin/index.vue deleted file mode 100644 index 44d41b93..00000000 --- a/src/views/dashboard/admin/index.vue +++ /dev/null @@ -1,111 +0,0 @@ - - - - - diff --git a/src/views/dashboard/editor/index.vue b/src/views/dashboard/editor/index.vue deleted file mode 100644 index 3c14d28d..00000000 --- a/src/views/dashboard/editor/index.vue +++ /dev/null @@ -1,73 +0,0 @@ - - - - - diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue deleted file mode 100644 index ed83a01c..00000000 --- a/src/views/dashboard/index.vue +++ /dev/null @@ -1,31 +0,0 @@ - - - diff --git a/src/views/documentation/index.vue b/src/views/documentation/index.vue deleted file mode 100644 index 557f62d3..00000000 --- a/src/views/documentation/index.vue +++ /dev/null @@ -1,49 +0,0 @@ - - - - diff --git a/src/views/errorLog/errorTestA.vue b/src/views/errorLog/errorTestA.vue deleted file mode 100644 index 52654e0e..00000000 --- a/src/views/errorLog/errorTestA.vue +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/src/views/errorLog/errorTestB.vue b/src/views/errorLog/errorTestB.vue deleted file mode 100644 index b04c2511..00000000 --- a/src/views/errorLog/errorTestB.vue +++ /dev/null @@ -1,11 +0,0 @@ - - - diff --git a/src/views/errorLog/index.vue b/src/views/errorLog/index.vue deleted file mode 100644 index 47db4ae5..00000000 --- a/src/views/errorLog/index.vue +++ /dev/null @@ -1,33 +0,0 @@ - - - - - diff --git a/src/views/errorPage/401.vue b/src/views/errorPage/401.vue index 2901c942..f57cae67 100644 --- a/src/views/errorPage/401.vue +++ b/src/views/errorPage/401.vue @@ -1,91 +1,57 @@ diff --git a/src/views/errorPage/404.vue b/src/views/errorPage/404.vue index d20a4ef4..1ce4ab42 100644 --- a/src/views/errorPage/404.vue +++ b/src/views/errorPage/404.vue @@ -1,17 +1,13 @@ - - diff --git a/src/views/moderation_log/ReportLink.vue b/src/views/moderationLog/ReportLink.vue similarity index 100% rename from src/views/moderation_log/ReportLink.vue rename to src/views/moderationLog/ReportLink.vue diff --git a/src/views/moderation_log/UserLink.vue b/src/views/moderationLog/UserLink.vue similarity index 100% rename from src/views/moderation_log/UserLink.vue rename to src/views/moderationLog/UserLink.vue diff --git a/src/views/moderation_log/index.vue b/src/views/moderationLog/index.vue similarity index 100% rename from src/views/moderation_log/index.vue rename to src/views/moderationLog/index.vue diff --git a/src/views/pdf/content.js b/src/views/pdf/content.js deleted file mode 100644 index e62b1a2b..00000000 --- a/src/views/pdf/content.js +++ /dev/null @@ -1,58 +0,0 @@ -const title = 'Plans for the Next Iteration of Vue.js' - -const content = `

Last week atVue.js LondonI gave a brief sneak peek of what’s coming in the next major version of Vue. This post provides an in-depth overview of the plan.

-

-

Why a new majorversion?

-

Vue 2.0 was releasedexactly two years ago(how time flies!). During this period, the core has remained backwards compatible with five minor releases. We’ve accumulated a number of ideas that would bring improvements, but they were held off because they would result in breaking changes. At the same time, the JavaScript ecosystem and the language itself has been evolving rapidly. There are greatly improved tools that could enhance our workflow, and many new language features that could unlock simpler, more complete, and more efficient solutions to the problems Vue is trying to solve. What’s more exciting is that we are seeing ES2015 support becoming a baseline for all major evergreen browsers. Vue 3.0 aims to leverage these new language features to make Vue core smaller, faster, and more powerful.

-

Vue 3.0 is currently in prototyping phase, and we have already implemented a runtime close to feature-parity with 2.x.Many of the items listed below are either already implemented, or confirmed to be feasible. Ones that are not yet implemented or still in exploration phase are marked with a *.

-

The Details

-

High-Level APIChanges

-
TL;DR: Everything except render function API and scoped-slots syntax will either remain the same or can be made 2.x compatible via a compatibility build.
-

Since it’s a new major, there is going to be some breaking changes. However, we take backwards compatibility seriously, so we want to start communicating these changes as soon as possible. Here’s the currently planned public API changes:

- -

Source Code Architecture

-
TL;DR: better decoupled internal modules, TypeScript, and a codebase that is easier to contribute to.
-

We are re-writing 3.0 from the ground up for a cleaner and more maintainable architecture, in particular trying to make it easier to contribute to. We are breaking some internal functionalities into individual packages in order to isolate the scope of complexity. For example, the observer module will become its own package, with its own public API and tests. Note this does not affect framework-level API— you will not have to manually import individual bits from multiple packages in order to use Vue. Instead, the final Vue package is assembled using these internal packages.

-

The codebase is also now written in TypeScript. Although this will make proficiency in TypeScript a pre-requisite for contributing to the new codebase, we believe the type information and IDE support will actually make it easier for a new contributor to make meaningful contributions.

-

Decoupling the observer and scheduler into separate packages also allows us to easily experiment with alternative implementations of these parts. For example, we can implement an IE11 compatible observer implementation with the same API, or an alternative scheduler that leveragesrequestIdleCallbackto yield to the browser during long updates.*

-

-

Observation Mechanism

-
TL;DR: more complete, precise, efficient and debuggable reactivity tracking & API for creating observables.
-

3.0 will ship with a Proxy-based observer implementation that provides reactivity tracking with full language coverage. This eliminates a number of limitations of Vue 2’s current implementation based onObject.defineProperty:

-

The new observer also features the following:

-

Easily understand why a component is re-rendering

-

-

Other Runtime Improvements

-
TL;DR: smaller, faster, tree-shakable features, fragments & portals, custom renderer API.
-

Compiler Improvements*

-
TL;DR: tree-shaking friendly output, more AOT optimizations, parser with better error info and source map support.
-

IE11 Support*

-
TL;DR: it will be supported, but in a separate build with the same reactivity limitations of Vue 2.x.
-

The new codebase currently targets evergreen browsers only and assumes baseline native ES2015 support. But alas, we know a lot of our users still need to support IE11 for the foreseeable future. Most of the ES2015 features used can be transpiled / polyfilled for IE11, with the exception for Proxies. Our plan is to implement an alternative observer with the same API, but using the good old ES5Object.definePropertyAPI. A separate build of Vue 3.x will be distributed using this observer implementation. However, this build will be subject to the same change detection caveats of Vue 2.x and thus not fully compatible with the “modern” build of 3.x. We are aware that this imposes some inconvenience for library authors as they will need to be aware of compatibility for two different builds, but we will make sure to provide clear guidelines on this when we reach that stage.

-

How Do We GetThere

-

First of all, although we are announcing it today, we do not have a definitive timeline yet. What we do know at the moment is the steps we will be taking to get there:

-

1. Internal Feedback for the Runtime Prototype

-

This is the phase we are in right now. Currently, we already have a working runtime prototype that includes the new observer, Virtual DOM and component implementation. We have invited a group of authors of influential community projects to provide feedback for the internal changes, and would like to make sure they are comfortable with the changes before moving forward. We want to ensure that important libraries in the ecosystem will be ready at the same time when we release 3.0, so that users relying on those projects can upgrade easily.

-

2. Public Feedback viaRFCs

-

Once we gain a certain level of confidence in the new design, for each breaking change we will be opening a dedicated RFC issue which includes:

-

We will anticipate public feedback from the wider community to help us consolidate these ideas.

-

3. Introduce Compatible Features in 2.x &2.x-next

-

We are not forgetting about 2.x! In fact, we plan to use 2.x to progressively accustom users to the new changes. We will be gradually introducing confirmed API changes into 2.x via opt-in adaptors, and 2.x-next will allow users to try out the new Proxy-based observer.

-

The last minor release in 2.x will become LTS and continue to receive bug and security fixes for 18 months when 3.0 is released.

-

4. AlphaPhase

-

Next, we will finish up the compiler and server-side rendering parts of 3.0 and start making alpha releases. These will mostly be for stability testing purposes in small greenfield apps.

-

5. BetaPhase

-

During beta phase, our main goal is updating support libraries and tools like Vue Router, Vuex, Vue CLI, Vue DevTools and make sure they work smoothly with the new core. We will also be working with major library authors from the community to help them get ready for 3.0.

-

6. RCPhase

-

Once we consider the API and codebase stable, we will enter RC phase with API freeze. During this phase we will also work on a “compat build”: a build of 3.0 that includes compatibility layers for 2.x API. This build will also ship with a flag you can turn on to emit deprecation warnings for 2.x API usage in your app. The compat build can be used as a guide to upgrade your app to 3.0.

-

7. IE11build

-

The last task before the final release will be the IE11 compatibility build as mentioned above.

-

8. FinalRelease

-

In all honesty, we don’t know when this will happen yet, but likely in 2019. Again, we care more about shipping something that is solid and stable rather than hitting specific dates. There is a lot of work to be done, but we are excited for what’s coming next!

` - -const data = { - title, - content -} - -export default data diff --git a/src/views/pdf/download.vue b/src/views/pdf/download.vue deleted file mode 100644 index 61d5ebf4..00000000 --- a/src/views/pdf/download.vue +++ /dev/null @@ -1,199 +0,0 @@ - - - - - diff --git a/src/views/pdf/index.vue b/src/views/pdf/index.vue deleted file mode 100644 index b7728152..00000000 --- a/src/views/pdf/index.vue +++ /dev/null @@ -1,9 +0,0 @@ - - diff --git a/src/views/qiniu/upload.vue b/src/views/qiniu/upload.vue deleted file mode 100644 index bd37992e..00000000 --- a/src/views/qiniu/upload.vue +++ /dev/null @@ -1,39 +0,0 @@ - - - diff --git a/src/views/reports/components/ModerateUserDropdown.vue b/src/views/reports/components/ModerateUserDropdown.vue index 6c93ca82..ae80a3af 100644 --- a/src/views/reports/components/ModerateUserDropdown.vue +++ b/src/views/reports/components/ModerateUserDropdown.vue @@ -8,7 +8,7 @@ - {{ account.deactivated ? $t('users.activateAccount') : $t('users.deactivateAccount') }} + {{ !account.is_active ? $t('users.activateAccount') : $t('users.deactivateAccount') }}
@@ -15,6 +16,7 @@ v-for="setting in emailAdapterChildren" :key="setting.key"> @@ -24,6 +26,7 @@
{ + return state[group][groupKey][targetKey] !== notEqual +} + +const rulesMap = { + renderIfNotEqual +} + +export const settingFollowsRules = (settingKey, settingGroupKey, state) => { + const rule = rules.find(rule => rule.groupKey === settingGroupKey && rule.key === settingKey) + if (!rule) return true + + const ruleFn = rulesMap[rule.name] + if (!ruleFn) return true + return ruleFn(state, rule) +} diff --git a/src/views/users/components/ModerationDropdown.vue b/src/views/users/components/ModerationDropdown.vue index d54efe43..57023192 100644 --- a/src/views/users/components/ModerationDropdown.vue +++ b/src/views/users/components/ModerationDropdown.vue @@ -38,7 +38,7 @@ v-if="showDeactivatedButton(user.id) && page !== 'statusPage'" :divided="showAdminAction(user)" @click.native="toggleActivation(user)"> - {{ user.deactivated ? $t('users.activateAccount') : $t('users.deactivateAccount') }} + {{ !user.is_active ? $t('users.activateAccount') : $t('users.deactivateAccount') }} {{ $t('users.approveAccount') }} {{ $t('users.rejectAccount') }} {{ $t('users.confirmAccount') }} {{ $t('users.resendConfirmation') }} @@ -261,7 +261,7 @@ export default { return this.$store.state.user.id !== id }, toggleActivation(user) { - user.deactivated + !user.is_active ? this.$store.dispatch('ActivateUsers', { users: [user], _userId: user.id }) : this.$store.dispatch('DeactivateUsers', { users: [user], _userId: user.id }) }, diff --git a/src/views/users/components/MultipleUsersMenu.vue b/src/views/users/components/MultipleUsersMenu.vue index bdf65006..7ebd4ef6 100644 --- a/src/views/users/components/MultipleUsersMenu.vue +++ b/src/views/users/components/MultipleUsersMenu.vue @@ -197,13 +197,13 @@ export default { applyAction(filtered, deleteRightFn) }, activate: () => { - const filtered = this.selectedUsers.filter(user => user.nickname && user.deactivated && this.$store.state.user.id !== user.id) + const filtered = this.selectedUsers.filter(user => user.nickname && !user.is_active && this.$store.state.user.id !== user.id) const activateUsersFn = async(users) => await this.$store.dispatch('ActivateUsers', { users }) applyAction(filtered, activateUsersFn) }, deactivate: () => { - const filtered = this.selectedUsers.filter(user => user.nickname && !user.deactivated && this.$store.state.user.id !== user.id) + const filtered = this.selectedUsers.filter(user => user.nickname && user.is_active && this.$store.state.user.id !== user.id) const deactivateUsersFn = async(users) => await this.$store.dispatch('DeactivateUsers', { users }) applyAction(filtered, deactivateUsersFn) @@ -238,19 +238,19 @@ export default { applyAction(filtered, requirePasswordResetFn) }, approveAccounts: () => { - const filtered = this.selectedUsers.filter(user => this.isLocalUser(user) && user.approval_pending) + const filtered = this.selectedUsers.filter(user => this.isLocalUser(user) && !user.is_approved) const approveAccountFn = async(users) => await this.$store.dispatch('ApproveUsersAccount', { users }) applyAction(filtered, approveAccountFn) }, confirmAccounts: () => { - const filtered = this.selectedUsers.filter(user => this.isLocalUser(user) && user.confirmation_pending) + const filtered = this.selectedUsers.filter(user => this.isLocalUser(user) && !user.is_confirmed) const confirmAccountFn = async(users) => await this.$store.dispatch('ConfirmUsersEmail', { users }) applyAction(filtered, confirmAccountFn) }, resendConfirmation: () => { - const filtered = this.selectedUsers.filter(user => this.isLocalUser(user) && user.confirmation_pending) + const filtered = this.selectedUsers.filter(user => this.isLocalUser(user) && !user.is_confirmed) const resendConfirmationFn = async(users) => await this.$store.dispatch('ResendConfirmationEmail', users) applyAction(filtered, resendConfirmationFn) diff --git a/src/views/users/index.vue b/src/views/users/index.vue index 4baaed01..510c7b23 100644 --- a/src/views/users/index.vue +++ b/src/views/users/index.vue @@ -56,16 +56,16 @@