Consolidates broken-out utils files in assets/js

Author: ryanfkeller

assets/js/current-projects-utils.js

@@ -1,6 +1,7 @@
 ---
 
 ---
+
 // Do All Dom Manipulation After The DOM content is full loaded
 document.addEventListener("DOMContentLoaded",function(){
     (function main(){
@@ -225,6 +226,55 @@ function retrieveProjectDataFromCollection() {
     return projectData;
 }
 
+/**
+ * Given an input of a project data array object as returned by the function `retrieveProjectDataFromCollection()`, this
+ * function sorts the project twice.
+ *  1. It sort all projects in the array alphabetically on their `status` value
+ *  2. It sort all project by title for each status type
+*/
+function projectDataSorter(projectdata){
+
+    const statusList = ["Active","Completed","On Hold"]
+    const sortedProjectContainer = [];
+
+    // Sort Project data by status alphabetically
+    projectdata.sort( (a,b) => (a.project.status > b.project.status) ? 1 : -1)
+
+    // Sort Project Data by title for each status type
+    for(const status of statusList){
+            let arr = projectdata.filter(function(item){
+            return item.project.status === status
+        }).sort( (a,b) => (a.project.title > b.project.title) ? 1 : -1);
+        sortedProjectContainer.push(...arr);
+    }
+
+    return sortedProjectContainer;
+}
+
+/**
+ * Given an array of project object as returned by ``retrieveProjectDataFromCollection()``
+ * Returns a filter object -> {filter_type1:[filter_value1,filter_value2], filter_type2:[filter_value1,filter_value2], ... }
+*/
+function createFilter(sortedProjectData, checkPage = false) {
+    if (checkPage) {
+        return {
+            'technologies': [...new Set(sortedProjectData.map(item => (item.project.technologies?.length > 0) ? [item.project.technologies].flat() : '').flat() ) ].filter(v=>v!='').sort(),
+            'languages': [...new Set(sortedProjectData.map(item => (item.project.languages?.length > 0) ? [item.project.languages].flat() : '').flat() ) ].filter(v=>v!='').sort(),
+            'tools': [...new Set(sortedProjectData.map(item => (item.project.tools?.length > 0) ? [item.project.tools].flat() : '').flat() ) ].filter(v=>v!='').sort(),
+            }        
+    } else {
+        return {
+            // 'looking': [ ... new Set( (sortedProjectData.map(item => item.project.looking ? item.project.looking.map(item => item.category) : '')).flat() ) ].filter(v=>v!='').sort(),
+            // ^ See issue #1997 for more info on why this is commented out
+            'programs': [...new Set(sortedProjectData.map(item => item.project.programAreas ? item.project.programAreas.map(programArea => programArea) : '').flat() ) ].filter(v=>v!='').sort(),
+            'technologies': [...new Set(sortedProjectData.map(item => (item.project.technologies?.length > 0) ? [item.project.technologies].flat() : '').flat() ) ].filter(v=>v!='').sort(),
+            'languages': [...new Set(sortedProjectData.map(item => (item.project.languages?.length > 0) ? [item.project.languages].flat() : '').flat())].filter(v => v != '').sort(),
+            'tools': [...new Set(sortedProjectData.map(item => (item.project.tools?.length > 0) ? [item.project.tools].flat() : '').flat() ) ].filter(v=>v!='').sort(),
+            'status': [... new Set(sortedProjectData.map(item => item.project.status))].sort()
+        }        
+    }
+}
+
 /**
  * Update the history state and the url parameters on checkbox changes
 */
@@ -879,4 +929,10 @@ function attachEventListenerCloseModal() {
             modal.style.display = 'none';
         }
     });
+}
+
+if (typeof module !== 'undefined' && module.exports) {
+    module.exports = {
+        createFilter, projectDataSorter,
+    };
 }

assets/js/current-projects.js

@@ -1,8 +1,6 @@
 ---
 ---
 
-import { filterTestEvents, sortEventsByDate } from "./vrms-events-utils.mjs";
-
 {% assign vrmsData = site.data.external.vrms_data %}
 const vrmsData = JSON.parse(decodeURIComponent("{{ vrmsData | jsonify | uri_escape }}"));
 
@@ -20,6 +18,28 @@ export const vrmsDataFetch = (currentPage, appendMeetingTimes) => {
   }
 }
 
+/**
+ * Sorts an array of events by their "startTime" variable, from oldest to newest
+ */
+export function sortEventsByDate(events) {
+     return events.sort((event1, event2) => {
+        // startTime includes date information
+        const date1 = new Date(event1.startTime);
+        const date2 = new Date(event2.startTime);
+        return date1 - date2;
+     });
+}
+
+/**
+ * Filters an array of events to remove instances of events with names containing
+ * "test" or "testing, case insensitive
+ */
+export function filterTestEvents(events) {
+    return events.filter(event => {
+        return !(/\btest(ing)?\b/i.test(event.name))
+    });
+}
+
 /**
   * @param {Date} time - A valid javscript time string. Example:  "2020-05-13T02:00:00.000Z"
   * @return {String} - A time string formatted in the 12 hour format and converted to your timezone. Example: "10:00 pm"