From 4948e387b81119c8fc3ec804e7eacede6c11f25c Mon Sep 17 00:00:00 2001
From: Caleb Ellis <caleb.ellis@canonical.com>
Date: Thu, 11 Mar 2021 10:41:48 +1000
Subject: [PATCH] fix(ui): add proxmox field names to add_chassis parameter map

---
 .../CommissionForm/CommissionForm.tsx               |  9 +++++++++
 .../ActionFormWrapper/TestForm/TestForm.js          |  9 +++++++++
 ui/src/app/utils/formatPowerParameters.js           |  3 +++
 ui/src/app/utils/formatPowerParameters.test.js      | 13 +++++++++++--
 4 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/ui/src/app/machines/views/MachineList/MachineListHeader/ActionFormWrapper/CommissionForm/CommissionForm.tsx b/ui/src/app/machines/views/MachineList/MachineListHeader/ActionFormWrapper/CommissionForm/CommissionForm.tsx
index 4ad69c456a..95fc763d44 100644
--- a/ui/src/app/machines/views/MachineList/MachineListHeader/ActionFormWrapper/CommissionForm/CommissionForm.tsx
+++ b/ui/src/app/machines/views/MachineList/MachineListHeader/ActionFormWrapper/CommissionForm/CommissionForm.tsx
@@ -1,3 +1,4 @@
+import { Spinner, Strip } from "@canonical/react-components";
 import PropTypes from "prop-types";
 import React, { useEffect } from "react";
 import { useDispatch, useSelector } from "react-redux";
@@ -63,6 +64,7 @@ export const CommissionForm = ({ setSelectedAction }: Props): JSX.Element => {
   const dispatch = useDispatch();
   const selectedMachines = useSelector(machineSelectors.selected);
   const errors = useSelector(machineSelectors.errors);
+  const scriptsLoaded = useSelector(scriptSelectors.loaded);
   const commissioningScripts = useSelector(scriptSelectors.commissioning);
   const preselectedCommissioningScripts = useSelector(
     scriptSelectors.preselectedCommissioning
@@ -102,6 +104,13 @@ export const CommissionForm = ({ setSelectedAction }: Props): JSX.Element => {
     }
   }, [dispatch, scriptsLoaded]);
 
+  if (!scriptsLoaded) {
+    return (
+      <Strip shallow>
+        <Spinner text="Loading..." />
+      </Strip>
+    );
+  }
   return (
     <ActionForm
       actionName="commission"
diff --git a/ui/src/app/machines/views/MachineList/MachineListHeader/ActionFormWrapper/TestForm/TestForm.js b/ui/src/app/machines/views/MachineList/MachineListHeader/ActionFormWrapper/TestForm/TestForm.js
index 0161f09314..3a384f2ff1 100644
--- a/ui/src/app/machines/views/MachineList/MachineListHeader/ActionFormWrapper/TestForm/TestForm.js
+++ b/ui/src/app/machines/views/MachineList/MachineListHeader/ActionFormWrapper/TestForm/TestForm.js
@@ -1,3 +1,4 @@
+import { Spinner, Strip } from "@canonical/react-components";
 import PropTypes from "prop-types";
 import React, { useEffect } from "react";
 import { useDispatch, useSelector } from "react-redux";
@@ -33,6 +34,7 @@ export const TestForm = ({ setSelectedAction }) => {
   const errors = useSelector(machineSelectors.errors);
   const testingSelected = useSelector(machineSelectors.testingSelected);
   const scripts = useSelector(scriptSelectors.testing);
+  const scriptsLoaded = useSelector(scriptSelectors.loaded);
   const urlScripts = useSelector(scriptSelectors.testingWithUrl);
 
   const formattedScripts = scripts.map((script) => ({
@@ -61,6 +63,13 @@ export const TestForm = ({ setSelectedAction }) => {
     }
   }, [dispatch, scriptsLoaded]);
 
+  if (!scriptsLoaded) {
+    return (
+      <Strip shallow>
+        <Spinner text="Loading..." />
+      </Strip>
+    );
+  }
   return (
     <ActionForm
       actionName="test"
diff --git a/ui/src/app/utils/formatPowerParameters.js b/ui/src/app/utils/formatPowerParameters.js
index fda51e55fc..d536806e19 100644
--- a/ui/src/app/utils/formatPowerParameters.js
+++ b/ui/src/app/utils/formatPowerParameters.js
@@ -17,7 +17,10 @@ const chassisParameterMap = new Map([
   ["power_pass", "password"],
   ["power_port", "port"],
   ["power_protocol", "protocol"],
+  ["power_token_name", "token_name"],
+  ["power_token_secret", "token_secret"],
   ["power_user", "username"],
+  ["power_verify_ssl", "verify_ssl"],
 ]);
 
 export const formatPowerParameters = (
diff --git a/ui/src/app/utils/formatPowerParameters.test.js b/ui/src/app/utils/formatPowerParameters.test.js
index c633369bef..92a31ec7e8 100644
--- a/ui/src/app/utils/formatPowerParameters.test.js
+++ b/ui/src/app/utils/formatPowerParameters.test.js
@@ -23,7 +23,10 @@ describe("formatPowerParameters", () => {
         { name: "power_pass" },
         { name: "power_port" },
         { name: "power_protocol" },
+        { name: "power_token_name" },
+        { name: "power_token_secret" },
         { name: "power_user" },
+        { name: "power_verify_ssl" },
       ],
     };
 
@@ -32,7 +35,10 @@ describe("formatPowerParameters", () => {
       power_pass: "value2",
       power_port: "value3",
       power_protocol: "value4",
-      power_user: "value5",
+      power_token_name: "value5",
+      power_token_secret: "value6",
+      power_user: "value7",
+      power_verify_ssl: "value8",
     };
     expect(
       formatPowerParameters(powerType, powerParameters, "chassis")
@@ -41,7 +47,10 @@ describe("formatPowerParameters", () => {
       password: "value2",
       port: "value3",
       protocol: "value4",
-      username: "value5",
+      token_name: "value5",
+      token_secret: "value6",
+      username: "value7",
+      verify_ssl: "value8",
     });
   });