Skip to content

fix(integrations): fix Slack integration modal after redirect #8542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bakirFS merged 2 commits into from
Sep 17, 2026
+8 −4
Merged

fix(integrations): fix Slack integration modal after redirect #8542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2fc931
fixed frontend after redirect
bakirFS Sep 16, 2026
c054d08
removed empty files
bakirFS Sep 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions frontend/web/components/IntegrationList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ const IntegrationList: FC<IntegrationListProps> = (props) => {
setIsLoading(false)
})
const params = Utils.fromParam()
if (params && params.configure) {
if (params?.configure && props.integrations.includes(params.configure)) {
const integrationList = Utils.getIntegrationData()

if (integrationList && integrationList[params.configure]) {
Expand Down Expand Up @@ -543,7 +543,7 @@ const IntegrationList: FC<IntegrationListProps> = (props) => {
: null
}
githubMeta={{ githubId: githubId, installationId: installationId }}
projectId={props.projectId}
projectId={params.project || props.projectId}
requiresProjectSelection={requiresProjectSelection}
onComplete={(result) => {
if (requiresProjectSelection && result?.projectId) {
Expand Down
8 changes: 6 additions & 2 deletions frontend/web/components/modals/CreateEditIntegrationModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,8 +239,11 @@ const CreateEditIntegration: FC<CreateEditIntegrationProps> = (props) => {
const handleOauthSignature = (res: { signature: string } | null) => {
const signature = res && res.signature
if (signature) {
const returnUrl = `${document.location.href}?environment=${
formData.flagsmithEnvironment
}&configure=${id}${projectId ? `&project=${projectId}` : ''}`
const postfix = `?redirect_url=${encodeURIComponent(
`${document.location.href}?environment=${formData.flagsmithEnvironment}&configure=${id}`,
returnUrl,
)}&signature=${signature}`
document.location = `${constructBaseUrl({
environmentApiKey: formData.flagsmithEnvironment,
Expand Down Expand Up @@ -483,6 +486,7 @@ const CreateEditIntegration: FC<CreateEditIntegrationProps> = (props) => {
</label>
<ProjectSelect
organisationId={AccountStore.getOrganisation()?.id}
readOnly={authorised}
Comment thread
Zaimwa9 marked this conversation as resolved.
value={selectedProjectId}
onChange={(v) => setSelectedProjectId(v)}
/>
Expand All @@ -495,7 +499,7 @@ const CreateEditIntegration: FC<CreateEditIntegrationProps> = (props) => {
</label>
<EnvironmentSelect
projectId={projectId}
readOnly={!!data}
readOnly={!!data?.id}
Comment thread
Zaimwa9 marked this conversation as resolved.
value={formData.flagsmithEnvironment}
onChange={(environment) =>
update('flagsmithEnvironment', environment)
Expand Down
Loading