Merge pull request #529 from digital-land/fix-missing-org-breaking-page

Hotfix: Fixes an issue where missing org could down the server if it's run in parallel
digital-land · Oct 8, 2024 · d619671 · d619671
2 parents 2fbc679 + 3e5de15
commit d619671
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 16 deletions.
diff --git a/src/middleware/datasetOverview.middleware.js b/src/middleware/datasetOverview.middleware.js
@@ -111,10 +111,8 @@ const getDatasetOverview = renderTemplate(
 )
 
 export default [
-  parallel([
-    fetchOrgInfo,
-    fetchDatasetInfo
-  ]),
+  fetchOrgInfo,
+  fetchDatasetInfo,
   parallel([
     fetchColumnSummary,
     fetchResourceStatus,

diff --git a/src/middleware/datasetTaskList.middleware.js b/src/middleware/datasetTaskList.middleware.js
@@ -113,9 +113,8 @@ const getDatasetTaskListError = renderTemplate({
 
 export default [
   fetchResourceStatus,
-  parallel([
-    fetchOrgInfoWithStatGeo,
-    fetchDatasetInfo]),
+  fetchOrgInfoWithStatGeo,
+  fetchDatasetInfo,
   fetchIf(isResourceAccessible, fetchLatestResource),
   parallel([
     fetchIf(isResourceAccessible, fetchLpaDatasetIssues),

diff --git a/src/middleware/issueDetails.middleware.js b/src/middleware/issueDetails.middleware.js
@@ -286,10 +286,8 @@ export const getIssueDetails = renderTemplate({
 
 export default [
   validateIssueDetailsQueryParams,
-  parallel([
-    fetchOrgInfo,
-    fetchDatasetInfo
-  ]),
+  fetchOrgInfo,
+  fetchDatasetInfo,
   fetchIf(isResourceIdInParams, fetchLatestResource, takeResourceIdFromParams),
   fetchIssues,
   reformatIssuesToBeByEntryNumber,

diff --git a/src/middleware/overview.middleware.js b/src/middleware/overview.middleware.js
@@ -1,6 +1,6 @@
 import performanceDbApi, { lpaOverviewQuery } from '../services/performanceDbApi.js'
 import { fetchOrgInfo, logPageError } from './common.middleware.js'
-import { fetchMany, FetchOptions, parallel, renderTemplate } from './middleware.builders.js'
+import { fetchMany, FetchOptions, renderTemplate } from './middleware.builders.js'
 import { dataSubjects } from '../utils/utils.js'
 import config from '../../config/index.js'
 import _ from 'lodash'
@@ -154,10 +154,8 @@ export const getOverview = renderTemplate({
 })
 
 export default [
-  parallel([
-    fetchOrgInfo,
-    fetchLatestResources]
-  ),
+  fetchOrgInfo,
+  fetchLatestResources,
   fetchEntityCounts,
   fetchLpaOverview,
   prepareOverviewTemplateParams,