Shared camps #8004

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 ready!

Name	Link
😎 Deployment	https://pr8004.ecamp3.ch/
🔑 Login	`[email protected]` / `test`
🕒 Last deployed at	Thu Sep 18 2025 14:42:21 GMT+0200
🔨 Latest commit	d2137062d49bc21b827c66b3ee4f3146b83ea623
🔍 Latest deploy log	https://github.com/ecamp/ecamp3/actions/runs/17828960286/job/50688901760
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

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": ... }?

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

api/src/State/CampUpdateProcessor.php

BacLuc · 2025-09-06T09:52:09Z

https://github.com/coderabbitai review this pr

BacLuc · 2025-09-06T10:50:58Z

@coderabbitai review this pr

coderabbitai · 2025-09-06T10:51:14Z

@BacLuc I'll review the PR for you, focusing on the shared camps functionality implementation including the API permission changes, UI modifications for sharing visitors, and overall code quality.

✅ Actions performed

Review triggered.

Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.

carlobeltrame · 2025-09-06T11:00:08Z

api/tests/Api/Camps/UpdateCampTest.php

+            'detail' => 'Access Denied.',
+        ]);
+    }
+


Add tests for setting and un-setting the flag, and check that the sharedSince and sharedBy fields are set correctly.

BacLuc

already very cool, thank you

BacLuc · 2025-09-06T10:00:38Z

api/src/Entity/Camp.php


+    /**
+     * Whether the programme of this camp is publicly available to anyone (except for
+     * personal data such as camp collaborations, personal material lists,


The comment might not yet be correct

BacLuc · 2025-09-06T10:01:21Z

api/src/Entity/Camp.php

+    /**
+     * Date and time when the camp was last set to be shared publicly.
+     */
+    #[ApiProperty(example: '2025-10-01T00:00:00+00:00', required: true, openapiContext: ['format' => 'date-time'])]


why required?

BacLuc · 2025-09-06T10:26:23Z

api/src/State/CampUpdateProcessor.php

+    }
+
+    public function onBeforeSharingStatusChange(Camp $data): Camp {
+        if ($data->isShared) {


The idea is to keep the timestamp when the camp was last shared and by whom, even if its not shared anymore.

BacLuc · 2025-09-06T10:27:53Z

api/tests/Api/Activities/CreateActivityTest.php

+        ]);
+    }
+
+    public function testCreateActivityInSharedCampIsDeniedForUnrelatedUser() {


testCreateActivityInSharedCampIsAllowedForCollaborator?

BacLuc · 2025-09-06T10:28:45Z

api/tests/Api/Activities/DeleteActivityTest.php

+        ]);
+    }
+
+    public function testDeleteActivityFromCampSharedIsDeniedForInvitedUser() {


testDeleteActivityFromCampSharedIsAllowedForCollaborator

BacLuc · 2025-09-06T11:00:52Z

...nseSnapshotTest__testGetCollectionMatchesStructure with data set camp_collaborations__1.json

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


Here too... is this correct

frontend/src/components/camp/FooterSharedCamp.vue

frontend/src/components/campAdmin/CampSharingSettings.vue

BacLuc · 2025-09-06T11:08:52Z

frontend/src/components/checklist/SortableChecklistItem.vue

 <template>
-  <div class="e-sortable-checklist-item" @dragstart="gugus">
-    <ChecklistItemEdit :checklist="checklist" :checklist-item="item">
+  <div class="e-sortable-checklist-item" @dragstart="startDragging">


maybe put into a separate component later

BacLuc · 2025-09-06T11:12:13Z

frontend/src/locales/de.json

      "navigation": {
        "desktop": {
          "navTopbar": {
-            "admin": "Admin",


were these left over translations?

Yes, exactly. They were referenced nowhere.

BacLuc · 2025-09-06T14:46:48Z

@coderabbitai review this pr again

coderabbitai · 2025-09-06T14:47:05Z

@BacLuc I'll conduct a comprehensive re-review of the entire PR, examining all the changes in the shared camps functionality implementation including the API permissions, UI modifications for sharing visitors, and code quality across all modified files.

✅ Actions performed

Full review triggered.

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 added 2 commits September 6, 2025 03:21

Allow sharing a camp

09fa06c

Adjust UI to absence of an active camp collaboration

ba00077

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 added 2 commits September 6, 2025 04:06

Add omnipresent banner about shared camp status

bf34949

Mark shared camps on camp list

9dfd9d8

carlobeltrame force-pushed the shared-camps branch from 3972403 to 690bed3 Compare September 6, 2025 02:07

carlobeltrame temporarily deployed to feature-branch September 6, 2025 02:09 — with GitHub Actions Inactive

carlobeltrame force-pushed the shared-camps branch from 690bed3 to 0da05df Compare September 6, 2025 02:18

carlobeltrame temporarily deployed to feature-branch September 6, 2025 02:20 — with GitHub Actions Inactive

carlobeltrame commented Sep 6, 2025

View reviewed changes

api/src/State/CampUpdateProcessor.php Outdated Show resolved Hide resolved

carlobeltrame added 3 commits September 6, 2025 04:43

Keep track of when and who last set the isShared flag

f011eb9

Filter away shared camps in the API requests

b3f8899

Add tests for sharing camps

79c8368

carlobeltrame force-pushed the shared-camps branch from 0da05df to 79c8368 Compare September 6, 2025 02:43

carlobeltrame requested a review from a team September 6, 2025 02:46

carlobeltrame temporarily deployed to feature-branch September 6, 2025 02:46 — with GitHub Actions Inactive

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

70546e6

carlobeltrame temporarily deployed to feature-branch September 6, 2025 09:49 — with GitHub Actions Inactive

carlobeltrame mentioned this pull request Sep 6, 2025

n+1 database queries when fetching /content_nodes and /camps endpoints #8123

Open

carlobeltrame commented Sep 6, 2025

View reviewed changes

BacLuc reviewed Sep 6, 2025

View reviewed changes

BacLuc mentioned this pull request Sep 6, 2025

chore(api): run rector again #7825

Draft

BacLuc requested a review from a team September 6, 2025 14:46

Improve ux of camp share

d213706

manuelmeister temporarily deployed to feature-branch September 6, 2025 20:53 — with GitHub Actions Inactive

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

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

Shared camps #8004

Are you sure you want to change the base?

Shared camps #8004

Uh oh!

Conversation

carlobeltrame commented Aug 21, 2025 • edited by BacLuc 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 ready!

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!

BacLuc commented Sep 6, 2025

Uh oh!

BacLuc commented Sep 6, 2025

Uh oh!

coderabbitai bot commented Sep 6, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

BacLuc left a comment

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!

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!

BacLuc commented Sep 6, 2025

Uh oh!

coderabbitai bot commented Sep 6, 2025

Uh oh!

Uh oh!

carlobeltrame commented Aug 21, 2025 •

edited by BacLuc

Loading

github-actions bot commented Sep 2, 2025 •

edited

Loading