From 106877f79355338c4b410ec4965f2a3c6702a835 Mon Sep 17 00:00:00 2001
From: Ahmed Basem
Date: Thu, 17 Aug 2023 14:45:02 +0300
Subject: [PATCH] Add recent release sort option to the website (#256)
In this commit, we add the release sort option to the frontend so the plugins can ranking by the latest released date.
---------
Co-authored-by: Jusong Yu
---
.../src/Components/MainIndex.jsx | 41 ++++++++++++++++---
1 file changed, 36 insertions(+), 5 deletions(-)
diff --git a/aiida-registry-app/src/Components/MainIndex.jsx b/aiida-registry-app/src/Components/MainIndex.jsx
index b60a1424..ad6abbe5 100644
--- a/aiida-registry-app/src/Components/MainIndex.jsx
+++ b/aiida-registry-app/src/Components/MainIndex.jsx
@@ -16,14 +16,14 @@ const length = Object.keys(plugins).length;
const currentPath = import.meta.env.VITE_PR_PREVIEW_PATH || "/aiida-registry/";
function MainIndex() {
- const [sortOption, setSortOption] = useState('commits');
+ const [sortOption, setSortOption] = useState('commits'); //Available options: 'commits', 'release', and 'alpha'.
const [sortedData, setSortedData] = useState(plugins);
useEffect(() => {
document.documentElement.style.scrollBehavior = 'auto';
- setSortedData(sortByCommits(plugins));
+ handleSort(sortOption);
setupScrollBehavior();
- }, [plugins, setSortedData]);
+ }, [sortOption]);
function sortByCommits(plugins) {
const pluginsArray = Object.entries(plugins);
@@ -35,6 +35,26 @@ function MainIndex() {
return Object.fromEntries(pluginsArray);
}
+ function sortByRelease(plugins) {
+ //Sort plugins by the recent release date, the newer the release date the larger the value,
+ //and the higher ranking it get. Sorting in descending order by date.
+ const pluginsArray = Object.entries(plugins);
+ pluginsArray.sort(([, pluginA], [, pluginB]) => {
+ if (!pluginA.metadata.release_date && !pluginB.metadata.release_date) {
+ return 0; // Both plugins have no release date, keep them in the current order
+ } else if (!pluginA.metadata.release_date) {
+ return 1; // Only pluginB has a release date, put pluginB higher ranking than pluginA.
+ } else if (!pluginB.metadata.release_date) {
+ return -1; // Only pluginA has a release date, put pluginA higher ranking than pluginB.
+ } else {
+ return new Date(pluginB.metadata.release_date) - new Date(pluginA.metadata.release_date);
+ }
+ });
+
+ //Return a new object with the sorted entries
+ return Object.fromEntries(pluginsArray);
+ }
+
function setupScrollBehavior() {
var prevScrollpos = window.scrollY;
window.onscroll = function() {
@@ -49,19 +69,21 @@ function MainIndex() {
prevScrollpos = currentScrollPos;
}
}
- setupScrollBehavior();
const handleSort = (option) => {
setSortOption(option);
- let sortedPlugins;
+ let sortedPlugins = {};
if (option === 'commits') {
sortedPlugins = sortByCommits(plugins);
}
else if (option == 'alpha') {
sortedPlugins = plugins;
}
+ else if (option == 'release') {
+ sortedPlugins = sortByRelease(plugins);
+ }
setSortedData(sortedPlugins);
};
@@ -100,6 +122,7 @@ function MainIndex() {
>
+
@@ -129,6 +152,14 @@ function MainIndex() {
src={`https://img.shields.io/badge/Yearly%20Commits-${value.commits_count}-007ec6.svg`}
/>
}
+
+ {sortOption === 'release' && value.metadata.release_date &&
+
+ }
{value.metadata.description}