diff --git a/packages/pl-fe/src/actions/admin.ts b/packages/pl-fe/src/actions/admin.ts index b4ed970df..f41c9a675 100644 --- a/packages/pl-fe/src/actions/admin.ts +++ b/packages/pl-fe/src/actions/admin.ts @@ -22,16 +22,6 @@ const ADMIN_USERS_FETCH_SUCCESS = 'ADMIN_USERS_FETCH_SUCCESS' as const; const ADMIN_USER_DELETE_SUCCESS = 'ADMIN_USER_DELETE_SUCCESS' as const; -const ADMIN_USER_INDEX_EXPAND_FAIL = 'ADMIN_USER_INDEX_EXPAND_FAIL' as const; -const ADMIN_USER_INDEX_EXPAND_REQUEST = 'ADMIN_USER_INDEX_EXPAND_REQUEST' as const; -const ADMIN_USER_INDEX_EXPAND_SUCCESS = 'ADMIN_USER_INDEX_EXPAND_SUCCESS' as const; - -const ADMIN_USER_INDEX_FETCH_FAIL = 'ADMIN_USER_INDEX_FETCH_FAIL' as const; -const ADMIN_USER_INDEX_FETCH_REQUEST = 'ADMIN_USER_INDEX_FETCH_REQUEST' as const; -const ADMIN_USER_INDEX_FETCH_SUCCESS = 'ADMIN_USER_INDEX_FETCH_SUCCESS' as const; - -const ADMIN_USER_INDEX_QUERY_SET = 'ADMIN_USER_INDEX_QUERY_SET' as const; - const fetchConfig = () => (dispatch: AppDispatch, getState: () => RootState) => getClient(getState).admin.config.getPleromaConfig() @@ -166,48 +156,6 @@ const setRole = (accountId: string, role: 'user' | 'moderator' | 'admin') => } }; -const setUserIndexQuery = (query: string) => ({ type: ADMIN_USER_INDEX_QUERY_SET, query }); - -const fetchUserIndex = () => - (dispatch: AppDispatch, getState: () => RootState) => { - const { query, isLoading } = getState().admin_user_index; - - if (isLoading) return; - - dispatch({ type: ADMIN_USER_INDEX_FETCH_REQUEST }); - - const params: AdminGetAccountsParams = { - origin: 'local', - status: 'active', - username: query, - }; - - dispatch(fetchUsers(params)) - .then((data) => { - const { items, total, next } = data; - dispatch({ type: ADMIN_USER_INDEX_FETCH_SUCCESS, users: items, total, next, params }); - }).catch(() => { - dispatch({ type: ADMIN_USER_INDEX_FETCH_FAIL }); - }); - }; - -const expandUserIndex = () => - (dispatch: AppDispatch, getState: () => RootState) => { - const { params, next, isLoading, loaded } = getState().admin_user_index; - - if (!loaded || isLoading || !next) return; - - dispatch({ type: ADMIN_USER_INDEX_EXPAND_REQUEST }); - - next() - .then((data) => { - const { items, total, next } = data; - dispatch({ type: ADMIN_USER_INDEX_EXPAND_SUCCESS, users: items, total, next, params }); - }).catch(() => { - dispatch({ type: ADMIN_USER_INDEX_EXPAND_FAIL }); - }); - }; - type AdminActions = | { type: typeof ADMIN_CONFIG_FETCH_SUCCESS; configs: PleromaConfig['configs']; needsReboot: boolean } | { type: typeof ADMIN_CONFIG_UPDATE_REQUEST; configs: PleromaConfig['configs'] } @@ -215,14 +163,7 @@ type AdminActions = | { 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 } - | ReturnType - | { type: typeof ADMIN_USER_INDEX_FETCH_REQUEST } - | { type: typeof ADMIN_USER_INDEX_FETCH_SUCCESS; users: Array; total?: number; next: (() => Promise>) | null; params?: AdminGetAccountsParams } - | { type: typeof ADMIN_USER_INDEX_FETCH_FAIL } - | { type: typeof ADMIN_USER_INDEX_EXPAND_REQUEST } - | { type: typeof ADMIN_USER_INDEX_EXPAND_SUCCESS; users: Array; total?: number; next: (() => Promise>) | null; params: AdminGetAccountsParams | null } - | { type: typeof ADMIN_USER_INDEX_EXPAND_FAIL }; + | { type: typeof ADMIN_USER_DELETE_SUCCESS; accountId: string }; export { ADMIN_CONFIG_FETCH_SUCCESS, @@ -232,13 +173,6 @@ export { ADMIN_REPORT_PATCH_SUCCESS, ADMIN_USERS_FETCH_SUCCESS, ADMIN_USER_DELETE_SUCCESS, - ADMIN_USER_INDEX_EXPAND_FAIL, - ADMIN_USER_INDEX_EXPAND_REQUEST, - ADMIN_USER_INDEX_EXPAND_SUCCESS, - ADMIN_USER_INDEX_FETCH_FAIL, - ADMIN_USER_INDEX_FETCH_REQUEST, - ADMIN_USER_INDEX_FETCH_SUCCESS, - ADMIN_USER_INDEX_QUERY_SET, fetchConfig, updateConfig, updatePlFeConfig, @@ -251,8 +185,5 @@ export { toggleStatusSensitivity, setBadges, setRole, - setUserIndexQuery, - fetchUserIndex, - expandUserIndex, type AdminActions, }; diff --git a/packages/pl-fe/src/reducers/admin-user-index.ts b/packages/pl-fe/src/reducers/admin-user-index.ts deleted file mode 100644 index b02a89f78..000000000 --- a/packages/pl-fe/src/reducers/admin-user-index.ts +++ /dev/null @@ -1,86 +0,0 @@ -import { create } from 'mutative'; - -import { - ADMIN_USER_INDEX_EXPAND_FAIL, - ADMIN_USER_INDEX_EXPAND_REQUEST, - ADMIN_USER_INDEX_EXPAND_SUCCESS, - ADMIN_USER_INDEX_FETCH_FAIL, - ADMIN_USER_INDEX_FETCH_REQUEST, - ADMIN_USER_INDEX_FETCH_SUCCESS, - ADMIN_USER_INDEX_QUERY_SET, - type AdminActions, -} from 'pl-fe/actions/admin'; - -import type { AdminAccount, AdminGetAccountsParams, PaginatedResponse } from 'pl-api'; -import type { APIEntity } from 'pl-fe/types/entities'; - -type State = { - isLoading: boolean; - loaded: boolean; - items: Array; - total?: number; - page: number; - query: string; - next: (() => Promise>) | null; - params: AdminGetAccountsParams | null; -} - -const initialState: State = { - isLoading: false, - loaded: false, - items: [], - total: Infinity, - page: -1, - query: '', - next: null, - params: null, -}; - -const admin_user_index = (state: State = initialState, action: AdminActions): State => { - switch (action.type) { - case ADMIN_USER_INDEX_QUERY_SET: - return create(state, draft => { - draft.query = action.query; - }); - case ADMIN_USER_INDEX_FETCH_REQUEST: - return create(state, draft => { - draft.isLoading = true; - draft.loaded = true; - draft.items = []; - draft.total = Infinity; - draft.page = 0; - draft.next = null; - }); - case ADMIN_USER_INDEX_FETCH_SUCCESS: - return create(state, draft => { - draft.isLoading = false; - draft.loaded = true; - draft.items = action.users.map((user: APIEntity) => user.id); - draft.total = action.total; - draft.page = 1; - draft.next = action.next; - }); - case ADMIN_USER_INDEX_FETCH_FAIL: - case ADMIN_USER_INDEX_EXPAND_FAIL: - return create(state, draft => { - draft.isLoading = false; - }); - case ADMIN_USER_INDEX_EXPAND_REQUEST: - return create(state, draft => { - draft.isLoading = true; - }); - case ADMIN_USER_INDEX_EXPAND_SUCCESS: - return create(state, draft => { - draft.isLoading = false; - draft.loaded = true; - draft.items = [...new Set(draft.items.concat(action.users.map((user: APIEntity) => user.id)))]; - draft.total = action.total; - draft.page = 1; - draft.next = action.next; - }); - default: - return state; - } -}; - -export { admin_user_index as default }; diff --git a/packages/pl-fe/src/reducers/index.ts b/packages/pl-fe/src/reducers/index.ts index a6df81c32..d7c757a77 100644 --- a/packages/pl-fe/src/reducers/index.ts +++ b/packages/pl-fe/src/reducers/index.ts @@ -6,7 +6,6 @@ import entities from 'pl-fe/entity-store/reducer'; import accounts_meta from './accounts-meta'; import admin from './admin'; -import admin_user_index from './admin-user-index'; import auth from './auth'; import compose from './compose'; import contexts from './contexts'; @@ -32,7 +31,6 @@ import timelines from './timelines'; const reducers = { accounts_meta, admin, - admin_user_index, auth, compose, contexts,