Skip to content

Commit a45dee4

Browse files
committed
Merge branch 'develop' of github.com:devtron-labs/devtron-fe-common-lib into feat/button
2 parents 69fab6d + 59831b9 commit a45dee4

File tree

15 files changed

+337
-141
lines changed

15 files changed

+337
-141
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* vivek@devtron.ai @vikramdevtron

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

src/Common/Common.service.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
*/
1616

1717
import moment from 'moment'
18+
import { RuntimeParamsAPIResponseType, RuntimeParamsListItemType } from '@Shared/types'
19+
import { getIsManualApprovalSpecific, sanitizeUserApprovalConfig, stringComparatorBySortOrder } from '@Shared/Helpers'
1820
import { get, post } from './Api'
1921
import { ROUTES } from './Constants'
2022
import { getUrlWithSearchParams, sortCallback } from './Helper'
@@ -41,7 +43,6 @@ import {
4143
CDMaterialListModalServiceUtilProps,
4244
} from './Types'
4345
import { ApiResourceType } from '../Pages'
44-
import { getIsManualApprovalSpecific, sanitizeUserApprovalConfig, stringComparatorBySortOrder } from '@Shared/Helpers'
4546
import { API_TOKEN_PREFIX } from '@Shared/constants'
4647
import { DefaultUserKey } from '@Shared/types'
4748

@@ -317,6 +318,11 @@ const processCDMaterialsApprovalInfo = (enableApproval: boolean, cdMaterialsResu
317318
}
318319
}
319320

321+
export const parseRuntimeParams = (response: RuntimeParamsAPIResponseType): RuntimeParamsListItemType[] =>
322+
Object.entries(response?.envVariables || {})
323+
.map(([key, value], index) => ({ key, value, id: index }))
324+
.sort((a, b) => stringComparatorBySortOrder(a.key, b.key))
325+
320326
const processCDMaterialsMetaInfo = (cdMaterialsResult): CDMaterialsMetaInfo => {
321327
if (!cdMaterialsResult) {
322328
return {
@@ -326,6 +332,7 @@ const processCDMaterialsMetaInfo = (cdMaterialsResult): CDMaterialsMetaInfo => {
326332
resourceFilters: [],
327333
totalCount: 0,
328334
requestedUserId: 0,
335+
runtimeParams: [],
329336
}
330337
}
331338

@@ -336,6 +343,7 @@ const processCDMaterialsMetaInfo = (cdMaterialsResult): CDMaterialsMetaInfo => {
336343
resourceFilters: cdMaterialsResult.resourceFilters ?? [],
337344
totalCount: cdMaterialsResult.totalCount ?? 0,
338345
requestedUserId: cdMaterialsResult.requestedUserId,
346+
runtimeParams: parseRuntimeParams(cdMaterialsResult.runtimeParams),
339347
}
340348
}
341349

src/Common/SearchBar/SearchBar.component.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ const SearchBar = ({
136136
type="text"
137137
{...inputProps}
138138
defaultValue={initialSearchText}
139-
className={`search-bar__input dc__position-abs w-100 h-100 br-4 dc__no-border pt-6 pr-10 pb-6 pl-30 fs-13 lh-20 fw-4 cn-9 placeholder-cn5 ${
139+
className={`search-bar__input dc__position-abs w-100 h-100 br-4 dc__no-border pt-6 pr-10 pb-6 pl-30 fs-13 lh-20 fw-4 cn-9 placeholder-cn5 dc__left-0 ${
140140
showClearButton ? 'pr-30' : 'pr-10'
141141
} ${noBackgroundAndBorder ? 'dc__no-background' : 'bc-n50'}`}
142142
onChange={handleChange}

src/Common/Tooltip/Tooltip.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const Tooltip = ({
2828
arrow={false}
2929
placement="top"
3030
{...rest}
31-
className={`default-tt ${wordBreak ? 'dc__word-break-all' : ''} dc__mxw-200 ${rest.className}`}
31+
className={`default-tt ${wordBreak ? 'dc__word-break-all' : ''} dc__mxw-200-imp ${rest.className}`}
3232
>
3333
{cloneElement(child, { ...child.props, ref: refCallback })}
3434
</TippyJS>

src/Common/Types.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616

1717
import React, { ReactNode, CSSProperties } from 'react'
1818
import { Placement } from 'tippy.js'
19+
import { UserGroupDTO } from '@Pages/GlobalConfigurations'
1920
import { ImageComment, ReleaseTag } from './ImageTags.Types'
2021
import { ACTION_STATE, DEPLOYMENT_WINDOW_TYPE, DockerConfigOverrideType, SortingOrder, TaskErrorObj } from '.'
21-
import { UserGroupDTO } from '@Pages/GlobalConfigurations'
22-
import { RegistryType, Severity } from '../Shared'
22+
import { RegistryType, RuntimeParamsListItemType, Severity } from '../Shared'
2323

2424
/**
2525
* Generic response type object with support for overriding the result type
@@ -695,6 +695,7 @@ export interface CDMaterialsMetaInfo {
695695
* This is the ID of user that has request the material
696696
*/
697697
requestedUserId: number
698+
runtimeParams: RuntimeParamsListItemType[]
698699
}
699700

700701
export interface ImagePromotionMaterialInfo {

0 commit comments

Comments
 (0)