Merge pull request #149 from alan-turing-institute/misc-final-items

Misc final items

eap_backend/requirements.txt

@@ -16,7 +16,7 @@ mypy-extensions==0.4.3
 pathspec==0.9.0
 platformdirs==2.4.0
 pre-commit==2.17.0
-psycopg2==2.9.3
+psycopg2-binary==2.9.3
 pytz==2021.3
 regex==2021.10.23
 sqlparse==0.4.2

frontend/src/components/CaseContainer.js

@@ -757,6 +757,7 @@ class CaseContainer extends Component {
   }
 }
 
+// eslint-disable-next-line import/no-anonymous-default-export
 export default (props) => (
   <CaseContainer {...props} params={useParams()} navigate={useNavigate()} />
 );

frontend/src/components/CasePermissionsManager.js

@@ -126,6 +126,7 @@ class CasePermissionsManager extends Component {
   }
 }
 
+// eslint-disable-next-line import/no-anonymous-default-export
 export default (props) => (
   <CasePermissionsManager
     {...props}

frontend/src/components/CreateGroup.js

@@ -45,6 +45,7 @@ class CreateGroup extends React.Component {
   }
 }
 
+// eslint-disable-next-line import/no-anonymous-default-export
 export default (props) => (
   <CreateGroup {...props} params={useParams()} navigate={useNavigate()} />
 );

frontend/src/components/EditableText.js

@@ -45,4 +45,5 @@ class EditableText extends Component {
   }
 }
 
+// eslint-disable-next-line import/no-anonymous-default-export
 export default (props) => <EditableText {...props} params={useParams()} />;

frontend/src/components/Groups.js

@@ -220,6 +220,7 @@ class Groups extends React.Component {
   }
 }
 
+// eslint-disable-next-line import/no-anonymous-default-export
 export default (props) => (
   <Groups {...props} params={useParams()} navigate={useNavigate()} />
 );

frontend/src/components/ItemCreator.js

@@ -14,7 +14,6 @@ import { getBaseURL } from "./utils.js";
 import configData from "../config.json";
 
 function ItemCreator(props) {
-  const [parentId, setParentId] = useState(1);
   const [name, setName] = useState("Name");
   const [sdesc, setShortDesc] = useState("Short description");
   const [ldesc, setLongDesc] = useState("Long description");
@@ -33,10 +32,7 @@ function ItemCreator(props) {
       return null;
     }
     setSubmitClicked(true);
-    console.log("handleSubmitset parentId ", parentId);
-    console.log("submitClicked", submitClicked);
     const res = createDBObject();
-    console.log("db object created?", res);
     return res.then((resolve) => {
       props.updateView();
     });

frontend/src/components/ItemEditor.js

@@ -273,5 +273,5 @@ function ItemEditor(props) {
     </Box>
   );
 }
-
+// eslint-disable-next-line import/no-anonymous-default-export
 export default (props) => <ItemEditor {...props} params={useParams()} />;

frontend/src/components/ItemViewer.js

@@ -77,4 +77,5 @@ function ItemViewer(props) {
   );
 }
 
+// eslint-disable-next-line import/no-anonymous-default-export
 export default (props) => <ItemViewer {...props} params={useParams()} />;

frontend/src/components/Navigation.js

@@ -14,6 +14,13 @@ function Navigation() {
           <Box gap="small" direction="row">
             {localStorage.getItem("token") != null && <CaseSelector />}
             <ul className="navbar-nav ml-auto">
+              {localStorage.getItem("token") != null && (
+                <li className="nav-item">
+                  <NavLink className="nav-link" to="/groups">
+                    Groups
+                  </NavLink>
+                </li>
+              )}
               <li className="nav-item">
                 <a
                   className="nav-link"
@@ -31,13 +38,6 @@ function Navigation() {
                   Github
                 </a>
               </li>
-              {localStorage.getItem("token") != null && (
-                <li className="nav-item">
-                  <NavLink className="nav-link" to="/groups">
-                    Groups
-                  </NavLink>
-                </li>
-              )}
               {localStorage.getItem("token") != null && (
                 <li className="nav-item">
                   <NavLink className="nav-link" to="/logout">

frontend/src/components/ParentSelector.js

@@ -92,4 +92,5 @@ class ParentSelector extends Component {
   }
 }
 
+// eslint-disable-next-line import/no-anonymous-default-export
 export default (props) => <ParentSelector {...props} params={useParams()} />;

frontend/src/components/PermissionSelector.js

@@ -3,10 +3,6 @@ import { useNavigate, useParams } from "react-router-dom";
 import { Box, RadioButton } from "grommet";
 
 class PermissionSelector extends Component {
-  constructor(props) {
-    super(props);
-  }
-
   render() {
     // Grommet also has an element called RadioButtonGroup, which should be perfect for
     // this, but as of 2022-05-26 it's too buggy to use: Having more than one of them on
@@ -50,6 +46,7 @@ class PermissionSelector extends Component {
   }
 }
 
+// eslint-disable-next-line import/no-anonymous-default-export
 export default (props) => (
   <PermissionSelector
     {...props}

frontend/src/components/TemplateSelector.js

@@ -41,4 +41,5 @@ class TemplateSelector extends Component {
   }
 }
 
+// eslint-disable-next-line import/no-anonymous-default-export
 export default (props) => <TemplateSelector {...props} params={useParams()} />;