Filters are persistant - they just don't update bc Deo needs to fix the UI...

Author: jkluge

my-app/firebase.js

@@ -30,12 +30,20 @@ export function connectToFirebase(model) {
 
 	// setting missing
 	// also save filters to local storage
-	//localStorage.setItem("filterOptions", filterOptions);
-	const options = localStorage.getItem("filterOptions");
-			if (options) {
-				model.setFilterOptions(options);
-				console.log("Restore options from local storage");
-			}
+	// 
+	const options = JSON.parse(localStorage.getItem("filterOptions"));
+		if (options) {
+			model.setFilterOptions(options);
+			console.log("Restore options from local storage");
+		}
+
+	reaction(
+		() => ({filterOptions: JSON.stringify(model.filterOptions)}),
+		// eslint-disable-next-line no-unused-vars
+		({filterOptions}) => {
+			localStorage.setItem("filterOptions", filterOptions);
+		}
+	);
 
 	onAuthStateChanged(auth, (user) => {
 		if (user) {
@@ -61,7 +69,7 @@ async function firebaseToModel(model) {
 			model.setCurrentSearchText(data.currentSearchText);
 		// if (data.scrollPosition)
 		// 	model.setScrollPosition(data.scrollPosition);
-		if (data.filterOptions) model.setFilterOptions(data.filterOptions);
+		// if (data.filterOptions) model.setFilterOptions(data.filterOptions);
 		noUpload = false;
 	});
 }
@@ -72,7 +80,7 @@ export function syncModelToFirebase(model) {
 			userId: model?.user.uid,
 			favourites: toJS(model.favourites),
 			currentSearchText: toJS(model.currentSearchText),
-			filterOptions: toJS(model.filterOptions),
+			// filterOptions: toJS(model.filterOptions),
 			// Add more per-user attributes here
 		}),
 		// eslint-disable-next-line no-unused-vars
@@ -82,7 +90,7 @@ export function syncModelToFirebase(model) {
 			const dataToSync = {
 				favourites,
 				currentSearchText,
-				filterOptions,
+				// filterOptions,
 			};
 
 			set(userRef, dataToSync)

my-app/src/model.js

@@ -18,20 +18,16 @@ export const model = {
         applyTranscriptFilter: true,
         eligibility: "weak",  //the possible values for the string are: "weak"/"moderate"/"strong"
         applyLevelFilter: true,
-        level: ["PREPARATORY", "BASIC", "ADVANCED", "RESEARCH"], //the possible values for the array are: "PREPARATORY", "BASIC", "ADVANCED", "RESEARCH"
+        level: [], //the possible values for the array are: "PREPARATORY", "BASIC", "ADVANCED", "RESEARCH"
         applyLanguageFilter: true,
         language: "none", //the possible values for the string are: "none"/"english"/"swedish"/"both"
         applyLocationFilter:true,
         location: [], //the possible values for the array are: 'KTH Campus', 'KTH Kista', 'AlbaNova', 'KTH Flemingsberg', 'KTH Solna', 'KTH Södertälje', 'Handelshögskolan', 'KI Solna', 'Stockholms universitet', 'KONSTFACK'
         applyCreditsFilter:true,
         creditMin: 0,
         creditMax: 45,
-        applyDepartmentFilter: true,
-        department: ["EECS/Computational Science and  Technology", "EECS/Theoretical Computer Science", "EECS/Electric Power and Energy Systems", "EECS/Network and Systems Engineering",
-        "ITM/Learning in Engineering Sciences", "ITM/Industrial Economics and Management", "ITM/Energy Systems", "ITM/Integrated Product Development and Design", "ITM/SKD GRU",
-        "SCI/Mathematics", "SCI/Applied Physics", "SCI/Mechanics", "SCI/Aeronautical and Vehicle Engineering", 
-        "ABE/Sustainability and Environmental Engineering", "ABE/Concrete Structures", "ABE/Structural Design & Bridges", "ABE/History of Science, Technology and Environment", ],
-        applyRemoveNullCourses: false
+        applyDepartmentFilter:false,
+        department: []
     },
 
     setUser(user) {
@@ -88,17 +84,15 @@ export const model = {
         entries.forEach(entry => {
             const course = {
                 code: entry[1].code,
-                name: entry[1]?.name ?? "null",
-                location: entry[1]?.location ?? "null",
-                department: entry[1]?.department ?? "null",
-                language: entry[1]?.language ?? "null",
-                description: entry[1]?.description ?? "null",
-                academicLevel: entry[1]?.academic_level ?? "null",
-                period: entry[1]?.period ?? "null",
+                name: entry[1]?.name ?? "",
+                location: entry[1]?.location ?? "",
+                department: entry[1]?.department ?? "",
+                language: entry[1]?.language ?? "",
+                description: entry[1]?.description ?? "",
+                academicLevel: entry[1]?.academic_level ?? "",
+                period: entry[1]?.period ?? "",
                 credits: entry[1]?.credits ?? 0,
-                prerequisites: entry[1]?.prerequisites ?? "null",
-                prerequisites_text: entry[1]?.prerequisites_text ?? "null",
-                learning_outcomes: entry[1]?.learning_outcomes ?? "null"
+                prerequisites: entry[1]?.prerequisites ?? "",
             };
             this.addCourse(course);
         });
@@ -135,11 +129,6 @@ export const model = {
         this.filterOptions = options; // do we want to set the flags? What about useEffect?
     },
 
-    setApplyRemoveNullCourses() {
-        this.filterOptions.applyRemoveNullCourses = !this.filterOptions.applyRemoveNullCourses;
-        this.setFiltersChange();
-    },
-
     updateLevelFilter(level) {
         this.filterOptions.level = level;
     },
@@ -157,10 +146,6 @@ export const model = {
         this.filterOptions.eligibility = eligibility;
     },
 
-    updateDepartmentFilter(department) {
-        this.filterOptions.department = department;
-    },
-
     //setters for the filter options
     setApplyTranscriptFilter(transcriptFilterState) {
         this.filterOptions.applyTranscriptFilter = transcriptFilterState;
@@ -177,16 +162,10 @@ export const model = {
     setApplyCreditsFilter(creditsFilterState) {
         this.filterOptions.applyCreditsFilter = creditsFilterState;
     },
-    setApplyDepartmentFilter(departmentFilterState) {
-        this.filterOptions.applyDepartmentFilter = departmentFilterState;
-    },
+    // setApplyDepartmentFilter(departmentFilterState) {
+    //     this.filterOptions.applyDepartmentFilter = departmentFilterState;
+    // },
 
-    async getAverageRating(courseCode) {
-        const reviews = await getReviewsForCourse(courseCode);
-        if (!reviews || reviews.length === 0) return null;
-        const total = reviews.reduce((sum, review) => sum + (review.overallRating || 0), 0);
-        return (total / reviews.length).toFixed(1);
-    },
 
 
 };