diff --git a/frontend/src/components/sidebar.tsx b/frontend/src/components/sidebar.tsx
index a834606..5e6507d 100644
--- a/frontend/src/components/sidebar.tsx
+++ b/frontend/src/components/sidebar.tsx
@@ -5,8 +5,6 @@ import { useEffect, useState } from "react";
import NumberField from "./numberField";
import getRatingsProviders from "../functions/getRatingsProviders";
import capitaliseFirstLetter from "../functions/capitaliseFirstLetter";
-import CheckIcon from '@mui/icons-material/Check';
-import ClearIcon from '@mui/icons-material/Clear';
interface SidebarProps {
filters : FilterState;
@@ -51,9 +49,9 @@ export default function Sidebar(props : SidebarProps) {
onChange={(_, value) => props.onChange(Object.assign({}, {...props.filters}, {nameOnly: value}))}
/>
+
{!props.filters.nameOnly &&
<>
-
Cities
-
- Results per Page
- props.onChange(Object.assign({}, {...props.filters}, {resultsPerPage: value, currentPage: 1}))}
- min={10}
- max={40}
- />
-
-
-
- Sort By
-
-
>}
+
+ Results per Page
+ props.onChange(Object.assign({}, {...props.filters}, {resultsPerPage: value, currentPage: 1}))}
+ min={10}
+ max={40}
+ />
+
+
+
+ Sort By
+
+
)
}
diff --git a/frontend/src/functions/getSolicitors.ts b/frontend/src/functions/getSolicitors.ts
index 428ddba..1121610 100644
--- a/frontend/src/functions/getSolicitors.ts
+++ b/frontend/src/functions/getSolicitors.ts
@@ -4,24 +4,29 @@ import FilterState from "../models/filterState";
import api from "./axios";
export default async function GetSolicitors(filters : FilterState) {
- var minRating = filters.minRating;
- if (minRating == null) {
- minRating = 0;
- }
- let queryString = `pageSize=${filters.resultsPerPage}&pageNumber=${filters.currentPage}&ratingsProvider=${filters.ratingsProvider}&minRating=${minRating}`;
- if (filters.cities.length > 0) {
- queryString += '&cities=' + filters.cities.join('&cities=');
- }
-
- if (filters.sortBy != null) {
- queryString += `&orderingType=${filters.sortBy}`;
- }
+ let queryString = `pageSize=${filters.resultsPerPage}&pageNumber=${filters.currentPage}`;
if (filters.namePart != null && filters.namePart !== '') {
queryString += `&nameFilter=${filters.namePart}`;
}
+ if (!filters.nameOnly) {
+ var minRating = filters.minRating;
+ if (minRating == null) {
+ minRating = 0;
+ }
+ queryString += `&minRating=${minRating}&ratingsProvider=${filters.ratingsProvider}`;
+
+ if (filters.cities.length > 0) {
+ queryString += '&cities=' + filters.cities.join('&cities=');
+ }
+ }
+
+ if (filters.sortBy != null) {
+ queryString += `&orderingType=${filters.sortBy}`;
+ }
+
const response = await api.get(`/solicitors?${queryString}`);
return response.data as PaginationResponse;
}
\ No newline at end of file