Skip to content

Commit 50a1710

Browse files
Merge pull request #1348 from devtron-labs/chore/shift-common
chore: shift common
2 parents 574588a + d731413 commit 50a1710

File tree

60 files changed

+145
-379
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+145
-379
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.30",
7+
"@devtron-labs/devtron-fe-common-lib": "0.0.31",
88
"@sentry/browser": "^7.3.1",
99
"@sentry/integrations": "^7.3.1",
1010
"@sentry/tracing": "^7.3.1",

src/components/AppSelector/ChartSelector.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import React from 'react';
22
import { useParams, useHistory, generatePath, useRouteMatch } from 'react-router';
3-
import { mapByKey, useAsync } from '../common';
43
import Select from 'react-select';
4+
import { useAsync } from '@devtron-labs/devtron-fe-common-lib';
5+
import { mapByKey } from '../common';
56
import { appSelectorStyle, DropdownIndicator } from './AppSelectorUtil';
67

78
interface ChartSelectorType {

src/components/ApplicationGroup/AppGroupDetailsRoute.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import React, { Suspense, useCallback, useRef, useEffect, useState, useMemo } from 'react'
22
import { Switch, Route, Redirect, NavLink } from 'react-router-dom'
3-
import { ErrorBoundary, useAsync, sortOptionsByLabel } from '../common'
43
import {
54
Progressing,
65
BreadCrumb,
@@ -10,7 +9,9 @@ import {
109
showError,
1110
GenericEmptyState,
1211
ToastBody,
12+
useAsync,
1313
} from '@devtron-labs/devtron-fe-common-lib'
14+
import { ErrorBoundary, sortOptionsByLabel } from '../common'
1415
import { useParams, useRouteMatch, useHistory, generatePath, useLocation } from 'react-router'
1516
import ReactGA from 'react-ga4'
1617
import { URLS } from '../../config'

src/components/ApplicationGroup/Details/EnvCDDetails/EnvCDDetails.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { useState, useEffect } from 'react'
2-
import { Progressing, showError, sortCallback } from '@devtron-labs/devtron-fe-common-lib'
3-
import { useAsync, useInterval, mapByKey, asyncWrap } from '../../../common'
2+
import { Progressing, showError, sortCallback, useAsync } from '@devtron-labs/devtron-fe-common-lib'
3+
import { useInterval, mapByKey, asyncWrap } from '../../../common'
44
import { ModuleNameMap } from '../../../../config'
55
import { useHistory, useRouteMatch, useParams, generatePath } from 'react-router'
66
import { TriggerOutput } from '../../../app/details/cdDetails/CDDetails'

src/components/ApplicationGroup/Details/EnvCIDetails/EnvCIDetails.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { useEffect, useState } from 'react'
22
import { generatePath, Route, useHistory, useParams, useRouteMatch } from 'react-router-dom'
3-
import { Progressing, showError, sortCallback } from '@devtron-labs/devtron-fe-common-lib'
3+
import { Progressing, showError, sortCallback, useAsync } from '@devtron-labs/devtron-fe-common-lib'
44
import { URLS } from '../../../../config'
55
import { APP_GROUP_CI_DETAILS } from '../../../../config/constantMessaging'
66
import { EmptyView, LogResizeButton } from '../../../app/details/cicdHistory/History.components'
@@ -14,7 +14,7 @@ import {
1414
import { Details } from '../../../app/details/cIDetails/CIDetails'
1515
import { CiPipeline } from '../../../app/details/triggerView/types'
1616
import { getTriggerHistory } from '../../../app/service'
17-
import { asyncWrap, mapByKey, useAsync, useInterval } from '../../../common'
17+
import { asyncWrap, mapByKey, useInterval } from '../../../common'
1818
import { getCIConfigList } from '../../AppGroup.service'
1919
import { AppGroupDetailDefaultType } from '../../AppGroup.types'
2020
import { CIPipelineBuildType } from '../../../ciPipeline/types'

src/components/ApplicationGroup/Details/EnvironmentConfig/EnvConfig.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { useEffect, useState } from 'react'
22
import { useHistory, useParams, useRouteMatch } from 'react-router-dom'
3-
import { Progressing, noop } from '@devtron-labs/devtron-fe-common-lib'
4-
import { importComponentFromFELibrary, useAsync } from '../../../common'
3+
import { Progressing, noop, useAsync } from '@devtron-labs/devtron-fe-common-lib'
4+
import { importComponentFromFELibrary } from '../../../common'
55
import EnvironmentOverride from '../../../EnvironmentOverride/EnvironmentOverride'
66
import { getConfigAppList } from '../../AppGroup.service'
77
import { AppGroupDetailDefaultType, ConfigAppList } from '../../AppGroup.types'

src/components/ApplicationGroup/Details/TriggerView/BulkCITrigger.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ import {
88
noop,
99
ConsequenceType,
1010
ConsequenceAction,
11+
useAsync,
1112
} from '@devtron-labs/devtron-fe-common-lib'
12-
import { importComponentFromFELibrary, useAsync } from '../../../common'
13+
import { importComponentFromFELibrary } from '../../../common'
1314
import { ReactComponent as Close } from '../../../../assets/icons/ic-cross.svg'
1415
import { ReactComponent as PlayIcon } from '../../../../assets/icons/misc/arrow-solid-right.svg'
1516
import { ReactComponent as Warning } from '../../../../assets/icons/ic-warning.svg'

src/components/ApplicationGroup/List/EnvironmentListView.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import React, { useState, useEffect } from 'react'
2-
import { Progressing, toastAccessDenied } from '@devtron-labs/devtron-fe-common-lib'
2+
import { Progressing, toastAccessDenied, useAsync } from '@devtron-labs/devtron-fe-common-lib'
33
import EnvEmptyStates from '../EnvEmptyStates'
44
import { ReactComponent as EnvIcon } from '../../../assets/icons/ic-app-group.svg'
55
import { NavLink, useHistory, useLocation, useRouteMatch } from 'react-router-dom'
6-
import { Pagination, useAsync } from '../../common'
6+
import { Pagination } from '../../common'
77
import { toast } from 'react-toastify'
88
import { EMPTY_LIST_MESSAGING, GROUP_LIST_HEADER, NO_ACCESS_TOAST_MESSAGE } from '../Constants'
99
import { getEnvAppList } from '../AppGroup.service'

src/components/ApplicationGroup/List/EnvironmentsList.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import React, { useState, useEffect, useContext } from 'react'
2-
import { Progressing } from '@devtron-labs/devtron-fe-common-lib'
2+
import { Progressing, 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'
66
import './EnvironmentsList.scss'
77
import PageHeader from '../../common/header/PageHeader'
8-
import { Filter, FilterOption, useAsync } from '../../common'
8+
import { Filter, FilterOption } from '../../common'
99
import EnvironmentsListView from './EnvironmentListView'
1010
import { getClusterListMinWithoutAuth } from '../../../services/service'
1111
import { Cluster } from '../../../services/service.types'

src/components/ClusterNodes/NodeDetails.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import React, { useState, useEffect, useRef, useMemo } from 'react'
2-
import { copyToClipboard, ToastBodyWithButton } from '../common'
2+
import { ToastBodyWithButton } from '../common'
33
import {
44
showError,
55
Progressing,
66
toastAccessDenied,
77
ServerErrors,
88
ErrorScreenManager,
9+
copyToClipboard,
910
} from '@devtron-labs/devtron-fe-common-lib'
1011
import { ReactComponent as Info } from '../../assets/icons/ic-info-filled.svg'
1112
import { ReactComponent as Error } from '../../assets/icons/ic-error-exclamation.svg'

0 commit comments

Comments
 (0)