From 0f0628c9706795bb00c8498095f2ba1a3dee17a0 Mon Sep 17 00:00:00 2001
From: Jenny <32821331+jenny-s51@users.noreply.github.com>
Date: Thu, 24 Oct 2024 14:09:49 -0400
Subject: [PATCH] refactor remaining modal

---
 .../components/RestoreRegisteredModel.tsx     | 43 ++++++++++++-------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/RestoreRegisteredModel.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/RestoreRegisteredModel.tsx
index 66bfec9b2..89e9fe281 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/RestoreRegisteredModel.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/RestoreRegisteredModel.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
-import { Modal } from '@patternfly/react-core/deprecated';
 import DashboardModalFooter from '~/app/components/DashboardModalFooter';
+import { Alert, Form, ModalHeader, Modal, ModalBody } from '@patternfly/react-core';
 
 // import useNotification from '~/utilities/useNotification'; TODO: Implement useNotification
 
@@ -41,27 +41,40 @@ export const RestoreRegisteredModelModal: React.FC<RestoreRegisteredModelModalPr
     }
   }, [onSubmit, onClose]);
 
+  const description = (
+    <>
+      <b>{registeredModelName}</b> and all of its versions will be restored and returned to the
+      registered models list.
+    </>
+  );
+
   return (
     <Modal
       isOpen={isOpen}
-      title="Restore model?"
       variant="small"
       onClose={onClose}
-      footer={
-        <DashboardModalFooter
-          onCancel={onClose}
-          onSubmit={onConfirm}
-          submitLabel="Restore"
-          isSubmitLoading={isSubmitting}
-          error={error}
-          alertTitle="Error"
-          isSubmitDisabled={isSubmitting}
-        />
-      }
       data-testid="restore-registered-model-modal"
     >
-      <b>{registeredModelName}</b> and all of its versions will be restored and returned to the
-      registered models list.
+      <ModalHeader title="Restore model?" />
+      <ModalBody>
+        <Form>
+          {error && (
+            <Alert data-testid="error-message-alert" isInline variant="danger" title={'Error'}>
+              {error.message}
+            </Alert>
+          )}
+        </Form>
+        {description}
+      </ModalBody>
+      <DashboardModalFooter
+        onCancel={onClose}
+        onSubmit={onConfirm}
+        submitLabel="Restore"
+        isSubmitLoading={isSubmitting}
+        error={error}
+        alertTitle="Error"
+        isSubmitDisabled={isSubmitting}
+      />
     </Modal>
   );
 };