Skip to content

Commit 9f380f0

Browse files
authored
Merge branch 'develop' into fix/theming-issues
2 parents ca3035d + 0f359b1 commit 9f380f0

File tree

6 files changed

+7
-11
lines changed

6 files changed

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

src/Shared/Components/FloatingVariablesSuggestions/SuggestionItem.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ const SuggestionItem = ({
103103
}
104104
placement="left"
105105
interactive
106+
alwaysShowTippyOnHover
106107
// Have to append to body because the parent is draggable
107108
appendTo={document.body}
108109
>
@@ -111,6 +112,7 @@ const SuggestionItem = ({
111112
)
112113

113114
return (
115+
// TODO: conditional wrap is not required since handled through alwaysShowTippyOnHover in tooltip
114116
<ConditionalWrap condition={showValueOnHover} wrap={renderTooltip}>
115117
<div
116118
className="flexbox-col pt-8 pb-8 pl-12 pr-12 dc__align-self-stretch bg__primary dc__border-bottom-n1 dc__hover-n50"

src/Shared/Components/SelectPicker/type.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ export type SelectPickerProps<OptionValue = number | string, IsMulti extends boo
140140
| 'formatOptionLabel'
141141
| 'onInputChange'
142142
| 'inputValue'
143+
| 'filterOption'
143144
> &
144145
Partial<
145146
Pick<

src/Shared/Store/IndexStore.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ export function getiNodesByRootNodeWithChildNodes(
124124
?.containers?.map((_c) => {
125125
const childNode = {} as iNode
126126
childNode.kind = Nodes.Containers
127-
// @ts-ignore -- pNode does not exist on iNode
128127
childNode.pNode = _pn
129128
childNode.name = _c
130129
return childNode

src/Shared/types.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ export interface iNode extends Node {
157157
childNodes: iNodes
158158
type: NodeType
159159
status: string
160+
pNode?: iNode
160161
}
161162
export interface ResourceTree {
162163
conditions: any
@@ -786,19 +787,12 @@ interface CommonTabArgsType {
786787
* Title for the tab
787788
*/
788789
title?: string
789-
isDeleted?: boolean
790790
/**
791791
* Type for the tab
792792
*
793793
* Note: Fixed tabs are always places before dynamic tabs
794794
*/
795795
type: 'fixed' | 'dynamic'
796-
/**
797-
* Path of the icon for the tab
798-
*
799-
* @default ''
800-
*/
801-
iconPath?: string
802796
/**
803797
* Dynamic title for the tab
804798
*

0 commit comments

Comments
 (0)