Allow properties in search

Olog · Jan 3, 2025 · 1c57afd · 1c57afd
1 parent d81065b
commit 1c57afd
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 9 deletions.
diff --git a/src/api/ologApi.js b/src/api/ologApi.js
@@ -91,11 +91,11 @@ export const ologApi = createApi({
     keepUnusedDataFor: 0, // Don't cache anything
     endpoints: builder => ({
         searchLogs: builder.query({
-          query: ({query, title, desc, start, end, level, logbooks, tags, owner, attachments, from, size, sort}) => {
+          query: ({query, title, desc, properties, start, end, level, logbooks, tags, owner, attachments, from, size, sort}) => {
             return {
               url: '/logs/search',
               params: { 
-                query, title, desc, start, end, level, logbooks, tags, owner, attachments, from, size, sort
+                query, title, desc, properties, start, end, level, logbooks, tags, owner, attachments, from, size, sort
               }
             }
           }

diff --git a/src/beta/components/search/AdvancedSearchDrawer.jsx b/src/beta/components/search/AdvancedSearchDrawer.jsx
@@ -5,7 +5,7 @@ import WizardDateInput from "components/shared/input/WizardDateInput";
 import EntryTypeSelect from "components/shared/input/managed/EntryTypeSelect";
 import LogbooksMultiSelect from "components/shared/input/managed/LogbooksMultiSelect";
 import TagsMultiSelect from "components/shared/input/managed/TagsMultiSelect";
-import { useForm, useWatch } from "react-hook-form";
+import { useForm } from "react-hook-form";
 import {
   defaultSearchParams,
   updateSearchParams,
@@ -77,6 +77,12 @@ export const AdvancedSearchDrawer = ({
               control={control}
               defaultValue=""
             />
+            <TextInput
+              name="properties"
+              label="Properties"
+              control={control}
+              defaultValue=""
+            />
             <EntryTypeSelect control={control} />
             <LogbooksMultiSelect control={control} />
             <TagsMultiSelect control={control} />

diff --git a/src/beta/components/search/SearchParamsBadges.jsx b/src/beta/components/search/SearchParamsBadges.jsx
@@ -54,8 +54,18 @@ export const SearchParamsBadges = () => {
   const dispatch = useDispatch();
   const onSearch = (vals) => dispatch(updateSearchParams(vals));
 
-  const { title, level, desc, owner, attachments, start, end, tags, logbooks } =
-    searchParams;
+  const {
+    title,
+    level,
+    desc,
+    properties,
+    owner,
+    attachments,
+    start,
+    end,
+    tags,
+    logbooks,
+  } = searchParams;
 
   return (
     <Stack flexDirection="row" gap={0.5} flexWrap="wrap" padding={0.5}>
@@ -85,6 +95,18 @@ export const SearchParamsBadges = () => {
           }
         />
       ) : null}
+      {properties ? (
+        <TextChip
+          name="properties"
+          value={properties}
+          onDelete={() =>
+            onSearch({
+              ...searchParams,
+              properties: defaultSearchParams.properties,
+            })
+          }
+        />
+      ) : null}
       {owner ? (
         <TextChip
           name="author"

diff --git a/src/beta/components/search/SearchResultList/SearchResultSingleItem.jsx b/src/beta/components/search/SearchResultList/SearchResultSingleItem.jsx
@@ -78,9 +78,6 @@ export const SearchResultSingleItem = ({
           whiteSpace="nowrap"
           variant="body2"
           fontSize=".75rem"
-          fontWeight="bold"
-          color="#0090AD"
-          sx={{ opacity: 0.8, marginRight: "2px" }}
         />
       </Stack>
       <Stack
@@ -93,7 +90,10 @@ export const SearchResultSingleItem = ({
         </Typography>
         <Box>
           {log?.attachments?.length > 0 ? (
-            <AttachFileIcon fontSize="small" />
+            <AttachFileIcon
+              fontSize="small"
+              sx={{ fontSize: "1.2rem", marginRight: "-2px", marginTop: "4px" }}
+            />
           ) : null}
         </Box>
       </Stack>

diff --git a/src/features/advancedSearchReducer.js b/src/features/advancedSearchReducer.js
@@ -29,6 +29,7 @@ export const advancedSearchSlice = createSlice({
         searchParams?.logbooks?.length > 0 && activeFieldCount++;
         searchParams?.tags?.length > 0 && activeFieldCount++;
         searchParams.owner && activeFieldCount++;
+        searchParams.properties && activeFieldCount++;
 
         // If any of the advanced-only fields have values
         // then advanced search is active

diff --git a/src/features/searchParamsReducer.js b/src/features/searchParamsReducer.js
@@ -9,6 +9,7 @@ export const defaultSearchParams = {
   query: "",
   title: "",
   desc: "",
+  properties: "",
   owner: "",
   level: undefined,
   start: undefined,