Skip to content

Commit faf6106

Browse files
authored
Merge pull request #347 from devtron-labs/chore/dev-sync-v20
chore: dev sync v20
2 parents d1f5f71 + 29dd930 commit faf6106

File tree

6 files changed

+20
-29
lines changed

6 files changed

+20
-29
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": "4.0.2",
3+
"version": "0.5.0",
44
"description": "Supporting common component library",
55
"type": "module",
66
"main": "dist/index.js",

src/Common/RJSF/utils.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ export const parseSchemaHiddenType = (hiddenSchema: HiddenType): MetaHiddenType
166166
const clone = structuredClone(hiddenSchema)
167167
if (typeof clone === 'string') {
168168
return {
169-
value: false,
169+
value: true,
170170
path: conformPathToPointers(clone),
171171
}
172172
}

src/Shared/Components/DatePicker/DateTimePicker.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ const DateTimePicker = ({
110110
onChange={handleTimeChange}
111111
data-testid={dataTestIdForTime}
112112
menuSize={ComponentSizeType.xs}
113-
menuPosition="absolute"
114113
size={ComponentSizeType.large}
114+
shouldMenuAlignRight
115115
/>
116116
</div>
117117
)}

src/Shared/Components/DatePicker/TimeSelect.tsx

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { ReactComponent as ErrorIcon } from '@Icons/ic-warning.svg'
1817
import { ReactComponent as ClockIcon } from '@Icons/ic-clock.svg'
1918
import { ComponentSizeType } from '@Shared/constants'
2019
import { DEFAULT_TIME_OPTIONS } from './utils'
@@ -29,26 +28,18 @@ export const TimePickerSelect = ({
2928
error,
3029
selectedTimeOption,
3130
}: TimeSelectProps) => (
32-
<>
33-
<SelectPicker
34-
inputId={DATE_PICKER_IDS.TIME}
35-
placeholder="12:00 AM"
36-
options={DEFAULT_TIME_OPTIONS}
37-
isSearchable={false}
38-
isDisabled={disabled}
39-
{...timePickerProps}
40-
value={selectedTimeOption}
41-
icon={<ClockIcon className="icon-dim-20 fcn-6" />}
42-
onChange={onChange}
43-
data-testid={DATE_PICKER_IDS.TIME}
44-
size={ComponentSizeType.large}
45-
menuPosition="absolute"
46-
/>
47-
{error && (
48-
<div className="form__error">
49-
<ErrorIcon className="form__icon form__icon--error" />
50-
{error}
51-
</div>
52-
)}
53-
</>
31+
<SelectPicker
32+
inputId={DATE_PICKER_IDS.TIME}
33+
placeholder="12:00 AM"
34+
options={DEFAULT_TIME_OPTIONS}
35+
isSearchable={false}
36+
isDisabled={disabled}
37+
{...timePickerProps}
38+
value={selectedTimeOption}
39+
icon={<ClockIcon className="icon-dim-20 fcn-6" />}
40+
onChange={onChange}
41+
data-testid={DATE_PICKER_IDS.TIME}
42+
size={ComponentSizeType.large}
43+
error={error}
44+
/>
5445
)

src/Shared/Services/ToastManager/toastManager.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
&__close-btn {
7070
button {
7171
svg {
72-
use {
72+
path {
7373
fill: var(--N0) !important;
7474
}
7575
}

0 commit comments

Comments
 (0)