Skip to content

Commit 4802c37

Browse files
committed
Merge branch 'refactor/calc-cleanup' of github.com:devtron-labs/devtron-fe-common-lib into feat/calc-cleanup
2 parents 238b2b9 + 7cb4dfb commit 4802c37

File tree

14 files changed

+162
-4
lines changed

14 files changed

+162
-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": "1.8.2",
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: 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+
}

src/Shared/Components/Icon/Icon.tsx

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import { ReactComponent as ICGithub } from '@IconsV2/ic-github.svg'
2727
import { ReactComponent as ICGitlab } from '@IconsV2/ic-gitlab.svg'
2828
import { ReactComponent as ICGoogleArtifactRegistry } from '@IconsV2/ic-google-artifact-registry.svg'
2929
import { ReactComponent as ICGoogleContainerRegistry } from '@IconsV2/ic-google-container-registry.svg'
30+
import { ReactComponent as ICGoogle } from '@IconsV2/ic-google.svg'
3031
import { ReactComponent as ICGridView } from '@IconsV2/ic-grid-view.svg'
3132
import { ReactComponent as ICHeartGreen } from '@IconsV2/ic-heart-green.svg'
3233
import { ReactComponent as ICHeartRedAnimated } from '@IconsV2/ic-heart-red-animated.svg'
@@ -39,11 +40,16 @@ import { ReactComponent as ICInfoFilled } from '@IconsV2/ic-info-filled.svg'
3940
import { ReactComponent as ICInfoOutline } from '@IconsV2/ic-info-outline.svg'
4041
import { ReactComponent as ICJobColor } from '@IconsV2/ic-job-color.svg'
4142
import { ReactComponent as ICK8sJob } from '@IconsV2/ic-k8s-job.svg'
43+
import { ReactComponent as ICLdap } from '@IconsV2/ic-ldap.svg'
44+
import { ReactComponent as ICLoginDevtronLogo } from '@IconsV2/ic-login-devtron-logo.svg'
45+
import { ReactComponent as ICMicrosoft } from '@IconsV2/ic-microsoft.svg'
4246
import { ReactComponent as ICMissing } from '@IconsV2/ic-missing.svg'
4347
import { ReactComponent as ICMonitoring } from '@IconsV2/ic-monitoring.svg'
4448
import { ReactComponent as ICNodeScript } from '@IconsV2/ic-node-script.svg'
49+
import { ReactComponent as ICOidc } from '@IconsV2/ic-oidc.svg'
4550
import { ReactComponent as ICOpenBox } from '@IconsV2/ic-open-box.svg'
4651
import { ReactComponent as ICOpenInNew } from '@IconsV2/ic-open-in-new.svg'
52+
import { ReactComponent as ICOpenshift } from '@IconsV2/ic-openshift.svg'
4753
import { ReactComponent as ICOutOfSync } from '@IconsV2/ic-out-of-sync.svg'
4854
import { ReactComponent as ICPaperPlaneColor } from '@IconsV2/ic-paper-plane-color.svg'
4955
import { ReactComponent as ICQuay } from '@IconsV2/ic-quay.svg'
@@ -87,6 +93,7 @@ export const iconMap = {
8793
'ic-gitlab': ICGitlab,
8894
'ic-google-artifact-registry': ICGoogleArtifactRegistry,
8995
'ic-google-container-registry': ICGoogleContainerRegistry,
96+
'ic-google': ICGoogle,
9097
'ic-grid-view': ICGridView,
9198
'ic-heart-green': ICHeartGreen,
9299
'ic-heart-red-animated': ICHeartRedAnimated,
@@ -99,11 +106,16 @@ export const iconMap = {
99106
'ic-info-outline': ICInfoOutline,
100107
'ic-job-color': ICJobColor,
101108
'ic-k8s-job': ICK8sJob,
109+
'ic-ldap': ICLdap,
110+
'ic-login-devtron-logo': ICLoginDevtronLogo,
111+
'ic-microsoft': ICMicrosoft,
102112
'ic-missing': ICMissing,
103113
'ic-monitoring': ICMonitoring,
104114
'ic-node-script': ICNodeScript,
115+
'ic-oidc': ICOidc,
105116
'ic-open-box': ICOpenBox,
106117
'ic-open-in-new': ICOpenInNew,
118+
'ic-openshift': ICOpenshift,
107119
'ic-out-of-sync': ICOutOfSync,
108120
'ic-paper-plane-color': ICPaperPlaneColor,
109121
'ic-quay': ICQuay,

0 commit comments

Comments
 (0)