Merge pull request #1163 from cdapio/help-area-height-in-newdialog

[CDAP-20927]: Help content area should show without scroll in service accounts edit dialog
cdapio · Dec 21, 2023 · d0a652c · d0a652c
2 parents 5232dec + 89487f6
commit d0a652c
Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/app/cdap/components/shared/ConfirmDialog/index.tsx b/app/cdap/components/shared/ConfirmDialog/index.tsx
@@ -70,17 +70,17 @@ export const ConfirmDialog = ({
   return (
     <StyledDialog open={isOpen} fullWidth>
       <DialogTitle>{headerTitle}</DialogTitle>
-      {statusMessage && (
-        <Status
-          severity={severity}
-          statusMessage={statusMessage}
-          extendedMessage={extendedMessage}
-          copyableExtendedMessage={copyableExtendedMessage}
-          key={statusMessage.toString()}
-          isExpandedDefault={isExpandedDefault}
-        ></Status>
-      )}
       <DialogContent>
+        {statusMessage && (
+          <Status
+            severity={severity}
+            statusMessage={statusMessage}
+            extendedMessage={extendedMessage}
+            copyableExtendedMessage={copyableExtendedMessage}
+            key={statusMessage.toString()}
+            isExpandedDefault={isExpandedDefault}
+          ></Status>
+        )}
         {confirmationText}
         {confirmationElem}
       </DialogContent>

diff --git a/app/cdap/components/shared/ConfirmDialog/styles.ts b/app/cdap/components/shared/ConfirmDialog/styles.ts
@@ -25,6 +25,9 @@ export const StyledDialog = styled(Dialog)`
       font-size: 24px;
     }
   }
+  & .MuiDialogContent-root {
+    padding-top: 0px;
+  }
   & .MuiDialogActions-root {
     margin-right: 16px;
     & .MuiButton-label {
@@ -35,12 +38,12 @@ export const StyledDialog = styled(Dialog)`
 
 export const StyledAlert = styled(Alert)`
   font-size: 12px;
-  margin-bottom: 8px;
+  margin: 0 -24px 8px -24px;
 `;
 
 export const StyledBox = styled(Box)`
   overflow-y: auto;
-  max-height: 14vh;
+  max-height: 30vh;
   word-break: break-word;
 
   & pre {