Skip to content
This repository was archived by the owner on Mar 1, 2025. It is now read-only.

show relevant options for buttons #481

Open
muskanbatra-dev wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

show relevant options for buttons #481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion src/components/member-card/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,11 @@ const Card = ({ developerInfo }) => {
onMouseEnter={() => setShowSettings(true)}
onMouseLeave={() => setShowSettings(false)}
>
<SuperUserOptions username={username} showSettings={showSettings} />
<SuperUserOptions
username={username}
showSettings={showSettings}
isMember={isMember}
/>
<motion.img
layoutId={username}
src={img_url || '/images/Avatar.png'}
Expand Down
10 changes: 8 additions & 2 deletions src/components/member-card/super-user-options/container.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,18 @@ import { useKeyboardContext } from '@store/keyboard/context';
import { userContext } from '@store/user/user-context';
import SuperUserOptions from '.';

const ShowSuperUserOptionContainer = ({ showSettings, username }) => {
const ShowSuperUserOptionContainer = ({ showSettings, username, isMember }) => {
const { isOptionKeyPressed } = useKeyboardContext();
const { isSuperUser } = userContext();

if (isOptionKeyPressed && isSuperUser) {
return <SuperUserOptions username={username} showSettings={showSettings} />;
return (
<SuperUserOptions
username={username}
showSettings={showSettings}
isMember={isMember}
/>
);
}
return null;
};
Expand Down
6 changes: 4 additions & 2 deletions src/components/member-card/super-user-options/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@ import React from 'react';
import classNames from '@components/member-card/card.module.scss';
import { userContext } from '@store/user/user-context';

const SuperUserOptions = ({ showSettings, username }) => {
const { setShowMemberRoleUpdateModal, setSelectedMember } = userContext();
const SuperUserOptions = ({ showSettings, username, isMember }) => {
const { setShowMemberRoleUpdateModal, setSelectedMember, setIsUserMember } =
userContext();

const showModal = (e) => {
e.preventDefault();
setShowMemberRoleUpdateModal(true);
setSelectedMember(username);
setIsUserMember(isMember);
};

return (
Expand Down
17 changes: 17 additions & 0 deletions src/components/member-role-update/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ const MemberRoleUpdate = () => {
showMemberRoleUpdateModal,
setShowMemberRoleUpdateModal,
selectedMember,
isUserMember,
} = userContext();

const [isUpdating, setIsUpdating] = useState(false);
Expand Down Expand Up @@ -41,6 +42,22 @@ const MemberRoleUpdate = () => {
};

const renderPromoteButton = () => {
if (isUserMember) {
return (
<>
<button
className={classNames.moveToMember}
type="button"
onClick={() => archiveTheMember(selectedMember)}
>
Archive Member
</button>
<br />
<p>{updateStatus}</p>
</>
);
}
Comment on lines +45 to +59
Copy link
Contributor

@vinayak-trivedi vinayak-trivedi Nov 5, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we need only one button when the user is a member, so instead of repeating yourself, you can put a condition below where the promote to member button only shows up if the user is not a member, also can you change the text in the button to archive user if the user is not a member


return (
<>
<button
Expand Down
3 changes: 3 additions & 0 deletions src/store/user/user-context.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export const UserContextProvider = ({ children }) => {
useState(false);
const [selectedMember, setSelectedMember] = useState(null);
const [userApiCalled, setUserApiCalled] = useState(false);
const [isUserMember, setIsUserMember] = useState(true);

const setUserPrivileges = useCallback(async () => {
setIsLoading(true);
Expand All @@ -36,6 +37,8 @@ export const UserContextProvider = ({ children }) => {
setUserApiCalled,
setUserPrivileges,
setIsLoading,
isUserMember,
setIsUserMember,
};

return (
Expand Down