Skip to content

Commit 57507dc

Browse files
committed
chore: replacement in app configuration
1 parent 3c31006 commit 57507dc

File tree

18 files changed

+73
-172
lines changed

18 files changed

+73
-172
lines changed

src/Pages/GlobalConfigurations/Authorization/Shared/components/K8sObjectPermissions/K8sListItemCard.tsx

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import {
2626
ComponentSizeType,
2727
EntityTypes,
2828
GVKType,
29-
InfoColourBar,
29+
InfoBlock,
3030
OptionType,
3131
ResourceListPayloadType,
3232
SelectPicker,
@@ -44,7 +44,6 @@ import {
4444

4545
import { ReactComponent as Clone } from '../../../../../../assets/icons/ic-copy.svg'
4646
import { ReactComponent as Delete } from '../../../../../../assets/icons/ic-delete-interactive.svg'
47-
import { ReactComponent as InfoIcon } from '../../../../../../assets/icons/info-filled.svg'
4847
import {
4948
convertToOptionsList,
5049
importComponentFromFELibrary,
@@ -497,12 +496,7 @@ const K8sListItemCard = ({
497496
size={ComponentSizeType.large}
498497
/>
499498
{K8S_PERMISSION_INFO_MESSAGE[k8sPermission?.kind?.label] && (
500-
<InfoColourBar
501-
message={K8S_PERMISSION_INFO_MESSAGE[k8sPermission.kind.label]}
502-
classname="info_bar mb-12"
503-
Icon={InfoIcon}
504-
iconClass="icon-dim-20"
505-
/>
499+
<InfoBlock description={K8S_PERMISSION_INFO_MESSAGE[k8sPermission.kind.label]} />
506500
)}
507501
<div className="w-300">
508502
<SelectPicker

src/Pages/Shared/LinkedCIDetailsModal/LinkedCIDetailsModal.tsx

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import {
2424
ErrorScreenNotAuthorized,
2525
GenericEmptyState,
2626
getIsRequestAborted,
27-
InfoColourBar,
27+
InfoBlock,
2828
OptionType,
2929
Pagination,
3030
Reload,
@@ -36,7 +36,6 @@ import {
3636
} from '@devtron-labs/devtron-fe-common-lib'
3737

3838
import { ReactComponent as Close } from '../../../assets/icons/ic-close.svg'
39-
import { ReactComponent as Info } from '../../../assets/icons/ic-info-filled.svg'
4039
import { preventBodyScroll } from '../../../components/common'
4140
import { API_STATUS_CODES, SELECT_ALL_VALUE } from '../../../config'
4241
import { ALL_ENVIRONMENT_OPTION, SortableKeys } from './constants'
@@ -173,11 +172,7 @@ const LinkedCIDetailsModal = ({ handleClose, workflows }: LinkedCIDetailModalPro
173172
<Close className="icon-dim-24" />
174173
</button>
175174
</div>
176-
<InfoColourBar
177-
message={getLinkedCITippyContent(linkedWorkflowCount)}
178-
classname="bcb-1 dc__border-bottom--b2"
179-
Icon={Info}
180-
/>
175+
<InfoBlock description={getLinkedCITippyContent(linkedWorkflowCount)} />
181176
</div>
182177
<div className="flexbox-col flex-grow-1">
183178
<div className="flex flex-justify-start dc__gap-8 pl-20 pr-20 pt-8 pb-8 lh-20 dc__zi-5">

src/components/ApplicationGroup/Details/EnvironmentOverview/HibernateStatusListDrawer.tsx

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,19 @@
1414
* limitations under the License.
1515
*/
1616

17-
import React, { useEffect } from 'react'
17+
import { useEffect } from 'react'
1818
import {
1919
Drawer,
2020
GenericEmptyState,
2121
ImageType,
22-
InfoColourBar,
2322
Progressing,
2423
usePrompt,
2524
DEFAULT_ROUTE_PROMPT_MESSAGE,
25+
InfoBlock,
2626
} from '@devtron-labs/devtron-fe-common-lib'
2727
import { Prompt } from 'react-router-dom'
2828
import { HibernateStatusRow } from './HibernateStatusRow'
2929
import { ReactComponent as Close } from '../../../../assets/icons/ic-cross.svg'
30-
import { ReactComponent as Error } from '../../../../assets/icons/ic-warning.svg'
3130
import { ReactComponent as MechanicalOperation } from '../../../../assets/img/ic-mechanical-operation.svg'
3231

3332
export default function HibernateStatusListDrawer({
@@ -78,13 +77,7 @@ export default function HibernateStatusListDrawer({
7877
SvgImage={MechanicalOperation}
7978
imageType={ImageType.Large}
8079
>
81-
<InfoColourBar
82-
message={DEFAULT_ROUTE_PROMPT_MESSAGE}
83-
classname="warn cn-9 lh-2 w-100 dc__align-left"
84-
Icon={Error}
85-
iconClass="warning-icon icon-dim-20-imp"
86-
iconSize={20}
87-
/>
80+
<InfoBlock variant="warning" description={DEFAULT_ROUTE_PROMPT_MESSAGE} />
8881
</GenericEmptyState>
8982

9083
<Prompt when message={DEFAULT_ROUTE_PROMPT_MESSAGE} />

src/components/ApplicationGroup/Details/EnvironmentOverview/RestartStatusListDrawer.tsx

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ import { useState } from 'react'
1818

1919
import {
2020
ACTION_STATE,
21+
DEFAULT_ROUTE_PROMPT_MESSAGE,
2122
DEPLOYMENT_WINDOW_TYPE,
2223
GenericEmptyState,
23-
InfoColourBar,
24+
InfoBlock,
2425
} from '@devtron-labs/devtron-fe-common-lib'
2526

2627
import { ReactComponent as Success } from '../../../../assets/icons/appstatus/healthy.svg'
2728
import { ReactComponent as Failed } from '../../../../assets/icons/ic-error.svg'
2829
import { ReactComponent as ArrowRight } from '../../../../assets/icons/ic-expand.svg'
29-
import { ReactComponent as Warn } from '../../../../assets/icons/ic-warning.svg'
3030
import { ReactComponent as MechanicalIcon } from '../../../../assets/img/ic-mechanical-operation.svg'
3131
import { importComponentFromFELibrary } from '../../../common'
3232
import { BulkRotatePodsMap, ResourcesMetaDataMap, RestartStatusListDrawerProps } from '../../AppGroup.types'
@@ -234,13 +234,7 @@ export const RestartStatusListDrawer = ({
234234
subTitle={APP_DETAILS_TEXT.APP_GROUP_RESTART_WORKLOAD_SUBTITLE}
235235
SvgImage={MechanicalIcon}
236236
>
237-
<InfoColourBar
238-
message={APP_DETAILS_TEXT.APP_GROUP_EMPTY_WORKLOAD_INFO_BAR}
239-
classname="warn cn-9 lh-2 w-100"
240-
Icon={Warn}
241-
iconClass="warning-icon h-100-imp"
242-
iconSize={24}
243-
/>
237+
<InfoBlock variant="warning" description={DEFAULT_ROUTE_PROMPT_MESSAGE} />
244238
</GenericEmptyState>
245239
</div>
246240
)

src/components/ApplicationGroup/Details/EnvironmentOverview/RestartWorkloadModal.tsx

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import {
2626
Drawer,
2727
ErrorScreenManager,
2828
GenericEmptyState,
29-
InfoColourBar,
29+
InfoBlock,
3030
MODAL_TYPE,
3131
stopPropagation,
3232
usePrompt,
@@ -37,8 +37,6 @@ import { ReactComponent as Retry } from '../../../../assets/icons/ic-arrow-clock
3737
import { ReactComponent as DropdownIcon } from '../../../../assets/icons/ic-arrow-left.svg'
3838
import { ReactComponent as RotateIcon } from '../../../../assets/icons/ic-arrows_clockwise.svg'
3939
import { ReactComponent as Close } from '../../../../assets/icons/ic-close.svg'
40-
import { ReactComponent as Warn } from '../../../../assets/icons/ic-warning.svg'
41-
import { ReactComponent as InfoIcon } from '../../../../assets/icons/info-filled.svg'
4240
import { ReactComponent as MechanicalIcon } from '../../../../assets/img/ic-mechanical-operation.svg'
4341
import { importComponentFromFELibrary } from '../../../common'
4442
import {
@@ -450,23 +448,16 @@ export const RestartWorkloadModal = ({
450448
subTitle={APP_DETAILS_TEXT.APP_GROUP_RESTART_WORKLOAD_SUBTITLE}
451449
SvgImage={MechanicalIcon}
452450
>
453-
<InfoColourBar
454-
message={APP_DETAILS_TEXT.APP_GROUP_EMPTY_WORKLOAD_INFO_BAR}
455-
classname="warn cn-9 lh-2 w-100"
456-
Icon={Warn}
457-
iconClass="warning-icon h-100-imp"
458-
iconSize={20}
459-
/>
451+
<InfoBlock variant="warning" description={DEFAULT_ROUTE_PROMPT_MESSAGE} />
460452
</GenericEmptyState>
461453
)
462454
}
463455

464456
return (
465457
<div className="flexbox-col dc__overflow-auto">
466-
<InfoColourBar
467-
message={APP_DETAILS_TEXT.APP_GROUP_INFO_TEXT}
468-
classname="info_bar dc__no-border-radius dc__no-top-border"
469-
Icon={InfoIcon}
458+
<InfoBlock
459+
borderConfig={{ top: false, left: false, right: false }}
460+
description={APP_DETAILS_TEXT.APP_GROUP_INFO_TEXT}
470461
/>
471462
{renderWorkloadTableHeader()}
472463
{renderRestartWorkloadModalListItems()}

src/components/ApplicationGroup/Details/EnvironmentOverview/constants.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ export enum APP_DETAILS_TEXT {
2121
ALL = 'All',
2222
APP_NAME = 'app-name',
2323
APP_GROUP_RESTART_WORKLOAD_SUBTITLE = 'It might take some time depending upon the number of applications',
24-
APP_GROUP_EMPTY_WORKLOAD_INFO_BAR = "Please don't wander off! Reloading or going back might disrupt the ongoing operation.",
2524
APP_GROUP_INFO_TEXT = 'Pods for selected workloads will be restarted. Configured deployment strategies will be used to restart workloads.',
2625
APPLICATIONS = 'APPLICATIONS',
2726
EXPAND_ALL = 'Expand all',

src/components/ApplicationGroup/Details/TriggerView/BulkSourceChange.tsx

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,10 @@ import {
2222
ButtonVariantType,
2323
CustomInput,
2424
Drawer,
25-
InfoColourBar,
25+
InfoBlock,
2626
} from '@devtron-labs/devtron-fe-common-lib'
2727

2828
import { ReactComponent as Close } from '../../../../assets/icons/ic-cross.svg'
29-
import { ReactComponent as Warn } from '../../../../assets/icons/ic-warning.svg'
3029
import SourceUpdateResponseModal from './SourceUpdateResponseModal'
3130
import { BulkSourceChangeProps } from './types'
3231

@@ -106,11 +105,11 @@ const BulkSourceChange = ({
106105
)
107106

108107
const renderInfoBar = (): JSX.Element => (
109-
<InfoColourBar
110-
message="Branch will be changed only for build pipelines with source type as ‘Branch Fixed’ or ‘Branch Regex’."
111-
classname="warn dc__no-border-radius dc__no-top-border dc__no-left-border dc__no-right-border"
112-
Icon={Warn}
113-
iconClass="warning-icon"
108+
<InfoBlock
109+
variant="warning"
110+
borderRadiusConfig={{ top: false }}
111+
borderConfig={{ top: false, left: false, right: false }}
112+
description="Branch will be changed only for build pipelines with source type as ‘Branch Fixed’ or ‘Branch Regex’."
114113
/>
115114
)
116115

src/components/ClusterNodes/NodeActions/EditTaintsModal.tsx

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import {
3131
Button,
3232
ButtonVariantType,
3333
ButtonStyleType,
34+
InfoBlock,
3435
} from '@devtron-labs/devtron-fe-common-lib'
3536
import { useParams } from 'react-router-dom'
3637
import { ReactComponent as InfoIcon } from '../../../assets/icons/info-filled.svg'
@@ -191,12 +192,7 @@ export default function EditTaintsModal({ name, version, kind, taints, closePopu
191192
</button>
192193
</div>
193194
<div className="flexbox-col pt-16 pr-20 pb-16 pl-20 dc__overflow-auto flex-grow-1">
194-
<InfoColourBar
195-
message={<RenderInfoMessage />}
196-
classname="info_bar mb-16"
197-
Icon={InfoIcon}
198-
iconClass="icon-dim-20"
199-
/>
195+
<InfoBlock description={<RenderInfoMessage />} />
200196
<div className="cursor cb-5 fw-6 fs-13 flexbox mr-20 mb-12" onClick={addNewTaint}>
201197
<Add className="icon-dim-20 fcb-5" /> {EDIT_TAINTS_MODAL_MESSAGING.addTaint}
202198
</div>
@@ -221,9 +217,7 @@ export default function EditTaintsModal({ name, version, kind, taints, closePopu
221217
value={taintDetails.value}
222218
onChange={handleInputChange}
223219
placeholder="Value"
224-
error={
225-
errorObj && !_errorObj['value'].isValid ? _errorObj['value'].message : null
226-
}
220+
error={errorObj && !_errorObj['value'].isValid ? _errorObj['value'].message : null}
227221
fullWidth
228222
/>
229223
<div className="w-70">

src/components/app/details/triggerView/BranchRegexModal.tsx

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,14 @@ import {
2020
ButtonVariantType,
2121
ComponentSizeType,
2222
CustomInput,
23-
InfoColourBar,
23+
InfoBlock,
2424
SourceTypeMap,
2525
stopPropagation,
2626
VisibleModal2,
2727
} from '@devtron-labs/devtron-fe-common-lib'
2828

2929
import { ReactComponent as LeftIcon } from '@Icons/ic-arrow-backward.svg'
3030
import { ReactComponent as Close } from '@Icons/ic-close.svg'
31-
import { ReactComponent as Info } from '@Icons/info-filled.svg'
3231
import { getGitProviderIcon } from '@Components/common'
3332

3433
import { REQUIRED_FIELD_MSG } from '../../../../config/constantMessaging'
@@ -88,11 +87,7 @@ const BranchRegexModal = ({
8887

8988
const renderRegexInfo = () => (
9089
<div className="dc__border-bottom--b2">
91-
<InfoColourBar
92-
classname="info_bar dc__no-border-radius dc__no-border-imp"
93-
message="Commit will be fetched from the provided branch. This can be changed later."
94-
Icon={Info}
95-
/>
90+
<InfoBlock description="Commit will be fetched from the provided branch. This can be changed later." />
9691
</div>
9792
)
9893

src/components/app/details/triggerView/workflow/Workflow.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import { TriggerPrePostCDNode } from './nodes/triggerPrePostCDNode'
3333
import { getCIPipelineURL, importComponentFromFELibrary, RectangularEdge as Edge } from '../../../../common'
3434
import { WorkflowProps, TriggerViewContextType } from '../types'
3535
import { WebhookNode } from '../../../../workflowEditor/nodes/WebhookNode'
36-
import DeprecatedPipelineWarning from '../../../../workflowEditor/DeprecatedPipelineWarning'
3736
import { GIT_BRANCH_NOT_CONFIGURED } from '../../../../../config'
3837
import { TriggerViewContext } from '../config'
3938

@@ -402,7 +401,6 @@ export class Workflow extends Component<WorkflowProps> {
402401
</>
403402
)}
404403
</div>
405-
{isExternalCiWorkflow && <DeprecatedPipelineWarning />}
406404
<div
407405
className={`workflow__body bg__secondary dc__overflow-auto dc__border-n1 br-4 ${this.props.isSelected ? 'eb-2' : ''}`}
408406
>

0 commit comments

Comments
 (0)