fix(web): prevent infinite loading when using dataset-url param

nextstrain · Dec 12, 2023 · 659fd9a · 659fd9a
1 parent d43b9b3
commit 659fd9a
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/packages_rs/nextclade-web/src/pages/_app.tsx b/packages_rs/nextclade-web/src/pages/_app.tsx
@@ -96,17 +96,15 @@ export function RecoilStateInitializer() {
         set(localeAtom, locale.key)
       })
       .then(async () => {
-        const datasetInfo = await fetchSingleDataset(urlQuery)
+        const datasetServerUrl = await getDatasetServerUrl(urlQuery)
+        set(datasetServerUrlAtom, datasetServerUrl)
+        const { datasets, currentDataset, minimizerIndexVersion } = await initializeDatasets(datasetServerUrl, urlQuery)
 
+        const datasetInfo = await fetchSingleDataset(urlQuery)
         if (!isNil(datasetInfo)) {
           const { datasets, currentDataset } = datasetInfo
           return { datasets, currentDataset, minimizerIndexVersion: undefined }
         }
-
-        const datasetServerUrl = await getDatasetServerUrl(urlQuery)
-        set(datasetServerUrlAtom, datasetServerUrl)
-
-        const { datasets, currentDataset, minimizerIndexVersion } = await initializeDatasets(datasetServerUrl, urlQuery)
         return { datasets, currentDataset, minimizerIndexVersion }
       })
       .catch((error) => {