fix: Adjust permissions logic for view / manage groups (#3679)

Flagsmith · Apr 8, 2024 · 5ba3083 · 5ba3083
1 parent 2df29c4
commit 5ba3083
Show file tree

Hide file tree

Showing 15 changed files with 40 additions and 107 deletions.
diff --git a/frontend/common/stores/account-store.js b/frontend/common/stores/account-store.js
@@ -52,7 +52,7 @@ const controller = {
 
         store.saved()
         if (isLoginPage) {
-          window.location.href = `/projects`
+          window.location.href = `/organisation-settings`
         }
       })
       .catch((e) => {

diff --git a/frontend/web/components/App.js b/frontend/web/components/App.js
@@ -23,7 +23,6 @@ import Icon from './Icon'
 import AccountStore from 'common/stores/account-store'
 import InfoMessage from './InfoMessage'
 import OrganisationLimit from './OrganisationLimit'
-import OrganisationLink from './OrganisationLink'
 import GithubStar from './GithubStar'
 import Tooltip from './Tooltip'
 
@@ -168,7 +167,7 @@ const App = class extends Component {
               id: lastEnv.orgId,
             })
             if (!lastOrg) {
-              this.context.router.history.replace('/projects')
+              this.context.router.history.replace('/organisation-settings')
               return
             }
 
@@ -184,7 +183,7 @@ const App = class extends Component {
             return
           }
 
-          this.context.router.history.replace('/projects')
+          this.context.router.history.replace('/organisation-settings')
         })
       }
     }
@@ -349,7 +348,21 @@ const App = class extends Component {
                             <React.Fragment>
                               <nav className='my-3 my-md-0 hidden-xs-down flex-row navbar-right space'>
                                 <Row>
-                                  <OrganisationLink />
+                                  <NavLink
+                                    id='org-settings-link'
+                                    activeClassName='active'
+                                    className='nav-link'
+                                    to='/organisation-settings'
+                                  >
+                                    <span className='mr-1'>
+                                      <Icon
+                                        name='layout'
+                                        width={20}
+                                        fill='#9DA4AE'
+                                      />
+                                    </span>
+                                    {'Organisation'}
+                                  </NavLink>
                                 </Row>
                                 <Row>
                                   <NavLink

diff --git a/frontend/web/components/OrganisationLink.tsx b/frontend/web/components/OrganisationLink.tsx
diff --git a/frontend/web/components/UserGroupList.tsx b/frontend/web/components/UserGroupList.tsx
@@ -3,13 +3,15 @@ const CreateGroup = require('./modals/CreateGroup')
 import Button from './base/forms/Button'
 import AccountStore from 'common/stores/account-store'
 import { UserGroup, GroupPermission } from 'common/types/responses'
-import { useDeleteGroupMutation } from 'common/services/useGroup'
+import {
+  useDeleteGroupMutation,
+  useGetGroupsQuery,
+} from 'common/services/useGroup'
 import { useGetUserGroupPermissionQuery } from 'common/services/useUserGroupPermission'
 import PanelSearch from './PanelSearch'
 import { sortBy } from 'lodash'
 import InfoMessage from './InfoMessage' // we need this to make JSX compile
 import Icon from './Icon'
-import { useGetGroupSummariesQuery } from 'common/services/useGroupSummary'
 import Panel from './base/grid/Panel'
 import PermissionsSummaryList from './PermissionsSummaryList'
 
@@ -135,8 +137,9 @@ const UserGroupsList: FC<UserGroupsListType> = ({
   showRemove,
 }) => {
   const [page, setPage] = useState(1)
-  const { data: userGroups, isLoading } = useGetGroupSummariesQuery({
+  const { data: userGroups, isLoading } = useGetGroupsQuery({
     orgId: `${orgId}`,
+    page,
   })
   const { data: userGroupsPermission, isLoading: userGroupPermissionLoading } =
     useGetUserGroupPermissionQuery(
@@ -153,7 +156,7 @@ const UserGroupsList: FC<UserGroupsListType> = ({
     : []
 
   if (userGroupsPermission?.length > 0) {
-    userGroups?.forEach((group) => {
+    userGroups?.results.forEach((group) => {
       const existingPermissionIndex =
         mergeduserGroupsPermissionWithUserGroups.findIndex(
           (userGroupPermission) => userGroupPermission.group.id === group.id,
@@ -186,7 +189,7 @@ const UserGroupsList: FC<UserGroupsListType> = ({
         items={
           userGroupsPermission
             ? sortBy(mergeduserGroupsPermissionWithUserGroups, 'group.name')
-            : sortBy(userGroups, 'name')
+            : sortBy(userGroups?.results, 'name')
         }
         paging={mergeduserGroupsPermissionWithUserGroups || userGroups}
         nextPage={() => setPage(page + 1)}

diff --git a/frontend/web/components/modals/Payment.js b/frontend/web/components/modals/Payment.js
@@ -33,7 +33,7 @@ const PaymentButton = (props) => {
             success: (res) => {
               AppActions.updateSubscription(res)
               if (this.props.isDisableAccount) {
-                window.location.href = `/projects`
+                window.location.href = `/organisation-settings`
               }
             },
           })

diff --git a/frontend/web/components/pages/ConfirmEmailPage.js b/frontend/web/components/pages/ConfirmEmailPage.js
@@ -19,7 +19,7 @@ const InvitePage = class extends Component {
 
   onSave = (id) => {
     AppActions.selectOrganisation(id)
-    this.context.router.history.replace('/projects?new=1')
+    this.context.router.history.replace('/organisation-settings')
   }
 
   render() {

diff --git a/frontend/web/components/pages/CreateOrganisationPage.js b/frontend/web/components/pages/CreateOrganisationPage.js
@@ -33,7 +33,7 @@ class CreateOrganisationPage extends Component {
   onSave = (id) => {
     AppActions.selectOrganisation(id)
     API.setCookie('organisation', `${id}`)
-    this.context.router.history.push('/projects')
+    this.context.router.history.push('/organisation-settings')
   }
 
   render() {

diff --git a/frontend/web/components/pages/EnvironmentSettingsPage.js b/frontend/web/components/pages/EnvironmentSettingsPage.js
@@ -88,7 +88,7 @@ const EnvironmentSettingsPage = class extends Component {
 
   onRemove = () => {
     toast('Your project has been removed')
-    this.context.router.history.replace('/projects')
+    this.context.router.history.replace('/organisation-settings')
   }
 
   confirmRemove = (environment, cb) => {

diff --git a/frontend/web/components/pages/InvitePage.js b/frontend/web/components/pages/InvitePage.js
@@ -20,7 +20,7 @@ const InvitePage = class extends Component {
 
   onSave = (id) => {
     AppActions.selectOrganisation(id)
-    this.context.router.history.replace('/projects?new=1')
+    this.context.router.history.replace('/organisation-settings')
   }
 
   render() {

diff --git a/frontend/web/components/pages/OrganisationSettingsPage.js b/frontend/web/components/pages/OrganisationSettingsPage.js
@@ -105,7 +105,7 @@ const OrganisationSettingsPage = class extends Component {
   onRemove = () => {
     toast('Your organisation has been removed')
     if (AccountStore.getOrganisation()) {
-      this.context.router.history.replace('/projects')
+      this.context.router.history.replace('/organisation-settings')
     } else {
       this.context.router.history.replace('/create')
     }
@@ -333,8 +333,6 @@ const OrganisationSettingsPage = class extends Component {
     const verifySeatsLimit = Utils.getFlagsmithHasFeature(
       'verify_seats_limit_for_invite_links',
     )
-    const canManageGroups =
-      this.state.permissions.includes('MANAGE_USER_GROUPS')
 
     return (
       <div className='app-container container'>
@@ -348,6 +346,7 @@ const OrganisationSettingsPage = class extends Component {
               <OrganisationProvider>
                 {({
                   error,
+                  groups,
                   invalidateInviteLink,
                   inviteLinks,
                   invites,
@@ -356,6 +355,7 @@ const OrganisationSettingsPage = class extends Component {
                   subscriptionMeta,
                   users,
                 }) => {
+                  const canManageGroups = !!groups?.length
                   const { max_seats } = subscriptionMeta ||
                     organisation.subscription || { max_seats: 1 }
                   const isAWS =
@@ -398,6 +398,7 @@ const OrganisationSettingsPage = class extends Component {
                       </div>
 
                       <Tabs
+                        hideNavOnSingleTab
                         value={this.state.tab || 0}
                         onChange={(tab) => this.setState({ tab })}
                         className='mt-0'

diff --git a/frontend/web/components/pages/ProjectSettingsPage.js b/frontend/web/components/pages/ProjectSettingsPage.js
@@ -426,7 +426,9 @@ const ProjectSettingsPage = class extends Component {
                           <Button
                             onClick={() =>
                               this.confirmRemove(project, () => {
-                                this.context.router.history.replace('/projects')
+                                this.context.router.history.replace(
+                                  '/organisation-settings',
+                                )
                                 deleteProject(this.props.match.params.projectId)
                               })
                             }

diff --git a/frontend/web/components/pages/ProjectsPage.tsx b/frontend/web/components/pages/ProjectsPage.tsx
diff --git a/frontend/web/components/pages/SegmentsPage.tsx b/frontend/web/components/pages/SegmentsPage.tsx
@@ -82,7 +82,7 @@ const SegmentsPage: FC<SegmentsPageType> = (props) => {
   useEffect(() => {
     if (error) {
       // Kick user back out to projects
-      props.router.history.replace('/projects')
+      props.router.history.replace('/organisation-settings')
     }
   }, [error, props.router.history])
   const newSegment = () => {

diff --git a/frontend/web/main.js b/frontend/web/main.js
@@ -56,7 +56,7 @@ setTimeout(() => {
     (document.location.pathname.indexOf('/project/') !== -1 ||
       document.location.pathname.indexOf('/create') !== -1 ||
       document.location.pathname.indexOf('/invite') !== -1 ||
-      document.location.pathname.indexOf('/projects') !== -1) &&
+      document.location.pathname.indexOf('/organisation-settings') !== -1) &&
     !AccountStore.getUser()
   ) {
     API.setRedirect(

diff --git a/frontend/web/routes.js b/frontend/web/routes.js
@@ -28,7 +28,6 @@ import AuditLogPage from './components/pages/AuditLogPage'
 import ComparePage from './components/pages/ComparePage'
 import WidgetPage from './components/pages/WidgetPage'
 import BrokenPage from './components/pages/BrokenPage'
-import ProjectsPage from './components/pages/ProjectsPage'
 import AuditLogItemPage from './components/pages/AuditLogItemPage'
 import FeatureHistoryPage from './components/pages/FeatureHistoryPage'
 
@@ -41,7 +40,6 @@ export default (
       <Route path='/signup' exact component={HomePage} />
       <Route path='/signup' exact component={HomePage} />
       <Route path='/home' exact component={HomePage} />
-      <Route path='/projects' exact component={ProjectsPage} />
       <Route path='/maintenance' exact component={Maintenance} />
       <Route
         path='/password-reset/confirm/:uid/:token/'