From 60e949de74d552aed9a7b3fc98e1d763a9e4bf42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?nicole=20miko=C5=82ajczyk?= Date: Thu, 10 Jul 2025 13:46:12 +0200 Subject: [PATCH] pl-fe: remove unused code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nicole mikołajczyk --- packages/pl-fe/src/actions/admin.ts | 20 +---------------- packages/pl-fe/src/reducers/admin.ts | 33 +--------------------------- 2 files changed, 2 insertions(+), 51 deletions(-) diff --git a/packages/pl-fe/src/actions/admin.ts b/packages/pl-fe/src/actions/admin.ts index f41c9a675..26d3e35f0 100644 --- a/packages/pl-fe/src/actions/admin.ts +++ b/packages/pl-fe/src/actions/admin.ts @@ -1,4 +1,3 @@ -import { fetchRelationships } from 'pl-fe/actions/accounts'; import { importEntities } from 'pl-fe/actions/importer'; import { filterBadges, getTagDiff } from 'pl-fe/utils/badges'; @@ -6,7 +5,7 @@ import { getClient } from '../api'; import { deleteFromTimelines } from './timelines'; -import type { Account, AdminAccount, AdminGetAccountsParams, AdminGetReportsParams, AdminReport, PaginatedResponse, PleromaConfig, Status } from 'pl-api'; +import type { AdminGetReportsParams, AdminReport, PleromaConfig, Status } from 'pl-api'; import type { AppDispatch, RootState } from 'pl-fe/store'; const ADMIN_CONFIG_FETCH_SUCCESS = 'ADMIN_CONFIG_FETCH_SUCCESS' as const; @@ -18,8 +17,6 @@ const ADMIN_REPORTS_FETCH_SUCCESS = 'ADMIN_REPORTS_FETCH_SUCCESS' as const; const ADMIN_REPORT_PATCH_SUCCESS = 'ADMIN_REPORT_PATCH_SUCCESS' as const; -const ADMIN_USERS_FETCH_SUCCESS = 'ADMIN_USERS_FETCH_SUCCESS' as const; - const ADMIN_USER_DELETE_SUCCESS = 'ADMIN_USER_DELETE_SUCCESS' as const; const fetchConfig = () => @@ -68,18 +65,6 @@ const closeReport = (reportId: string) => return report; }); -const fetchUsers = (params?: AdminGetAccountsParams) => - (dispatch: AppDispatch, getState: () => RootState) => { - const state = getState(); - - return getClient(state).admin.accounts.getAccounts(params).then((res) => { - dispatch(importEntities({ accounts: res.items.map(({ account }) => account).filter((account): account is Account => account !== null) })); - dispatch(fetchRelationships(res.items.map((account) => account.id))); - dispatch({ type: ADMIN_USERS_FETCH_SUCCESS, users: res.items, params, next: res.next }); - return res; - }); - }; - const deactivateUser = (accountId: string, report_id?: string) => (dispatch: AppDispatch, getState: () => RootState) => { const state = getState(); @@ -162,7 +147,6 @@ type AdminActions = | { type: typeof ADMIN_CONFIG_UPDATE_SUCCESS; configs: PleromaConfig['configs']; needsReboot: boolean } | { type: typeof ADMIN_REPORTS_FETCH_SUCCESS; reports: Array; params?: AdminGetReportsParams } | { type: typeof ADMIN_REPORT_PATCH_SUCCESS; report: AdminReport; reportId: string } - | { type: typeof ADMIN_USERS_FETCH_SUCCESS; users: Array; params?: AdminGetAccountsParams; next: (() => Promise>) | null } | { type: typeof ADMIN_USER_DELETE_SUCCESS; accountId: string }; export { @@ -171,14 +155,12 @@ export { ADMIN_CONFIG_UPDATE_SUCCESS, ADMIN_REPORTS_FETCH_SUCCESS, ADMIN_REPORT_PATCH_SUCCESS, - ADMIN_USERS_FETCH_SUCCESS, ADMIN_USER_DELETE_SUCCESS, fetchConfig, updateConfig, updatePlFeConfig, fetchReports, closeReport, - fetchUsers, deactivateUser, deleteUser, deleteStatus, diff --git a/packages/pl-fe/src/reducers/admin.ts b/packages/pl-fe/src/reducers/admin.ts index 10c5395c6..798b0bbce 100644 --- a/packages/pl-fe/src/reducers/admin.ts +++ b/packages/pl-fe/src/reducers/admin.ts @@ -1,4 +1,3 @@ -import omit from 'lodash/omit'; import { create } from 'mutative'; import { @@ -6,20 +5,17 @@ import { ADMIN_CONFIG_UPDATE_SUCCESS, ADMIN_REPORTS_FETCH_SUCCESS, ADMIN_REPORT_PATCH_SUCCESS, - ADMIN_USERS_FETCH_SUCCESS, // ADMIN_USER_DELETE_SUCCESS, type AdminActions, } from 'pl-fe/actions/admin'; import { normalizeAdminReport, type AdminReport as MinifiedReport } from 'pl-fe/normalizers/admin-report'; -import type { AdminAccount, AdminGetAccountsParams, AdminReport } from 'pl-api'; +import type { AdminReport } from 'pl-api'; import type { Config } from 'pl-fe/utils/config-db'; interface State { reports: Record; openReports: Array; - users: Record; - latestUsers: Array; configs: Array; needsReboot: boolean; } @@ -27,35 +23,10 @@ interface State { const initialState: State = { reports: {}, openReports: [], - users: {}, - latestUsers: [], configs: [], needsReboot: false, }; -const toIds = (items: any[]) => items.map(item => item.id); - -const maybeImportLatest = (state: State, users: Array, params?: AdminGetAccountsParams) => { - if (params?.origin === 'local' && params.status === 'active') { - const newIds = toIds(users); - state.latestUsers = newIds; - } -}; - -const minifyUser = (user: AdminAccount) => omit(user, ['account']); - -type MinifiedUser = ReturnType; - -const importUsers = (state: State, users: Array, params?: AdminGetAccountsParams) => { - // maybeImportUnapproved(state, users, params); - maybeImportLatest(state, users, params); - - users.forEach(user => { - const normalizedUser = minifyUser(user); - state.users[user.id] = normalizedUser; - }); -}; - // const deleteUser = (state: State, accountId: string) => { // state.awaitingApproval = state.awaitingApproval.filter(id => id !== accountId); // delete state.users[accountId]; @@ -102,8 +73,6 @@ const admin = (state = initialState, action: AdminActions): State => { return create(state, (draft) => importReports(draft, action.reports)); case ADMIN_REPORT_PATCH_SUCCESS: return create(state, (draft) => handleReportDiffs(draft, action.report)); - case ADMIN_USERS_FETCH_SUCCESS: - return create(state, (draft) => importUsers(draft, action.users, action.params)); // case ADMIN_USER_DELETE_SUCCESS: // return create(state, (draft) => deleteUser(draft, action.accountId)); default: