diff --git a/package-lock.json b/package-lock.json index ffe42dd3d..1ab4f7d06 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "0.0.58-beta-9", + "version": "0.0.58-beta-11", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "0.0.58-beta-9", + "version": "0.0.58-beta-11", "license": "ISC", "dependencies": { "fast-json-patch": "^3.1.1", diff --git a/package.json b/package.json index c8bca2229..35e53a70b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "0.0.58-beta-9", + "version": "0.0.58-beta-11", "description": "Supporting common component library", "main": "dist/index.js", "scripts": { diff --git a/src/Common/Hooks/useUrlFilters/useUrlFilters.ts b/src/Common/Hooks/useUrlFilters/useUrlFilters.ts index ce15f8fbc..183379809 100644 --- a/src/Common/Hooks/useUrlFilters/useUrlFilters.ts +++ b/src/Common/Hooks/useUrlFilters/useUrlFilters.ts @@ -79,6 +79,7 @@ const useUrlFilters = ({ initialSortKey }: UseUrlFiltersProps = { const handleSearch = (searchTerm: string) => { _updateSearchParam(SEARCH_KEY, searchTerm) + _resetPageNumber() } const handleSorting = (_sortBy: T) => { diff --git a/src/Pages/GlobalConfigurations/Authorization/constants.ts b/src/Pages/GlobalConfigurations/Authorization/constants.ts new file mode 100644 index 000000000..d808b853b --- /dev/null +++ b/src/Pages/GlobalConfigurations/Authorization/constants.ts @@ -0,0 +1,16 @@ +/** + * User Status received from the API + */ +export enum UserStatusDto { + active = 'active', + inactive = 'inactive', +} + +/** + * User status for the frontend + */ +export enum UserStatus { + active = 'active', + inactive = 'inactive', + temporary = 'temporary', +} diff --git a/src/Pages/GlobalConfigurations/Authorization/index.ts b/src/Pages/GlobalConfigurations/Authorization/index.ts new file mode 100644 index 000000000..f87cf0102 --- /dev/null +++ b/src/Pages/GlobalConfigurations/Authorization/index.ts @@ -0,0 +1 @@ +export * from './constants' diff --git a/src/Pages/GlobalConfigurations/index.ts b/src/Pages/GlobalConfigurations/index.ts new file mode 100644 index 000000000..5175a46c7 --- /dev/null +++ b/src/Pages/GlobalConfigurations/index.ts @@ -0,0 +1 @@ +export * from './Authorization' diff --git a/src/Pages/index.ts b/src/Pages/index.ts new file mode 100644 index 000000000..39917d906 --- /dev/null +++ b/src/Pages/index.ts @@ -0,0 +1 @@ +export * from './GlobalConfigurations' diff --git a/src/index.ts b/src/index.ts index 30ed5989d..370f778ed 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1 +1,2 @@ -export * from "./Common" +export * from './Common' +export * from './Pages'