Skip to content

Commit a5de804

Browse files
authored
Merge pull request #719 from devtron-labs/feat/holmes-integration
feat: add intelligenceConfig in main context
2 parents 9197bea + adb3fb2 commit a5de804

File tree

14 files changed

+64
-35
lines changed

14 files changed

+64
-35
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.12.0-pre-4",
3+
"version": "1.12.0-pre-5",
44
"description": "Supporting common component library",
55
"type": "module",
66
"main": "dist/index.js",

src/Assets/IconV2/ic-info-filled.svg

Lines changed: 1 addition & 1 deletion
Loading

src/Assets/IconV2/ic-thumb-down.svg

Lines changed: 3 additions & 0 deletions
Loading

src/Assets/IconV2/ic-thumb-up.svg

Lines changed: 3 additions & 0 deletions
Loading

src/Common/Types.ts

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1071,16 +1071,6 @@ export interface EnvironmentHelmResult {
10711071

10721072
export type EnvironmentListHelmResponse = ResponseType<EnvironmentListHelmResult[]>
10731073

1074-
export interface WidgetEventDetails {
1075-
message: string
1076-
namespace: string
1077-
object: string
1078-
source: string
1079-
count: number
1080-
age: string
1081-
lastSeen: string
1082-
}
1083-
10841074
export interface GlobalVariableDTO {
10851075
name: string
10861076
format: VariableTypeFormat
@@ -1129,4 +1119,4 @@ export interface AppMeta {
11291119
export interface EnvAppsMetaDTO {
11301120
appCount: number
11311121
apps: AppMeta[]
1132-
}
1122+
}

src/Shared/Components/Icon/Icon.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@ import { ReactComponent as ICSuccess } from '@IconsV2/ic-success.svg'
108108
import { ReactComponent as ICSuspended } from '@IconsV2/ic-suspended.svg'
109109
import { ReactComponent as ICTata1mg } from '@IconsV2/ic-tata1mg.svg'
110110
import { ReactComponent as ICTerminalFill } from '@IconsV2/ic-terminal-fill.svg'
111+
import { ReactComponent as ICThumbDown } from '@IconsV2/ic-thumb-down.svg'
112+
import { ReactComponent as ICThumbUp } from '@IconsV2/ic-thumb-up.svg'
111113
import { ReactComponent as ICTimeoutDash } from '@IconsV2/ic-timeout-dash.svg'
112114
import { ReactComponent as ICTimer } from '@IconsV2/ic-timer.svg'
113115
import { ReactComponent as ICTravclan } from '@IconsV2/ic-travclan.svg'
@@ -229,6 +231,8 @@ export const iconMap = {
229231
'ic-suspended': ICSuspended,
230232
'ic-tata1mg': ICTata1mg,
231233
'ic-terminal-fill': ICTerminalFill,
234+
'ic-thumb-down': ICThumbDown,
235+
'ic-thumb-up': ICThumbUp,
232236
'ic-timeout-dash': ICTimeoutDash,
233237
'ic-timer': ICTimer,
234238
'ic-travclan': ICTravclan,

src/Shared/Components/TabGroup/TabGroup.component.tsx

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,15 @@ import { getClassNameBySizeMap, tabGroupClassMap } from './TabGroup.utils'
2828
import './TabGroup.scss'
2929

3030
const MotionLayoutUnderline = ({ layoutId }: { layoutId: string }) => (
31-
<motion.div layout="position" layoutId={layoutId} className="underline bcb-5" />
31+
<motion.div
32+
layout="position"
33+
transformTemplate={(_, generatedTransform) =>
34+
// Replace the y value in translate3d(x, y, z) with 0px to omit y axis transitions
35+
generatedTransform.replace(/translate3d\(([^,]+),\s*[^,]+,\s*([^)]+)\)/, 'translate3d($1, 0px, $2)')
36+
}
37+
layoutId={layoutId}
38+
className="underline bcb-5 w-100 dc__position-abs"
39+
/>
3240
)
3341

3442
const Tab = ({
@@ -59,7 +67,6 @@ const Tab = ({
5967

6068
const { tabClassName, iconClassName, badgeClassName } = getClassNameBySizeMap({
6169
hideTopPadding,
62-
isTabActive,
6370
})[size]
6471

6572
const onClickHandler = (

src/Shared/Components/TabGroup/TabGroup.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,10 @@
3434
@include svg-styles(var(--N700));
3535

3636
.underline {
37-
height: 2px;
37+
height: 2px !important;
3838
border-top-left-radius: 2px;
3939
border-top-right-radius: 2px;
40+
bottom: -1px;
4041
}
4142

4243
&--active {

src/Shared/Components/TabGroup/TabGroup.utils.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ import { TabGroupProps } from './TabGroup.types'
2121

2222
export const getClassNameBySizeMap = ({
2323
hideTopPadding,
24-
isTabActive,
25-
}: Pick<TabGroupProps, 'hideTopPadding'> & { isTabActive: boolean }): Record<
24+
}: Pick<TabGroupProps, 'hideTopPadding'>): Record<
2625
TabGroupProps['size'],
2726
{
2827
tabClassName: string
@@ -31,17 +30,17 @@ export const getClassNameBySizeMap = ({
3130
}
3231
> => ({
3332
[ComponentSizeType.medium]: {
34-
tabClassName: `fs-12 ${!hideTopPadding ? 'pt-6' : ''} ${isTabActive ? 'pb-3' : 'pb-5'}`,
33+
tabClassName: `fs-12 ${!hideTopPadding ? 'pt-6' : ''} pb-5`,
3534
iconClassName: 'icon-dim-14',
3635
badgeClassName: 'fs-11 lh-18 tab-group__tab__badge--medium',
3736
},
3837
[ComponentSizeType.large]: {
39-
tabClassName: `fs-13 ${!hideTopPadding ? 'pt-8' : ''} ${isTabActive ? 'pb-5' : 'pb-7'}`,
38+
tabClassName: `fs-13 ${!hideTopPadding ? 'pt-8' : ''} pb-7`,
4039
iconClassName: 'icon-dim-16',
4140
badgeClassName: 'fs-12 lh-20',
4241
},
4342
[ComponentSizeType.xl]: {
44-
tabClassName: `min-w-200 fs-13 ${!hideTopPadding ? 'pt-10' : ''} ${isTabActive ? 'pb-7' : 'pb-9'}`,
43+
tabClassName: `min-w-200 fs-13 ${!hideTopPadding ? 'pt-10' : ''} pb-9`,
4544
iconClassName: 'icon-dim-16',
4645
badgeClassName: 'fs-12 lh-20',
4746
},

0 commit comments

Comments
 (0)