fix precommits (#1083)

longshuicy · web-flow · commit f365060df110 · 2024-06-07T10:41:10.000-05:00
* fix precommits

* remove not needed variables

* more missing precommit fixes
diff --git a/backend/app/deps/authorization_deps.py b/backend/app/deps/authorization_deps.py
@@ -1,6 +1,3 @@
-from beanie import PydanticObjectId
-from beanie.operators import Or
-from fastapi import Depends, HTTPException
 from app.keycloak_auth import get_current_username, get_read_only_user
 from app.models.authorization import AuthorizationDB, RoleType
 from app.models.datasets import DatasetDB, DatasetStatus
diff --git a/backend/app/keycloak_auth.py b/backend/app/keycloak_auth.py
@@ -383,7 +383,7 @@ async def get_read_only_user(
                     detail={"error": "Key is invalid."},
                     headers={"WWW-Authenticate": "Bearer"},
                 )
-        except BadSignature as e:
+        except BadSignature:
             raise HTTPException(
                 status_code=401,
                 detail={"error": "Key is invalid."},
diff --git a/backend/app/routers/authorization.py b/backend/app/routers/authorization.py
@@ -274,7 +274,6 @@ async def set_dataset_user_role(
                 AuthorizationDB.dataset_id == PydanticObjectId(dataset_id),
                 AuthorizationDB.role == role,
             )
-            rolename = role.name
             if user.read_only_user and role.name is not RoleType.VIEWER.name:
                 raise HTTPException(
                     status_code=405, detail=f"User {username} is read only"
diff --git a/backend/app/routers/datasets.py b/backend/app/routers/datasets.py
@@ -683,13 +683,10 @@ async def save_file(
                 )
         file_public = False
         file_authenticated = False
-        file_private = False
         if dataset.status == DatasetStatus.PUBLIC:
             file_public = True
         elif dataset.status == DatasetStatus.AUTHENTICATED:
             file_authenticated = True
-        else:
-            file_private = True
         await add_file_entry(
             new_file,
             user,
diff --git a/backend/app/search/index.py b/backend/app/search/index.py
@@ -87,8 +87,6 @@ async def index_file(
     ):
         metadata.append(md.content)
 
-    status = file.status
-
     # Add en entry to the file index
     doc = ElasticsearchEntry(
         resource_type="file",
diff --git a/backend/app/tests/test_elastic_search.py b/backend/app/tests/test_elastic_search.py
@@ -193,8 +193,6 @@ async def test_public_files():
         time.sleep(1)
         dummy_file_query = []
 
-        query_body = {"query": {"match": {"creator": "xyz"}}}
-
         user_public_clause = {
             "bool": {
                 "should": [
diff --git a/docs/docs/devs/standalone-docker-deployment.md b/docs/docs/devs/standalone-docker-deployment.md
@@ -60,4 +60,4 @@ docker-compose -f docker-compose.yml -f docker-compose.override.yml up -d
 
 4. Access the keycloak admin console at `http://{{IP_ADDRESS}}/keycloak/` and login with the credentials from the `docker-compose.yml` file and finish the steps in [Keycloak](keycloak.md), using the same IP address as the `{hostname}` placeholder.
 
-You shall be able to log in now at `http://{{IP_ADDRESS}}/`. 
+You shall be able to log in now at `http://{{IP_ADDRESS}}/`.
diff --git a/frontend/src/actions/user.js b/frontend/src/actions/user.js
@@ -304,12 +304,13 @@ export function revokeAdmin(email) {
 	};
 }
 
-
 export const ENABLE_READONLY = "ENABLE_READONLY";
 
 export function enableReadOnly(email) {
 	return (dispatch) => {
-		return V2.LoginService.enableReadonlyUserApiV2UsersEnableReadonlyUseremailPost(email)
+		return V2.LoginService.enableReadonlyUserApiV2UsersEnableReadonlyUseremailPost(
+			email
+		)
 			.then((json) => {
 				dispatch({
 					type: ENABLE_READONLY,
@@ -327,7 +328,9 @@ export const DISABLE_READONLY = "DISABLE_READONLY";
 
 export function disableReadOnly(email) {
 	return (dispatch) => {
-		return V2.LoginService.disableReadonlyUserApiV2UsersDisableReadonlyUseremailPost(email)
+		return V2.LoginService.disableReadonlyUserApiV2UsersDisableReadonlyUseremailPost(
+			email
+		)
 			.then((json) => {
 				dispatch({
 					type: DISABLE_READONLY,
diff --git a/frontend/src/components/Layout.tsx b/frontend/src/components/Layout.tsx
@@ -377,9 +377,9 @@ export default function PersistentDrawerLeft(props) {
 					</>
 				) : null}
 				<List>
-					{currUserProfile.read_only_user? (
+					{currUserProfile.read_only_user ? (
 						<></>
-					) :
+					) : (
 						<ListItem key={"groups"} disablePadding>
 							<ListItemButton component={RouterLink} to="/groups">
 								<ListItemIcon>
@@ -388,33 +388,33 @@ export default function PersistentDrawerLeft(props) {
 								<ListItemText primary={"Groups"} />
 							</ListItemButton>
 						</ListItem>
-					}
+					)}
 				</List>
 				<Divider />
 				<List>
-					{currUserProfile.read_only_user? (
+					{currUserProfile.read_only_user ? (
 						<></>
-					) :
+					) : (
 						<ListItem key={"newdataset"} disablePadding>
 							<ListItemButton component={RouterLink} to="/create-dataset">
 								<ListItemIcon>
 									<AddBox />
 								</ListItemIcon>
-							<ListItemText primary={"New Dataset"} />
-						</ListItemButton>
-					</ListItem>
-					}
+								<ListItemText primary={"New Dataset"} />
+							</ListItemButton>
+						</ListItem>
+					)}
 				</List>
 				<Divider />
 				<List>
-						<ListItem key={"metadataDefinition"} disablePadding>
-							<ListItemButton component={RouterLink} to="/metadata-definitions">
-								<ListItemIcon>
-									<InfoOutlinedIcon />
-								</ListItemIcon>
-								<ListItemText primary={"Metadata Definitions"} />
-							</ListItemButton>
-						</ListItem>
+					<ListItem key={"metadataDefinition"} disablePadding>
+						<ListItemButton component={RouterLink} to="/metadata-definitions">
+							<ListItemIcon>
+								<InfoOutlinedIcon />
+							</ListItemIcon>
+							<ListItemText primary={"Metadata Definitions"} />
+						</ListItemButton>
+					</ListItem>
 				</List>
 				<Divider />
 				<List>
diff --git a/frontend/src/components/PublicLayout.tsx b/frontend/src/components/PublicLayout.tsx
@@ -97,7 +97,8 @@ export default function PersistentDrawerLeft(props) {
 	const { children } = props;
 	const theme = useTheme();
 	const [open, setOpen] = React.useState(false);
-	const [embeddedPublicSearchHidden, setEmbeddedPublicSearchHidden] = React.useState(false);
+	const [embeddedPublicSearchHidden, setEmbeddedPublicSearchHidden] =
+		React.useState(false);
 	const [anchorEl, setAnchorEl] = React.useState(null);
 	const isMenuOpen = Boolean(anchorEl);
 
@@ -236,7 +237,7 @@ export default function PersistentDrawerLeft(props) {
 						</ListItemButton>
 					</ListItem>
 				</List>
-				<Divider/>
+				<Divider />
 				<List>
 					<ListItem key={"public_search"} disablePadding>
 						<ListItemButton component={RouterLink} to="/public_search">
diff --git a/frontend/src/components/datasets/ShareDatasetModal.tsx b/frontend/src/components/datasets/ShareDatasetModal.tsx
@@ -89,7 +89,7 @@ export default function ShareDatasetModal(props: ShareDatasetModalProps) {
 		setShowSuccessAlert(false);
 		await setUserRole(datasetId, email, role);
 		getRoles(datasetId);
-		let currentRoles = datasetRoles;
+		const currentRoles = datasetRoles;
 		// TODO check for roles
 		let found_user = false;
 		if (currentRoles !== undefined && currentRoles.user_roles !== undefined) {
diff --git a/frontend/src/components/metadata/MetadataDefinitionEntry.tsx b/frontend/src/components/metadata/MetadataDefinitionEntry.tsx
@@ -11,7 +11,7 @@ import { fetchMetadataDefinition as fetchMetadataDefinitionAction } from "../../
 import { RootState } from "../../types/data";
 import DeleteMetadataDefinitionModal from "./DeleteMetadataDefinitionModal";
 import DeleteIcon from "@mui/icons-material/Delete";
-import {fetchUserProfile} from "../../actions/user";
+import { fetchUserProfile } from "../../actions/user";
 
 export function MetadataDefinitionEntry() {
 	// path parameter
@@ -126,22 +126,22 @@ export function MetadataDefinitionEntry() {
 				</Grid>
 
 				{/*Buttons*/}
-				{currUserProfile.read_only_user? (
+				{currUserProfile.read_only_user ? (
 					<></>
-					):
-						<Grid
-							item
-							xs={12}
-							sm={12}
-							md={4}
-							lg={3}
-							sx={{
-								display: "flex",
-								justifyContent: "flex-end",
-								alignItems: "baseline",
-								flexDirection: "row",
-							}}
-						>
+				) : (
+					<Grid
+						item
+						xs={12}
+						sm={12}
+						md={4}
+						lg={3}
+						sx={{
+							display: "flex",
+							justifyContent: "flex-end",
+							alignItems: "baseline",
+							flexDirection: "row",
+						}}
+					>
 						<Button
 							variant="contained"
 							aria-label="delete"
@@ -154,7 +154,7 @@ export function MetadataDefinitionEntry() {
 							Delete
 						</Button>
 					</Grid>
-				}
+				)}
 			</Grid>
 			<ReactJson
 				src={metadataDefinition}
diff --git a/frontend/src/components/metadata/MetadataDefinitions.tsx b/frontend/src/components/metadata/MetadataDefinitions.tsx
@@ -33,7 +33,7 @@ import { Link } from "react-router-dom";
 import { GenericSearchBox } from "../search/GenericSearchBox";
 import { MetadataDefinitionOut } from "../../openapi/v2";
 import config from "../../app.config";
-import {fetchUserProfile} from "../../actions/user";
+import { fetchUserProfile } from "../../actions/user";
 
 export function MetadataDefinitions() {
 	// Redux connect equivalent
@@ -109,7 +109,6 @@ export function MetadataDefinitions() {
 		else listMetadataDefinitions(null, newSkip, limit);
 	};
 
-
 	return (
 		<Layout>
 			{/*Error Message dialogue*/}
@@ -155,9 +154,9 @@ export function MetadataDefinitions() {
 				</DialogContent>
 			</Dialog>
 			<div className="outer-container">
-				{currUserProfile.read_only_user? (
+				{currUserProfile.read_only_user ? (
 					<></>
-					):
+				) : (
 					<Grid container>
 						<Grid item xs={8} />
 						<Grid item xs={4}>
@@ -172,7 +171,7 @@ export function MetadataDefinitions() {
 							</Button>
 						</Grid>
 					</Grid>
-				}
+				)}
 				<br />
 				<Grid container spacing={2}>
 					<Grid item xs={12}>
@@ -239,21 +238,20 @@ export function MetadataDefinitions() {
 													key={`${mdd.id}-delete`}
 													align="left"
 												>
-													{currUserProfile.read_only_user?
-														(
-															<></>
-														):
+													{currUserProfile.read_only_user ? (
+														<></>
+													) : (
 														<IconButton
 															aria-label="delete"
 															size="small"
 															onClick={() => {
 																setSelectedMetadataDefinition(mdd.id);
 																setDeleteMetadataDefinitionConfirmOpen(true);
 															}}
-															>
-																<DeleteIcon fontSize="small" />
+														>
+															<DeleteIcon fontSize="small" />
 														</IconButton>
-													}
+													)}
 												</TableCell>
 											</TableRow>
 										);
diff --git a/frontend/src/components/search/PublicSearch.tsx b/frontend/src/components/search/PublicSearch.tsx
@@ -16,7 +16,6 @@ import { PublicSearchResult } from "./PublicSearchResult";
 export function PublicSearch() {
 	const [luceneOn, setLuceneOn] = useState(false);
 
-
 	// toggle super admin
 	// const adminMode = useSelector((state: RootState) => state.user.adminMode);
 
@@ -89,11 +88,7 @@ export function PublicSearch() {
 										fuzziness={0}
 										debounce={100}
 										react={{
-											and: [
-												"downloadfilter",
-												"fromfilter",
-												"tofilter",
-											],
+											and: ["downloadfilter", "fromfilter", "tofilter"],
 										}}
 										// apply react to the filter
 										URLParams={true}
diff --git a/frontend/src/components/users/ManageUsers.tsx b/frontend/src/components/users/ManageUsers.tsx
@@ -16,7 +16,7 @@ import {
 	revokeAdmin as revokeAdminAction,
 	setAdmin as setAdminAction,
 	enableReadOnly as setEnableReadOnlyAction,
-	disableReadOnly as setDisableReadOnlyAction
+	disableReadOnly as setDisableReadOnlyAction,
 } from "../../actions/user";
 import { Box, Grid, Pagination, Switch } from "@mui/material";
 import { ErrorModal } from "../errors/ErrorModal";
@@ -47,9 +47,10 @@ export const ManageUsers = (): JSX.Element => {
 	const setAdmin = (email: string) => dispatch(setAdminAction(email));
 	const revokeAdmin = (email: string) => dispatch(revokeAdminAction(email));
 
-	const setEnableReadOnly = (email: string) => dispatch(setEnableReadOnlyAction(email));
-	const setDisableReadOnly = (email: string) => dispatch(setDisableReadOnlyAction(email));
-
+	const setEnableReadOnly = (email: string) =>
+		dispatch(setEnableReadOnlyAction(email));
+	const setDisableReadOnly = (email: string) =>
+		dispatch(setDisableReadOnlyAction(email));
 
 	// component did mount
 	useEffect(() => {
@@ -83,8 +84,7 @@ export const ManageUsers = (): JSX.Element => {
 		} else {
 			setDisableReadOnly(email);
 		}
-	}
-
+	};
 
 	return (
 		<Layout>
@@ -157,7 +157,10 @@ export const ManageUsers = (): JSX.Element => {
 																setAdmin(profile.email);
 															}
 														}}
-														disabled={profile.email === currentUser.email || profile.read_only_user}
+														disabled={
+															profile.email === currentUser.email ||
+															profile.read_only_user
+														}
 													/>
 												</TableCell>
 												<TableCell align="left">
@@ -171,7 +174,10 @@ export const ManageUsers = (): JSX.Element => {
 																changeReadOnly(profile.email, true);
 															}
 														}}
-														disabled={(profile.email === currentUser.email || profile.admin)}
+														disabled={
+															profile.email === currentUser.email ||
+															profile.admin
+														}
 													/>
 												</TableCell>
 											</TableRow>
diff --git a/frontend/src/routes.tsx b/frontend/src/routes.tsx
@@ -225,12 +225,7 @@ export const AppRoutes = (): JSX.Element => {
 						</PrivateRoute>
 					}
 				/>
-				<Route
-					path="/public_search"
-					element={
-						<PublicSearch />
-					}
-				/>
+				<Route path="/public_search" element={<PublicSearch />} />
 				<Route
 					path="/extractions"
 					element={
diff --git a/openapi.json b/openapi.json

Original file line number	Diff line number	Diff line change
`@@ -383,7 +383,7 @@ async def get_read_only_user(`
`383`	`383`	`detail={"error": "Key is invalid."},`
`384`	`384`	`headers={"WWW-Authenticate": "Bearer"},`
`385`	`385`	`)`
`386`		`- except BadSignature as e:`
	`386`	`+ except BadSignature:`
`387`	`387`	`raise HTTPException(`
`388`	`388`	`status_code=401,`
`389`	`389`	`detail={"error": "Key is invalid."},`
Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,6 @@ async def set_dataset_user_role(`
`274`	`274`	`AuthorizationDB.dataset_id == PydanticObjectId(dataset_id),`
`275`	`275`	`AuthorizationDB.role == role,`
`276`	`276`	`)`
`277`		`- rolename = role.name`
`278`	`277`	`if user.read_only_user and role.name is not RoleType.VIEWER.name:`
`279`	`278`	`raise HTTPException(`
`280`	`279`	`status_code=405, detail=f"User {username} is read only"`
Original file line number	Diff line number	Diff line change
`@@ -60,4 +60,4 @@ docker-compose -f docker-compose.yml -f docker-compose.override.yml up -d`
`60`	`60`
`61`	`61`	4. Access the keycloak admin console at `http://{{IP_ADDRESS}}/keycloak/` and login with the credentials from the `docker-compose.yml` file and finish the steps in [Keycloak](keycloak.md), using the same IP address as the `{hostname}` placeholder.
`62`	`62`
`63`		-You shall be able to log in now at `http://{{IP_ADDRESS}}/`.
	`63`	+You shall be able to log in now at `http://{{IP_ADDRESS}}/`.