From 837e76686a08209039a2c515a687884505ed0424 Mon Sep 17 00:00:00 2001 From: Mark Volkmann Date: Tue, 30 Apr 2024 14:55:05 -0500 Subject: [PATCH 1/5] initial work on adding Switch in EditGuildModal --- .../guild-results/EditGuildModal.jsx | 39 +++++++++++++++---- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/web-ui/src/components/guild-results/EditGuildModal.jsx b/web-ui/src/components/guild-results/EditGuildModal.jsx index fc17c433ac..3f5d87f3ac 100644 --- a/web-ui/src/components/guild-results/EditGuildModal.jsx +++ b/web-ui/src/components/guild-results/EditGuildModal.jsx @@ -6,7 +6,13 @@ import { selectCurrentMembers } from '../../context/selectors'; -import { Button, Modal, TextField } from '@mui/material'; +import { + Button, + FormControlLabel, + Modal, + Switch, + TextField +} from '@mui/material'; import Autocomplete from '@mui/material/Autocomplete'; import './EditGuildModal.css'; @@ -14,10 +20,14 @@ const EditGuildModal = ({ guild = {}, open, onSave, onClose, headerText }) => { const { state } = useContext(AppContext); const currentUser = selectCurrentUser(state); const [editedGuild, setGuild] = useState(guild); + const [isCommunity, setIsCommunity] = useState(false); const [guildMemberOptions, setGuildMemberOptions] = useState([]); const currentMembers = selectCurrentMembers(state); const guildMembers = guild?.guildMembers; + console.log('EditGuildModal.jsx : editedGuild =', editedGuild); + console.log('EditGuildModal.jsx : guildMemberOptions =', guildMemberOptions); + const findExistingMember = useCallback( member => guildMembers?.find(current => current.memberId === member.memberId), @@ -159,6 +169,17 @@ const EditGuildModal = ({ guild = {}, open, onSave, onClose, headerText }) => { value={editedGuild.name ? editedGuild.name : ''} onChange={e => setGuild({ ...editedGuild, name: e.target.value })} /> +
+ setIsCommunity(c => !c)} + /> + } + label="Community" + /> +
{ ? editedGuild.guildMembers.filter(guildMember => guildMember.lead) : [] } - isOptionEqualToValue={(option, value) => - value && option.id === value.memberId - } + isOptionEqualToValue={(option, value) => { + console.log('guildLeadSelect: option =', option); + console.log('guildLeadSelect: value =', value); + return value && option.id === value.memberId; + }} onChange={onLeadsChange} getOptionLabel={option => option.name} renderInput={params => ( @@ -213,9 +236,11 @@ const EditGuildModal = ({ guild = {}, open, onSave, onClose, headerText }) => { } onChange={onGuildMembersChange} getOptionLabel={option => option.name} - isOptionEqualToValue={(option, value) => - value && option.id === value.memberId - } + isOptionEqualToValue={(option, value) => { + console.log('guildMemberOptions: option =', option); + console.log('guildMemberOptions: value =', value); + value && option.id === value.memberId; + }} renderInput={params => ( Date: Wed, 1 May 2024 13:09:50 -0500 Subject: [PATCH 2/5] progress on 2287 --- web-ui/src/api/guild.js | 2 ++ .../components/guild-results/EditGuildModal.jsx | 14 ++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/web-ui/src/api/guild.js b/web-ui/src/api/guild.js index a09fc9cbaa..7312bf7f8b 100644 --- a/web-ui/src/api/guild.js +++ b/web-ui/src/api/guild.js @@ -21,6 +21,7 @@ export const getMembersByGuild = async (id, cookie) => { }; export const updateGuild = async (guild, cookie) => { + console.log('guild.js updateGuild: guild =', guild); return resolve({ method: 'PUT', url: guildUrl, @@ -51,6 +52,7 @@ export const getAllGuilds = async cookie => { }; export const createGuild = async (guild, cookie) => { + console.log('guild.js createGuild: guild =', guild); return resolve({ method: 'POST', url: guildUrl, diff --git a/web-ui/src/components/guild-results/EditGuildModal.jsx b/web-ui/src/components/guild-results/EditGuildModal.jsx index 3f5d87f3ac..8af0fc3e79 100644 --- a/web-ui/src/components/guild-results/EditGuildModal.jsx +++ b/web-ui/src/components/guild-results/EditGuildModal.jsx @@ -20,13 +20,11 @@ const EditGuildModal = ({ guild = {}, open, onSave, onClose, headerText }) => { const { state } = useContext(AppContext); const currentUser = selectCurrentUser(state); const [editedGuild, setGuild] = useState(guild); - const [isCommunity, setIsCommunity] = useState(false); const [guildMemberOptions, setGuildMemberOptions] = useState([]); const currentMembers = selectCurrentMembers(state); const guildMembers = guild?.guildMembers; console.log('EditGuildModal.jsx : editedGuild =', editedGuild); - console.log('EditGuildModal.jsx : guildMemberOptions =', guildMemberOptions); const findExistingMember = useCallback( member => @@ -173,8 +171,14 @@ const EditGuildModal = ({ guild = {}, open, onSave, onClose, headerText }) => { setIsCommunity(c => !c)} + checked={editedGuild.community} + onChange={event => { + const { checked } = event.target; + setGuild(g => { + g.community = checked; + return g; + }); + }} /> } label="Community" @@ -209,8 +213,6 @@ const EditGuildModal = ({ guild = {}, open, onSave, onClose, headerText }) => { : [] } isOptionEqualToValue={(option, value) => { - console.log('guildLeadSelect: option =', option); - console.log('guildLeadSelect: value =', value); return value && option.id === value.memberId; }} onChange={onLeadsChange} From b6bf29d1fec7c3af269ba92826500546591af02d Mon Sep 17 00:00:00 2001 From: Mark Volkmann Date: Thu, 2 May 2024 09:33:04 -0500 Subject: [PATCH 3/5] added Community switch to EditGuildModal --- .../components/guild-results/EditGuildModal.jsx | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/web-ui/src/components/guild-results/EditGuildModal.jsx b/web-ui/src/components/guild-results/EditGuildModal.jsx index 8af0fc3e79..ba8e28a0b8 100644 --- a/web-ui/src/components/guild-results/EditGuildModal.jsx +++ b/web-ui/src/components/guild-results/EditGuildModal.jsx @@ -24,8 +24,6 @@ const EditGuildModal = ({ guild = {}, open, onSave, onClose, headerText }) => { const currentMembers = selectCurrentMembers(state); const guildMembers = guild?.guildMembers; - console.log('EditGuildModal.jsx : editedGuild =', editedGuild); - const findExistingMember = useCallback( member => guildMembers?.find(current => current.memberId === member.memberId), @@ -174,10 +172,7 @@ const EditGuildModal = ({ guild = {}, open, onSave, onClose, headerText }) => { checked={editedGuild.community} onChange={event => { const { checked } = event.target; - setGuild(g => { - g.community = checked; - return g; - }); + setGuild({ ...editedGuild, community: checked }); }} /> } @@ -238,11 +233,9 @@ const EditGuildModal = ({ guild = {}, open, onSave, onClose, headerText }) => { } onChange={onGuildMembersChange} getOptionLabel={option => option.name} - isOptionEqualToValue={(option, value) => { - console.log('guildMemberOptions: option =', option); - console.log('guildMemberOptions: value =', value); - value && option.id === value.memberId; - }} + isOptionEqualToValue={(option, value) => + value && option.id === value.memberId + } renderInput={params => ( Date: Thu, 2 May 2024 09:33:56 -0500 Subject: [PATCH 4/5] removed console.log calls from guild.js --- web-ui/src/api/guild.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/web-ui/src/api/guild.js b/web-ui/src/api/guild.js index 7312bf7f8b..a09fc9cbaa 100644 --- a/web-ui/src/api/guild.js +++ b/web-ui/src/api/guild.js @@ -21,7 +21,6 @@ export const getMembersByGuild = async (id, cookie) => { }; export const updateGuild = async (guild, cookie) => { - console.log('guild.js updateGuild: guild =', guild); return resolve({ method: 'PUT', url: guildUrl, @@ -52,7 +51,6 @@ export const getAllGuilds = async cookie => { }; export const createGuild = async (guild, cookie) => { - console.log('guild.js createGuild: guild =', guild); return resolve({ method: 'POST', url: guildUrl, From 77104cb76108edc992adcbc4d25d804f3fca3c63 Mon Sep 17 00:00:00 2001 From: Mark Volkmann Date: Thu, 2 May 2024 09:35:17 -0500 Subject: [PATCH 5/5] undid a change in EditGuildModal --- web-ui/src/components/guild-results/EditGuildModal.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web-ui/src/components/guild-results/EditGuildModal.jsx b/web-ui/src/components/guild-results/EditGuildModal.jsx index ba8e28a0b8..41e009a2e5 100644 --- a/web-ui/src/components/guild-results/EditGuildModal.jsx +++ b/web-ui/src/components/guild-results/EditGuildModal.jsx @@ -207,9 +207,9 @@ const EditGuildModal = ({ guild = {}, open, onSave, onClose, headerText }) => { ? editedGuild.guildMembers.filter(guildMember => guildMember.lead) : [] } - isOptionEqualToValue={(option, value) => { - return value && option.id === value.memberId; - }} + isOptionEqualToValue={(option, value) => + value && option.id === value.memberId + } onChange={onLeadsChange} getOptionLabel={option => option.name} renderInput={params => (