@@ -17,6 +17,7 @@ import {
17
17
ToastBody ,
18
18
ToastBody3 as UpdateToast ,
19
19
ErrorBoundary ,
20
+ importComponentFromFELibrary ,
20
21
} from './components/common'
21
22
import { showError , BreadcrumbStore , Reload , DevtronProgressing } from '@devtron-labs/devtron-fe-common-lib'
22
23
import * as serviceWorker from './serviceWorker'
@@ -25,6 +26,7 @@ import { validateToken } from './services/service'
25
26
26
27
const NavigationRoutes = lazy ( ( ) => import ( './components/common/navigation/NavigationRoutes' ) )
27
28
const Login = lazy ( ( ) => import ( './components/login/Login' ) )
29
+ const ApprovedModal = importComponentFromFELibrary ( 'ApprovedModal' )
28
30
29
31
toast . configure ( {
30
32
autoClose : 3000 ,
@@ -87,6 +89,9 @@ export default function App() {
87
89
useEffect ( ( ) => {
88
90
async function validation ( ) {
89
91
try {
92
+ if ( location . pathname . includes ( 'approval' ) ) {
93
+ return
94
+ }
90
95
await validateToken ( )
91
96
defaultRedirection ( )
92
97
} catch ( err : any ) {
@@ -106,7 +111,7 @@ export default function App() {
106
111
}
107
112
}
108
113
// If not K8S_CLIENT then validateToken otherwise directly redirect
109
- if ( ! window . _env_ . K8S_CLIENT ) {
114
+ if ( ! window . _env_ . K8S_CLIENT ) {
110
115
validation ( )
111
116
} else {
112
117
setValidating ( false )
@@ -207,7 +212,7 @@ export default function App() {
207
212
< Suspense fallback = { null } >
208
213
{ validating ? (
209
214
< div className = "full-height-width" >
210
- < DevtronProgressing parentClasses = "h-100 flex bcn-0" classes = "icon-dim-80" />
215
+ < DevtronProgressing parentClasses = "h-100 flex bcn-0" classes = "icon-dim-80" />
211
216
</ div >
212
217
) : (
213
218
< >
@@ -220,6 +225,7 @@ export default function App() {
220
225
< BreadcrumbStore >
221
226
< Switch >
222
227
{ ! window . _env_ . K8S_CLIENT && < Route path = { `/login` } component = { Login } /> }
228
+ < Route path = { `/approval` } component = { ApprovedModal } />
223
229
< Route path = "/" render = { ( ) => < NavigationRoutes /> } />
224
230
< Redirect
225
231
to = { window . _env_ . K8S_CLIENT ? '/' : `${ URLS . LOGIN_SSO } ${ location . search } ` }
0 commit comments