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.

Sign up for GitHub

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

Jump to bottom

Issue 1722/sub org survey read only #1941

Merged
merged 35 commits into from
May 27, 2024
Merged

Issue 1722/sub org survey read only #1941

merged 35 commits into from
May 27, 2024

Conversation

kaulfield23
Copy link
Contributor

@kaulfield23 kaulfield23 commented May 6, 2024 •
edited

Description

This PR fixes a bug where sub-organizations were able to edit the original survey shared by the parent organization. It also implements a 'shared with us' project in overview which makes it easier for users to find shared activities.

Screenshots

image
image
image

Shared with us

image
image
image
image

Changes

  • Adds messageIds to relevant places
  • Changes .tsx to .ts of hooks in organization dir
  • Adds isReadOnly to ZUIDateRangePicker and ZUIEditTextInPlace
  • Adds <Alert/> to TabbedLayout
  • Adds shared/index.tsx, shared/acitivities.tsx and shared/archive.tsx
  • Creates SharedCard.tsx

Notes to reviewer

Related issues

Resolves #1722

@kaulfield23
pass campId to surveyLayout prop
36d617c
@kaulfield23
set title readonly when campId is shared
754239e
@kaulfield23
disable buttons, remove tooltip when campId is shared
050cd18
@kaulfield23
add readOnly prop to zuiDateRangePicker and disable it
1784817
@kaulfield23
readOnly to surveyEditor, return null when question is hidden
1aaa5ce
@kaulfield23
hide hidden elements when survey is shared
e5c2113
@kaulfield23
hide submission sidebar when shared
79c4e65
@kaulfield23
add alert message to tabbedLayout when survey is shared
cadba07
@kaulfield23
show alert message when there is orgTitle
1265490
@kaulfield23
try to get role from useOrganizations but it needs some change to store
c0914ae
@kaulfield23
change tsx to ts and rename userOrgList to userMembershipList
3f5a318
@kaulfield23
change useOrganizations to useMemberships
e47853f
@kaulfield23
use useSubOrgs hook instead of useMemberships, create ZetkinMembershi…
7e64617 
…pListData interface
@kaulfield23
navigate to original survey when clicking button in alert
cfa4138
@kaulfield23
use existing useMemberships hook instead
1d841a3
@kaulfield23
move useMemberships hook to organizations dir, remove membershipLoad …
d5fe13a 
…action in campaign store
@kaulfield23
hide questions on submission pane if hidden is true and hide edit war…
9a32f33 
…ning card when shared
@kaulfield23
hide text block on submission pane if elem is hidden
8530c09
@kaulfield23
create SharedCard, pass shared surveys data and add messages for the …
3cae507 
…card
@kaulfield23
navigates to shared with us project and create sharedActivitiesLayout
1cc2803
@kaulfield23
show hidden question and texts to suborgs
988d14b
@kaulfield23
display only shared surveys on acitivities overview card
db88b57
@kaulfield23
add message 'shared' to breadcrumb messageIds
8012e9a
@kaulfield23
creates archive and activities page
cabf0c3
@kaulfield23
shared card visible when there are active shared surveys, rename shar…
09e7956 
…ed to share with us in breadcrumb
@kaulfield23 kaulfield23 marked this pull request as draft May 6, 2024 08:10
@kaulfield23 kaulfield23 marked this pull request as ready for review May 7, 2024 12:27
richardolsson
richardolsson reviewed May 10, 2024
View reviewed changes
Copy link
Member

@richardolsson richardolsson left a comment

Choose a reason for hiding this comment

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

Nice work! I began reviewing this but didn't finish so I didn't publish my comment. I'm publishing them now and will continue to review the rest of the PR as soon as I can, but most likely not until next week.

src/zui/ZUIEditTextInPlace/index.tsx Outdated Show resolved Hide resolved
src/pages/organize/[orgId]/projects/index.tsx Outdated Show resolved Hide resolved
src/pages/organize/[orgId]/projects/index.tsx Outdated Show resolved Hide resolved
@kaulfield23
Copy link
Contributor Author

kaulfield23 commented May 15, 2024 •
edited

Come to think of it, I think <SharedCard/> should not be in surveys dir. I will fix it today!

@richardolsson richardolsson mentioned this pull request May 24, 2024
Open
richardolsson
richardolsson requested changes May 24, 2024
View reviewed changes
Copy link
Member

@richardolsson richardolsson left a comment

Choose a reason for hiding this comment

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

Awesome work on this! I think it's really nice. I've looked at the code and played around with the preview build. There were some texts that I feel could be improved when I saw them in place, but then I think it's ready to merge!

src/features/surveys/l10n/messageIds.ts Outdated Show resolved Hide resolved
src/features/surveys/l10n/messageIds.ts Outdated Show resolved Hide resolved
src/features/campaigns/components/SharedCard.tsx Show resolved Hide resolved
src/features/campaigns/l10n/messageIds.ts Outdated Show resolved Hide resolved
richardolsson
richardolsson previously approved these changes May 27, 2024
View reviewed changes
Copy link
Member

@richardolsson richardolsson left a comment

Choose a reason for hiding this comment

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

With those minor changes to the messages I think this is ready to merge now. Nice work! 🎉

@kaulfield23
Copy link
Contributor Author

Just fixed a merge conflict!

richardolsson
richardolsson approved these changes May 27, 2024
View reviewed changes
Copy link
Member

@richardolsson richardolsson left a comment

Choose a reason for hiding this comment

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

Full speed ahead! 🚀

@kaulfield23 kaulfield23 merged commit 66ea6f0 into main May 27, 2024
5 checks passed
@kaulfield23 kaulfield23 deleted the issue-1722/sub-org-survey-read-only branch May 27, 2024 13:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@richardolsson richardolsson richardolsson approved these changes

@ziggabyte ziggabyte Awaiting requested review from ziggabyte

@rebecarubio rebecarubio Awaiting requested review from rebecarubio

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Accessing an inherited survey presents as if sub-org admin can edit it
2 participants
@kaulfield23 @richardolsson