use link instead of buttons (#1049)

longshuicy · web-flow · commit c113f9be0de0 · 2024-05-14T12:43:34.000-05:00
diff --git a/backend/app/routers/groups.py b/backend/app/routers/groups.py
@@ -92,8 +92,8 @@ async def search_group(
 
     criteria_list = [
         Or(
-            RegEx(field=GroupDB.name, pattern=search_term),
-            RegEx(field=GroupDB.description, pattern=search_term),
+            RegEx(field=GroupDB.name, pattern=search_term, options="i"),
+            RegEx(field=GroupDB.description, pattern=search_term, options="i"),
         ),
     ]
     if not admin or not admin_mode:
diff --git a/backend/app/routers/jobs.py b/backend/app/routers/jobs.py
@@ -51,7 +51,9 @@ async def get_all_job_summary(
     if listener_id is not None:
         filters.append(EventListenerJobViewList.listener_id == listener_id)
     if status is not None:
-        filters.append(RegEx(field=EventListenerJobViewList.status, pattern=status))
+        filters.append(
+            RegEx(field=EventListenerJobViewList.status, pattern=status, options="i")
+        )
     if created is not None:
         created_datetime_object = datetime.strptime(created, "%Y-%m-%d")
         filters.append(GTE(EventListenerJobViewList.created, created_datetime_object))
diff --git a/backend/app/routers/listeners.py b/backend/app/routers/listeners.py
@@ -229,8 +229,8 @@ async def search_listeners(
     listeners_and_count = (
         await EventListenerDB.find(
             Or(
-                RegEx(field=EventListenerDB.name, pattern=text),
-                RegEx(field=EventListenerDB.description, pattern=text),
+                RegEx(field=EventListenerDB.name, pattern=text, options="i"),
+                RegEx(field=EventListenerDB.description, pattern=text, options="i"),
             ),
         )
         .aggregate(aggregation_pipeline)
diff --git a/backend/app/routers/metadata.py b/backend/app/routers/metadata.py
@@ -138,9 +138,17 @@ async def search_metadata_definition(
     mdds_and_count = (
         await MetadataDefinitionDB.find(
             Or(
-                RegEx(field=MetadataDefinitionDB.name, pattern=search_term),
-                RegEx(field=MetadataDefinitionDB.description, pattern=search_term),
-                RegEx(field=MetadataDefinitionDB.context, pattern=search_term),
+                RegEx(
+                    field=MetadataDefinitionDB.name, pattern=search_term, options="i"
+                ),
+                RegEx(
+                    field=MetadataDefinitionDB.description,
+                    pattern=search_term,
+                    options="i",
+                ),
+                RegEx(
+                    field=MetadataDefinitionDB.context, pattern=search_term, options="i"
+                ),
             ),
         )
         .aggregate(
diff --git a/backend/app/routers/public_metadata.py b/backend/app/routers/public_metadata.py
@@ -66,9 +66,11 @@ async def search_metadata_definition(
 
     mdds = await MetadataDefinitionDB.find(
         Or(
-            RegEx(field=MetadataDefinitionDB.name, pattern=search_term),
-            RegEx(field=MetadataDefinitionDB.description, pattern=search_term),
-            RegEx(field=MetadataDefinitionDB.context, pattern=search_term),
+            RegEx(field=MetadataDefinitionDB.name, pattern=search_term, options="i"),
+            RegEx(
+                field=MetadataDefinitionDB.description, pattern=search_term, options="i"
+            ),
+            RegEx(field=MetadataDefinitionDB.context, pattern=search_term, options="i"),
         ),
         sort=(-MetadataDefinitionDB.created),
         skip=skip,
diff --git a/backend/app/routers/users.py b/backend/app/routers/users.py
@@ -118,9 +118,9 @@ async def search_users(
     users_and_count = (
         await UserDB.find(
             Or(
-                RegEx(field=UserDB.email, pattern=text),
-                RegEx(field=UserDB.first_name, pattern=text),
-                RegEx(field=UserDB.last_name, pattern=text),
+                RegEx(field=UserDB.email, pattern=text, options="i"),
+                RegEx(field=UserDB.first_name, pattern=text, options="i"),
+                RegEx(field=UserDB.last_name, pattern=text, options="i"),
             )
         )
         .aggregate(
@@ -147,7 +147,7 @@ async def search_users_prefix(
     query_regx = f"^{prefix}.*"
     users_and_count = (
         await UserDB.find(
-            Or(RegEx(field=UserDB.email, pattern=query_regx)),
+            Or(RegEx(field=UserDB.email, pattern=query_regx, options="i")),
         )
         .aggregate(
             [_get_page_query(skip, limit, sort_field="email", ascending=True)],
diff --git a/frontend/src/components/groups/Groups.tsx b/frontend/src/components/groups/Groups.tsx
@@ -6,6 +6,7 @@ import {
 	DialogContent,
 	DialogTitle,
 	Grid,
+	Link as MuiLink,
 	Pagination,
 } from "@mui/material";
 import { RootState } from "../../types/data";
@@ -161,9 +162,13 @@ export function Groups() {
 												}}
 											>
 												<TableCell scope="row" key={group.id}>
-													<Button component={Link} to={`/groups/${group.id}`}>
+													<MuiLink
+														component={Link}
+														to={`/groups/${group.id}`}
+														sx={{ textDecoration: "none" }}
+													>
 														{group.name}
-													</Button>
+													</MuiLink>
 												</TableCell>
 												<TableCell scope="row" key={group.id} align="left">
 													{group.description}
diff --git a/frontend/src/components/groups/MembersTableUserEntry.tsx b/frontend/src/components/groups/MembersTableUserEntry.tsx
@@ -4,7 +4,6 @@ import TableRow from "@mui/material/TableRow";
 import TableCell from "@mui/material/TableCell";
 import PersonIcon from "@mui/icons-material/Person";
 import {
-	Button,
 	ButtonGroup,
 	FormControl,
 	IconButton,
@@ -94,14 +93,18 @@ export function MembersTableUserEntry(props: MembersTableUserEntryProps) {
 							height: "32px",
 							borderRadius: "50%",
 							verticalAlign: "middle",
+							marginRight: "1em",
 						}}
 					/>
 				) : (
-					<PersonIcon sx={iconStyle} />
+					<PersonIcon
+						sx={{
+							verticalAlign: "middle",
+							marginRight: "1em",
+						}}
+					/>
 				)}
-				<Button>
-					{member.user.first_name} {member.user.last_name}
-				</Button>
+				{member.user.first_name} {member.user.last_name}
 			</TableCell>
 			<TableCell align="right">{member.user.email}</TableCell>
 			{member.user.email == creatorEmail && (
diff --git a/frontend/src/components/listeners/ListenerItem.tsx b/frontend/src/components/listeners/ListenerItem.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { Box, Button, IconButton, Tooltip, Typography } from "@mui/material";
+import { Box, IconButton, Link, Tooltip, Typography } from "@mui/material";
 import { EventListenerOut } from "../../openapi/v2";
 import { theme } from "../../theme";
 import PlayCircleIcon from "@mui/icons-material/PlayCircle";
@@ -51,15 +51,16 @@ export default function ListenerItem(props: ListenerCardProps) {
 						/>
 					</Tooltip>
 				)}
-				<Button
+				<Link
 					onClick={() => {
 						setOpenSubmitExtraction(true);
 						setSelectedExtractor(extractor);
 						setInfoOnly(true);
 					}}
+					sx={{ textDecoration: "none", cursor: "pointer" }}
 				>
 					{extractorName}
-				</Button>
+				</Link>
 				{!(fileId !== undefined || datasetId !== undefined) ||
 				!extractor["alive"] ? (
 					<Typography
diff --git a/frontend/src/components/metadata/MetadataDefinitions.tsx b/frontend/src/components/metadata/MetadataDefinitions.tsx
@@ -7,6 +7,7 @@ import {
 	DialogTitle,
 	Grid,
 	IconButton,
+	Link as MuiLink,
 	Pagination,
 	Snackbar,
 } from "@mui/material";
@@ -205,12 +206,13 @@ export function MetadataDefinitions() {
 												}}
 											>
 												<TableCell scope="row" key={`${mdd.id}-name`}>
-													<Button
+													<MuiLink
 														component={Link}
 														to={`/metadata-definitions/${mdd.id}`}
+														sx={{ textDecoration: "none" }}
 													>
 														{mdd.name}
-													</Button>
+													</MuiLink>
 												</TableCell>
 												<TableCell
 													scope="row"
