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

@@ -1,18 +1,19 @@
-import { useQuery } from "@apollo/client";
+import {useQuery} from "@apollo/client";
-import { Button, Card, Input, Modal, Space, Table, Typography } from "antd";
+import {Button, Card, Input, Modal, Space, Table, Typography} from "antd";
-import React, { useState } from "react";
+import React, {useState} from "react";
-import { useTranslation } from "react-i18next";
+import {useTranslation} from "react-i18next";
-import { Link } from "react-router-dom";
+import {Link} from "react-router-dom";
-import { QUERY_SCOREBOARD_PAGINATED } from "../../graphql/scoreboard.queries";
+import {QUERY_SCOREBOARD_PAGINATED} from "../../graphql/scoreboard.queries";
-import { DateFormatter } from "../../utils/DateFormatter";
+import {DateFormatter} from "../../utils/DateFormatter";
 import AlertComponent from "../alert/alert.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import ScoreboardEntryEdit from "../scoreboard-entry-edit/scoreboard-entry-edit.component";
 import ScoreboardRemoveButton from "../scoreboard-remove-button/scorebard-remove-button.component";
-import { SyncOutlined } from "@ant-design/icons";
+import {SyncOutlined} from "@ant-design/icons";
 import {pageLimit} from "../../utils/config";
-export default function ScoreboardJobsList({ scoreBoardlist }) {
+
-  const { t } = useTranslation();
+export default function ScoreboardJobsList({scoreBoardlist}) {
+    const {t} = useTranslation();
     const [state, setState] = useState({
         open: false,
         search: "",
@@ -20,7 +21,7 @@ export default function ScoreboardJobsList({ scoreBoardlist }) {
         pageSize: pageLimit,
     });
 
-  const { loading, error, data, refetch } = useQuery(
+    const {loading, error, data, refetch} = useQuery(
         QUERY_SCOREBOARD_PAGINATED,
         {
             fetchPolicy: "network-only",
@@ -56,7 +57,7 @@ export default function ScoreboardJobsList({ scoreBoardlist }) {
             key: "owner",
             ellipsis: true,
 
-      render: (text, record) => <OwnerNameDisplay ownerObject={record.job} />,
+            render: (text, record) => <OwnerNameDisplay ownerObject={record.job}/>,
         },
         {
             title: t("jobs.fields.vehicle"),
@@ -91,8 +92,8 @@ export default function ScoreboardJobsList({ scoreBoardlist }) {
             key: "actions",
             render: (text, record) => (
                 <Space>
-          <ScoreboardEntryEdit entry={record} style={{ zIndex: 15 }} />
+                    <ScoreboardEntryEdit entry={record} style={{zIndex: 15}}/>
-          <ScoreboardRemoveButton scoreboardId={record.id} />
+                    <ScoreboardRemoveButton scoreboardId={record.id}/>
                 </Space>
             ),
         },
@@ -104,7 +105,10 @@ export default function ScoreboardJobsList({ scoreBoardlist }) {
                 open={state.open}
                 destroyOnClose
                 width="80%"
-        cancelButtonProps={{ style: { display: "none" } }}
+                cancelButtonProps={{style: {display: "none"}}}
+                onOk={() => {
+                   setState((state) => ({ ...state, open: false }));
+                }}
                 onCancel={() =>
                     setState((state) => ({
                         ...state,
@@ -115,22 +119,22 @@ export default function ScoreboardJobsList({ scoreBoardlist }) {
                 }
             >
                 {error && (
-          <AlertComponent type="error" message={JSON.stringify(error)} />
+                    <AlertComponent type="error" message={JSON.stringify(error)}/>
                 )}
                 <Card
                     extra={
                         <Space align="middle" wrap>
                             <Button onClick={() => refetch()}>
-                <SyncOutlined />
+                                <SyncOutlined/>
                             </Button>
                             <Typography.Title level={4}>
-                {t("general.labels.searchresults", { search: state.search })}
+                                {t("general.labels.searchresults", {search: state.search})}
                             </Typography.Title>
                             <Input.Search
                                 placeholder={t("jobs.fields.ro_number")}
                                 allowClear
                                 onSearch={(value) => {
-                  setState((state) => ({ ...state, search: value }));
+                                    setState((state) => ({...state, search: value}));
                                 }}
                                 //value={state.search}
                                 enterButton
@@ -145,7 +149,7 @@ export default function ScoreboardJobsList({ scoreBoardlist }) {
                         loading={loading}
                         onClick={(e) => e.stopPropagation()}
                         onChange={(tableArgs) =>
-              setState((state) => ({ ...state, ...tableArgs }))
+                            setState((state) => ({...state, ...tableArgs}))
                         }
                         pagination={{
                             position: "top",
@@ -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>