Skip to content

fix(admin-ui): resolve navigation hang when redirecting to SSA page (#2672) #2675

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
moabu merged 6 commits into from
Feb 26, 2026
Merged

fix(admin-ui): resolve navigation hang when redirecting to SSA page (#2672) #2675

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3a64bdb
fix(admin-ui): resolve navigation hang when redirecting to SSA page (…
faisalsiddique4400 Feb 26, 2026
733b065
coderabbit ai suggestions
faisalsiddique4400 Feb 26, 2026
cd0d46d
show error page when Config API is unavailable instead of rendering S…
faisalsiddique4400 Feb 26, 2026
080bfb4
show error page when Config API is unavailable instead of rendering S…
faisalsiddique4400 Feb 26, 2026
2fa4037
show error page when Config API is unavailable instead of rendering S…
faisalsiddique4400 Feb 26, 2026
135020f
code rabbit suggestions
faisalsiddique4400 Feb 26, 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: 4 additions & 0 deletions admin-ui/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ plugins_repo
.env.*
*.local

# Cursor
.cursor/
.cursorrules

# ESLint cache
.eslintcache
.vscode/*
Expand Down
3 changes: 3 additions & 0 deletions admin-ui/app/redux/sagas/LicenseSaga.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,9 @@ function* retrieveLicenseKey(_action?: { type: string }) {
yield put(checkLicensePresentResponse({ isLicenseValid: false }))
yield put(generateTrialLicenseResponse(null))
}
} else {
yield put(retrieveLicenseKeyResponse({ isNoValidLicenseKeyFound: true }))
yield put(checkLicensePresentResponse({ isLicenseValid: false }))
}
} catch (err) {
yield put(setLicenseError(getLicenseErrorMessage(err as Error | SagaError)))
Expand Down
11 changes: 4 additions & 7 deletions admin-ui/app/utils/ApiKeyRedirect.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,10 @@ const ApiKeyRedirect = ({
isNoValidLicenseKeyFound

const showRedirectingLoader =
!islicenseCheckResultLoaded ||
isConfigValid === null ||
(isConfigValid !== false &&
!isTimeout &&
isUnderThresholdLimit &&
backendStatus.active &&
!shouldShowApiKey)
isConfigValid !== false &&
(!islicenseCheckResultLoaded ||
isConfigValid === null ||
(!isTimeout && isUnderThresholdLimit && backendStatus.active && !shouldShowApiKey))

if (showRedirectingLoader) {
return (
Expand Down
10 changes: 9 additions & 1 deletion admin-ui/app/utils/styles/UploadSSA.style.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ const useStyles = makeStyles<{ themeColors: ThemeConfig }>()((theme, { themeColo
},
dropzone: {
'marginTop': theme.spacing(1),
'minHeight': '80px',
'display': 'flex',
'alignItems': 'center',
'justifyContent': 'center',
'padding': theme.spacing(2),
'boxSizing': 'border-box',
'borderRadius': `${MAPPING_SPACING.INFO_ALERT_BORDER_RADIUS}px`,
'border': `1px solid ${themeColors.infoAlert.border}`,
'background': themeColors.infoAlert.background,
Expand All @@ -30,7 +36,7 @@ const useStyles = makeStyles<{ themeColors: ThemeConfig }>()((theme, { themeColo
},
error: {
color: themeColors.errorColor,
fontSize: fontSizes.xl,
fontSize: fontSizes.content,
fontWeight: fontWeights.semiBold,
marginTop: theme.spacing(2),
display: 'block',
Expand All @@ -42,6 +48,8 @@ const useStyles = makeStyles<{ themeColors: ThemeConfig }>()((theme, { themeColo
fontStyle: 'normal',
fontWeight: fontWeights.medium,
lineHeight: lineHeights.tight,
margin: 0,
textAlign: 'center',
},
button: {
display: 'inline-flex',
Expand Down
Loading