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

feat(organization): add new route for organization projects TASK-975 #5240

Merged
merged 55 commits into from
Nov 14, 2024
Merged

feat(organization): add new route for organization projects TASK-975 #5240

merged 55 commits into from
Nov 14, 2024

Conversation

magicznyleszek
Copy link
Member

@magicznyleszek magicznyleszek commented Nov 7, 2024 •
edited
Loading

🗒️ Checklist

  1. run linter locally
  2. update all related docs (API, README, inline, etc.), if any
  3. draft PR with a title <type>(<scope>)<!>: <title> TASK-1234
  4. tag PR: at least frontend or backend unless it's global
  5. fill in the template below and delete template comments
  6. review thyself: read the diff and repro the preview as written
  7. open PR & confirm that CI passes
  8. request reviewers, if needed
  9. delete this section before merging

📣 Summary

Make it possible to view your organization projects in a table.

📖 Description

Add new route for viewing your organization projects at #/projects/organization. Make it possible to switch into the new route through the View Switcher UI element.

👀 Preview steps

  1. ℹ️ have a non admin account (e.g. "joe") with couple of projects
  2. enable feature flag mmosEnabled
  3. navigate to "My projects"
  4. 🟢 notice that "My projects" is just a text, not a View Switcher (kind of a dropdown)
  5. log in as admin and go to http://kf.kobo.local/admin/organizations/organization/
  6. choose non admin account oganization (e.g. "joe's organization")
  7. enable "Multi-members override"
  8. log in as non admin account ("joe")
  9. navigate to "My projects"
  10. 🟢 notice that "My projects" is a View Switcher (kind of a dropdown), and one of the options would be the non admin account organization name ("joe's organization")
  11. select organization
  12. 🟢 notice that in the Projects Table the organizations projects load properly

💭 Notes

This is build atop #5218 so it would be best to wait with merge until the BE PR is done. Still, this one is totally reviewable ❤️

noliveleger and others added 30 commits October 21, 2024 15:29
@noliveleger
Draft of organization assets endpoint
cccb2c9
@noliveleger
Merge branch 'task-958-set-owner-accordingly' into task-960-organizat…
dffa612 
…ion-assets-endpoint
@noliveleger
Add new endpoint for org assets
9c7f4b2
@noliveleger
Restrict org admin to view org assets only
857867e
@noliveleger
Handle permission exception for org admins
bce9c54
@noliveleger
Add delete asset permission to org admins
7b312d4
@noliveleger
Merge branch 'main' into task-960-organization-assets-endpoint
a649509
@noliveleger
Merge branch 'task-958-set-owner-accordingly' into task-960-organizat…
914f102 
…ion-assets-endpoint
@noliveleger
Make org admins access project details
05efe40
@noliveleger
Merge branch 'task-958-set-owner-accordingly' into task-960-organizat…
8c6fff3 
…ion-assets-endpoint
@noliveleger
Merge branch 'task-958-set-owner-accordingly' into task-960-organizat…
f06fd5b 
…ion-assets-endpoint
@noliveleger
Merge branch 'main' into task-960-organization-assets-endpoint
e529991
@noliveleger
Fix bad merge
88a289b
@noliveleger
Bypass Guardian in OpenRosa when user is an org admin
d9c8430
@noliveleger
Rename variables
5800ed4
@noliveleger
Delete own organization when user is added to another org
e8227b7
@noliveleger
Block add_user if org is not MMO
1eaa215
@noliveleger
Refactor permissions system for org admins on related asset objects
6b3ac7d
@noliveleger
Refactor old unit tests for organization admins tests
38482b1
@noliveleger
Refactor AssetFile and AssetSnapshot permission and filter mechanism …
edc46a1 
…to support org admins
@noliveleger
Fix add_user() with multi-member orgs
32cc65a
@noliveleger
Fix organization name being empty on sync
2a80fe3
@noliveleger
Merge branch 'main' into task-960-organization-assets-endpoint
6ef682d
@noliveleger
Linting
4339820
@noliveleger
Refactoring unit tests to use common code for adding, editing and del…
58163fd 
…eting submissions
@noliveleger
Fix 0006 db migrations to avoid overwriting org name with empty strings
f51bdfe
@magicznyleszek
create MyOrgProjectsRoute and update ViewSwitcher to make it accessible
069ad04
@magicznyleszek
Merge branch 'main' into task-960-organization-assets-endpoint
ee4f9ae 
# Conflicts:
#	kpi/views/v2/asset_file.py
@magicznyleszek
Merge branch 'task-960-organization-assets-endpoint' into leszek/task…
0bf9dc1 
…-975-org-viewswticher

# Conflicts:
#	jsapp/js/projects/projectViews/viewSwitcher.tsx
@magicznyleszek
rename organization projects route
6c63a9e
magicznyleszek and others added 13 commits November 8, 2024 16:13
@magicznyleszek
move transfer modal and banner code outside MyProjectsRoute
d5d5d8e
@magicznyleszek
update MyOrgProjectsRoute after updates in MyProjectsRoute
74ba1d7
@magicznyleszek
fix order of things in MyOrgProjectsRoute to match MyProjectsRoute
454b8eb
@magicznyleszek
fix infinite API calls
61dbf67
@magicznyleszek
change route of organization projects to match other organization rel…
30eaf50 
…ated routes
@magicznyleszek
more unification between three projects routes components
726efcc
@magicznyleszek
create UniversalProjectsRoute and use it for three routes
a673d2d
@magicznyleszek
Merge branch 'main' into task-960-organization-assets-endpoint
d67f2af
@magicznyleszek
Merge branch 'task-960-organization-assets-endpoint' into leszek/task…
2f25bf9 
…-975-org-viewswticher
@magicznyleszek
fix projects filter button custom styles
e2310da
@magicznyleszek
Merge branch 'leszek/task-975-org-viewswticher' of github.com:kobotoo…
1b1d3e8 
…lbox/kpi into leszek/task-975-org-viewswticher
@magicznyleszek
Merge branch 'main' into task-960-organization-assets-endpoint
3317899
@magicznyleszek
Merge branch 'task-960-organization-assets-endpoint' into leszek/task…
1d8f59a 
…-975-org-viewswticher
@magicznyleszek
Copy link
Member Author

@jamesrkiger because this is built atop #5218 and requires #5251, I will update it and make it review-ready after either of them is merged.

Base automatically changed from task-960-organization-assets-endpoint to main November 11, 2024 18:41
@magicznyleszek magicznyleszek marked this pull request as ready for review November 12, 2024 20:54
jamesrkiger
jamesrkiger approved these changes Nov 14, 2024
View reviewed changes
Copy link
Contributor

@jamesrkiger jamesrkiger left a comment

Choose a reason for hiding this comment

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

lgtm

@magicznyleszek magicznyleszek merged commit 699114b into main Nov 14, 2024
6 of 7 checks passed
@magicznyleszek magicznyleszek deleted the leszek/task-975-org-viewswticher branch November 14, 2024 17:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jamesrkiger jamesrkiger jamesrkiger approved these changes

Assignees

@magicznyleszek magicznyleszek

Labels
Front end
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@magicznyleszek @jamesrkiger @noliveleger