Skip to content

Commit db4c266

Browse files
authored
Frontend Warnings fix (#273)
* Frontend Warnings fix Signed-off-by: vmuralictr <vmurali.ctr@gmail.com> * errors fix Signed-off-by: vmuralictr <vmurali.ctr@gmail.com> * errors fix Signed-off-by: vmuralictr <vmurali.ctr@gmail.com> --------- Signed-off-by: vmuralictr <vmurali.ctr@gmail.com>
1 parent 9d23515 commit db4c266

4 files changed

Lines changed: 29 additions & 26 deletions

File tree

react-frontend/src/components/HeroSection.jsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import heroPic from "../images/hero-theme-pic.png";
2-
import openMainFrameLogo from "../images/openmainframeproject-color-1.png";
32

43
function HeroSection() {
54
return (

react-frontend/src/components/Navbar.jsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
// export default NavBar;
2323

2424

25+
26+
2527
import sdtLogo from "../images/sdt-logo.png";
2628
function NavBar() {
2729
return (

react-frontend/src/components/SearchBar.jsx

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { useState, useEffect } from "react";
22
import omfLogo from "../images/openmainframe-logo.png";
3-
import SearchResults from './SearchResults';
3+
import SearchResults from './SearchResults.jsx';
44
import '../App.css';
55

66
function SearchBar({ onSearchPerformed }) {
@@ -36,7 +36,7 @@ function SearchBar({ onSearchPerformed }) {
3636

3737
useEffect(() => {
3838
if (searchPerformed) {
39-
setNoDistributionMessage(isNoDistributionSelected());
39+
setNoDistributionMessage(!Object.values(selectedOS).some(selected => selected));
4040
}
4141
}, [selectedOS, searchPerformed]);
4242

@@ -145,10 +145,6 @@ function SearchBar({ onSearchPerformed }) {
145145
});
146146
};
147147

148-
const isNoDistributionSelected = () => {
149-
return !Object.values(selectedOS).some(selected => selected);
150-
};
151-
152148
return (
153149
<div>
154150
<div className="search-bar-wrapper">

react-frontend/src/components/SearchResults.jsx

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,35 @@ function SearchResults({ results = [], showDesc, itemsPerPage, searchPerformed,
1111
const [availableDistributions, setAvailableDistributions] = useState(['All']);
1212

1313
useEffect(() => {
14-
updateAvailableDistributions();
15-
}, [selectedParentDistributions, osList]);
16-
17-
useEffect(() => {
18-
updatePaginatedResults();
19-
}, [currentPage, itemsPerPage, refinePackageName, results, selectedDistribution]);
20-
21-
const updateAvailableDistributions = () => {
22-
const childDistributions = selectedParentDistributions.flatMap(parent =>
14+
const childDistributions = selectedParentDistributions.flatMap(parent =>
2315
Object.keys(osList[parent] || {})
2416
);
2517
setAvailableDistributions(['All', ...new Set(childDistributions)]);
26-
18+
2719
if (!childDistributions.includes(selectedDistribution) && selectedDistribution !== 'All') {
2820
setSelectedDistribution('All');
2921
}
30-
};
22+
}, [selectedParentDistributions, osList, selectedDistribution]);
23+
24+
useEffect(() => {
25+
if (!Array.isArray(results)) {
26+
setPaginatedResults([]);
27+
return;
28+
}
29+
const filteredByName = results.filter((result) => {
30+
const nameMatch = result.packageName.toLowerCase().includes(refinePackageName.toLowerCase());
31+
const versionMatch = result.version.toLowerCase().includes(refinePackageName.toLowerCase());
32+
return nameMatch || versionMatch;
33+
});
34+
const filteredResults = selectedDistribution === 'All'
35+
? filteredByName
36+
: filteredByName.filter(result =>
37+
result.ostag.split(',').map(tag => tag.trim()).includes(selectedDistribution)
38+
);
39+
const start = currentPage * itemsPerPage;
40+
const end = start + itemsPerPage;
41+
setPaginatedResults(filteredResults.slice(start, end));
42+
}, [currentPage, itemsPerPage, refinePackageName, results, selectedDistribution]);
3143

3244
const filterResults = () => {
3345
if (!Array.isArray(results)) return [];
@@ -47,14 +59,7 @@ function SearchResults({ results = [], showDesc, itemsPerPage, searchPerformed,
4759
});
4860
}
4961
};
50-
51-
const updatePaginatedResults = () => {
52-
const filteredResults = filterResults();
53-
const start = currentPage * itemsPerPage;
54-
const end = start + itemsPerPage;
55-
setPaginatedResults(filteredResults.slice(start, end));
56-
};
57-
62+
5863
const handlePageChange = (selectedPage) => {
5964
setCurrentPage(selectedPage.selected);
6065
};
@@ -66,6 +71,7 @@ function SearchResults({ results = [], showDesc, itemsPerPage, searchPerformed,
6671
});
6772
};
6873

74+
6975
const handleDistributionChange = (e) => {
7076
setSelectedDistribution(e.target.value);
7177
setCurrentPage(0); // Reset to first page when changing distribution

0 commit comments

Comments
 (0)