Skip to content

Commit

Permalink
Merge pull request #520 from DnD-Montreal/bugfix-hide-buttons-for-non…
Browse files Browse the repository at this point in the history
…-campaign-owner

Hide buttons for campaign non-owners
m-triassi authored Mar 17, 2022
2 parents 66e0fbd + 45bdfd0 commit 392aded
Showing 4 changed files with 30 additions and 17 deletions.
37 changes: 21 additions & 16 deletions resources/js/Components/Detail/CampaignDetail/CampaignDetailBox.tsx
Original file line number Diff line number Diff line change
@@ -31,6 +31,7 @@ const CampaignDetailBox = ({
const {t} = useTranslation()
const [isKickModalOpen, setIsKickModalOpen] = useState<boolean>(false)
const {enqueueSnackbar} = useSnackbar()
const {is_owner} = campaign

return (
<>
@@ -81,13 +82,15 @@ const CampaignDetailBox = ({
}}>
{t('common.invite')}
</Button>
<Button
data-cy='update-button'
variant='contained'
startIcon={<CreateIcon fontSize='small' />}
onClick={() => setIsEditDrawerOpen(true)}>
{t('common.update')}
</Button>
{is_owner && (
<Button
data-cy='update-button'
variant='contained'
startIcon={<CreateIcon fontSize='small' />}
onClick={() => setIsEditDrawerOpen(true)}>
{t('common.update')}
</Button>
)}
{userCharacter ? (
<Link
href={route('entry.create').concat(
@@ -111,15 +114,17 @@ const CampaignDetailBox = ({
</Button>
</Link>
)}
<Button
data-cy='kick-button'
variant='contained'
startIcon={<AutoStoriesIcon fontSize='small' />}
onClick={() => {
setIsKickModalOpen(true)
}}>
{t('common.kick')}
</Button>
{is_owner && (
<Button
data-cy='kick-button'
variant='contained'
startIcon={<AutoStoriesIcon fontSize='small' />}
onClick={() => {
setIsKickModalOpen(true)
}}>
{t('common.kick')}
</Button>
)}
</Stack>
</Grid>
</Grid>
3 changes: 2 additions & 1 deletion resources/js/Pages/Campaign/Detail/CampaignDetail.tsx
Original file line number Diff line number Diff line change
@@ -36,7 +36,8 @@ const CampaignDetail = ({

const [isEditCampaignDrawerOpen, setIsEditCampaignDrawerOpen] = useState<boolean>(false)
const {t} = useTranslation()
const linkedAdventure = campaign.adventure
const {adventure: linkedAdventure} = campaign

return (
<>
<Drawer
1 change: 1 addition & 0 deletions resources/js/Types/campaign-data.ts
Original file line number Diff line number Diff line change
@@ -10,4 +10,5 @@ export type CampaignData = {
code: string
character_id: number
characters: CharacterData[]
is_owner: boolean
}
6 changes: 6 additions & 0 deletions resources/mock/campaign-data.ts
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@ export const campaignData = [
{
title: 'campaign1',
code: 'XYZ123',
is_owner: true,
characters: [
{
background: null,
@@ -33,6 +34,7 @@ export const campaignData = [
{
title: 'campaign2',
code: 'XYZ124',
is_owner: true,
characters: [
{
background: null,
@@ -54,6 +56,7 @@ export const campaignData = [
{
title: 'campaign3',
code: 'XYZ125',
is_owner: true,
characters: [
{
background: null,
@@ -75,6 +78,7 @@ export const campaignData = [
{
title: 'campaign4',
code: 'XYZ126',
is_owner: true,
characters: [
{
background: null,
@@ -96,6 +100,7 @@ export const campaignData = [
{
title: 'campaign5',
code: 'XYZ126',
is_owner: true,
characters: [
{
background: null,
@@ -117,6 +122,7 @@ export const campaignData = [
{
title: 'campaign6',
code: 'XYZ127',
is_owner: true,
characters: [
{
background: null,

0 comments on commit 392aded

Please sign in to comment.