Skip to content

Commit 31952dd

Browse files
committed
Merge branch 'develop' of github.com:devtron-labs/devtron-fe-common-lib into feat/codemirror-enhancements
2 parents 312a518 + 7e0e787 commit 31952dd

File tree

22 files changed

+456
-77
lines changed

22 files changed

+456
-77
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.3",
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: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -435,3 +435,16 @@ export const UNCHANGED_ARRAY_ELEMENT_SYMBOL = Symbol(
435435
`The element at this index remains unchanged from the original object.
436436
This symbol is used by @buildObjectFromPath & later consumed by @recursivelyRemoveSymbolFromArraysInObject`,
437437
)
438+
439+
/**
440+
* Authorization config types for SSO Login
441+
*/
442+
export enum SSOProvider {
443+
google = 'google',
444+
github = 'github',
445+
gitlab = 'gitlab',
446+
microsoft = 'microsoft',
447+
ldap = 'ldap',
448+
oidc = 'oidc',
449+
openshift = 'openshift',
450+
}

0 commit comments

Comments
 (0)