Skip to content

Commit 1039ce9

Browse files
authored
Merge pull request #769 from devtron-labs/feat/replace-conf-dialogs
feat: delete confirmation dialog
2 parents 964f142 + acfab78 commit 1039ce9

File tree

7 files changed

+5
-78
lines changed

7 files changed

+5
-78
lines changed

.eslintignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ src/Common/DebouncedSearch/DebouncedSearch.tsx
2121
src/Common/DebouncedSearch/Utils.ts
2222
src/Common/DebouncedSearch/__tests__/DebouncedSearch.test.tsx
2323
src/Common/DevtronProgressing/DevtronProgressing.tsx
24-
src/Common/Dialogs/ConfirmationDialog.tsx
2524
src/Common/Dialogs/DialogForm.tsx
2625
src/Common/DraggableWrapper/DraggableButton.tsx
2726
src/Common/DraggableWrapper/DraggableWrapper.tsx

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

src/Common/Dialogs/ConfirmationDialog.tsx

Lines changed: 0 additions & 54 deletions
This file was deleted.

src/Common/Dialogs/Types.ts

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -53,23 +53,7 @@ export interface ForceDeleteDialogType {
5353
forceDeleteDialogTitle: string
5454
forceDeleteDialogMessage: string
5555
}
56-
export interface ConfirmationDialogType {
57-
className?: string
58-
children: any
59-
close?: (e) => void
60-
}
61-
export interface ConfirmationDialogIconType {
62-
src: string
63-
className?: string
64-
}
65-
export interface ConfirmationDialogBodyType {
66-
title: string
67-
subtitle?: ReactNode
68-
children?: any
69-
}
70-
export interface ConfirmationDialogButtonGroupType {
71-
children: any
72-
}
56+
7357
export interface DialogFormProps {
7458
className: string
7559
title: string

src/Common/Dialogs/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,4 @@
1414
* limitations under the License.
1515
*/
1616

17-
export { default as ConfirmationDialog } from './ConfirmationDialog'
1817
export * from './DialogForm'

src/Shared/Components/ConfirmationModal/ConfirmationModal.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@ const ConfirmationModalBody = ({
5858
const hideIcon = variant === ConfirmationModalVariantType.custom && !ButtonIcon
5959

6060
const disablePrimaryButton: boolean =
61-
('disabled' in primaryButtonConfig && primaryButtonConfig.disabled) ||
62-
(confirmationKeyword && confirmationText.trim() !== confirmationKeyword)
61+
!!primaryButtonConfig?.disabled || (confirmationKeyword && confirmationText.trim() !== confirmationKeyword)
6362

6463
const handleTriggerPrimaryActionButton = () => {
6564
if (primaryButtonConfig && !disablePrimaryButton) {

0 commit comments

Comments
 (0)