From 22789bb7db493965a5dc50a9008efff856722aaf Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Wed, 10 Jun 2026 18:34:43 +0300 Subject: [PATCH 01/15] remove generic_confirm --- .../confirm_modal/generic_confirm.js | 40 ------------------- .../confirm_modal/generic_confirm.vue | 23 ----------- 2 files changed, 63 deletions(-) delete mode 100644 src/components/confirm_modal/generic_confirm.js delete mode 100644 src/components/confirm_modal/generic_confirm.vue diff --git a/src/components/confirm_modal/generic_confirm.js b/src/components/confirm_modal/generic_confirm.js deleted file mode 100644 index 82bb0e54e..000000000 --- a/src/components/confirm_modal/generic_confirm.js +++ /dev/null @@ -1,40 +0,0 @@ -import ConfirmModal from './confirm_modal.vue' -//import Select from 'src/components/select/select.vue' - -export default { - props: { - title: { - type: String, - }, - message: { - type: String, - }, - cancelText: { - type: String, - }, - confirmText: { - type: String, - }, - }, - emits: ['hide', 'show', 'action'], - data: () => ({ - showing: false, - }), - components: { - ConfirmModal, - }, - methods: { - show() { - this.showing = true - this.$emit('show') - }, - hide() { - this.showing = false - this.$emit('hide') - }, - doGeneric() { - this.$emit('action') - this.hide() - }, - }, -} diff --git a/src/components/confirm_modal/generic_confirm.vue b/src/components/confirm_modal/generic_confirm.vue deleted file mode 100644 index d223d6ea9..000000000 --- a/src/components/confirm_modal/generic_confirm.vue +++ /dev/null @@ -1,23 +0,0 @@ - - - diff --git a/src/components/interactions/interactions.js b/src/components/interactions/interactions.js index 5dc2a8714..d008c4b30 100644 --- a/src/components/interactions/interactions.js +++ b/src/components/interactions/interactions.js @@ -17,7 +17,7 @@ const Interactions = { allowFollowingMove: this.$store.state.users.currentUser.allow_following_move, filterMode: tabModeDict.mentions, - canSeeReports: this.$store.state.users.currentUser.has.has( + canSeeReports: this.$store.state.users.currentUser.privileges.has( 'reports_manage_reports', ), } diff --git a/src/components/list/list.vue b/src/components/list/list.vue index 317eb293f..c3e041201 100644 --- a/src/components/list/list.vue +++ b/src/components/list/list.vue @@ -1,6 +1,7 @@ - + - + diff --git a/src/components/settings_modal/admin_tabs/frontends_tab.js b/src/components/settings_modal/admin_tabs/frontends_tab.js index ea7b970fb..9bec3d763 100644 --- a/src/components/settings_modal/admin_tabs/frontends_tab.js +++ b/src/components/settings_modal/admin_tabs/frontends_tab.js @@ -105,7 +105,7 @@ const FrontendsTab = { const ref = suggestRef || this.getSuggestedRef(frontend) const { name } = frontend - useAdminSettingsStore.updateAdminDraft({ + useAdminSettingsStore().updateAdminDraft({ path: [':pleroma', ':frontends', ':primary'], value: { name, ref }, }) diff --git a/src/components/settings_modal/admin_tabs/links_tab.js b/src/components/settings_modal/admin_tabs/links_tab.js index b4563576b..a6b99483b 100644 --- a/src/components/settings_modal/admin_tabs/links_tab.js +++ b/src/components/settings_modal/admin_tabs/links_tab.js @@ -112,19 +112,19 @@ const LinksTab = { }, methods: { checkRel(e) { - useAdminSettingsStore.updateAdminDraft({ + useAdminSettingsStore().updateAdminDraft({ path: [':pleroma', 'Pleroma.Formatter', ':rel'], value: e ? '' : false, }) }, checkClass(e) { - useAdminSettingsStore.updateAdminDraft({ + useAdminSettingsStore().updateAdminDraft({ path: [':pleroma', 'Pleroma.Formatter', ':class'], value: e ? '' : false, }) }, checkTruncate(e) { - useAdminSettingsStore.updateAdminDraft({ + useAdminSettingsStore().updateAdminDraft({ path: [':pleroma', 'Pleroma.Formatter', ':truncate'], value: e ? 20 : false, }) diff --git a/src/components/settings_modal/admin_tabs/users_tab.js b/src/components/settings_modal/admin_tabs/users_tab.js index c12111263..640afa507 100644 --- a/src/components/settings_modal/admin_tabs/users_tab.js +++ b/src/components/settings_modal/admin_tabs/users_tab.js @@ -5,10 +5,8 @@ import Checkbox from 'src/components/checkbox/checkbox.vue' import GenericConfirm from 'src/components/confirm_modal/generic_confirm.vue' import List from 'src/components/list/list.vue' import ModerationTools from 'src/components/moderation_tools/moderation_tools.vue' -import ProgressButton from 'src/components/progress_button/progress_button.vue' import Select from 'src/components/select/select.vue' -import AdminCard from 'src/components/settings_modal/admin_tabs/admin_card.vue' -import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx' +import AdminUserCard from 'src/components/settings_modal/admin_tabs/admin_user_card.vue' import { useAdminSettingsStore } from 'src/stores/admin_settings.js' @@ -18,18 +16,10 @@ const UsersTab = { Select, BasicUserCard, List, - ProgressButton, - AdminCard, - TabSwitcher, + AdminUserCard, ModerationTools, GenericConfirm, }, - provide() { - return { - defaultDraftMode: true, - defaultSource: 'admin', - } - }, data() { return { filtersOrigin: 'local', diff --git a/src/components/settings_modal/admin_tabs/users_tab.vue b/src/components/settings_modal/admin_tabs/users_tab.vue index 1dbd7bcb0..a12c76ddd 100644 --- a/src/components/settings_modal/admin_tabs/users_tab.vue +++ b/src/components/settings_modal/admin_tabs/users_tab.vue @@ -131,7 +131,7 @@