Merge pull request #1146 from JGreenlee/fermata-fixes-apr17

Fermata fixes apr17
e-mission · Apr 20, 2024 · b9dd3ba · b9dd3ba
2 parents 9cfff85 + d83f4d4
commit b9dd3ba
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/www/js/config/dynamicConfig.ts b/www/js/config/dynamicConfig.ts
@@ -92,11 +92,11 @@ function cacheResourcesFromConfig(config: AppConfig) {
   if (config.survey_info?.surveys) {
     Object.values(config.survey_info.surveys).forEach((survey) => {
       if (!survey?.['formPath']) throw new Error(i18next.t('config.survey-missing-formpath'));
-      fetchUrlCached(survey['formPath']);
+      fetchUrlCached(survey['formPath'], { cache: 'reload' });
     });
   }
   if (config.label_options) {
-    fetchUrlCached(config.label_options);
+    fetchUrlCached(config.label_options, { cache: 'reload' });
   }
 }
 

diff --git a/www/js/diary/timelineHelper.ts b/www/js/diary/timelineHelper.ts
@@ -182,7 +182,7 @@ export async function updateUnprocessedBleScans(queryRange: TimestampRange) {
     endTs: queryRange.end_ts,
   };
   const getMethod = window['cordova'].plugins.BEMUserCache.getSensorDataForInterval;
-  getUnifiedDataForInterval('background/bluetooth_ble', tq, getMethod).then(
+  await getUnifiedDataForInterval('background/bluetooth_ble', tq, getMethod).then(
     (bleScans: BEMData<BluetoothBleData>[]) => {
       logDebug(`Read ${bleScans.length} BLE scans`);
       unprocessedBleScans = bleScans;

diff --git a/www/js/services/commHelper.ts b/www/js/services/commHelper.ts
@@ -5,17 +5,18 @@ import { TimestampRange } from '../types/diaryTypes';
 
 /**
  * @param url URL endpoint for the request
+ * @param fetchOpts (optional) options for the fetch request. If 'cache' is set to 'reload', the cache will be ignored
  * @returns Promise of the fetched response (as text) or cached text from local storage
  */
-export async function fetchUrlCached(url) {
+export async function fetchUrlCached(url: string, fetchOpts?: RequestInit) {
   const stored = localStorage.getItem(url);
-  if (stored) {
+  if (stored && fetchOpts?.cache != 'reload') {
     logDebug(`fetchUrlCached: found cached data for url ${url}, returning`);
     return Promise.resolve(stored);
   }
   try {
-    logDebug(`fetchUrlCached: found no cached data for url ${url}, fetching`);
-    const response = await fetch(url);
+    logDebug(`fetchUrlCached: cache had ${stored} for url ${url}, not using; fetching`);
+    const response = await fetch(url, fetchOpts);
     const text = await response.text();
     localStorage.setItem(url, text);
     logDebug(`fetchUrlCached: fetched data for url ${url}, returning`);

diff --git a/www/js/survey/enketo/UserInputButton.tsx b/www/js/survey/enketo/UserInputButton.tsx
@@ -34,6 +34,7 @@ const UserInputButton = ({ timelineEntry }: Props) => {
 
   // which survey will this button launch?
   const [surveyName, notFilledInLabel] = useMemo(() => {
+    if (!appConfig) return []; // no config loaded yet; show blank for now
     const tripLabelConfig = appConfig?.survey_info?.buttons?.['trip-label'];
     if (!tripLabelConfig) {
       // config doesn't specify; use default