#888 add url with params

OpenSourceBrain · Mar 18, 2024 · ed25935 · ed25935
1 parent 436b1a3
commit ed25935
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 13 deletions.
diff --git a/applications/nwb-explorer/dependencies/nwb-explorer.git b/applications/nwb-explorer/dependencies/nwb-explorer.git
diff --git a/applications/osb-portal/src/components/common/RepositoriesWorkspacesSearchField.tsx b/applications/osb-portal/src/components/common/RepositoriesWorkspacesSearchField.tsx
@@ -40,6 +40,7 @@ const StyledTextField = styled(TextField)(({ theme }) => ({
 interface RepositoriesSearchProps {
   filterChanged: (newFilter: string) => void;
   borderRadius?: number;
+  value?: string;
 }
 
 export default (props: RepositoriesSearchProps) => {
@@ -48,6 +49,7 @@ export default (props: RepositoriesSearchProps) => {
       variant="standard"
       id="standard-start-adornment"
       fullWidth={true}
+      value={props?.value}
       sx={{
         borderRadius: props?.borderRadius
           ? `${props?.borderRadius}px`

diff --git a/applications/osb-portal/src/components/common/SearchFilterReposWorkspaces.tsx b/applications/osb-portal/src/components/common/SearchFilterReposWorkspaces.tsx
@@ -34,6 +34,7 @@ import searchFilter from "../../types/searchFilter";
 
 //services
 import RepositoryService from "../../service/RepositoryService";
+import { Badge } from "@mui/material";
 
 interface SearchReposWorkspacesProps {
   searchFilterValues: searchFilter;
@@ -185,13 +186,13 @@ export const SearchFilterReposWorkspaces = (
 
   return (
     <>
-      <RepositoriesWorkspacesSearchField filterChanged={props?.filterChanged} />
+      <RepositoriesWorkspacesSearchField value={props.searchFilterValues.text} filterChanged={props?.filterChanged} />
       <StyledFilterButton
         aria-describedby={id}
         aria-haspopup="true"
         variant="contained"
         onClick={handlePopoverClick}
-        startIcon={<FilterListIcon />}
+        startIcon={<Badge variant="dot" color="primary" badgeContent={props?.searchFilterValues.tags?.length || props?.searchFilterValues.types?.length}><FilterListIcon /></Badge>}
       >
         <Typography component="label">Filter</Typography>
       </StyledFilterButton>
@@ -244,6 +245,7 @@ export const SearchFilterReposWorkspaces = (
             <>
               <SearchIcon />
               <TextField
+
                 InputProps={{
                   startAdornment: (
                     <InputAdornment position="start">

diff --git a/applications/osb-portal/src/pages/Repositories/RepositoriesPage.tsx b/applications/osb-portal/src/pages/Repositories/RepositoriesPage.tsx
@@ -27,7 +27,7 @@ import { OSBRepository, Tag } from "../../apiclient/workspaces";
 import searchFilter from "../../types/searchFilter";
 
 //hooks
-import { useNavigate } from "react-router-dom";
+import { useNavigate, useSearchParams } from "react-router-dom";
 
 //api
 import RepositoryService from "../../service/RepositoryService";
@@ -89,12 +89,13 @@ export const RepositoriesPage = ({
   user: UserInfo;
   counter: number;
 }) => {
+  const [searchParams, ] = useSearchParams();
   const navigate = useNavigate();
   const [searchFilterValues, setSearchFilterValues] =
     React.useState<searchFilter>({
-      text: undefined,
-      tags: [],
-      types: [],
+      text: searchParams.get("q"),
+      tags: searchParams.getAll("tags"),
+      types: searchParams.getAll("types"),
     });
   const [repositories, setRepositories] = React.useState<OSBRepository[]>([]);
   const [page, setPage] = React.useState(1);
@@ -194,7 +195,7 @@ export const RepositoriesPage = ({
   return (
     <>
       <Box width={1} className="verticalFit">
-        <div id="repositories-list" className="verticalFit">
+        <Box id="repositories-list" className="verticalFit">
           <Box borderBottom={`1px solid ${lineColor}`} >
             <Box
               display="flex"
@@ -323,7 +324,7 @@ export const RepositoriesPage = ({
               refreshRepositories={handleRefreshRepositories}
             />
           )}
-        </div>
+        </Box>
         {repositories && totalPages > 1 && (
           <OSBPagination
             count={totalPages}

diff --git a/applications/osb-portal/src/pages/WorkspacesPage.tsx b/applications/osb-portal/src/pages/WorkspacesPage.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import { ReactElement } from "react";
 import debounce from "lodash/debounce";
-import { useNavigate } from "react-router-dom";
+import { useNavigate, useSearchParams } from "react-router-dom";
 
 //components
 import Box from "@mui/material/Box";
@@ -46,12 +46,13 @@ interface WorkspacesPageProps {
 
 export const WorkspacesPage = (props: WorkspacesPageProps) => {
   const navigate = useNavigate();
+  const [searchParams, ] = useSearchParams();
 
   const [searchFilterValues, setSearchFilterValues] =
     React.useState<searchFilter>({
-      text: undefined,
-      tags: [],
-      types: [],
+      text: searchParams.get("q"),
+      tags: searchParams.getAll("tags"),
+      types: searchParams.getAll("types"),
     });
 
   const [workspaces, setWorkspaces] = React.useState<Workspace[]>(null);