feat: redesign organisation layout #3257

azaiko-akveo · 2024-01-09T14:06:09Z

Thanks for submitting a PR! Please check the boxes below:

I have run pre-commit to check linting
I have added information to docs/ if required so people know about the feature!
I have filled in the "Changes" section below?
I have filled in the "How did you test this code" section below?
I have used a Conventional Commit title for this Pull Request

Changes

Apply new design to organization management functionality

How did you test this code?

Test application locally

vercel · 2024-01-09T14:06:15Z

@azaiko-akveo is attempting to deploy a commit to the Flagsmith Team on Vercel.

A member of the Team first needs to authorize it.

vercel · 2024-01-09T14:06:16Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
docs	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Jan 24, 2024 6:23pm
flagsmith-frontend-preview	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Jan 24, 2024 6:23pm
flagsmith-frontend-staging	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Jan 24, 2024 6:23pm

github-actions · 2024-01-09T14:09:52Z

Uffizzi Preview deployment-44671 was deleted.

dabeeeenster · 2024-01-10T11:29:30Z

Can we fix the layout shifting as per the screen recording

2024-01-10.11-27-57.mp4

azaiko-akveo · 2024-01-10T15:10:16Z

Can we fix the layout shifting as per the screen recording

The shift occurs due to hiding/displaying the global application scrollbar (the effect also exists on the Account page).
The effect is not reproduced for most recent browser versions (verified for Chrome, Firefox, and Safari).

To resolve this issue, we need to update the global application layout styles. It will take significant time and considers testing all existing pages to handle unexpected issues.

kyle-ssg · 2024-01-10T15:52:19Z

Upon logging in I see the following with no ability to change organisation. I suspect that we haven't considered permissions / viewing organisations as non admins ?

This needs to be tested with the following permissions

Org admin
Non org admin
Non org admin but with Manage user groups / Manage users permissions

azaiko-akveo · 2024-01-11T07:45:50Z

Upon logging in I see the following with no ability to change organisation. I suspect that we haven't considered permissions / viewing organisations as non admins ?

This needs to be tested with the following permissions

Org admin

Non org admin

Non org admin but with Manage user groups / Manage users permissions

Fixed. Now it is possible to choose an organization if user doesn't have permissions

kyle-ssg · 2024-01-11T13:13:03Z

@azaiko-akveo I can switch org now but I can't do what I previously could?

After:

Previously:

Note: I can select a project to view.

Please check that you can perform the same actions that you can on staging.flagsmith.com.

Also as mentioned, please check this with Manage user groups / Manage users permissions

dabeeeenster · 2024-01-16T12:26:40Z

@azaiko-akveo can we get an update?

azaiko-akveo · 2024-01-16T12:56:35Z

an we get an update?

still in the process of applying the logic of permissions

dabeeeenster · 2024-01-16T13:10:09Z

an we get an update?

still in the process of applying the logic of permissions

Thanks for the update

azaiko-akveo · 2024-01-17T08:53:05Z

@dabeeeenster , @kyle-ssg.
Permissions logic was updated. The PR is ready for review

azaiko-akveo · 2024-01-19T13:43:18Z

Just a couple comments

@kyle-ssg , code was updated

kyle-ssg · 2024-01-23T17:22:09Z

@azaiko-akveo When I click on the flagsmith logo it goes to /projects which looks just like the organisation link except without tabs. Is there a need for /projects? It doesn't seem useful.

Unless I'm missing something I think we can:

Remove the /projects route

Make the home button behave the same was as clicking organisation

See following comment instead

dabeeeenster · 2024-01-23T17:50:52Z

It should redirect to the new projects tab in the org screen?

kyle-ssg · 2024-01-23T17:59:05Z

After discussion, let's just remove the logo from the nav so that we have the following @azaiko-akveo. If I'm not mistaken, we can remove the projects page unless it's being used?

azaiko-akveo · 2024-01-24T13:26:32Z

@kyle-ssg , @dabeeeenster

there is a case when user has access only for reading projects. To avoid displaying single tab we display a separate page. The same behaviour currently exists for /organisation-groups
navigation to the /projects (projects page) is used in many other components withing the app including login functionality

feat: redesign organisation layout

8d9de16

github-actions bot added the front-end Issue related to the React Front End Dashboard label Jan 9, 2024

vercel bot deployed to Preview – docs January 9, 2024 14:07 View deployment

fix: reset form after organisation is saved

18d93e5

vercel bot deployed to Preview – docs January 9, 2024 15:15 View deployment

azaiko-akveo marked this pull request as draft January 9, 2024 15:24

vercel bot deployed to Preview – flagsmith-frontend-preview January 10, 2024 09:02 View deployment

vercel bot deployed to Preview – flagsmith-frontend-staging January 10, 2024 10:38 View deployment

azaiko-akveo marked this pull request as ready for review January 10, 2024 15:00

dabeeeenster requested a review from kyle-ssg January 10, 2024 15:32

fix: select organisation with no permissions

2bcf2a5

vercel bot deployed to Preview – docs January 11, 2024 07:43 View deployment

fix(OrganisationManageWidget): rename props

841f292

vercel bot deployed to Preview – docs January 11, 2024 08:07 View deployment

vercel bot deployed to Preview – flagsmith-frontend-preview January 11, 2024 12:39 View deployment

vercel bot deployed to Preview – flagsmith-frontend-staging January 11, 2024 12:41 View deployment

fix: organisation permissions logic

56194f7

vercel bot deployed to Preview – docs January 17, 2024 08:45 View deployment

vercel bot deployed to Preview – flagsmith-frontend-staging January 19, 2024 12:12 View deployment

fix: use service hooks for projects management

ce820fc

vercel bot deployed to Preview – docs January 19, 2024 13:36 View deployment

fix: delete unnecessary code

2b9bde7

vercel bot deployed to Preview – docs January 19, 2024 13:47 View deployment

Merge branch 'main' into feat/organisation-redesign

341b8ad

vercel bot deployed to Preview – docs January 19, 2024 14:14 View deployment

azaiko-akveo requested a review from kyle-ssg January 19, 2024 14:20

fix: e2e tests

dc446a7

vercel bot deployed to Preview – docs January 19, 2024 14:52 View deployment

dabeeeenster assigned kyle-ssg Jan 22, 2024

dabeeeenster added this to the Front End ToDo milestone Jan 22, 2024

vercel bot deployed to Preview – flagsmith-frontend-preview January 23, 2024 16:56 View deployment

vercel bot deployed to Preview – flagsmith-frontend-staging January 23, 2024 16:59 View deployment

Remove logo from aside

c7d0f2a

vercel bot deployed to Preview – docs January 24, 2024 10:20 View deployment

kyle-ssg enabled auto-merge January 24, 2024 10:21

vercel bot deployed to Preview – flagsmith-frontend-preview January 24, 2024 18:20 View deployment

vercel bot deployed to Preview – flagsmith-frontend-staging January 24, 2024 18:23 View deployment

kyle-ssg approved these changes Jan 24, 2024

View reviewed changes

kyle-ssg added this pull request to the merge queue Jan 24, 2024

Merged via the queue into Flagsmith:main with commit 61d0585 Jan 24, 2024
16 checks passed

dabeeeenster mentioned this pull request Jan 24, 2024

chore(main): release 2.96.0 #3324

Merged

dabeeeenster mentioned this pull request Apr 18, 2024

chore(main): release 2.109.0 #3798

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: redesign organisation layout #3257

feat: redesign organisation layout #3257

azaiko-akveo commented Jan 9, 2024

vercel bot commented Jan 9, 2024

vercel bot commented Jan 9, 2024 •

edited

Loading

github-actions bot commented Jan 9, 2024 •

edited

Loading

dabeeeenster commented Jan 10, 2024

azaiko-akveo commented Jan 10, 2024 •

edited

Loading

kyle-ssg commented Jan 10, 2024 •

edited

Loading

azaiko-akveo commented Jan 11, 2024

kyle-ssg commented Jan 11, 2024

dabeeeenster commented Jan 16, 2024

azaiko-akveo commented Jan 16, 2024 •

edited

Loading

dabeeeenster commented Jan 16, 2024 •

edited

Loading

azaiko-akveo commented Jan 17, 2024

azaiko-akveo commented Jan 19, 2024

kyle-ssg commented Jan 23, 2024 •

edited

Loading

dabeeeenster commented Jan 23, 2024

kyle-ssg commented Jan 23, 2024 •

edited

Loading

azaiko-akveo commented Jan 24, 2024 •

edited

Loading

feat: redesign organisation layout #3257

feat: redesign organisation layout #3257

Conversation

azaiko-akveo commented Jan 9, 2024

Changes

How did you test this code?

vercel bot commented Jan 9, 2024

vercel bot commented Jan 9, 2024 • edited Loading

github-actions bot commented Jan 9, 2024 • edited Loading

dabeeeenster commented Jan 10, 2024

azaiko-akveo commented Jan 10, 2024 • edited Loading

kyle-ssg commented Jan 10, 2024 • edited Loading

azaiko-akveo commented Jan 11, 2024

kyle-ssg commented Jan 11, 2024

dabeeeenster commented Jan 16, 2024

azaiko-akveo commented Jan 16, 2024 • edited Loading

dabeeeenster commented Jan 16, 2024 • edited Loading

azaiko-akveo commented Jan 17, 2024

azaiko-akveo commented Jan 19, 2024

kyle-ssg commented Jan 23, 2024 • edited Loading

dabeeeenster commented Jan 23, 2024

kyle-ssg commented Jan 23, 2024 • edited Loading

azaiko-akveo commented Jan 24, 2024 • edited Loading

vercel bot commented Jan 9, 2024 •

edited

Loading

github-actions bot commented Jan 9, 2024 •

edited

Loading

azaiko-akveo commented Jan 10, 2024 •

edited

Loading

kyle-ssg commented Jan 10, 2024 •

edited

Loading

azaiko-akveo commented Jan 16, 2024 •

edited

Loading

dabeeeenster commented Jan 16, 2024 •

edited

Loading

kyle-ssg commented Jan 23, 2024 •

edited

Loading

kyle-ssg commented Jan 23, 2024 •

edited

Loading

azaiko-akveo commented Jan 24, 2024 •

edited

Loading