From 5b9f83e1348cf9c5682b7f117352af2f89a91a48 Mon Sep 17 00:00:00 2001 From: wilson Date: Tue, 15 Mar 2022 13:45:09 -0400 Subject: [PATCH 1/2] fix: hide buttons for campaign non-owners --- .../CampaignDetail/CampaignDetailBox.tsx | 37 +++++++++++-------- .../Pages/Campaign/Detail/CampaignDetail.tsx | 3 +- resources/js/Types/campaign-data.ts | 1 + 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/resources/js/Components/Detail/CampaignDetail/CampaignDetailBox.tsx b/resources/js/Components/Detail/CampaignDetail/CampaignDetailBox.tsx index 6e49f695e..cfdabfd05 100644 --- a/resources/js/Components/Detail/CampaignDetail/CampaignDetailBox.tsx +++ b/resources/js/Components/Detail/CampaignDetail/CampaignDetailBox.tsx @@ -31,6 +31,7 @@ const CampaignDetailBox = ({ const {t} = useTranslation() const [isKickModalOpen, setIsKickModalOpen] = useState(false) const {enqueueSnackbar} = useSnackbar() + const {is_owner} = campaign return ( <> @@ -81,13 +82,15 @@ const CampaignDetailBox = ({ }}> {t('common.invite')} - + {is_owner && ( + + )} {userCharacter && ( - + {is_owner && ( + + )} diff --git a/resources/js/Pages/Campaign/Detail/CampaignDetail.tsx b/resources/js/Pages/Campaign/Detail/CampaignDetail.tsx index d881c96c0..857e598cd 100644 --- a/resources/js/Pages/Campaign/Detail/CampaignDetail.tsx +++ b/resources/js/Pages/Campaign/Detail/CampaignDetail.tsx @@ -36,7 +36,8 @@ const CampaignDetail = ({ const [isEditCampaignDrawerOpen, setIsEditCampaignDrawerOpen] = useState(false) const {t} = useTranslation() - const linkedAdventure = campaign.adventure + const {adventure: linkedAdventure} = campaign + return ( <> Date: Tue, 15 Mar 2022 14:01:59 -0400 Subject: [PATCH 2/2] test: fix unit test --- resources/mock/campaign-data.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/resources/mock/campaign-data.ts b/resources/mock/campaign-data.ts index 554d043d2..b6b51329b 100644 --- a/resources/mock/campaign-data.ts +++ b/resources/mock/campaign-data.ts @@ -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,