Merge branch 'master' into community

asyncapi · Mar 4, 2023 · 0c6eac0 · 0c6eac0
2 parents be5a92b + e22911e
commit 0c6eac0
Show file tree

Hide file tree

Showing 16 changed files with 662 additions and 181 deletions.
diff --git a/components/dashboard/GoodFirstIssues.js b/components/dashboard/GoodFirstIssues.js
@@ -17,6 +17,7 @@ function GoodFirstIssues({ issues }) {
   //Get current issues
 
   let filteredIssues = issues;
+  let allIssues=issues
   if (selectedRepo !== 'All')
     filteredIssues = filteredIssues.filter(
       (issue) => issue.repo === selectedRepo
@@ -34,6 +35,7 @@ function GoodFirstIssues({ issues }) {
           <Filters
             className="ml-auto"
             issues={filteredIssues}
+            allIssues={issues}
             setSelectedRepo={setSelectedRepo}
             setSelectedArea={setSelectedArea}
             selectedArea={selectedArea}

diff --git a/components/dashboard/table/Filters.js b/components/dashboard/table/Filters.js
@@ -28,6 +28,7 @@ export default function Filters({
   className,
   issues,
   setSelectedRepo,
+  allIssues,
   setSelectedArea,
   selectedArea,
   selectedRepo,
@@ -39,13 +40,13 @@ export default function Filters({
   });
   const wrapperRef = useRef(null);
   useOutsideAlerter(wrapperRef, setOpen);
-  const areas = issues.map((issue) => issue.area);
+  const areas = allIssues.map((issue) => issue.area);
   const uniqueAreas = ['All', ...new Set(areas)].map((area) => ({
     key: area,
     text: area,
   }));
 
-  const repos = issues.map((issue) => issue.repo);
+  const repos = allIssues.map((issue) => issue.repo);
   const uniqueRepos = ['All', ...new Set(repos)].map((repo) => ({
     key: repo,
     text: repo,

diff --git a/components/dashboard/table/Pagination.js b/components/dashboard/table/Pagination.js
@@ -13,7 +13,7 @@ const Pagination = ({ issuesPerPage, currentPage, totalIssues, paginate }) => {
   }
 
   return (
-    <div className="px-5 py-5 bg-white border-t flex flex-col xs:flex-row items-center xs:justify-between          ">
+    <div className="px-5 py-5 bg-white border-t flex flex-col xs:flex-row items-center xs:justify-between">
       <span className="text-xs xs:text-sm text-gray-900">
         Showing {lowerBound} to {upperBound} {''}
         of {totalIssues} Issues