Skip to content

Commit 4393fa9

Browse files
committed
Merge branch 'develop' of github.com:devtron-labs/devtron-fe-common-lib into feat/codemirror-diff-minimap
2 parents 0bfd20e + bbec103 commit 4393fa9

File tree

22 files changed

+458
-78
lines changed

22 files changed

+458
-78
lines changed

.eslintignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ src/Common/Modals/VisibleModal2.tsx
4040
src/Common/MultiSelectCustomization.tsx
4141
src/Common/PopupMenu.tsx
4242
src/Common/Progressing.tsx
43-
src/Common/RJSF/Form.tsx
4443
src/Common/RJSF/config.ts
4544
src/Common/RJSF/templates/ArrayFieldTemplate.tsx
4645
src/Common/RJSF/templates/BaseInput.tsx

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": "1.8.1",
3+
"version": "1.8.4",
44
"description": "Supporting common component library",
55
"type": "module",
66
"main": "dist/index.js",

src/Assets/IconV2/ic-google.svg

Lines changed: 6 additions & 0 deletions
Loading

src/Assets/IconV2/ic-ldap.svg

Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 22 additions & 0 deletions
Loading

src/Assets/IconV2/ic-microsoft.svg

Lines changed: 6 additions & 0 deletions
Loading

src/Assets/IconV2/ic-oidc.svg

Lines changed: 4 additions & 0 deletions
Loading

src/Assets/IconV2/ic-openshift.svg

Lines changed: 10 additions & 0 deletions
Loading

src/Common/Constants.ts

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ export const PATTERNS = {
3939
START_END_ALPHANUMERIC: /^(([A-Za-z0-9].*[A-Za-z0-9])|[A-Za-z0-9])$/,
4040
ALPHANUMERIC_WITH_SPECIAL_CHAR: /^[A-Za-z0-9._-]+$/, // allow alphanumeric,(.) ,(-),(_)
4141
ESCAPED_CHARACTERS: /[.*+?^${}()|[\]\\]/g,
42-
NUMBERS_WITH_SCOPE_VARIABLES: /^(\d+(\.\d+)?|@{{[a-zA-Z0-9-]+}})$/,
42+
NUMBERS_WITH_SCOPE_VARIABLES: /^(\d+(\.\d+)?|@{{([a-zA-Z0-9-_\s]+)}})$/,
43+
BOOLEAN_WITH_SCOPE_VARIABLES: /^(TRUE|FALSE|true|false|True|False|@{{([a-zA-Z0-9-_\s]+)}})$/,
4344
ALL_DIGITS_BETWEEN_0_AND_7: /^[0-7]*$/,
4445
// eslint-disable-next-line no-useless-escape
4546
CONFIG_MAP_AND_SECRET_MULTIPLE_KEYS: /^[-._a-zA-Z0-9\,\?\s]*[-._a-zA-Z0-9\s]$/,
@@ -435,3 +436,16 @@ export const UNCHANGED_ARRAY_ELEMENT_SYMBOL = Symbol(
435436
`The element at this index remains unchanged from the original object.
436437
This symbol is used by @buildObjectFromPath & later consumed by @recursivelyRemoveSymbolFromArraysInObject`,
437438
)
439+
440+
/**
441+
* Authorization config types for SSO Login
442+
*/
443+
export enum SSOProvider {
444+
google = 'google',
445+
github = 'github',
446+
gitlab = 'gitlab',
447+
microsoft = 'microsoft',
448+
ldap = 'ldap',
449+
oidc = 'oidc',
450+
openshift = 'openshift',
451+
}

0 commit comments

Comments
 (0)