Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix admin access to the campaign expneses #1400

Merged
merged 14 commits into from
Mar 29, 2023
Merged

Fix admin access to the campaign expneses #1400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
49dc926
Expenses for campaigns:
slavcho Feb 20, 2023
71fff23
Add the layout of the portal to the expenses form.
slavcho Feb 21, 2023
bb59b96
Allow for expenses files to be downloaded and delete.
slavcho Mar 9, 2023
01aa615
Add the expenses list to the campaigns page if there are any.
slavcho Mar 12, 2023
4127b36
Merge branch 'master' of github.com:slavcho/frontend into expenses
slavcho Mar 12, 2023
e418eeb
Fix the build of the frontend. Remove unused elements.
slavcho Mar 17, 2023
8241b3d
Merge branch 'master' of github.com:slavcho/frontend into expenses
slavcho Mar 26, 2023
fc72c2a
Stop using the can-edit endpoint. We can use the useCurrentUser to ge…
slavcho Mar 26, 2023
197ae07
Refactor the endpoints for the expenses lists. In order to make the m…
slavcho Mar 28, 2023
f1b2d74
Fix a bug - isAdmin does not seems to be working in this context.
slavcho Mar 28, 2023
50bff3c
We should not allow any expenses to be saved without an attachment.
slavcho Mar 28, 2023
406de91
Add an on error handler when uploading an expense file.
slavcho Mar 28, 2023
5fe102d
Use isAdmin function for production. podkrepi-admin role is not avail…
slavcho Mar 29, 2023
8903c65
Merge branch 'master' of github.com:slavcho/frontend into expenses
slavcho Mar 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/common/hooks/campaigns.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {
import { DonationStatus } from 'gql/donations.enums'
import { apiClient } from 'service/apiClient'
import { useCurrentPerson } from 'common/util/useCurrentPerson'
import { isAdmin } from 'common/util/roles'

// NOTE: shuffling the campaigns so that each gets its fair chance to be on top row
export const campaignsOrderQueryFunction: QueryFunction<CampaignResponse[]> = async ({
Expand Down Expand Up @@ -128,7 +129,8 @@ export function useCanEditCampaign(slug: string) {

const canEdit =
userData.user.id === campaignData.campaign.organizer?.person.id ||
session?.user?.realm_access?.roles?.includes('podkrepi-admin')
session?.user?.realm_access?.roles?.includes('podkrepi-admin') ||
isAdmin(session)

return canEdit
}
4 changes: 3 additions & 1 deletion src/components/client/campaign-expenses/Form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import { downloadCampaignExpenseFile, deleteExpenseFile } from 'service/expense'
import { useSession } from 'next-auth/react'
import DeleteForeverIcon from '@mui/icons-material/DeleteForever'
import { useViewPersonByKeylockId } from 'common/hooks/person'
import { isAdmin } from 'common/util/roles'

const validTypes = Object.keys(ExpenseType)
const validStatuses = Object.keys(ExpenseStatus)
Expand All @@ -53,7 +54,8 @@ export default function Form() {
const { data: expenseFiles } = useCampaignExpenseFiles(id)
const { data: session } = useSession()

const canApprove = !!session?.user?.realm_access?.roles?.includes('podkrepi-admin')
const canApprove =
!!session?.user?.realm_access?.roles?.includes('podkrepi-admin') || isAdmin(session)

const { data: person } = useViewPersonByKeylockId(session?.user?.sub as string)

Expand Down