added new editor filter button to the activity tab

WikiEducationFoundation · Feb 25, 2025 · 09a13c3 · 09a13c3
1 parent 34d4669
commit 09a13c3
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 3 deletions.
diff --git a/app/assets/javascripts/components/revisions/revisions_handler.jsx b/app/assets/javascripts/components/revisions/revisions_handler.jsx
@@ -9,9 +9,11 @@ import { ARTICLE_FETCH_LIMIT } from '../../constants/revisions.js';
 import Select from 'react-select';
 import sortSelectStyles from '../../styles/sort_select';
 import { getStudentUsers } from '../../selectors/index.js';
+import { sortByKey } from '../../utils/model_utils.js';
 
 const RevisionHandler = ({ course, courseScopedLimit }) => {
   const [isCourseScoped, setIsCourseScoped] = useState(false);
+  const [isNewEditor, setIsNewEditor] = useState(false);
 
   const dispatch = useDispatch();
 
@@ -74,10 +76,19 @@ const RevisionHandler = ({ course, courseScopedLimit }) => {
     }
   };
 
+  const toggleNewEditor = () => {
+    const toggledIsNewEditor = !isNewEditor;
+    setIsNewEditor(toggledIsNewEditor);
+  };
+
   const revisionFilterButtonText = () => {
     return isCourseScoped ? I18n.t('revisions.show_all') : I18n.t('revisions.show_course_specific');
   };
 
+  const newEditorFilterButtonText = () => {
+    return isNewEditor ? 'Show all' : 'Show new Editors';
+  };
+
   const sortSelect = (e) => {
     dispatch(sortRevisions(e.value));
   };
@@ -102,7 +113,11 @@ const RevisionHandler = ({ course, courseScopedLimit }) => {
   // we only fetch articles data for a max of 500 articles(for course specific revisions).
   // If there are more than 500 articles, the toggle button is not shown
   const revisionFilterButton = (
-    <div><button className="button ghost stacked right" onClick={toggleCourseSpecific}>{revisionFilterButtonText()}</button></div>
+    <button className="button ghost stacked right" style={{ marginLeft: '10px' }} onClick={toggleCourseSpecific}>{revisionFilterButtonText()}</button>
+  );
+
+  const editorFilterButton = (
+    <button className="button ghost stacked right" onClick={toggleNewEditor}>{newEditorFilterButtonText()}</button>
   );
 
   const options = [
@@ -114,11 +129,31 @@ const RevisionHandler = ({ course, courseScopedLimit }) => {
     { value: 'date', label: I18n.t('revisions.date_time') },
   ];
 
+  const filterRevisions = () => {
+    let revisions = isCourseScoped ? revisionsDisplayedCourseSpecific : revisionsDisplayed;
+    if (isNewEditor) {
+      // this filters out the revisions where the user registered after the course start date and presents only those revisions
+      revisions = revisions.filter((revision) => {
+        const registered_at = new Date(revision.registered_at);
+        const course_start = new Date(course.start);
+        return registered_at > course_start;
+      });
+
+      const sorted = sortByKey(revisions, 'registered_at');
+      return sorted.newModels;
+    }
+    return revisions;
+  };
+
+
   return (
     <div id="revisions">
       <div className="section-header">
         <h3>{I18n.t('application.recent_activity')}</h3>
-        {course.article_count <= ARTICLE_FETCH_LIMIT && revisionFilterButton}
+        <div>
+          {course.article_count <= ARTICLE_FETCH_LIMIT && revisionFilterButton}
+          {editorFilterButton}
+        </div>
         <div className="sort-container">
           <Select
             name="sorts"
@@ -130,7 +165,7 @@ const RevisionHandler = ({ course, courseScopedLimit }) => {
       </div>
       <div className="revision-list-container">
         <RevisionList
-          revisions={isCourseScoped ? revisionsDisplayedCourseSpecific : revisionsDisplayed}
+          revisions={filterRevisions()}
           loaded={loaded}
           course={course}
           sortBy={sortRevisions}

diff --git a/app/assets/javascripts/utils/mediawiki_revisions_utils.js b/app/assets/javascripts/utils/mediawiki_revisions_utils.js
@@ -49,6 +49,7 @@ const fetchAll = async (API_URL, params, continue_str) => {
 // currently its used to filter tracked articles
 export const fetchRevisionsFromUsers = async (course, users, days, last_date, filter) => {
   const usernames = users.map(user => user.username);
+  const registered_dates = users.map(user => user.registered_at);
 
   let revisions = [];
   const wikiPromises = [];
@@ -80,6 +81,14 @@ export const fetchRevisionsFromUsers = async (course, users, days, last_date, fi
   // remove duplicates
   // they occur because dates overlap and sometimes the same revision is included twice
   revisions = [...new Map(revisions.map(v => [v.id, v])).values()];
+  // adds the enrolled_at property to each revision
+  revisions = revisions.map((revision) => {
+    const userIndex = usernames.indexOf(revision.user);
+    return {
+      ...revision,
+      registered_at: userIndex !== -1 ? registered_dates[userIndex] : null
+    };
+  });
 
   return { revisions, last_date };
 };

diff --git a/app/views/courses/_users.json.jbuilder b/app/views/courses/_users.json.jbuilder
@@ -9,6 +9,7 @@ json.users course.courses_users.eager_load(:user, :course) do |cu|
   json.call(cu.user, :id, :username)
   json.enrolled_at cu.created_at
   json.admin cu.user.admin?
+  json.registered_at cu.user.registered_at
 
   exercise_progress = cu.course.training_progress_manager.course_exercise_progress(cu.user)
   if exercise_progress.is_a?(Hash)