Skip to content

Commit d73dc48

Browse files
committed
Merge branch 'develop' of github.com:devtron-labs/devtron-fe-common-lib into feat/deployment-exception
2 parents 0450fbe + 0a808e2 commit d73dc48

25 files changed

+356
-61
lines changed

package-lock.json

Lines changed: 12 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: 2 additions & 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.11.0-pre-2",
3+
"version": "1.11.0-pre-8",
44
"description": "Supporting common component library",
55
"type": "module",
66
"main": "dist/index.js",
@@ -121,6 +121,7 @@
121121
"jsonpath-plus": "^10.3.0",
122122
"marked": "^13.0.3",
123123
"nanoid": "^3.3.8",
124+
"qrcode.react": "^4.2.0",
124125
"react-canvas-confetti": "^2.0.7",
125126
"react-dates": "^21.8.0",
126127
"react-diff-viewer-continued": "^3.4.0",

src/Assets/IconV2/ic-bg-cluster.svg

Lines changed: 6 additions & 0 deletions
Loading

src/Assets/IconV2/ic-file-key.svg

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

src/Common/Constants.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ export const DOCUMENTATION = {
2929
BLOB_STORAGE: `${DOCUMENTATION_HOME_PAGE}${DOCUMENTATION_VERSION}/getting-started/install/installation-configuration#configuration-of-blob-storage`,
3030
GLOBAL_CONFIG_BUILD_INFRA: `${DOCUMENTATION_HOME_PAGE}${DOCUMENTATION_VERSION}/global-configurations/build-infra`,
3131
ENTERPRISE_LICENSE: `${DOCUMENTATION_HOME_PAGE}/enterprise-license`,
32+
KUBE_CONFIG: `${DOCUMENTATION_HOME_PAGE}${DOCUMENTATION_VERSION}/usage/resource-browser#running-kubectl-commands-locally`,
3233
}
3334

3435
export const PATTERNS = {
@@ -155,6 +156,7 @@ export const ROUTES = {
155156
RESOURCE_TEMPLATE: 'resource/template',
156157
ENVIRONMENT_DATA: 'global/environment-variables',
157158
DASHBOARD_EVENT: 'dashboard-event',
159+
LICENSE_DATA: 'license/data',
158160
} as const
159161

160162
export enum KEY_VALUE {

src/Common/EmptyState/emptyState.scss

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,6 @@
1616

1717
.empty-state {
1818
height: 100%;
19-
img {
20-
height: 40%;
21-
max-height: 200px;
22-
width: auto;
23-
max-width: 250px;
24-
}
25-
svg {
26-
height: 40%;
27-
max-height: 200px;
28-
width: auto;
29-
}
30-
.button svg {
31-
height: 100%;
32-
max-height: none;
33-
width: 100%;
34-
}
3519
h1,
3620
h2,
3721
h3,

src/Common/Helper.tsx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -247,10 +247,6 @@ export function useSearchString(): UseSearchString {
247247
return queryParams
248248
}, [location])
249249

250-
// const searchParams={}
251-
// for (let [key, value] of queryParams.entries()){
252-
// searchParams[key]=value
253-
// }
254250
const searchParams = Array.from(queryParams.entries()).reduce((agg, curr, idx) => {
255251
agg[curr[0]] = curr[1]
256252
return agg

src/Shared/Components/DevtronLicenseCard/InstallationFingerprintInfo.tsx

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)