Skip to content

Commit b00c0e0

Browse files
committed
Merge branch 'main' into feat/plugin-version
2 parents f51e99b + 9a3e6d3 commit b00c0e0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+5808
-10868
lines changed

package-lock.json

Lines changed: 3688 additions & 10772 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@devtron-labs/devtron-fe-common-lib",
3-
"version": "0.0.95",
3+
"version": "0.1.3",
44
"description": "Supporting common component library",
55
"type": "module",
66
"main": "dist/index.js",
@@ -60,7 +60,6 @@
6060
"moment": "^2.29.4",
6161
"monaco-editor": "0.44.0",
6262
"monaco-yaml": "5.1.1",
63-
"react-monaco-editor": "^0.55.0",
6463
"prettier": "^3.1.1",
6564
"react-ga4": "^1.4.1",
6665
"react-mde": "^11.5.0",
@@ -92,9 +91,19 @@
9291
"dependencies": {
9392
"ansi_up": "^5.2.1",
9493
"fast-json-patch": "^3.1.1",
95-
"jsonpath-plus": "^7.2.0",
9694
"react-monaco-editor": "^0.54.0",
95+
"@types/react-dates": "^21.8.6",
96+
"react-dates": "^21.8.0",
9797
"sass": "^1.69.7",
9898
"tslib": "^2.4.1"
99+
},
100+
"overrides": {
101+
"react-dates": {
102+
"react": "^17.0.2",
103+
"react-dom": "^17.0.2"
104+
},
105+
"react-monaco-editor": {
106+
"monaco-editor": "0.44.0"
107+
}
99108
}
100-
}
109+
}

src/Assets/Icon/ic-arrow-down.svg

Lines changed: 19 additions & 0 deletions
Loading

src/Assets/Icon/ic-calender-blank.svg

Lines changed: 19 additions & 0 deletions
Loading

src/Assets/Icon/ic-clock.svg

Lines changed: 19 additions & 0 deletions
Loading
Lines changed: 20 additions & 0 deletions
Loading

src/Common/BreadCrumb/BreadcrumbStore.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,16 @@
1515
*/
1616

1717
import React, { createContext, useState } from 'react'
18+
import { BreadcrumbTextProps } from './Types'
1819

1920
const initialState = {
2021
alias: {},
2122
}
2223

24+
export const BreadcrumbText = ({ heading, isActive }: BreadcrumbTextProps) => (
25+
<h2 className={`m-0 fs-16 fw-6 lh-32 ${isActive ? 'cn-9' : 'cb-5'}`}>{heading}</h2>
26+
)
27+
2328
const Store = ({ children }) => {
2429
const [state, setState] = useState(initialState)
2530
return <BreadcrumbContext.Provider value={{ state, setState }}>{children}</BreadcrumbContext.Provider>

src/Common/BreadCrumb/Types.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,8 @@ export interface Breadcrumbs {
4343
}
4444

4545
export type UseBreadcrumbOptionalProps = UseBreadcrumbProps | null
46+
47+
export interface BreadcrumbTextProps {
48+
heading: string
49+
isActive?: boolean
50+
}

src/Common/Constants.ts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,12 @@ export const FALLBACK_REQUEST_TIMEOUT = 60000
2020
export const Host = window?.__ORCHESTRATOR_ROOT__ ?? '/orchestrator'
2121

2222
export const DOCUMENTATION_HOME_PAGE = 'https://docs.devtron.ai'
23+
export const DOCUMENTATION_VERSION = '/v/v0.7'
2324
export const DISCORD_LINK = 'https://discord.devtron.ai/'
2425
export const DOCUMENTATION = {
25-
APP_TAGS: `${DOCUMENTATION_HOME_PAGE}/v/v0.6/usage/applications/create-application#tags`,
26-
APP_OVERVIEW_TAGS: `${DOCUMENTATION_HOME_PAGE}/v/v0.6/usage/applications/overview#manage-tags`,
27-
BLOB_STORAGE: `${DOCUMENTATION_HOME_PAGE}/v/v0.6/getting-started/install/installation-configuration#configuration-of-blob-storage`,
26+
APP_TAGS: `${DOCUMENTATION_HOME_PAGE}${DOCUMENTATION_VERSION}/usage/applications/create-application#tags`,
27+
APP_OVERVIEW_TAGS: `${DOCUMENTATION_HOME_PAGE}${DOCUMENTATION_VERSION}/usage/applications/overview#manage-tags`,
28+
BLOB_STORAGE: `${DOCUMENTATION_HOME_PAGE}${DOCUMENTATION_VERSION}/getting-started/install/installation-configuration#configuration-of-blob-storage`,
2829
}
2930

3031
export const PATTERNS = {
@@ -423,10 +424,6 @@ export enum FREQUENCY_ENUM {
423424
WEEKLY_RANGE = 'WEEKLY_RANGE',
424425
}
425426

426-
export const TIME_FORMAT = {
427-
DD_MMM_YYYY_HH_MM: 'DD MMM YYYY, hh:mm',
428-
}
429-
430427
export function getOrdinal(number) {
431428
if (number % 100 >= 11 && number % 100 <= 13) {
432429
return `${number}th`
@@ -514,4 +511,6 @@ export const DATE_TIME_FORMATS = {
514511
TWELVE_HOURS_FORMAT: 'ddd, DD MMM YYYY, hh:mm A',
515512
TWELVE_HOURS_FORMAT_WITHOUT_WEEKDAY: 'DD MMM YYYY, hh:mm A',
516513
TWELVE_HOURS_EXPORT_FORMAT: 'DD-MMM-YYYY hh.mm A',
514+
DD_MMM_YYYY_HH_MM: 'DD MMM YYYY, hh:mm',
515+
DD_MMM_YYYY: 'DD MMM YYYY',
517516
}

src/Common/CustomInput/CustomInput.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
import { CustomInputProps } from './Types'
18-
import { ReactComponent as Info } from '../../Assets/Icon/ic-info-filled.svg'
18+
import { ReactComponent as Info } from '../../Assets/Icon/ic-info-filled-override.svg'
1919
import { ReactComponent as ErrorIcon } from '../../Assets/Icon/ic-warning.svg'
2020

2121
export const CustomInput = ({
@@ -135,9 +135,9 @@ export const CustomInput = ({
135135

136136
{getInputError()}
137137
{helperText && (
138-
<div className="form__text-field-info">
139-
<Info className="form__icon form__icon--info" />
140-
<p className="sentence-case">{helperText}</p>
138+
<div className="flex left top dc__gap-4 fs-11 lh-16 cn-7">
139+
<Info className="icon-dim-16" />
140+
<div>{helperText}</div>
141141
</div>
142142
)}
143143
</div>

0 commit comments

Comments
 (0)