Fix null value not showing up

Author: riyajain59

client/src/components/settings/LanguageCustomizationForm.tsx

@@ -14,9 +14,9 @@ const LanguageCustomization = () => {
   const [selectedLanguage, setSelectedLanguage] = useState<string>('')
 
   useEffect(() => {
-    UpdateURL(navigate, selectedLanguage, null)
-    UpdateSettings(selectedLanguage, null)
-  }, [navigate, selectedLanguage])
+    UpdateURL(navigate, setSelectedLanguage, null)
+    UpdateSettings(setSelectedLanguage, null)
+  }, [navigate, setSelectedLanguage])
 
   const formSubmit = (e: any) => {
     e.preventDefault()
@@ -25,14 +25,12 @@ const LanguageCustomization = () => {
         language: selectedLanguage,
         lifelines: localStorage.getItem(LIFELINES_LOCAL_STORAGE_KEY),
       }
-      console.log('inside')
       const settings_json = JSON.stringify(json)
       let compressed = compressToEncodedURIComponent(settings_json)
 
       localStorage.setItem(COMPRESSED_KEY, compressed)
       navigate(`${compressed}`)
     }
-    console.log('here2')
     localStorage.setItem(LANGUAGE_LOCAL_STORAGE_KEY, selectedLanguage)
   }
 

client/src/components/settings/LifelineCreationForm.tsx

@@ -38,9 +38,9 @@ const LifelineCreationForm = () => {
       setModules,
       setLifelineModules,
     )
-    UpdateURL(navigate, null, lifelineModules)
-    UpdateSettings(null, lifelineModules)
-  }, [navigate, lifelineModules])
+    UpdateURL(navigate, null, setLifelineModules)
+    UpdateSettings(null, setLifelineModules)
+  }, [navigate, setLifelineModules])
 
   /* clearProperties
    *

client/src/routing/UpdateSettings.tsx

@@ -1,15 +1,39 @@
 import { decompressFromEncodedURIComponent } from 'lz-string'
-import { COMPRESSED_KEY } from '../utils/constants'
+import {
+  COMPRESSED_KEY,
+  LANGUAGE_LOCAL_STORAGE_KEY,
+  LIFELINES_LOCAL_STORAGE_KEY,
+} from '../utils/constants'
+
 export const UpdateSettings = (selectLanguage, lifelineModules) => {
-  if (localStorage.getItem(COMPRESSED_KEY) !== '') {
+  let url = window.location.href
+  let url_split = url.split('/')
+  let compressed_path = url_split[url_split.length - 1]
+  console.log(url_split)
+  console.log(compressed_path)
+  if (compressed_path.length < 20) {
+    return
+  }
+  localStorage.setItem(COMPRESSED_KEY, compressed_path)
+  if (
+    localStorage.getItem(COMPRESSED_KEY) !== null &&
+    localStorage.getItem(COMPRESSED_KEY) !== ''
+  ) {
     let decompressed = JSON.parse(
       decompressFromEncodedURIComponent(localStorage.getItem(COMPRESSED_KEY)),
     )
+    console.log(decompressed)
     if (decompressed.language !== selectLanguage) {
-      selectLanguage = decompressed.language
+      selectLanguage(decompressed.language)
+      localStorage.setItem(LANGUAGE_LOCAL_STORAGE_KEY, decompressed.language)
     }
     if (lifelineModules != null && decompressed.lifelines !== lifelineModules) {
-      lifelineModules = decompressed.lifelines
+      console.log(JSON.stringify(decompressed.lifelines))
+      lifelineModules(decompressed.lifelines)
+      localStorage.setItem(
+        LIFELINES_LOCAL_STORAGE_KEY,
+        JSON.stringify(decompressed.lifelines),
+      )
     }
   }
 }

client/src/routing/UpdateURL.tsx

@@ -4,18 +4,17 @@ import {
   LIFELINES_LOCAL_STORAGE_KEY,
 } from '../utils/constants'
 export const UpdateURL = (navigate, language, lifelines) => {
-  console.log(lifelines)
   if (
     language &&
     localStorage.getItem(LANGUAGE_LOCAL_STORAGE_KEY) !== language &&
-    localStorage.getItem(COMPRESSED_KEY) !== ''
+    localStorage.getItem(COMPRESSED_KEY) !== null
   ) {
     navigate(`${localStorage.getItem(COMPRESSED_KEY)}`)
   }
   if (
     lifelines &&
     localStorage.getItem(LIFELINES_LOCAL_STORAGE_KEY) !== lifelines &&
-    localStorage.getItem(COMPRESSED_KEY) !== ''
+    localStorage.getItem(COMPRESSED_KEY) !== null
   ) {
     navigate(`${localStorage.getItem(COMPRESSED_KEY)}`)
   }

client/src/utils/constants.ts

@@ -3,4 +3,4 @@ export const NUM_LIFELINES_DISPLAYED = 3
 export const LIFELINES_LOCAL_STORAGE_KEY: string = 'lifelines'
 export const ERROR_MSG: string = 'Error retrieving module data from API...'
 export const URL: string = 'https://api.climateclock.world/v1/clock'
-export const COMPRESSED_KEY: string = ''
+export const COMPRESSED_KEY: string = 'compressedKey'