Add tests

frontend/common/services/useRolePermission.ts

@@ -121,15 +121,12 @@ export async function getRoleProjectPermissions(
     typeof rolePermissionService.endpoints.getRoleProjectPermissions.initiate
   >[1],
 ) {
-  store.dispatch(
+  return store.dispatch(
     rolePermissionService.endpoints.getRoleProjectPermissions.initiate(
       data,
       options,
     ),
   )
-  return Promise.all(
-    store.dispatch(rolePermissionService.util.getRunningQueriesThunk()),
-  )
 }
 
 export async function getRoleEnvironmentPermissions(
@@ -139,15 +136,12 @@ export async function getRoleEnvironmentPermissions(
     typeof rolePermissionService.endpoints.getRoleEnvironmentPermissions.initiate
   >[1],
 ) {
-  store.dispatch(
+  return store.dispatch(
     rolePermissionService.endpoints.getRoleEnvironmentPermissions.initiate(
       data,
       options,
     ),
   )
-  return Promise.all(
-    store.dispatch(rolePermissionService.util.getRunningQueriesThunk()),
-  )
 }
 
 export async function createRolePermissions(

frontend/common/stores/account-store.js

@@ -7,6 +7,8 @@ import Constants from 'common/constants'
 import dataRelay from 'data-relay'
 import { sortBy } from 'lodash'
 import Project from 'common/project'
+import { getStore } from 'common/store'
+import { service } from "common/service";
 
 const controller = {
   acceptInvite: (id) => {
@@ -341,6 +343,7 @@ const controller = {
         API.reset().finally(() => {
           store.model = user
           store.organisation = null
+          getStore().dispatch(service.util.resetApiState())
           store.trigger('logout')
         })
       })

frontend/e2e/init.cafe.js

@@ -129,20 +129,20 @@ fixture`E2E Tests`.requestHooks(logger).before(async () => {
 //   await logout()
 // })
 //
-test('Organisation-permission', async () => {
-  await organisationPermissionTest()
-  await logout()
-})
+// test('Organisation-permission', async () => {
+//   await organisationPermissionTest()
+//   await logout()
+// })
 
 // test('Project-permission', async () => {
 //   await projectPermissionTest()
 //   await logout()
 // })
-//
-// test('Environment-permission', async () => {
-//   await environmentPermissionTest()
-//   await logout()
-// })
+
+test('Environment-permission', async () => {
+  await environmentPermissionTest()
+  await logout()
+})
 
 // test('Roles', async () => {
 //   await rolesTest()

frontend/e2e/tests/environment-permission-test.ts

@@ -5,8 +5,8 @@ import {
   gotoTraits,
   log,
   login,
-  toggleFeature,
-} from '../helpers.cafe'
+  toggleFeature, waitForElementNotExist
+} from "../helpers.cafe";
 import { PASSWORD, E2E_NON_ADMIN_USER_WITH_ENV_PERMISSIONS } from '../config'
 import { Selector, t } from 'testcafe'
 
@@ -25,4 +25,7 @@ export default async function () {
   await gotoTraits()
   const createTraitBtn = Selector(byId('add-trait'))
   await t.expect(createTraitBtn.hasAttribute('disabled')).ok()
+  log('User without permissions cannot see audit logs')
+  await waitForElementNotExist(byId('audit-log-link'))
+
 }

frontend/e2e/tests/organisation-permission-test.ts

@@ -15,7 +15,6 @@ import {
 import { Selector, t } from 'testcafe'
 
 export default async function () {
-  const projectName = 'Test Project'
   log('Login')
   await login(E2E_NON_ADMIN_USER_WITH_ORG_PERMISSIONS, PASSWORD)
   log('User without permissions cannot see any Project')
@@ -29,9 +28,8 @@ export default async function () {
   await click(byId('users-and-permissions'))
   await clickByText('Groups')
   await waitForElementClickable("#btn-invite-groups")
-
-  log('Login as project user')
   await logout(t)
+  log('Login as project user')
   await login(E2E_NON_ADMIN_USER_WITH_PROJECT_PERMISSIONS, PASSWORD)
   log('User cannot manage users or groups')
   await click(byId('users-and-permissions'))

frontend/e2e/tests/project-permission-test.ts

@@ -11,8 +11,8 @@ import {
 } from '../helpers.cafe';
 import {
   PASSWORD,
-  E2E_NON_ADMIN_USER_WITH_PROJECT_PERMISSIONS,
-} from '../config'
+  E2E_NON_ADMIN_USER_WITH_PROJECT_PERMISSIONS, E2E_NON_ADMIN_USER_WITH_ENV_PERMISSIONS
+} from "../config";
 import { Selector, t } from 'testcafe'
 
 export default async function () {
@@ -40,4 +40,5 @@ export default async function () {
   await t.expect(createSegmentBtn.hasAttribute('disabled')).ok()
   log('User with permissions can see the Audit Logs')
   await click(byId('audit-log-link'))
+  log('Login')
 }

frontend/web/components/pages/EnvironmentSettingsPage.js

@@ -17,6 +17,7 @@ import Icon from 'components/Icon'
 import PageTitle from 'components/PageTitle'
 import { getStore } from 'common/store'
 import { getRoles } from 'common/services/useRole'
+import { getRoleEnvironmentPermissions } from 'common/services/useRolePermission'
 import AccountStore from 'common/stores/account-store'
 import { Link } from 'react-router-dom'
 import { enableFeatureVersioning } from 'common/services/useEnableFeatureVersioning'
@@ -66,9 +67,21 @@ const EnvironmentSettingsPage = class extends Component {
       { organisation_id: AccountStore.getOrganisation().id },
       { forceRefetch: true },
     ).then((roles) => {
-      if (roles.error) {
-        return
-      }
+      getRoleEnvironmentPermissions(
+        getStore(),
+        {
+          env_id: env.id,
+          organisation_id: AccountStore.getOrganisation().id,
+          role_id: roles.data.results[0].id,
+        },
+        { forceRefetch: true },
+      ).then((res) => {
+        debugger
+        const matchingItems = roles.data.results.filter((item1) =>
+          res.data.results.some((item2) => item2.role === item1.id),
+        )
+        this.setState({ roles: matchingItems })
+      })
     })
 
     if (Utils.getPlansPermission('METADATA')) {

frontend/web/components/pages/ProjectSettingsPage.js

@@ -25,6 +25,7 @@ import { Link } from 'react-router-dom'
 import Setting from 'components/Setting'
 import PlanBasedBanner from 'components/PlanBasedAccess'
 import classNames from 'classnames'
+import { getRoleProjectPermissions } from 'common/services/useRolePermission'
 
 const ProjectSettingsPage = class extends Component {
   static displayName = 'ProjectSettingsPage'
@@ -58,7 +59,22 @@ const ProjectSettingsPage = class extends Component {
       getStore(),
       { organisation_id: AccountStore.getOrganisation().id },
       { forceRefetch: true },
-    )
+    ).then((roles) => {
+      getRoleProjectPermissions(
+        getStore(),
+        {
+          organisation_id: AccountStore.getOrganisation().id,
+          project_id: this.props.match.params.projectId,
+          role_id: roles.data.results[0].id,
+        },
+        { forceRefetch: true },
+      ).then((res) => {
+        const matchingItems = roles.data.results.filter((item1) =>
+          res.data.results.some((item2) => item2.role === item1.id),
+        )
+        this.setState({ roles: matchingItems })
+      })
+    })
   }
 
   onSave = () => {

frontend/web/components/pages/UsersAndPermissionsPage.tsx

@@ -721,7 +721,7 @@ const UsersAndPermissionsInner: FC<UsersAndPermissionsInnerType> = ({
                         <Row space className='mt-4 mb-1'>
                           <h5 className='mb-0'>User Groups</h5>
                           {Utils.renderWithPermission(
-                            !manageGroupsPermission.permission,
+                            manageGroupsPermission.permission,
                             Constants.organisationPermissions(
                               'Manage User Groups',
                             ),

frontend/web/components/tags/TagValues.tsx

@@ -2,6 +2,9 @@ import React, { FC, Fragment, ReactNode } from 'react'
 import Button from 'components/base/forms/Button'
 import Tag from './Tag'
 import { useGetTagsQuery } from 'common/services/useTag'
+import Utils from 'common/utils/utils'
+import Constants from 'common/constants'
+import { useHasPermission } from 'common/providers/Permission'
 
 type TagValuesType = {
   onAdd?: () => void
@@ -22,6 +25,16 @@ const TagValues: FC<TagValuesType> = ({
 }) => {
   const { data: tags } = useGetTagsQuery({ projectId })
   const Wrapper = inline ? Fragment : Row
+  const permissionType = Utils.getFlagsmithHasFeature('manage_tags_permission')
+    ? 'MANAGE_TAGS'
+    : 'ADMIN'
+
+  const { permission: createEditTagPermission } = useHasPermission({
+    id: projectId,
+    level: 'project',
+    permission: permissionType,
+  })
+
   return (
     <Wrapper className='tag-values align-content-center'>
       {children}
@@ -36,11 +49,22 @@ const TagValues: FC<TagValuesType> = ({
             />
           ),
       )}
-      {!!onAdd && (
-        <Button size='xSmall' onClick={onAdd} type='button' theme='outline'>
-          Add Tag
-        </Button>
-      )}
+      {!!onAdd &&
+        Utils.renderWithPermission(
+          createEditTagPermission,
+          Constants.projectPermissions(
+            permissionType === 'ADMIN' ? 'Admin' : 'Manage Tags',
+          ),
+          <Button
+            disabled={!createEditTagPermission}
+            size='xSmall'
+            onClick={onAdd}
+            type='button'
+            theme='outline'
+          >
+            Add Tag
+          </Button>,
+        )}
     </Wrapper>
   )
 }