refactor: scope-aware project and organisation integrations by kyle-ssg · Pull Request #7311 · Flagsmith/flagsmith

kyle-ssg · 2026-04-22T11:53:52Z

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

I have read the Contributing Guide.
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.

Changes

Project page now surfaces org-level integrations — org-only ones deep-link to the org page, or show "Manage Repositories" if already
connected (fixes the GitHub dead-end).
Org page now surfaces project-level integrations — with a project picker in the modal that auto-loads existing config.
Org admins can create and edit integrations for all their projects from the organisation view
Permission-aware CTAs with tooltips for non-org-admins.
Cleaner cards: action menu replaces the button row; kebab on each active integration for Edit/Delete.
Dropped the InfoMessage blurbs — the UI now explains itself.
Migrate integrations to RTK

Project integrations page

Organistaion integrations page with the ability to create/edit at project level

abc.mov

How did you test this code?

Added and edited integrations

…ion pages Clarify which integrations belong at which scope, tighten permission gating, and let admins add project-level integrations from the org page. - Project page: surface GitHub (org-only) with a permission-gated link to org settings; dual-level integrations (Jira, Grafana) expose both an "Add to project" primary CTA and a "Manage at organisation level" link. - Org page: list all integrations, grouped into org-level (actionable) and project-level (now actionable via a project selector in the standard modal, gated by org admin via renderWithPermission). - Integration modal: adds a project dropdown when required, seeds formData with field defaults so validation borders reflect actual state, suppresses autocomplete on all fields, and switches to edit mode when the selected project (and env, for per-env integrations) already has a configuration. - Integration tiles: action area is now a single primary button or an ellipsis menu styled like the feature-row menu; each added config row gets its own Edit/Delete menu. - Add to project / Add to organisation labelling, with Edit {scope} integration when an existing non-per-env config is present. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

claude

⚠️ Code review skipped — your organization's overage spend limit has been reached.

Code review is billed via overage credits. To resume reviews, an organization admin can raise the monthly limit at claude.ai/admin-settings/claude-code.

Once credits are available, reopen this pull request to trigger a review.

vercel · 2026-04-22T11:53:57Z

The latest updates on your projects. Learn more about Vercel for GitHub.

Project	Deployment	Actions	Updated (UTC)
flagsmith-frontend-preview	Ready	Preview, Comment	Apr 22, 2026 0:50am
flagsmith-frontend-staging	Ready	Preview, Comment	Apr 22, 2026 0:50am

1 Skipped Deployment

Project	Deployment	Actions	Updated (UTC)
docs	Ignored	Preview	Apr 22, 2026 0:50am

github-actions · 2026-04-22T11:54:58Z

Docker builds report

Image	Build Status	Security report
`ghcr.io/flagsmith/flagsmith-api-test:pr-7311`	Finished ✅	Skipped
`ghcr.io/flagsmith/flagsmith-e2e:pr-7311`	Finished ✅	Skipped
`ghcr.io/flagsmith/flagsmith-api:pr-7311`	Finished ✅	Results ✅
`ghcr.io/flagsmith/flagsmith:pr-7311`	Finished ✅	Results ✅
`ghcr.io/flagsmith/flagsmith-private-cloud:pr-7311`	Finished ✅	Results ✅
`ghcr.io/flagsmith/flagsmith-frontend:pr-7311`	Finished ✅	Results ✅

github-actions · 2026-04-22T11:59:29Z

Playwright Test Results (oss - depot-ubuntu-latest-16)

11 passed

Details

11 tests across 8 suites
43.5 seconds
6d1fec5
🔄 Run: #16250 (attempt 1)

1 test across 1 suite
44.8 seconds
be18d49
🔄 Run: #16256 (attempt 1)

Playwright Test Results (private-cloud - depot-ubuntu-latest-arm-16)

3 passed

Details

3 tests across 3 suites
20.5 seconds
be18d49
🔄 Run: #16256 (attempt 1)

github-actions · 2026-04-22T12:01:14Z

Visual Regression

16 screenshots compared. See report for details.
View full report

…, reset form on project switch - Add useGetIntegrationQuery to replace ad-hoc _data fetches for existing integration config - Extract ProjectSelect component mirroring EnvironmentSelect - Reset form state when the selected project changes so stale values (notably flagsmithEnvironment, used to key per-environment queries) don't leak between projects - Initialise every field key in default form data so controlled inputs actually clear instead of going uncontrolled - Collapse the external-integration CTA ladder into a single getPrimaryCta helper - Simplify renderActions to honour action.requiresOrgAdmin/disabled directly Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

…ration summary Render each read-only entry as a col-md-3 cell with label above value inside a shared row, so multiple entries flow side-by-side instead of stacking. Edit mode rendering is unchanged. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

…ct renderField - Add create/update RTK mutations for integration config; modal submit goes through them with tag-based invalidation - Alphabetise integrations by display title on both project and organisation pages - Extract renderField helpers to remove nested ternary in the fields loop - Tighten Res['integration'] to (ActiveIntegration & Record<string, any>)[] - Shorten a couple of stale comments Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

talissoncosta

Thanks for handling that @kyle-ssg.

I've added some comments, mostly clarifications..

talissoncosta · 2026-04-27T21:04:03Z

+const ReadOnlyEnvironmentName: FC<{ environmentId?: string }> = ({
+  environmentId,
+}) => {
+  const { data: environment } = useGetEnvironmentQuery(
+    { id: environmentId as any },
+    { skip: !environmentId },
+  )
+  return <>{environment?.name || ''}</>


Is environmentId here the api_key or the numeric id? Req['getEnvironment'] is { id: number }, so the as any looks like it's papering over a mismatch. If it's the api_key, could we rename to environmentApiKey: string to match the standardisation ?

talissoncosta · 2026-04-27T21:08:57Z

+  getIntegration: {
+    integrationId: string
+    projectId?: string
+    environmentId?: string


Could you confirm the value is the api_key? If so, can we name the field environmentApiKey: string to align?

talissoncosta · 2026-04-27T21:26:51Z

+                <IntegrationActionsMenu
+                  actions={[


Can you please check if this component can be replaced by DropdownMenu ?

Suggested change

<IntegrationActionsMenu

actions={[

<DropdownMenu

items={[

talissoncosta · 2026-04-27T21:29:36Z

+      }
+      return button
+    }
+    return <IntegrationActionsMenu actions={actions} />


Can you please check if this component can be replaced by DropdownMenu ?

Suggested change

return <IntegrationActionsMenu actions={actions} />

return <DropdownMenu items={actions} />

talissoncosta · 2026-04-27T21:49:37Z

+  const onError = (err: any) => {
    const defaultError =
      'There was an error adding your integration. Please check the details and try again.'
-    res.text().then((errorText) => {
-      try {
-        const err = JSON.parse(errorText)
-        setError(err[0] || defaultError)
-      } catch {
-        setError(defaultError)
-      } finally {
-        setIsLoading(false)
-      }
-    })
+    try {
+      const payload = err?.data ?? err
+      setError(
+        (Array.isArray(payload) ? payload[0] : undefined) || defaultError,
+      )
+    } catch {
+      setError(defaultError)
+    } finally {
+      setIsLoading(false)
+    }
  }


The try/catch/finally here isn't doing anything — nothing inside the try can throw now that we're not parsing JSON. Could flatten to its body.

talissoncosta · 2026-04-27T21:56:29Z

+      integrationData[b]?.title || b,
+    ),
+  )
+  const organisationId = AccountStore.getOrganisation()?.id


Can we get orgId from another source to avoid getting this data from flux ?

talissoncosta · 2026-04-27T22:02:09Z

+      {!!projectIntegrations.length && (
+        <>
+          <h5 className='mt-5 mb-3'>Project-level integrations</h5>
+          <IntegrationList
+            organisationId={organisationId}
+            integrations={projectIntegrations}
+            isOrgAdmin={isOrgAdmin}
+          />
+        </>
+      )}


I tried this end-to-end and the UX confused me. Steps:

Opened the org integrations page.

In the "Project-level integrations" section, clicked Add on a project-level integration, picked a project, filled in the fields, hit save.

Nothing appeared on the org page after closing the modal — I thought the save had failed.

Navigated to that project's integrations page, and the integration was there.

Is this the intended behaviour?

kyle-ssg requested a review from a team as a code owner April 22, 2026 11:53

kyle-ssg requested review from Zaimwa9 and removed request for a team April 22, 2026 11:53

claude Bot reviewed Apr 22, 2026

View reviewed changes

github-actions Bot added front-end Issue related to the React Front End Dashboard refactor labels Apr 22, 2026

kyle-ssg marked this pull request as draft April 22, 2026 11:55

github-actions Bot removed the refactor label Apr 22, 2026

vercel Bot deployed to Preview – flagsmith-frontend-staging April 22, 2026 12:22 View deployment

github-actions Bot added the refactor label Apr 22, 2026

vercel Bot deployed to Preview – flagsmith-frontend-preview April 22, 2026 12:22 View deployment

vercel Bot deployed to Preview – flagsmith-frontend-staging April 22, 2026 12:31 View deployment

vercel Bot deployed to Preview – flagsmith-frontend-preview April 22, 2026 12:31 View deployment

github-actions Bot added refactor and removed refactor labels Apr 22, 2026

vercel Bot deployed to Preview – flagsmith-frontend-preview April 22, 2026 12:39 View deployment

vercel Bot deployed to Preview – flagsmith-frontend-staging April 22, 2026 12:39 View deployment

kyle-ssg marked this pull request as ready for review April 22, 2026 12:45

github-actions Bot added refactor and removed refactor labels Apr 22, 2026

Fix switch environment flicker

be18d49

vercel Bot deployed to Preview – flagsmith-frontend-staging April 22, 2026 12:50 View deployment

vercel Bot deployed to Preview – flagsmith-frontend-preview April 22, 2026 12:50 View deployment

github-actions Bot added refactor and removed refactor labels Apr 22, 2026

kyle-ssg linked an issue Apr 22, 2026 that may be closed by this pull request

GitHub integration is org-wide but managed at project level in the UI #7280

Open

4 tasks

talissoncosta requested changes Apr 27, 2026

View reviewed changes

	return <IntegrationActionsMenu actions={actions} />
	return <DropdownMenu items={actions} />

Conversation

kyle-ssg commented Apr 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes

Project integrations page

Organistaion integrations page with the ability to create/edit at project level

How did you test this code?

Uh oh!

claude Bot left a comment

Choose a reason for hiding this comment

Uh oh!

vercel Bot commented Apr 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Apr 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Docker builds report

Uh oh!

github-actions Bot commented Apr 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Playwright Test Results (oss - depot-ubuntu-latest-16)

Details

Playwright Test Results (oss - depot-ubuntu-latest-arm-16)

Details

Playwright Test Results (private-cloud - depot-ubuntu-latest-arm-16)

Details

Playwright Test Results (private-cloud - depot-ubuntu-latest-16)

Details

Playwright Test Results (oss - depot-ubuntu-latest-16)

Details

Playwright Test Results (oss - depot-ubuntu-latest-arm-16)

Details

Playwright Test Results (private-cloud - depot-ubuntu-latest-16)

Details

Playwright Test Results (private-cloud - depot-ubuntu-latest-arm-16)

Details

Playwright Test Results (oss - depot-ubuntu-latest-16)

Details

Playwright Test Results (oss - depot-ubuntu-latest-arm-16)

Details

Playwright Test Results (private-cloud - depot-ubuntu-latest-16)

Details

Playwright Test Results (private-cloud - depot-ubuntu-latest-arm-16)

Details

Uh oh!

github-actions Bot commented Apr 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Visual Regression

Uh oh!

talissoncosta left a comment

Choose a reason for hiding this comment

Uh oh!

talissoncosta Apr 27, 2026

Choose a reason for hiding this comment

Uh oh!

talissoncosta Apr 27, 2026

Choose a reason for hiding this comment

Uh oh!

talissoncosta Apr 27, 2026

Choose a reason for hiding this comment

Uh oh!

talissoncosta Apr 27, 2026

Choose a reason for hiding this comment

Uh oh!

talissoncosta Apr 27, 2026

Choose a reason for hiding this comment

Uh oh!

talissoncosta Apr 27, 2026

Choose a reason for hiding this comment

Uh oh!

talissoncosta Apr 27, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

kyle-ssg commented Apr 22, 2026 •

edited

Loading

vercel Bot commented Apr 22, 2026 •

edited

Loading

github-actions Bot commented Apr 22, 2026 •

edited

Loading

github-actions Bot commented Apr 22, 2026 •

edited

Loading

github-actions Bot commented Apr 22, 2026 •

edited

Loading