Skip to content

Commit 3a1bfcd

Browse files
mukultayal135mukultayal135
authored
Merge branch 'main' into user-permissions-injob
2 parents cd7e4f9 + 9a25d30 commit 3a1bfcd

File tree

9 files changed

+29
-17
lines changed

9 files changed

+29
-17
lines changed

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"private": true,
55
"homepage": "/dashboard",
66
"dependencies": {
7-
"@devtron-labs/devtron-fe-common-lib": "0.0.42",
7+
"@devtron-labs/devtron-fe-common-lib": "0.0.43",
88
"@sentry/browser": "^7.3.1",
99
"@sentry/integrations": "^7.3.1",
1010
"@sentry/tracing": "^7.3.1",

‎src/App.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {
1818
ToastBody3 as UpdateToast,
1919
ErrorBoundary,
2020
} from './components/common'
21-
import { showError, Progressing, BreadcrumbStore, Reload } from '@devtron-labs/devtron-fe-common-lib'
21+
import { showError, BreadcrumbStore, Reload, DevtronProgressing } from '@devtron-labs/devtron-fe-common-lib'
2222
import * as serviceWorker from './serviceWorker'
2323
import Hotjar from './components/Hotjar/Hotjar'
2424
import { validateToken } from './services/service'
@@ -207,7 +207,7 @@ export default function App() {
207207
<Suspense fallback={null}>
208208
{validating ? (
209209
<div className="full-height-width">
210-
<Progressing pageLoader />
210+
<DevtronProgressing parentClasses="h-100 flex bcn-0" classes="icon-dim-80"/>
211211
</div>
212212
) : (
213213
<>

‎src/components/ApplicationGroup/List/EnvironmentsList.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { useState, useEffect, useContext } from 'react'
2-
import { Progressing, useAsync } from '@devtron-labs/devtron-fe-common-lib'
2+
import { DevtronProgressing, useAsync } from '@devtron-labs/devtron-fe-common-lib'
33
import { useRouteMatch } from 'react-router'
44
import { ReactComponent as Search } from '../../../assets/icons/ic-search.svg'
55
import { ReactComponent as Clear } from '../../../assets/icons/ic-error.svg'
@@ -191,7 +191,7 @@ export default function EnvironmentsList({ isSuperAdmin }: AppGroupAdminType) {
191191
}
192192

193193
if (loading) {
194-
return <Progressing pageLoader />
194+
return <DevtronProgressing parentClasses="h-100 flex bcn-0" classes="icon-dim-80"/>
195195
}
196196

197197
return (

‎src/components/Jobs/JobList/JobsList.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import { Route, Switch, useHistory, useLocation, useRouteMatch } from 'react-rou
33
import { URLS } from '../../../config'
44
import {
55
ErrorScreenManager,
6-
Progressing,
76
showError,
87
stopPropagation,
98
ServerErrors,
109
useAsync,
10+
DevtronProgressing,
1111
} from '@devtron-labs/devtron-fe-common-lib'
1212
import { Filter, FilterOption } from '../../common'
1313
import HeaderWithCreateButton from '../../common/header/HeaderWithCreateButton/HeaderWithCreateButton'
@@ -331,8 +331,8 @@ export default function JobsList() {
331331
return (
332332
<div className="jobs-view-container">
333333
{dataStateType === JobListViewType.LOADING && (
334-
<div className="dc__loading-wrapper">
335-
<Progressing pageLoader />
334+
<div className="w-100 h-100vh">
335+
<DevtronProgressing parentClasses="h-100 w-100 flex bcn-0" classes="icon-dim-80"/>
336336
</div>
337337
)}
338338
{dataStateType === JobListViewType.ERROR && (

‎src/components/ResourceBrowser/ResourceList/ResourceList.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import {
1616
useBreadcrumb,
1717
ErrorScreenManager,
1818
Reload,
19+
DevtronProgressing,
1920
} from '@devtron-labs/devtron-fe-common-lib'
2021
import PageHeader from '../../common/header/PageHeader'
2122
import {
@@ -1039,7 +1040,7 @@ export default function ResourceList() {
10391040
} else if ((loader && !selectedCluster?.value) || clusterLoader) {
10401041
return (
10411042
<div style={{ height: 'calc(100vh - 48px)' }}>
1042-
<Progressing pageLoader />
1043+
<DevtronProgressing parentClasses="h-100 flex bcn-0" classes="icon-dim-80" />
10431044
</div>
10441045
)
10451046
} else if (!selectedCluster?.value) {

‎src/components/charts/list/DiscoverCharts.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
mapByKey,
55
sortOptionsByLabel,
66
} from '../../common'
7-
import { showError, Progressing, ConditionalWrap, InfoColourBar } from '@devtron-labs/devtron-fe-common-lib'
7+
import { showError, Progressing, ConditionalWrap, InfoColourBar, DevtronProgressing } from '@devtron-labs/devtron-fe-common-lib'
88
import { Switch, Route, NavLink } from 'react-router-dom'
99
import { useHistory, useLocation, useRouteMatch } from 'react-router'
1010
import { ReactComponent as Add } from '../../../assets/icons/ic-add.svg'
@@ -624,7 +624,7 @@ function DiscoverChartList({isSuperAdmin} : {isSuperAdmin: boolean}) {
624624
</aside>
625625
</div>
626626
) : (
627-
<Progressing pageLoader />
627+
<DevtronProgressing parentClasses="h-100 flex bcn-0" classes="icon-dim-80"/>
628628
)}
629629
</div>
630630
{showDeployModal ? (

‎src/components/common/navigation/NavigationRoutes.tsx

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { lazy, Suspense, useEffect, useState, createContext, useContext, useRef, useMemo } from 'react'
22
import { Route, Switch } from 'react-router-dom'
3-
import { getLoginInfo, showError, Progressing, Host, Reload, useAsync } from '@devtron-labs/devtron-fe-common-lib'
3+
import { getLoginInfo, showError, Host, Reload, useAsync, DevtronProgressing } from '@devtron-labs/devtron-fe-common-lib'
44
import { URLS, AppListConstants, ViewType, SERVER_MODE, ModuleNameMap } from '../../../config'
55
import { ErrorBoundary, AppContext } from '../../common'
66
import Navigation from './Navigation'
@@ -297,7 +297,7 @@ export default function NavigationRoutes() {
297297
if (pageState === ViewType.LOADING || loginLoader) {
298298
return (
299299
<div className="full-height-width">
300-
<Progressing pageLoader />
300+
<DevtronProgressing parentClasses="h-100 flex bcn-0" classes="icon-dim-80"/>
301301
</div>
302302
)
303303
} else if (pageState === ViewType.ERROR) {
@@ -345,7 +345,9 @@ export default function NavigationRoutes() {
345345
pageOverflowEnabled ? '' : 'main__overflow-disabled'
346346
}`}
347347
>
348-
<Suspense fallback={<Progressing pageLoader />}>
348+
<Suspense
349+
fallback={<DevtronProgressing parentClasses="h-100 flex bcn-0" classes="icon-dim-80" />}
350+
>
349351
<ErrorBoundary>
350352
<Switch>
351353
<Route
@@ -372,7 +374,11 @@ export default function NavigationRoutes() {
372374
<Route key={URLS.APPLICATION_GROUP} path={URLS.APPLICATION_GROUP}>
373375
<AppGroupRoute isSuperAdmin={isSuperAdmin} />
374376
</Route>,
375-
<Route key={URLS.CHARTS} path={URLS.CHARTS} render={() => <Charts isSuperAdmin={isSuperAdmin} />} />,
377+
<Route
378+
key={URLS.CHARTS}
379+
path={URLS.CHARTS}
380+
render={() => <Charts isSuperAdmin={isSuperAdmin} />}
381+
/>,
376382
<Route
377383
key={URLS.DEPLOYMENT_GROUPS}
378384
path={URLS.DEPLOYMENT_GROUPS}

‎src/components/v2/devtronStackManager/DevtronStackManager.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
ErrorBoundary,
66
useInterval,
77
} from '../../common'
8-
import { showError, Progressing, ErrorScreenManager } from '@devtron-labs/devtron-fe-common-lib'
8+
import { showError, Progressing, ErrorScreenManager, DevtronProgressing } from '@devtron-labs/devtron-fe-common-lib'
99
import AboutDevtronView from './AboutDevtronView'
1010
import {
1111
handleError,
@@ -523,7 +523,7 @@ export default function DevtronStackManager({
523523
handleBreadcrumbClick={handleBreadcrumbClick}
524524
/>
525525
{stackDetails.isLoading ? (
526-
<Progressing pageLoader />
526+
<DevtronProgressing parentClasses="h-100 flex bcn-0" classes="icon-dim-80"/>
527527
) : stackDetails.errorStatusCode > 0 ? (
528528
<div className="flex">
529529
<ErrorScreenManager code={stackDetails.errorStatusCode} />

‎src/css/icons.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,11 @@
183183
height: 48px;
184184
}
185185

186+
.icon-dim-80 {
187+
width: 80px;
188+
height: 80px;
189+
}
190+
186191
.icon-n2 {
187192
.fill-color {
188193
fill: var(--N200);

0 commit comments

Comments
 (0)