Shared camps by carlobeltrame · Pull Request #8004 · ecamp/ecamp3

carlobeltrame · 2025-08-21T14:52:31Z

Fixes #7481
Fixes #7324
Fixes #7445
Fixes #6281

To be discussed / decided / done:

Is the location of the switch in the UI fine, or should it be in the danger zone or on the team page?
Write extensive API permission tests for accessing shared camps and all other entities
Find all places in the UI where we need to hide / disable things for sharing visitors
- Activity filtering UI
- Any "add xyz" buttons
- Anywhere there is a console error
- Improve readability of readonly fields
- more...

github-actions · 2025-09-02T18:23:46Z

⛔ Feature branch deployment currently inactive.

If the PR is still open, you can add the deploy! label to this PR to trigger a feature branch deployment.

carlobeltrame · 2025-09-04T05:35:44Z

...nseSnapshotTest__testGetCollectionMatchesStructure with data set camp_collaborations__1.json

+                            "self": {
+                                "href": "escaped_value"
+                            },
+                            "sharedBy": "escaped_value"


Anyone knows why this isn't wrapped in a { "href": ... }?

Probably because it's null. Maybe we should disable escaping for null values...

yes, it may even be in both places, because api platform cannot differentiate between a null ref and a null value.

carlobeltrame · 2025-09-04T05:36:05Z

api/tests/Api/SnapshotTests/EndpointPerformanceTest.php

    private static function getContentNodeEndpointQueryCountRanges(): array {
        return [
-            '/content_nodes' => [10, 12],
+            '/content_nodes' => [11, 13],


I don't know why this went up...

carlobeltrame · 2025-09-04T05:39:27Z

...apshots__/test_EndpointPerformanceTest__testPerformanceDidNotChangeForStableEndpoints__1.yml

 /activity_responsibles: 6
 /activity_responsibles/item: 8
-/camps: 15
+/camps: 18


What are the numbers in this snapshot? Query count? Why did this go up?

carlobeltrame · 2025-09-04T05:53:11Z

frontend/src/components/campAdmin/CampSharingSettings.vue

+            {{ $tc(`components.campAdmin.campSharingSettings.copyCampLink`) }}
+          </v-tooltip>
+        </v-list-item-action>
+        <v-list-item-action v-if="isManager" class="align-self-start">


As with all camp settings, the frontend only allows managers to change this, but in the API it is also possible for members. #3440

Follow-up for ecamp#8004 Querying by isPrototype OR isShared is slow, because databases don't like OR conditions too much. We work around this by adding a combined isPublic field which is enforced to always contain isShared || isPrototype and have the DB queries filter by that.

Refs ecamp#8004

carlobeltrame force-pushed the shared-camps branch from b70271c to 4030b09 Compare August 21, 2025 15:39

carlobeltrame force-pushed the shared-camps branch 2 times, most recently from 19845e2 to 5f0de3a Compare August 29, 2025 15:02

carlobeltrame mentioned this pull request Aug 29, 2025

Add material overview for orphan (unassigned) material items #8053

Merged

carlobeltrame added the deploy! Creates a feature branch deployment for this PR label Sep 2, 2025

carlobeltrame temporarily deployed to feature-branch September 2, 2025 18:19 — with GitHub Actions Inactive

carlobeltrame force-pushed the shared-camps branch from 5f0de3a to e93b56d Compare September 3, 2025 22:29

carlobeltrame temporarily deployed to feature-branch September 3, 2025 22:32 — with GitHub Actions Inactive

carlobeltrame force-pushed the shared-camps branch from e93b56d to cc3806d Compare September 4, 2025 05:25

carlobeltrame temporarily deployed to feature-branch September 4, 2025 05:27 — with GitHub Actions Inactive

carlobeltrame removed the deploy! Creates a feature branch deployment for this PR label Sep 4, 2025

carlobeltrame commented Sep 4, 2025

View reviewed changes

carlobeltrame force-pushed the shared-camps branch 2 times, most recently from e2f1de3 to 48d92bb Compare September 4, 2025 05:49

carlobeltrame commented Sep 4, 2025

View reviewed changes

carlobeltrame marked this pull request as ready for review September 4, 2025 06:05

carlobeltrame changed the title ~~WIP share camps~~ Shared camps Sep 4, 2025

carlobeltrame mentioned this pull request Sep 4, 2025

Shared camps with filters #8103

Draft

8 tasks

carlobeltrame added the deploy! Creates a feature branch deployment for this PR label Sep 5, 2025

carlobeltrame temporarily deployed to feature-branch September 5, 2025 17:23 — with GitHub Actions Inactive

carlobeltrame force-pushed the shared-camps branch from 7ab2a38 to fa8f622 Compare September 6, 2025 01:21

carlobeltrame had a problem deploying to feature-branch September 6, 2025 01:24 — with GitHub Actions Error

carlobeltrame force-pushed the shared-camps branch 2 times, most recently from ee508e6 to 3972403 Compare September 6, 2025 01:25

carlobeltrame had a problem deploying to feature-branch September 6, 2025 01:27 — with GitHub Actions Failure

carlobeltrame added deploy! Creates a feature branch deployment for this PR and removed deploy! Creates a feature branch deployment for this PR labels Sep 6, 2025

carlobeltrame had a problem deploying to feature-branch September 6, 2025 01:42 — with GitHub Actions Failure

carlobeltrame removed the deploy! Creates a feature branch deployment for this PR label Sep 6, 2025

carlobeltrame and others added 8 commits October 3, 2025 15:59

Keep track of when and who last set the isShared flag

0fdf4df

Filter away shared camps in the API requests

5c995cb

Add tests for sharing camps

2f03815

fixup! Keep track of when and who last set the isShared flag

ce46530

fixup! Add tests for sharing camps

bc52e2b

fixup! Keep track of when and who last set the isShared flag

399114c

Fixes from code review

4009612

Improve ux of camp share

1960a91

carlobeltrame force-pushed the shared-camps branch from d213706 to 1960a91 Compare October 3, 2025 14:17

carlobeltrame temporarily deployed to feature-branch October 3, 2025 14:21 — with GitHub Actions Inactive

carlobeltrame requested a review from BacLuc October 3, 2025 14:23

carlobeltrame temporarily deployed to feature-branch October 3, 2025 16:16 — with GitHub Actions Inactive

Fix tests and linter

6b05540

carlobeltrame force-pushed the shared-camps branch from 256330f to 6b05540 Compare October 3, 2025 17:06

carlobeltrame temporarily deployed to feature-branch October 3, 2025 17:08 — with GitHub Actions Inactive

carlobeltrame added the before-vue3 label Oct 3, 2025

carlobeltrame temporarily deployed to feature-branch October 3, 2025 18:03 — with GitHub Actions Inactive

pmattmann approved these changes Oct 3, 2025

View reviewed changes

usu approved these changes Oct 3, 2025

View reviewed changes

usu added this pull request to the merge queue Oct 3, 2025

Merged via the queue into ecamp:devel with commit 15b332a Oct 3, 2025
46 checks passed

github-actions bot mentioned this pull request Oct 3, 2025

Deploy to staging #8262

Merged

carlobeltrame deleted the shared-camps branch October 3, 2025 21:08

github-actions bot mentioned this pull request Oct 3, 2025

Deploy to prod #8266

Closed

carlobeltrame mentioned this pull request Oct 4, 2025

Add isPublic field for query performance #8274

Merged

carlobeltrame added a commit to carlobeltrame/ecamp3 that referenced this pull request Oct 4, 2025

Adapt ACL to combined isPublic column

4bad327

Refs ecamp#8004

github-actions bot mentioned this pull request Oct 4, 2025

Staging -> Prod #8278

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Shared camps#8004

Shared camps#8004
usu merged 13 commits intoecamp:develfrom
carlobeltrame:shared-camps

carlobeltrame commented Aug 21, 2025 •

edited

Loading

Uh oh!

github-actions bot commented Sep 2, 2025 •

edited

Loading

Uh oh!

carlobeltrame Sep 4, 2025

Uh oh!

carlobeltrame Oct 3, 2025

Uh oh!

BacLuc Oct 3, 2025

Uh oh!

carlobeltrame Sep 4, 2025

Uh oh!

carlobeltrame Sep 6, 2025

Uh oh!

carlobeltrame Sep 4, 2025

Uh oh!

carlobeltrame Sep 6, 2025

Uh oh!

carlobeltrame Sep 4, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

carlobeltrame commented Aug 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Sep 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

⛔ Feature branch deployment currently inactive.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

carlobeltrame commented Aug 21, 2025 •

edited

Loading

github-actions bot commented Sep 2, 2025 •

edited

Loading