-
Notifications
You must be signed in to change notification settings - Fork 61
Shared camps with filters #8103
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
Draft
carlobeltrame
wants to merge
6
commits into
ecamp:devel
Choose a base branch
from
carlobeltrame:shared-camps-with-filters
base: devel
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
a54618b
Add isPublic field for query performance
carlobeltrame 4bad327
Adapt ACL to combined isPublic column
carlobeltrame 9f0279b
Add tests for sharing camps
carlobeltrame ce665df
Filter away person-related data in public camps
carlobeltrame 655ef1b
Filter out personal material lists
carlobeltrame f488958
Adjust UI to limited permissions of outsiders
carlobeltrame File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace DoctrineMigrations; | ||
|
|
||
| use Doctrine\DBAL\Schema\Schema; | ||
| use Doctrine\Migrations\AbstractMigration; | ||
|
|
||
| final class Version20250903154700 extends AbstractMigration { | ||
| public function getDescription(): string { | ||
| return 'Add another view for filtering out person-related data in public camps'; | ||
| } | ||
|
|
||
| public function up(Schema $schema): void { | ||
| $this->addSql( | ||
| <<<'EOF' | ||
| CREATE OR REPLACE VIEW public.view_user_camps | ||
| AS | ||
| select cc.id::TEXT, cc.userid, cc.campid | ||
| from camp_collaboration cc | ||
| where cc.status = 'established' | ||
| EOF | ||
| ); | ||
| $this->addSql( | ||
| <<<'EOF' | ||
| CREATE OR REPLACE VIEW public.view_user_camps_with_public | ||
| AS | ||
| SELECT CONCAT(u.id, c.id) id, u.id userid, c.id campid | ||
| from camp c, "user" u | ||
| where c.isprototype = TRUE or c.isshared = TRUE | ||
| union all | ||
| select cc.id, cc.userid, cc.campid | ||
| from camp_collaboration cc | ||
| where cc.status = 'established' | ||
| EOF | ||
| ); | ||
| } | ||
|
|
||
| public function down(Schema $schema): void { | ||
| $this->addSql('DROP VIEW IF EXISTS public.view_user_camps_with_public'); | ||
| $this->addSql( | ||
| <<<'EOF' | ||
| CREATE OR REPLACE VIEW public.view_user_camps | ||
| AS | ||
| SELECT CONCAT(u.id, c.id) id, u.id userid, c.id campid | ||
| from camp c, "user" u | ||
| where c.isprototype = TRUE | ||
| union all | ||
| select cc.id, cc.userid, cc.campid | ||
| from camp_collaboration cc | ||
| where cc.status = 'established' | ||
| EOF | ||
| ); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace DoctrineMigrations; | ||
|
|
||
| use Doctrine\DBAL\Schema\Schema; | ||
| use Doctrine\Migrations\AbstractMigration; | ||
|
|
||
| /** | ||
| * Auto-generated Migration: Please modify to your needs! | ||
| */ | ||
| final class Version20251004093025 extends AbstractMigration { | ||
| public function getDescription(): string { | ||
| return ''; | ||
| } | ||
|
|
||
| public function up(Schema $schema): void { | ||
| // this up() migration is auto-generated, please modify it to your needs | ||
| $this->addSql('ALTER TABLE camp ADD isPublic BOOLEAN DEFAULT false NOT NULL'); | ||
| $this->addSql('UPDATE camp SET isPublic = (isShared OR isPrototype)'); | ||
| $this->addSql('ALTER TABLE camp ADD CONSTRAINT enforce_public_flag CHECK (isPublic = (isShared OR isPrototype))'); | ||
| $this->addSql('CREATE INDEX IDX_C1944230FADC24C7 ON camp (isPublic)'); | ||
| $this->addSql( | ||
| <<<'EOF' | ||
| CREATE OR REPLACE VIEW public.view_user_camps | ||
| AS | ||
| SELECT CONCAT(u.id, c.id) id, u.id userid, c.id campid | ||
| from camp c, "user" u | ||
| where c.ispublic = TRUE | ||
| union all | ||
| select cc.id, cc.userid, cc.campid | ||
| from camp_collaboration cc | ||
| where cc.status = 'established' | ||
| EOF | ||
| ); | ||
| } | ||
|
|
||
| public function down(Schema $schema): void { | ||
| // this down() migration is auto-generated, please modify it to your needs | ||
| $this->addSql( | ||
| <<<'EOF' | ||
| CREATE OR REPLACE VIEW public.view_user_camps | ||
| AS | ||
| SELECT CONCAT(u.id, c.id) id, u.id userid, c.id campid | ||
| from camp c, "user" u | ||
| where c.isprototype = TRUE or c.isshared = TRUE | ||
| union all | ||
| select cc.id, cc.userid, cc.campid | ||
| from camp_collaboration cc | ||
| where cc.status = 'established' | ||
| EOF | ||
| ); | ||
| $this->addSql('DROP INDEX IDX_C1944230FADC24C7'); | ||
| $this->addSql('ALTER TABLE camp DROP CONSTRAINT enforce_public_flag'); | ||
| $this->addSql('ALTER TABLE camp DROP isPublic'); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When
/camps/camp-id/camp_collaborationsis accessed, and the camp has set 'isPublic', then this endpoint may be displayed, but as an empty array.Am I correctly?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Exactly. This allows the frontend to "fail" gracefully. If someone visits the team page (even though it's not in the menu), they will see an empty list