Merged in feature/IO-1828-Front-End-Package-Updates (pull request #1163)

- Scoreboard fixes

client/src/components/scoreboard-entry-edit/scoreboard-entry-edit.component.jsx

@@ -33,7 +33,12 @@ export default function ScoreboardEntryEdit({ entry }) {
     setLoading(false);
   };
 
-  const popContent = (
+
+  const menu = {
+    items: [
+      {
+          key: '1',
+        label: (
             <Card style={{ padding: "1rem" }}>
               <Form
                   layout="vertical"
@@ -86,13 +91,14 @@ export default function ScoreboardEntryEdit({ entry }) {
                 </Button>
               </Form>
             </Card>
-  );
+        )
-
+      }
-  // TODO Client Update, why is this a card
+    ]
+  }
 
   return (
     <div>
-      <Dropdown open={open} overlay={popContent}>
+      <Dropdown open={open} menu={menu}>
         <Button
           onClick={(e) => {
             e.stopPropagation();

client/src/components/scoreboard-jobs-list/scoreboard-jobs-list.component.jsx

@@ -11,6 +11,7 @@ import ScoreboardEntryEdit from "../scoreboard-entry-edit/scoreboard-entry-edit.
 import ScoreboardRemoveButton from "../scoreboard-remove-button/scorebard-remove-button.component";
 import {SyncOutlined} from "@ant-design/icons";
 import {pageLimit} from "../../utils/config";
+
 export default function ScoreboardJobsList({scoreBoardlist}) {
     const {t} = useTranslation();
     const [state, setState] = useState({
@@ -105,6 +106,9 @@ export default function ScoreboardJobsList({ scoreBoardlist }) {
                 destroyOnClose
                 width="80%"
                 cancelButtonProps={{style: {display: "none"}}}
+                onOk={() => {
+                   setState((state) => ({ ...state, open: false }));
+                }}
                 onCancel={() =>
                     setState((state) => ({
                         ...state,
@@ -157,7 +161,9 @@ export default function ScoreboardJobsList({ scoreBoardlist }) {
                 </Card>
             </Modal>
             <Button
-        onClick={() => setState((state) => ({ ...state, open: true }))}
+                onClick={() => {
+                    setState((state) => ({...state, open: true}))
+                }}
             >
                 {t("scoreboard.labels.entries")}
             </Button>