Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(SILVA-582): enabling map on recent openings #524

Merged
merged 1 commit into from
Dec 5, 2024
Merged

fix(SILVA-582): enabling map on recent openings #524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 10 additions & 17 deletions frontend/src/__test__/components/Dashboard/Opening/RecentOpeningsDataTable.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,27 +14,23 @@ describe("OpeningsSearchBar", () => {
// Create a new QueryClient instance for each test
const queryClient = new QueryClient();
const handleCheckboxChange = vi.fn()
const setLoadId = vi.fn()
const toggleSpatial = vi.fn()
const showSpatial = false
const data = { data: [], perPage: 0, totalPages: 0 }
const headers = []
const setOpeningIds = vi.fn()
const showSpatial = false
const data = { data: [], perPage: 0, totalPages: 0 }
const headers = []

it("shows appropriate message when no data is in the table", () => {
render(
<MemoryRouter>
<QueryClientProvider client={queryClient}>
<PaginationProvider>
<RecentOpeningsDataTable
<RecentOpeningsDataTable
rows={data?.data || []}
headers={headers}
defaultColumns={headers}
handleCheckboxChange={handleCheckboxChange}
setOpeningId={setLoadId}
toggleSpatial={toggleSpatial}
setOpeningIds={setOpeningIds}
showSpatial={showSpatial}
totalItems={(data?.perPage ?? 0) * (data?.totalPages ?? 0)}
/>
/>
</PaginationProvider>
</QueryClientProvider>
</MemoryRouter>
Expand All @@ -48,16 +44,13 @@ describe("OpeningsSearchBar", () => {
<MemoryRouter>
<QueryClientProvider client={queryClient}>
<PaginationProvider>
<RecentOpeningsDataTable
<RecentOpeningsDataTable
rows={[]}
headers={headers}
defaultColumns={headers}
handleCheckboxChange={handleCheckboxChange}
setOpeningId={setLoadId}
toggleSpatial={toggleSpatial}
setOpeningIds={setOpeningIds}
showSpatial={showSpatial}
totalItems={(data?.perPage ?? 0) * (data?.totalPages ?? 0)}
/>
/>
</PaginationProvider>
</QueryClientProvider>
</MemoryRouter>
Expand Down
22 changes: 9 additions & 13 deletions frontend/src/components/Dashboard/Opening/RecentOpeningsDataTable/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@ import ComingSoonModal from "../../../ComingSoonModal";
interface IRecentOpeningsDataTable {
rows: OpeningsSearch[];
headers: ITableHeader[];
defaultColumns: ITableHeader[];
handleCheckboxChange: Function;
setOpeningId: Function;
toggleSpatial: Function;
setOpeningIds: (openingIds: number[]) => void;
showSpatial: boolean;
totalItems: number;
}
Expand All @@ -30,7 +27,8 @@ const RecentOpeningsDataTable: React.FC<IRecentOpeningsDataTable> = ({
rows,
headers,
showSpatial,
totalItems,
setOpeningIds,
totalItems
}) => {
const {
itemsPerPage,
Expand All @@ -43,6 +41,10 @@ const RecentOpeningsDataTable: React.FC<IRecentOpeningsDataTable> = ({
setInitialItemsPerPage(itemsPerPage);
}, [rows, totalItems]);

useEffect(() => {
setOpeningIds(selectedRows.map((id) => parseFloat(id)));
},[selectedRows]);

// Function to handle row selection changes
const handleRowSelectionChanged = (rowId: string) => {
setSelectedRows((prevSelectedRows) =>
Expand All @@ -53,12 +55,7 @@ const RecentOpeningsDataTable: React.FC<IRecentOpeningsDataTable> = ({
};

return (
<>
<TableContainer className="search-data-table">
<TableToolbar aria-label="data table toolbar">
{/* Toolbar content... */}
</TableToolbar>

<TableContainer className="search-data-table">
<Table aria-label="sample table">
<TableHead>
<TableRow>
Expand Down Expand Up @@ -98,7 +95,6 @@ const RecentOpeningsDataTable: React.FC<IRecentOpeningsDataTable> = ({
setOpeningDetails={setOpeningDetails}
/>
</TableContainer>
</>
);
);
};
export default RecentOpeningsDataTable;
1 change: 0 additions & 1 deletion frontend/src/components/OpeningsMap/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ const OpeningsMap: React.FC<MapProps> = ({
setOpenings(results.filter((opening) => opening !== null));

} else {
setOpeningPolygonNotFound(true);
setOpenings([]);
}

Expand Down
12 changes: 4 additions & 8 deletions frontend/src/components/OpeningsTab/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ interface Props {
}

const OpeningsTab: React.FC<Props> = ({ showSpatial, setShowSpatial }) => {
const [loadId, setLoadId] = useState<number | null>(null);
const [selectedOpeningIds,setSelectedOpeningIds] = useState<number[]>([]);
const [openingPolygonNotFound, setOpeningPolygonNotFound] = useState<boolean>(false);
const { data, isFetching } = useUserRecentOpeningQuery(10);

Expand All @@ -36,7 +36,6 @@ const OpeningsTab: React.FC<Props> = ({ showSpatial, setShowSpatial }) => {
renderIcon={Location}
type="button"
onClick={() => toggleSpatial()}
disabled
>
{showSpatial ? 'Hide map' : 'Show map'}
</Button>
Expand All @@ -45,8 +44,8 @@ const OpeningsTab: React.FC<Props> = ({ showSpatial, setShowSpatial }) => {
<div className="row px-2">
<div className="leaflet-container">
<OpeningsMap
openingId={loadId}
openingIds={null}
openingId={null}
openingIds={selectedOpeningIds}
setOpeningPolygonNotFound={setOpeningPolygonNotFound}
/>
</div>
Expand All @@ -70,10 +69,7 @@ const OpeningsTab: React.FC<Props> = ({ showSpatial, setShowSpatial }) => {
<RecentOpeningsDataTable
rows={data?.data || []}
headers={headers}
defaultColumns={headers}
handleCheckboxChange={() => {}}
setOpeningId={setLoadId}
toggleSpatial={toggleSpatial}
setOpeningIds={setSelectedOpeningIds}
showSpatial={showSpatial}
totalItems={(data?.perPage ?? 0) * (data?.totalPages ?? 0)}
/>
Expand Down
Loading