Skip to content

Commit 56d3a20

Browse files
committed
Merge 'develop' from feat/info-bar-replacement
1 parent 635547c commit 56d3a20

File tree

4 files changed

+27
-32
lines changed

4 files changed

+27
-32
lines changed

src/components/dockerRegistry/Docker.tsx

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1500,30 +1500,30 @@ const DockerForm = ({
15001500
return
15011501
}
15021502
return (
1503-
<>
1504-
<div className="mb-12">
1505-
<SelectPicker
1506-
required
1507-
label="List of repositories"
1508-
isMulti
1509-
options={[]}
1510-
autoFocus
1511-
isClearable
1512-
placeholder="Enter repository name and press enter"
1513-
inputValue={customState.repositoryList.inputValue}
1514-
value={customState.repositoryList.value}
1515-
onBlur={setRepoListValue}
1516-
onInputChange={handleCreatableInputChange}
1517-
onKeyDown={handleCreatableKeyDown}
1518-
onChange={handleCreatableChange}
1519-
inputId="repository-list"
1520-
error={repositoryError || customState.repositoryList?.error}
1521-
shouldHideMenu
1522-
size={ComponentSizeType.large}
1523-
helperText={registryStorageType === RegistryStorageType.OCI_PUBLIC && renderPrivateDockerInfoContent()}
1524-
/>
1525-
</div>
1526-
</>
1503+
<div className="mb-12">
1504+
<SelectPicker
1505+
required
1506+
label="List of repositories"
1507+
isMulti
1508+
options={[]}
1509+
autoFocus
1510+
isClearable
1511+
placeholder="Enter repository name and press enter"
1512+
inputValue={customState.repositoryList.inputValue}
1513+
value={customState.repositoryList.value}
1514+
onBlur={setRepoListValue}
1515+
onInputChange={handleCreatableInputChange}
1516+
onKeyDown={handleCreatableKeyDown}
1517+
onChange={handleCreatableChange}
1518+
inputId="repository-list"
1519+
error={repositoryError || customState.repositoryList?.error}
1520+
shouldHideMenu
1521+
size={ComponentSizeType.large}
1522+
helperText={
1523+
registryStorageType === RegistryStorageType.OCI_PUBLIC && renderPrivateDockerInfoContent()
1524+
}
1525+
/>
1526+
</div>
15271527
)
15281528
}
15291529

src/components/dockerRegistry/ManageRegistry.tsx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@ import {
3434
StyledRadioGroup as RadioGroup,
3535
InfoIconTippy,
3636
InfoBlock,
37-
Icon,
38-
ButtonVariantType,
39-
ButtonStyleType,
40-
ComponentSizeType,
4137
} from '@devtron-labs/devtron-fe-common-lib'
4238
import { REQUIRED_FIELD_MSG } from '../../config/constantMessaging'
4339
import { DOCUMENTATION } from '../../config'

src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/CustomLogsModal/CustomLogsModal.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,11 @@
1414
* limitations under the License.
1515
*/
1616

17-
import React, { useEffect, useState } from 'react'
17+
import { useEffect, useState } from 'react'
1818
import {
1919
RadioGroupItem,
2020
VisibleModal,
2121
RadioGroup,
22-
InfoColourBar,
2322
SelectPicker,
2423
ComponentSizeType,
2524
CustomInput,

src/components/v2/values/chartValuesDiff/ChartValuesGUIView.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ const ChartBetaFeatureInfo = () => (
3737
<InfoBlock
3838
description={
3939
<span className="fs-12 cn-9">
40-
This feature is in BETA. If you find an issue please&nbsp;
40+
This feature is in BETA. If you find an issue please
4141
<a href={RAISE_ISSUE} target="_blank" rel="noopener noreferrer">
42-
report it here.
42+
&nbsp;report it here.
4343
</a>
4444
</span>
4545
}

0 commit comments

Comments
 (0)