From cba6209f293af0192011bf72b8da99b52a087377 Mon Sep 17 00:00:00 2001
From: Jelle van der Waa <jvanderwaa@redhat.com>
Date: Mon, 28 Nov 2022 17:01:33 +0100
Subject: [PATCH 1/3] Convert ContainerRestoreModal to a functional component

---
 src/ContainerRestoreModal.jsx | 127 +++++++++++++++-------------------
 1 file changed, 54 insertions(+), 73 deletions(-)

diff --git a/src/ContainerRestoreModal.jsx b/src/ContainerRestoreModal.jsx
index d16ea2f66..551678c89 100644
--- a/src/ContainerRestoreModal.jsx
+++ b/src/ContainerRestoreModal.jsx
@@ -1,90 +1,71 @@
-import React from 'react';
+import React, { useState } from 'react';
 import { Button, Checkbox, Form, Modal } from '@patternfly/react-core';
-import { DialogsContext } from "dialogs.jsx";
+import { useDialogs } from "dialogs.jsx";
 import cockpit from 'cockpit';
 
 import * as client from './client.js';
 
 const _ = cockpit.gettext;
 
-class ContainerRestoreModal extends React.Component {
-    static contextType = DialogsContext;
+const ContainerRestoreModal = ({ containerWillRestore, onAddNotification }) => {
+    const Dialogs = useDialogs();
 
-    constructor(props) {
-        super(props);
-        this.state = {
-            inProgress: false,
-            keep: false,
-            tcpEstablished: false,
-            ignoreRootFS: false,
-            ignoreStaticIP: false,
-            ignoreStaticMAC: false
-        };
-        this.handleChange = this.handleChange.bind(this);
-    }
+    const [inProgress, setInProgress] = useState(false);
+    const [keep, setKeep] = useState(false);
+    const [tcpEstablished, setTcpEstablished] = useState(false);
+    const [ignoreStaticIP, setIgnoreStaticIP] = useState(false);
+    const [ignoreStaticMAC, setIgnoreStaticMAC] = useState(false);
 
-    handleChange(checked, event) {
-        if (event.target.type === "checkbox")
-            this.setState({ [event.target.name]: event.target.checked });
-    }
-
-    handleRestoreContainer(args) {
-        const Dialogs = this.context;
-        const container = this.props.containerWillRestore;
-        this.setState({ inProgress: true });
-        client.postContainer(container.isSystem, "restore", container.Id, args)
+    const handleRestoreContainer = (args) => {
+        setInProgress(true);
+        client.postContainer(containerWillRestore.isSystem, "restore", containerWillRestore.Id, args)
                 .catch(ex => {
-                    const error = cockpit.format(_("Failed to restore container $0"), container.Names);
-                    this.props.onAddNotification({ type: 'danger', error, errorDetail: ex.message });
-                    this.setState({ inProgress: false });
+                    const error = cockpit.format(_("Failed to restore container $0"), containerWillRestore.Names);
+                    onAddNotification({ type: 'danger', error, errorDetail: ex.message });
+                    setInProgress(false);
                 })
                 .finally(() => {
                     Dialogs.close();
                 });
-    }
+    };
 
-    render() {
-        const Dialogs = this.context;
-        return (
-            <Modal isOpen
-                   showClose={false}
-                   position="top" variant="medium"
-                   title={cockpit.format(_("Restore container $0"), this.props.containerWillRestore.Names)}
-                   footer={<>
-                       <Button variant="primary" isDisabled={this.state.inProgress}
-                               isLoading={this.state.inProgress}
-                               onClick={() => {
-                                   this.handleRestoreContainer({
-                                       keep: this.state.keep,
-                                       leaveRunning: this.state.leaveRunning,
-                                       tcpEstablished: this.state.tcpEstablished,
-                                       ignoreRootFS: this.state.ignoreRootFS
-                                   });
-                               }}>
-                           {_("Restore")}
-                       </Button>
-                       <Button variant="link" isDisabled={this.state.inProgress}
-                               onClick={Dialogs.close}>
-                           {_("Cancel")}
-                       </Button>
-                   </>}
-            >
-                <Form isHorizontal>
-                    <Checkbox label={_("Keep all temporary checkpoint files")} id="restore-dialog-keep" name="keep"
-                              isChecked={this.state.keep} onChange={this.handleChange} />
-                    <Checkbox label={_("Restore with established TCP connections")}
-                              id="restore-dialog-tcpEstablished" name="tcpEstablished"
-                              isChecked={this.state.tcpEstablished} onChange={this.handleChange} />
-                    <Checkbox label={_("Ignore IP address if set statically")} id="restore-dialog-ignoreStaticIP"
-                              name="ignoreStaticIP" isChecked={this.state.ignoreStaticIP}
-                              onChange={this.handleChange} />
-                    <Checkbox label={_("Ignore MAC address if set statically")} id="restore-dialog-ignoreStaticMAC"
-                              name="ignoreStaticMAC" isChecked={this.state.ignoreStaticMAC}
-                              onChange={this.handleChange} />
-                </Form>
-            </Modal>
-        );
-    }
-}
+    return (
+        <Modal isOpen
+               showClose={false}
+               position="top" variant="medium"
+               title={cockpit.format(_("Restore container $0"), containerWillRestore.Names)}
+               footer={<>
+                   <Button variant="primary" isDisabled={inProgress}
+                           isLoading={inProgress}
+                           onClick={() => {
+                               handleRestoreContainer({
+                                   keep: keep,
+                                   tcpEstablished: tcpEstablished,
+                               });
+                           }}>
+                       {_("Restore")}
+                   </Button>
+                   <Button variant="link" isDisabled={inProgress}
+                           onClick={Dialogs.close}>
+                       {_("Cancel")}
+                   </Button>
+               </>}
+        >
+            <Form isHorizontal>
+                <Checkbox label={_("Keep all temporary checkpoint files")} id="restore-dialog-keep" name="keep"
+                          isChecked={keep} onChange={setKeep} />
+                <Checkbox label={_("Restore with established TCP connections")}
+                          id="restore-dialog-tcpEstablished" name="tcpEstablished"
+                          isChecked={tcpEstablished} onChange={setTcpEstablished} />
+                <Checkbox label={_("Ignore IP address if set statically")} id="restore-dialog-ignoreStaticIP"
+                          name="ignoreStaticIP" isChecked={ignoreStaticIP}
+                          onChange={setIgnoreStaticIP} />
+                <Checkbox label={_("Ignore MAC address if set statically")} id="restore-dialog-ignoreStaticMAC"
+                          name="ignoreStaticMAC" isChecked={ignoreStaticMAC}
+                          onChange={setIgnoreStaticMAC} />
+            </Form>
+        </Modal>
+    );
+};
 
 export default ContainerRestoreModal;

From 866d879d8e19dfa22948c63f53fb6643c1d980c5 Mon Sep 17 00:00:00 2001
From: Jelle van der Waa <jvanderwaa@redhat.com>
Date: Mon, 28 Nov 2022 17:16:09 +0100
Subject: [PATCH 2/3] Pass checkpoint restore form arguments

We never passed the ignoreStaticIP or ignoreStaticMAC options to the
restore rest call.
---
 src/ContainerRestoreModal.jsx | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/ContainerRestoreModal.jsx b/src/ContainerRestoreModal.jsx
index 551678c89..4f852367d 100644
--- a/src/ContainerRestoreModal.jsx
+++ b/src/ContainerRestoreModal.jsx
@@ -16,9 +16,14 @@ const ContainerRestoreModal = ({ containerWillRestore, onAddNotification }) => {
     const [ignoreStaticIP, setIgnoreStaticIP] = useState(false);
     const [ignoreStaticMAC, setIgnoreStaticMAC] = useState(false);
 
-    const handleRestoreContainer = (args) => {
+    const handleRestoreContainer = () => {
         setInProgress(true);
-        client.postContainer(containerWillRestore.isSystem, "restore", containerWillRestore.Id, args)
+        client.postContainer(containerWillRestore.isSystem, "restore", containerWillRestore.Id, {
+            keep,
+            tcpEstablished,
+            ignoreStaticIP,
+            ignoreStaticMAC,
+        })
                 .catch(ex => {
                     const error = cockpit.format(_("Failed to restore container $0"), containerWillRestore.Names);
                     onAddNotification({ type: 'danger', error, errorDetail: ex.message });
@@ -37,12 +42,7 @@ const ContainerRestoreModal = ({ containerWillRestore, onAddNotification }) => {
                footer={<>
                    <Button variant="primary" isDisabled={inProgress}
                            isLoading={inProgress}
-                           onClick={() => {
-                               handleRestoreContainer({
-                                   keep: keep,
-                                   tcpEstablished: tcpEstablished,
-                               });
-                           }}>
+                           onClick={handleRestoreContainer}>
                        {_("Restore")}
                    </Button>
                    <Button variant="link" isDisabled={inProgress}

From 60e3490fccb3102231f94d4a24c91fd3b9c937a3 Mon Sep 17 00:00:00 2001
From: Jelle van der Waa <jvanderwaa@redhat.com>
Date: Mon, 28 Nov 2022 17:49:50 +0100
Subject: [PATCH 3/3] Drop ignore rootfs from checkpoint

Ignoring the rootfs is only supported with an export as the man page
describes:

IMPORTANT: This OPTION only works in combination with --export, -e.
---
 src/ContainerCheckpointModal.jsx | 5 -----
 test/check-application           | 2 --
 2 files changed, 7 deletions(-)

diff --git a/src/ContainerCheckpointModal.jsx b/src/ContainerCheckpointModal.jsx
index 6711edda5..8dadad08c 100644
--- a/src/ContainerCheckpointModal.jsx
+++ b/src/ContainerCheckpointModal.jsx
@@ -13,7 +13,6 @@ const ContainerCheckpointModal = ({ containerWillCheckpoint, onAddNotification }
     const [keep, setKeep] = useState(false);
     const [leaveRunning, setLeaveRunning] = useState(false);
     const [tcpEstablished, setTcpEstablished] = useState(false);
-    const [ignoreRootFS, setIgnoreRootFS] = useState(false);
 
     const handleCheckpointContainer = () => {
         setProgress(true);
@@ -21,7 +20,6 @@ const ContainerCheckpointModal = ({ containerWillCheckpoint, onAddNotification }
             keep,
             leaveRunning,
             tcpEstablished,
-            ignoreRootFS,
         })
                 .catch(ex => {
                     const error = cockpit.format(_("Failed to checkpoint container $0"), containerWillCheckpoint.Names);
@@ -59,9 +57,6 @@ const ContainerCheckpointModal = ({ containerWillCheckpoint, onAddNotification }
                 <Checkbox label={_("Support preserving established TCP connections")}
                               id="checkpoint-dialog-tcpEstablished" name="tcpEstablished"
                               isChecked={tcpEstablished} onChange={setTcpEstablished} />
-                <Checkbox label={_("Do not include root file-system changes when exporting")}
-                              id="checkpoint-dialog-ignoreRootFS" name="ignoreRootFS"
-                              isChecked={ignoreRootFS} onChange={setIgnoreRootFS} />
             </Form>
         </Modal>
     );
diff --git a/test/check-application b/test/check-application
index 153f7edb5..a1d555f4f 100755
--- a/test/check-application
+++ b/test/check-application
@@ -1132,7 +1132,6 @@ class TestApplication(testlib.MachineCase):
         self.performContainerAction("busybox:latest", "Checkpoint")
         b.set_checked('.pf-c-modal-box input#checkpoint-dialog-keep', True)
         b.set_checked('.pf-c-modal-box input#checkpoint-dialog-tcpEstablished', True)
-        b.set_checked('.pf-c-modal-box input#checkpoint-dialog-ignoreRootFS', True)
         b.click('.pf-c-modal-box button:contains(Checkpoint)')
         b.wait_not_present('.modal_dialog')
 
@@ -1175,7 +1174,6 @@ class TestApplication(testlib.MachineCase):
         self.performContainerAction("swamped-crate", "Checkpoint")
         b.set_checked('.pf-c-modal-box input#checkpoint-dialog-keep', True)
         b.set_checked('.pf-c-modal-box input#checkpoint-dialog-tcpEstablished', True)
-        b.set_checked('.pf-c-modal-box input#checkpoint-dialog-ignoreRootFS', True)
         b.click('.pf-c-modal-box button:contains(Checkpoint)')
 
         with b.wait_timeout(300):