Skip to content

Commit d31f673

Browse files
committed
Merge branch 'main' of github.com:devtron-labs/devtron-fe-common-lib into feat/release-v2
2 parents 1cd7def + 2eecd9b commit d31f673

File tree

6 files changed

+22
-4
lines changed

6 files changed

+22
-4
lines changed

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@devtron-labs/devtron-fe-common-lib",
3-
"version": "0.0.83-beta-4",
3+
"version": "0.0.84",
44
"description": "Supporting common component library",
55
"type": "module",
66
"main": "dist/index.js",

src/Assets/Img/empty-noresult@2x.png

70.1 KB
Loading

src/Common/Api.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,4 +247,4 @@ export const abortPreviousRequests = <T>(
247247
*/
248248
export const getIsRequestAborted = (error) =>
249249
// The 0 code is common for aborted and blocked requests
250-
error && error.code === 0 && (error.message === 'The user aborted a request.' || error.message === 'signal is aborted without reason')
250+
error && error.code === 0 && error.message.search('abort\|aborted')
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import { GenericEmptyStateType } from '../Types'
2+
import noResult from '../../Assets/Img/empty-noresult@2x.png'
3+
import GenericEmptyState from './GenericEmptyState'
4+
5+
const GenericFilterEmptyState = (
6+
props: Omit<GenericEmptyStateType, 'image' | 'title' | 'subTitle'> &
7+
Partial<Pick<GenericEmptyStateType, 'title' | 'subTitle'>>,
8+
) => (
9+
<GenericEmptyState
10+
image={noResult}
11+
title="No results"
12+
subTitle="We couldn’t find any matching results"
13+
{...props}
14+
/>
15+
)
16+
17+
export default GenericFilterEmptyState

src/Common/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ export { default as InfoColourBar } from './InfoColorBar/InfoColourbar'
2626
export * from './Common.service'
2727
export * from './Checkbox'
2828
export { default as GenericEmptyState } from './EmptyState/GenericEmptyState'
29+
export { default as GenericFilterEmptyState } from './EmptyState/GenericFilterEmptyState'
2930
export * from './SearchBar'
3031
export * from './SortableTableHeaderCell'
3132
export { default as Toggle } from './Toggle/Toggle'

0 commit comments

Comments
 (0)