From 54315850fe5d73af1c374b788c2eabaf5b3d1fa6 Mon Sep 17 00:00:00 2001
From: Kyle Johnson <kyle@solidstategroup.com>
Date: Tue, 28 Jan 2025 16:04:20 +0000
Subject: [PATCH] fix: integrations page permission (#5042)

---
 .../web/components/pages/IntegrationsPage.tsx | 69 +++++++++----------
 1 file changed, 31 insertions(+), 38 deletions(-)

diff --git a/frontend/web/components/pages/IntegrationsPage.tsx b/frontend/web/components/pages/IntegrationsPage.tsx
index 62f08e105d82..d420f5624101 100644
--- a/frontend/web/components/pages/IntegrationsPage.tsx
+++ b/frontend/web/components/pages/IntegrationsPage.tsx
@@ -1,29 +1,34 @@
 import React, { FC, useEffect } from 'react'
 import IntegrationList from 'components/IntegrationList'
-import Permission from 'common/providers/Permission'
+import { useHasPermission } from 'common/providers/Permission'
 import Constants from 'common/constants'
 import PageTitle from 'components/PageTitle'
 import InfoMessage from 'components/InfoMessage'
 import { Link } from 'react-router-dom'
 import Utils from 'common/utils/utils'
-import { Project } from 'common/types/responses'
 import AccountStore from 'common/stores/account-store'
-import ProjectProvider from 'common/providers/ProjectProvider'
 import API from 'project/api'
-type ProjectSettingsPageType = {
+import { useGetProjectQuery } from 'common/services/useProject'
+
+type IntegrationsPageType = {
   match: {
     params: {
       projectId: string
     }
   }
 }
-const ProjectSettingsPage: FC<ProjectSettingsPageType> = ({ match }) => {
+const IntegrationsPage: FC<IntegrationsPageType> = ({ match }) => {
   useEffect(() => {
     API.trackPage(Constants.pages.INTEGRATIONS)
   }, [])
 
   const integrations = Object.keys(Utils.getIntegrationData())
-
+  const { isLoading: permissionsLoading, permission } = useHasPermission({
+    id: match.params.projectId,
+    level: 'project',
+    permission: 'ADMIN',
+  })
+  const { data: project } = useGetProjectQuery({ id: match.params.projectId })
   return (
     <div className='app-container container'>
       <PageTitle title={'Integrations'}>
@@ -45,40 +50,28 @@ const ProjectSettingsPage: FC<ProjectSettingsPageType> = ({ match }) => {
         </InfoMessage>
       )}
 
-      <Permission
-        level='project'
-        permission='CREATE_ENVIRONMENT'
-        id={match.params.projectId}
-      >
-        {({ isLoading, permission }) =>
-          isLoading ? (
-            <Loader />
-          ) : (
-            <div>
-              <ProjectProvider id={match.params.projectId}>
-                {({ project }: { project: Project }) => (
-                  <div>
-                    {permission ? (
-                      <div>
-                        {project && project.environments && (
-                          <IntegrationList
-                            projectId={match.params.projectId}
-                            integrations={integrations}
-                          />
-                        )}
-                      </div>
-                    ) : (
-                      <div>{Constants.projectPermissions('Admin')}</div>
-                    )}
-                  </div>
+      {permissionsLoading ? (
+        <Loader />
+      ) : (
+        <div>
+          <div>
+            {permission ? (
+              <div>
+                {project && (
+                  <IntegrationList
+                    projectId={match.params.projectId}
+                    integrations={integrations}
+                  />
                 )}
-              </ProjectProvider>
-            </div>
-          )
-        }
-      </Permission>
+              </div>
+            ) : (
+              <div>{Constants.projectPermissions('Admin')}</div>
+            )}
+          </div>
+        </div>
+      )}
     </div>
   )
 }
 
-export default ProjectSettingsPage
+export default IntegrationsPage