Skip to content

Commit d2823b8

Browse files
authored
Merge pull request #180 from devtron-labs/feat/deployment-window-gc-3
feat: Deployment window date time picker (Phase 3)
2 parents d2e305c + 310521e commit d2823b8

30 files changed

+2925
-2262
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
cache: 'npm'
2727

2828
- name: Install dependencies
29-
run: npm ci
29+
run: npm ci --f
3030

3131
- name: Check linting issues
3232
run: npm run lint

.github/workflows/release-package.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
registry-url: 'https://registry.npmjs.org/'
2323

2424
- name: Install dependencies
25-
run: npm ci
25+
run: npm ci -f
2626

2727
- name: Execute test cases
2828
run: npm test

package-lock.json

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

package.json

Lines changed: 3 additions & 2 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.98",
3+
"version": "0.0.99",
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",
@@ -94,6 +93,8 @@
9493
"fast-json-patch": "^3.1.1",
9594
"jsonpath-plus": "^7.2.0",
9695
"react-monaco-editor": "^0.54.0",
96+
"@types/react-dates": "^21.8.6",
97+
"react-dates": "^21.8.0",
9798
"sass": "^1.69.7",
9899
"tslib": "^2.4.1"
99100
}

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: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -421,10 +421,6 @@ export enum FREQUENCY_ENUM {
421421
WEEKLY_RANGE = 'WEEKLY_RANGE',
422422
}
423423

424-
export const TIME_FORMAT = {
425-
DD_MMM_YYYY_HH_MM: 'DD MMM YYYY, hh:mm',
426-
}
427-
428424
export function getOrdinal(number) {
429425
if (number % 100 >= 11 && number % 100 <= 13) {
430426
return `${number}th`
@@ -512,4 +508,6 @@ export const DATE_TIME_FORMATS = {
512508
TWELVE_HOURS_FORMAT: 'ddd, DD MMM YYYY, hh:mm A',
513509
TWELVE_HOURS_FORMAT_WITHOUT_WEEKDAY: 'DD MMM YYYY, hh:mm A',
514510
TWELVE_HOURS_EXPORT_FORMAT: 'DD-MMM-YYYY hh.mm A',
511+
DD_MMM_YYYY_HH_MM: 'DD MMM YYYY, hh:mm',
512+
DD_MMM_YYYY: 'DD MMM YYYY',
515513
}

0 commit comments

Comments
 (0)