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.

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

refactor: Landscape membership list #1262

Closed
wants to merge 31 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
f288a4f
chore: Upgrade shared version
josebui Oct 11, 2023
d5f25ac
refactor: Use membership list for home page and landscapeService
josebui Oct 11, 2023
54f38b4
refactor: (WIP) Landscape view membership list
josebui Oct 11, 2023
e9a66e4
chore: Updated shared version
josebui Oct 27, 2023
699c983
fix: Fixed Landscape View, Landscape List, Shared data link to Landscape
josebui Oct 30, 2023
1d19913
fix: Get home landscapes by user email
josebui Oct 31, 2023
297310a
fix: Linter fixes
josebui Oct 31, 2023
ab5ad69
refactor: (WIP) Landscape membership list
josebui Oct 31, 2023
c7a3e43
refactor: Landscape members list
josebui Oct 31, 2023
26b1cfb
fix: Removed default landscape group filter
josebui Nov 1, 2023
787e544
fix: Use collaboration context for shared data components
josebui Nov 1, 2023
db1cc89
chore: Updated shared version
josebui Nov 1, 2023
692b0a5
fix: Fixed tests
josebui Nov 1, 2023
b61b8e9
chore: Updated shared version
josebui Nov 1, 2023
c7ae8c5
fix: Added base url for collaboration context in group view
josebui Nov 1, 2023
5fb5cde
fix: Moved string to collaboration
josebui Nov 1, 2023
8779e79
fix: Get manage members permission in landscape view
josebui Nov 1, 2023
7af1640
fix: Linter fix
josebui Nov 1, 2023
715580a
Update src/landscape/landscapeSlice.js
josebui Nov 7, 2023
c5718b0
Update src/collaboration/components/MemberJoin.js
josebui Nov 7, 2023
c12141c
Update src/collaboration/components/MembershipJoinLeaveButton.js
josebui Nov 7, 2023
b09c6cf
Update src/collaboration/components/MembershipPendingWarning.js
josebui Nov 7, 2023
9a21373
Update src/collaboration/components/MembershipJoinLeaveButton.js
josebui Nov 7, 2023
8166715
Update src/collaboration/collaborationContext.js
josebui Nov 7, 2023
301b693
Update src/collaboration/components/MembershipCard.js
josebui Nov 7, 2023
d5ae619
Update src/collaboration/components/MembershipCard.js
josebui Nov 7, 2023
53f9fd3
Update src/collaboration/components/MembershipCount.js
josebui Nov 7, 2023
4868b85
fix: Small fixes from PR comments
josebui Nov 7, 2023
7411532
fix: Added label to role select
josebui Nov 7, 2023
525e89e
fix: Linter fix
josebui Nov 7, 2023
472a8f7
chore: Updated shared version
josebui Nov 10, 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
Prev Previous commit
Next Next commit
fix: Get manage members permission in landscape view
josebui committed Nov 21, 2023
commit 8779e794b6450a0208ef30f2d88cadc9129835ed
4 changes: 3 additions & 1 deletion src/landscape/components/LandscapeView.js
Original file line number Diff line number Diff line change
@@ -69,6 +69,7 @@ import BaseMap from './LandscapeMap';
import { Partnership } from './LandscapeProfile/AffiliationCard';

import theme from 'theme';
import { usePermission } from 'permissions';

const MemberLeaveButton = withProps(LandscapeMemberLeave, {
label: 'landscape.view_leave_label',
@@ -235,6 +236,7 @@ const LandscapeView = () => {
state => state.landscape.view
);
const { slug } = useParams();
const { allowed: allowedToManageMembers } = usePermission('landscape.manageMembers', landscape);

useDocumentTitle(
t('landscape.view_document_title', {
@@ -400,7 +402,7 @@ const LandscapeView = () => {
style={{ display: 'flex', alignItems: 'flex-start' }}
>
<MembershipCard
// TODO allowedToManageMembers
allowedToManageMembers={allowedToManageMembers}
onViewMembers={() =>
navigate(`/landscapes/${landscape.slug}/members`)
}