Add tag_based_permissions logic to frontend

Flagsmith · Nov 6, 2024 · 2c71cfa · 2c71cfa
1 parent 716706b
commit 2c71cfa
Show file tree

Hide file tree

Showing 12 changed files with 1,352 additions and 1,344 deletions.
diff --git a/frontend/common/providers/Permission.tsx b/frontend/common/providers/Permission.tsx
@@ -1,11 +1,13 @@
-import React, { FC, ReactNode } from 'react'
+import React, { FC, ReactNode, useMemo } from 'react'
 import { useGetPermissionQuery } from 'common/services/usePermission'
 import { PermissionLevel } from 'common/types/requests'
-import AccountStore from 'common/stores/account-store' // we need this to make JSX compile
+import AccountStore from 'common/stores/account-store'
+import intersection from 'lodash/intersection' // we need this to make JSX compile
 
 type PermissionType = {
   id: any
   permission: string
+  tags?: number[]
   level: PermissionLevel
   children: (data: { permission: boolean; isLoading: boolean }) => ReactNode
 }
@@ -14,11 +16,23 @@ export const useHasPermission = ({
   id,
   level,
   permission,
+  tags,
 }: Omit<PermissionType, 'children'>) => {
-  const { data, isLoading, isSuccess } = useGetPermissionQuery(
-    { id: `${id}`, level },
-    { skip: !id || !level },
-  )
+  const {
+    data: permissionsData,
+    isLoading,
+    isSuccess,
+  } = useGetPermissionQuery({ id: `${id}`, level }, { skip: !id || !level })
+  const data = useMemo(() => {
+    if (!tags?.length || !permissionsData?.tag_based_permissions) return permissionsData
+    const addedPermissions = permissionsData
+    permissionsData.tag_based_permissions.forEach((tagBasedPermission) => {
+      if (intersection(tagBasedPermission.tags, tags).length) {
+        addedPermissions[tagBasedPermission.key] = true
+      }
+    })
+    return addedPermissions
+  }, [permissionsData, tags])
   const hasPermission = !!data?.[permission] || !!data?.ADMIN
   return {
     isLoading,
@@ -32,11 +46,13 @@ const Permission: FC<PermissionType> = ({
   id,
   level,
   permission,
+  tags,
 }) => {
   const { isLoading, permission: hasPermission } = useHasPermission({
     id,
     level,
     permission,
+    tags,
   })
   return (
     <>

diff --git a/frontend/common/services/usePermission.ts b/frontend/common/services/usePermission.ts
@@ -13,16 +13,25 @@ export const permissionService = service
         query: ({ id, level }: Req['getPermission']) => ({
           url: `${level}s/${id}/my-permissions/`,
         }),
-        transformResponse(baseQueryReturnValue: {
-          admin: boolean
-          permissions: string[]
-        }) {
+        transformResponse(
+          baseQueryReturnValue: {
+            admin: boolean
+            permissions: string[]
+            tag_based_permissions?: Res['permission']['tag_based_permissions']
+          },
+          _,
+        ) {
           const res: Res['permission'] = {
             ADMIN: baseQueryReturnValue.admin,
           }
+          if (baseQueryReturnValue.tag_based_permissions) {
+            res.tag_based_permissions =
+              baseQueryReturnValue.tag_based_permissions
+          }
           baseQueryReturnValue.permissions.forEach((v) => {
             res[v] = true
           })
+
           return res
         },
       }),

diff --git a/frontend/common/types/responses.ts b/frontend/common/types/responses.ts
@@ -628,7 +628,10 @@ export type Res = {
   }
   identity: { id: string } //todo: we don't consider this until we migrate identity-store
   identities: EdgePagedResponse<Identity>
-  permission: Record<string, boolean>
+  permission: Record<string, boolean> & {
+    ADMIN: boolean
+    tag_based_permissions?: { key: string; tags: number[] }[]
+  }
   availablePermissions: AvailablePermission[]
   tag: Tag
   tags: Tag[]

diff --git a/frontend/web/components/CompareEnvironments.js b/frontend/web/components/CompareEnvironments.js
@@ -242,6 +242,7 @@ class CompareEnvironments extends Component {
                     </div>
                     <Permission
                       level='environment'
+                      tags={p.projectFlagLeft.tags}
                       permission={Utils.getManageFeaturePermission(
                         Utils.changeRequestsEnabled(
                           environmentLeft.minimum_change_request_approvals,
@@ -270,6 +271,7 @@ class CompareEnvironments extends Component {
                     </Permission>
                     <Permission
                       level='environment'
+                      tags={p.projectFlagLeft.tags}
                       permission={Utils.getManageFeaturePermission(
                         Utils.changeRequestsEnabled(
                           environmentRight.minimum_change_request_approvals,

diff --git a/frontend/web/components/CompareFeatures.js b/frontend/web/components/CompareFeatures.js
@@ -107,6 +107,7 @@ class CompareEnvironments extends Component {
                   )
                   return (
                     <Permission
+                      tags={this.state.flag?.tags}
                       level='environment'
                       permission={Utils.getManageFeaturePermission(
                         changeRequestsEnabled,

diff --git a/frontend/web/components/FeatureAction.tsx b/frontend/web/components/FeatureAction.tsx
@@ -15,6 +15,7 @@ interface FeatureActionProps {
   projectId: string
   featureIndex: number
   readOnly: boolean
+  tags: number[]
   protectedTags: Tag[] | undefined
   hideAudit: boolean
   hideHistory: boolean
@@ -54,6 +55,7 @@ export const FeatureAction: FC<FeatureActionProps> = ({
   projectId,
   protectedTags,
   readOnly,
+  tags,
 }) => {
   const [isOpen, setIsOpen] = useState<boolean>(false)
 
@@ -147,6 +149,7 @@ export const FeatureAction: FC<FeatureActionProps> = ({
             <Permission
               level='project'
               permission='DELETE_FEATURE'
+              tags={tags}
               id={projectId}
             >
               {({ permission: removeFeaturePermission }) =>

diff --git a/frontend/web/components/FeatureRow.js b/frontend/web/components/FeatureRow.js
@@ -141,20 +141,20 @@ class TheComponent extends Component {
     const changeRequestsEnabled = Utils.changeRequestsEnabled(
       environment && environment.minimum_change_request_approvals,
     )
-    const onChange = ()=> {
-        if(disableControls) {
-          return;
-        }
-        if (
-          projectFlag?.multivariate_options?.length ||
-          Utils.changeRequestsEnabled(
-            environment.minimum_change_request_approvals,
-          )
-        ) {
-          this.editFeature(projectFlag, environmentFlags[id])
-          return
-        }
-        this.confirmToggle()
+    const onChange = () => {
+      if (disableControls) {
+        return
+      }
+      if (
+        projectFlag?.multivariate_options?.length ||
+        Utils.changeRequestsEnabled(
+          environment.minimum_change_request_approvals,
+        )
+      ) {
+        this.editFeature(projectFlag, environmentFlags[id])
+        return
+      }
+      this.confirmToggle()
     }
     const isCompact = getViewMode() === 'compact'
     if (this.props.condensed) {
@@ -381,6 +381,7 @@ class TheComponent extends Component {
             featureIndex={this.props.index}
             readOnly={readOnly}
             protectedTags={protectedTags}
+            tags={projectFlag.tags}
             isCompact={isCompact}
             hideAudit={
               AccountStore.getOrganisationRole() !== 'ADMIN' ||