@ministryofjustice/hmpps-digital-prison-reporting-frontend 4.28.8 → 4.29.1

package/dpr/routes/journeys/view-report/async/report/utils.ts

@@ -3,33 +3,32 @@ import { Url } from 'url'
 import { Request, Response } from 'express'
 
 // Types
-import type { Columns } from '../../../../../components/_reports/report-columns-form/types'
+import { ReportTemplateData } from '../../../../../utils/TemplateBuilder/SectionedDataHelper/types'
+import { ChildData } from '../../../../../utils/TemplateBuilder/ParentChildDataBuilder/types'
+import type { Columns } from '../../../../../components/_reports/report-heading/report-columns/report-columns-form/types'
 import type { AsyncReportUtilsParams } from '../../../../../types/AsyncReportUtils'
 import type { DataTable } from '../../../../../utils/DataTableBuilder/types'
 import type { components } from '../../../../../types/api'
 import type { AsyncSummary, RequestedReport } from '../../../../../types/UserReports'
 import { LoadType, ReportType } from '../../../../../types/UserReports'
 import ReportQuery from '../../../../../types/ReportQuery'
-import type { ChildData } from '../../../../../utils/ParentChildDataTableBuilder/types'
 import type { ExtractedDefinitionData, ExtractedRequestData, ReportUrls } from './types'
-import type { DownloadActionParams } from '../../../../../components/_reports/report-actions/types'
+import type { DownloadActionParams } from '../../../../../components/_reports/report-heading/report-actions/types'
 import { FiltersType } from '../../../../../components/_filters/filtersTypeEnum'
 import type { Services } from '../../../../../types/Services'
 
 // Utils
 import definitionUtils from '../../../../../utils/definitionUtils'
-import PaginationUtils from '../../../../../components/_reports/report-pagination/utils'
-import TotalsUtils from '../../../../../components/_reports/report-totals/utils'
+import PaginationUtils from '../../../../../components/_reports/report-page/report-template/report-pagination/utils'
+import TotalsUtils from '../../../../../components/_reports/report-page/report-template/report-totals/utils'
 import ReportFiltersUtils from '../../../../../components/_filters/utils'
-import ColumnUtils from '../../../../../components/_reports/report-columns-form/utils'
-import ReportActionsUtils from '../../../../../components/_reports/report-actions/utils'
+import ColumnUtils from '../../../../../components/_reports/report-heading/report-columns/report-columns-form/utils'
+import ReportActionsUtils from '../../../../../components/_reports/report-heading/report-actions/utils'
 import UserReportsUtils from '../../../../../components/user-reports/utils'
 import LocalsHelper from '../../../../../utils/localsHelper'
-import DataTableUtils from '../../../../../components/_reports/report-data-table/utils'
+import ReportTemplateUtils from '../../../../../components/_reports/report-page/report-template/utils'
 import RequestedReportService from '../../../my-reports/requested-reports/service'
 
-import CollatedSummaryBuilder from '../../../../../utils/CollatedSummaryBuilder/CollatedSummaryBuilder'
-
 export const getData = async ({
   res,
   req,
@@ -256,7 +255,7 @@ export const renderReport = async ({ req, res, services }: AsyncReportUtilsParam
   })
 
   // Get the data table
-  const dataTable: DataTable[] = DataTableUtils.createDataTable(
+  const dataTable: DataTable | ReportTemplateData = ReportTemplateUtils.createReportTemplateData(
     definition,
     columns,
     reportData,
@@ -271,7 +270,6 @@ export const renderReport = async ({ req, res, services }: AsyncReportUtilsParam
     res,
     services,
     definition,
-    summariesData,
     dataTable,
     columns,
     reportQuery,
@@ -301,8 +299,7 @@ const getTemplateData = async (
   res: Response,
   services: Services,
   definition: components['schemas']['SingleVariantReportDefinition'],
-  summariesData: AsyncSummary[],
-  dataTable: DataTable[],
+  dataTable: DataTable | ReportTemplateData,
   columns: Columns,
   reportQuery: ReportQuery,
   requestData?: RequestedReport,
@@ -342,18 +339,12 @@ const getTemplateData = async (
   // Set the extra meta data
   const meta = setMetaData(res, req)
 
-  let reportSummaries
-  if (summariesData.length) {
-    const collatedSummaryBuilder = new CollatedSummaryBuilder(specification, summariesData)
-    reportSummaries = collatedSummaryBuilder.collatePageSummaries()
-  }
-
   let pagination
   let totals
   if (definitionData.template === 'list') {
     pagination = PaginationUtils.getPaginationData(url, count, req)
     const { pageSize, currentPage, totalRows } = pagination
-    totals = TotalsUtils.getTotals(pageSize, currentPage, totalRows, dataTable[0].rowCount)
+    totals = TotalsUtils.getTotals(pageSize, currentPage, totalRows, dataTable.rowCount)
   }
 
   return {
@@ -368,7 +359,6 @@ const getTemplateData = async (
     ...urls,
     ...(pagination && { pagination }),
     ...(totals && { totals }),
-    ...(reportSummaries && { reportSummaries }),
   }
 }
 

package/dpr/routes/journeys/view-report/report.njk

@@ -1,7 +1,7 @@
-{% from "../../../components/_reports/report-wrapper/view.njk" import dprReportWrapper %}
+{% from "../../../components/_reports/report-page/view.njk" import dprReportPage %}
 
 {% extends layoutPath %}
 
 {% block content %}
-  {{ dprReportWrapper(renderData) }}
+  {{ dprReportPage(renderData) }}
 {% endblock %}

package/dpr/routes/journeys/view-report/sync/dashboard/utils.js

@@ -38,7 +38,7 @@ var import_utils = __toESM(require("../../../../../components/_filters/filters-s
 var import_localsHelper = __toESM(require("../../../../../utils/localsHelper"));
 var import_UserStoreItemBuilder = __toESM(require("../../../../../utils/UserStoreItemBuilder"));
 var import_utils2 = __toESM(require("../../async/dashboard/utils"));
-var import_utils3 = __toESM(require("../../../../../components/_reports/report-actions/utils"));
+var import_utils3 = __toESM(require("../../../../../components/_reports/report-heading/report-actions/utils"));
 const setAsRecentlyViewed = async ({
   req,
   services,

package/dpr/routes/journeys/view-report/sync/dashboard/utils.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../dpr/routes/journeys/view-report/sync/dashboard/utils.ts"],
-  "sourcesContent": ["import type { Request, Response } from 'express'\nimport Dict = NodeJS.Dict\n\nimport type { Services } from '../../../../../types/Services'\nimport { ReportType, RequestStatus } from '../../../../../types/UserReports'\nimport { FilterValue } from '../../../../../components/_filters/types'\nimport SelectedFiltersUtils from '../../../../../components/_filters/filters-selected/utils'\nimport LocalsHelper from '../../../../../utils/localsHelper'\nimport UserStoreItemBuilder from '../../../../../utils/UserStoreItemBuilder'\nimport { DashboardDataResponse } from '../../../../../types/Metrics'\nimport AsyncDashboardUtils from '../../async/dashboard/utils'\nimport { DashboardSection } from '../../../../../components/_dashboards/dashboard-visualisation/types'\nimport { components } from '../../../../../types/api'\nimport ReportActionsUtils from '../../../../../components/_reports/report-actions/utils'\n\nconst setAsRecentlyViewed = async ({\n  req,\n  services,\n  reportName,\n  name,\n  description,\n  reportId,\n  id,\n  userId,\n  filters,\n}: {\n  req: Request\n  services: Services\n  reportName: string\n  name: string\n  description: string\n  reportId: string\n  id: string\n  userId: string\n  filters: FilterValue[]\n}) => {\n  const stateData = {\n    type: ReportType.DASHBOARD,\n    reportId,\n    id,\n    reportName,\n    description,\n    name,\n  }\n\n  const interactiveQueryData: { query: Dict<string>; querySummary: Array<Dict<string>> } = {\n    query: <Dict<string>>req.query,\n    querySummary: SelectedFiltersUtils.getQuerySummary(<Dict<string>>req.query, filters),\n  }\n\n  const recentlyViewedData = new UserStoreItemBuilder(stateData)\n    .addInteractiveQuery(interactiveQueryData)\n    .addStatus(RequestStatus.READY)\n    .addTimestamp()\n    .addReportUrls(req)\n    .build()\n\n  await services.recentlyViewedService.setRecentlyViewed(recentlyViewedData, userId)\n}\n\nexport const renderSyncDashboard = async ({\n  req,\n  res,\n  services,\n}: {\n  req: Request\n  res: Response\n  services: Services\n}) => {\n  const { token, csrfToken, dprUser, nestedBaseUrl } = LocalsHelper.getValues(res)\n  const { reportId, id } = req.params\n  const fullUrl = `${req.protocol}://${req.get('host')}${req.originalUrl}`\n\n  const {\n    query,\n    filters: filterData,\n    reportDefinition,\n    dashboardDefinition,\n  } = await AsyncDashboardUtils.getDefinitionData({\n    req,\n    res,\n    services,\n  })\n\n  const dashboardData: DashboardDataResponse[][] = await services.dashboardService.getSyncDashboard(\n    token,\n    id,\n    reportId,\n    query,\n  )\n  const flattenedData: DashboardDataResponse[] = dashboardData.flat()\n\n  // Get the dashboard parts\n  const sections: DashboardSection[] = AsyncDashboardUtils.getSections(dashboardDefinition, flattenedData, query)\n\n  await setAsRecentlyViewed({\n    req,\n    services,\n    reportName: reportDefinition.name,\n    name: dashboardDefinition.name,\n    description: dashboardDefinition.description || reportDefinition.description || '',\n    reportId,\n    id,\n    userId: dprUser.id,\n    filters: filterData.filters,\n  })\n\n  return {\n    dashboardData: {\n      token,\n      id,\n      reportId,\n      name: dashboardDefinition.name,\n      description: dashboardDefinition.description,\n      reportName: reportDefinition.name,\n      bookmarked: await services.bookmarkService.isBookmarked(id, reportId, dprUser.id),\n      nestedBaseUrl,\n      csrfToken,\n      sections,\n      filters: filterData,\n      type: ReportType.DASHBOARD,\n      actions: setActions(dashboardDefinition, reportDefinition, fullUrl),\n    },\n  }\n}\n\nexport const setActions = (\n  definition: components['schemas']['DashboardDefinition'],\n  summaryDefinition: components['schemas']['ReportDefinitionSummary'],\n  url: string,\n) => {\n  const { name: reportName } = summaryDefinition\n  const { name } = definition\n\n  return ReportActionsUtils.getActions({\n    share: {\n      reportName,\n      name,\n      url,\n    },\n    copy: {\n      url,\n    },\n  })\n}\n\nexport default {\n  renderSyncDashboard,\n}\n"],
+  "sourcesContent": ["import type { Request, Response } from 'express'\nimport Dict = NodeJS.Dict\n\nimport type { Services } from '../../../../../types/Services'\nimport { ReportType, RequestStatus } from '../../../../../types/UserReports'\nimport { FilterValue } from '../../../../../components/_filters/types'\nimport SelectedFiltersUtils from '../../../../../components/_filters/filters-selected/utils'\nimport LocalsHelper from '../../../../../utils/localsHelper'\nimport UserStoreItemBuilder from '../../../../../utils/UserStoreItemBuilder'\nimport { DashboardDataResponse } from '../../../../../types/Metrics'\nimport AsyncDashboardUtils from '../../async/dashboard/utils'\nimport { DashboardSection } from '../../../../../components/_dashboards/dashboard-visualisation/types'\nimport { components } from '../../../../../types/api'\nimport ReportActionsUtils from '../../../../../components/_reports/report-heading/report-actions/utils'\n\nconst setAsRecentlyViewed = async ({\n  req,\n  services,\n  reportName,\n  name,\n  description,\n  reportId,\n  id,\n  userId,\n  filters,\n}: {\n  req: Request\n  services: Services\n  reportName: string\n  name: string\n  description: string\n  reportId: string\n  id: string\n  userId: string\n  filters: FilterValue[]\n}) => {\n  const stateData = {\n    type: ReportType.DASHBOARD,\n    reportId,\n    id,\n    reportName,\n    description,\n    name,\n  }\n\n  const interactiveQueryData: { query: Dict<string>; querySummary: Array<Dict<string>> } = {\n    query: <Dict<string>>req.query,\n    querySummary: SelectedFiltersUtils.getQuerySummary(<Dict<string>>req.query, filters),\n  }\n\n  const recentlyViewedData = new UserStoreItemBuilder(stateData)\n    .addInteractiveQuery(interactiveQueryData)\n    .addStatus(RequestStatus.READY)\n    .addTimestamp()\n    .addReportUrls(req)\n    .build()\n\n  await services.recentlyViewedService.setRecentlyViewed(recentlyViewedData, userId)\n}\n\nexport const renderSyncDashboard = async ({\n  req,\n  res,\n  services,\n}: {\n  req: Request\n  res: Response\n  services: Services\n}) => {\n  const { token, csrfToken, dprUser, nestedBaseUrl } = LocalsHelper.getValues(res)\n  const { reportId, id } = req.params\n  const fullUrl = `${req.protocol}://${req.get('host')}${req.originalUrl}`\n\n  const {\n    query,\n    filters: filterData,\n    reportDefinition,\n    dashboardDefinition,\n  } = await AsyncDashboardUtils.getDefinitionData({\n    req,\n    res,\n    services,\n  })\n\n  const dashboardData: DashboardDataResponse[][] = await services.dashboardService.getSyncDashboard(\n    token,\n    id,\n    reportId,\n    query,\n  )\n  const flattenedData: DashboardDataResponse[] = dashboardData.flat()\n\n  // Get the dashboard parts\n  const sections: DashboardSection[] = AsyncDashboardUtils.getSections(dashboardDefinition, flattenedData, query)\n\n  await setAsRecentlyViewed({\n    req,\n    services,\n    reportName: reportDefinition.name,\n    name: dashboardDefinition.name,\n    description: dashboardDefinition.description || reportDefinition.description || '',\n    reportId,\n    id,\n    userId: dprUser.id,\n    filters: filterData.filters,\n  })\n\n  return {\n    dashboardData: {\n      token,\n      id,\n      reportId,\n      name: dashboardDefinition.name,\n      description: dashboardDefinition.description,\n      reportName: reportDefinition.name,\n      bookmarked: await services.bookmarkService.isBookmarked(id, reportId, dprUser.id),\n      nestedBaseUrl,\n      csrfToken,\n      sections,\n      filters: filterData,\n      type: ReportType.DASHBOARD,\n      actions: setActions(dashboardDefinition, reportDefinition, fullUrl),\n    },\n  }\n}\n\nexport const setActions = (\n  definition: components['schemas']['DashboardDefinition'],\n  summaryDefinition: components['schemas']['ReportDefinitionSummary'],\n  url: string,\n) => {\n  const { name: reportName } = summaryDefinition\n  const { name } = definition\n\n  return ReportActionsUtils.getActions({\n    share: {\n      reportName,\n      name,\n      url,\n    },\n    copy: {\n      url,\n    },\n  })\n}\n\nexport default {\n  renderSyncDashboard,\n}\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAIA,yBAA0C;AAE1C,mBAAiC;AACjC,0BAAyB;AACzB,kCAAiC;AAEjC,IAAAA,gBAAgC;AAGhC,IAAAA,gBAA+B;AAE/B,MAAM,sBAAsB,OAAO;AAAA,EACjC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAUM;AACJ,QAAM,YAAY;AAAA,IAChB,MAAM,8BAAW;AAAA,IACjB;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AAEA,QAAM,uBAAmF;AAAA,IACvF,OAAqB,IAAI;AAAA,IACzB,cAAc,aAAAC,QAAqB,gBAA8B,IAAI,OAAO,OAAO;AAAA,EACrF;AAEA,QAAM,qBAAqB,IAAI,4BAAAC,QAAqB,SAAS,EAC1D,oBAAoB,oBAAoB,EACxC,UAAU,iCAAc,KAAK,EAC7B,aAAa,EACb,cAAc,GAAG,EACjB,MAAM;AAET,QAAM,SAAS,sBAAsB,kBAAkB,oBAAoB,MAAM;AACnF;AAEO,MAAM,sBAAsB,OAAO;AAAA,EACxC;AAAA,EACA;AAAA,EACA;AACF,MAIM;AACJ,QAAM,EAAE,OAAO,WAAW,SAAS,cAAc,IAAI,oBAAAC,QAAa,UAAU,GAAG;AAC/E,QAAM,EAAE,UAAU,GAAG,IAAI,IAAI;AAC7B,QAAM,UAAU,GAAG,IAAI,QAAQ,MAAM,IAAI,IAAI,MAAM,CAAC,GAAG,IAAI,WAAW;AAEtE,QAAM;AAAA,IACJ;AAAA,IACA,SAAS;AAAA,IACT;AAAA,IACA;AAAA,EACF,IAAI,MAAM,cAAAC,QAAoB,kBAAkB;AAAA,IAC9C;AAAA,IACA;AAAA,IACA;AAAA,EACF,CAAC;AAED,QAAM,gBAA2C,MAAM,SAAS,iBAAiB;AAAA,IAC/E;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACA,QAAM,gBAAyC,cAAc,KAAK;AAGlE,QAAM,WAA+B,cAAAA,QAAoB,YAAY,qBAAqB,eAAe,KAAK;AAE9G,QAAM,oBAAoB;AAAA,IACxB;AAAA,IACA;AAAA,IACA,YAAY,iBAAiB;AAAA,IAC7B,MAAM,oBAAoB;AAAA,IAC1B,aAAa,oBAAoB,eAAe,iBAAiB,eAAe;AAAA,IAChF;AAAA,IACA;AAAA,IACA,QAAQ,QAAQ;AAAA,IAChB,SAAS,WAAW;AAAA,EACtB,CAAC;AAED,SAAO;AAAA,IACL,eAAe;AAAA,MACb;AAAA,MACA;AAAA,MACA;AAAA,MACA,MAAM,oBAAoB;AAAA,MAC1B,aAAa,oBAAoB;AAAA,MACjC,YAAY,iBAAiB;AAAA,MAC7B,YAAY,MAAM,SAAS,gBAAgB,aAAa,IAAI,UAAU,QAAQ,EAAE;AAAA,MAChF;AAAA,MACA;AAAA,MACA;AAAA,MACA,SAAS;AAAA,MACT,MAAM,8BAAW;AAAA,MACjB,SAAS,WAAW,qBAAqB,kBAAkB,OAAO;AAAA,IACpE;AAAA,EACF;AACF;AAEO,MAAM,aAAa,CACxB,YACA,mBACA,QACG;AACH,QAAM,EAAE,MAAM,WAAW,IAAI;AAC7B,QAAM,EAAE,KAAK,IAAI;AAEjB,SAAO,cAAAC,QAAmB,WAAW;AAAA,IACnC,OAAO;AAAA,MACL;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAAA,IACA,MAAM;AAAA,MACJ;AAAA,IACF;AAAA,EACF,CAAC;AACH;AAEA,IAAO,gBAAQ;AAAA,EACb;AACF;",
   "names": ["import_utils", "SelectedFiltersUtils", "UserStoreItemBuilder", "LocalsHelper", "AsyncDashboardUtils", "ReportActionsUtils"]
 }

package/dpr/routes/journeys/view-report/sync/dashboard/utils.ts

@@ -11,7 +11,7 @@ import { DashboardDataResponse } from '../../../../../types/Metrics'
 import AsyncDashboardUtils from '../../async/dashboard/utils'
 import { DashboardSection } from '../../../../../components/_dashboards/dashboard-visualisation/types'
 import { components } from '../../../../../types/api'
-import ReportActionsUtils from '../../../../../components/_reports/report-actions/utils'
+import ReportActionsUtils from '../../../../../components/_reports/report-heading/report-actions/utils'
 
 const setAsRecentlyViewed = async ({
   req,

package/dpr/routes/journeys/view-report/sync/report/utils.js

@@ -39,16 +39,16 @@ module.exports = __toCommonJS(utils_exports);
 var import_parseurl = __toESM(require("parseurl"));
 var import_UserReports = require("../../../../../types/UserReports");
 var import_ReportQuery = __toESM(require("../../../../../types/ReportQuery"));
-var import_utils = __toESM(require("../../../../../components/_reports/report-pagination/utils"));
-var import_utils2 = __toESM(require("../../../../../components/_reports/report-totals/utils"));
-var import_utils3 = __toESM(require("../../../../../components/_reports/report-columns-form/utils"));
-var import_utils4 = __toESM(require("../../../../../components/_reports/report-actions/utils"));
+var import_utils = __toESM(require("../../../../../components/_reports/report-page/report-template/report-pagination/utils"));
+var import_utils2 = __toESM(require("../../../../../components/_reports/report-page/report-template/report-totals/utils"));
+var import_utils3 = __toESM(require("../../../../../components/_reports/report-heading/report-columns/report-columns-form/utils"));
+var import_utils4 = __toESM(require("../../../../../components/_reports/report-heading/report-actions/utils"));
 var import_utils5 = __toESM(require("../../../../../components/_filters/utils"));
 var import_utils6 = __toESM(require("../../../../../components/_filters/filters-selected/utils"));
 var import_localsHelper = __toESM(require("../../../../../utils/localsHelper"));
 var import_UserStoreItemBuilder = __toESM(require("../../../../../utils/UserStoreItemBuilder"));
-var import_DataTableBuilder = __toESM(require("../../../../../utils/DataTableBuilder/DataTableBuilder"));
 var import_filtersTypeEnum = require("../../../../../components/_filters/filtersTypeEnum");
+var import_utils7 = __toESM(require("../../../../../components/_reports/report-page/report-template/utils"));
 const setActions = (csrfToken, reportDefinition, columns, url, canDownload, count, dataProductDefinitionsPath, currentUrl, currentQueryParams, nestedBaseUrl) => {
   const { name: reportName, variant, id: reportId } = reportDefinition;
   const { name, id, printable } = variant;
@@ -197,12 +197,30 @@ const getReportRenderData = async ({
   specification,
   reportQuery,
   data,
-  filtersType
+  filtersType,
+  definition
 }) => {
   const url = (0, import_parseurl.default)(req);
   const fullUrl = `${req.protocol}://${req.get("host")}${req.originalUrl}`;
   const pathname = url?.search ? req.originalUrl.split(url.search)[0] : req.originalUrl;
-  const dataTable = new import_DataTableBuilder.default(specification.fields).withHeaderSortOptions(reportQuery).buildTable(data);
+  const columns = import_utils3.default.getColumns(specification, req);
+  const reportDefinition = {
+    ...definition,
+    variant: {
+      ...definition.variant,
+      interactive: true
+    }
+  };
+  const dataTable = import_utils7.default.createReportTemplateData(
+    reportDefinition,
+    columns,
+    data,
+    [],
+    // child data - N/A for sync reports
+    [],
+    // summaries data - N/A for sync reports
+    reportQuery
+  );
   let pagination;
   let totals;
   if (url) {
@@ -221,9 +239,8 @@ const getReportRenderData = async ({
     services,
     filtersType: filtersType || import_filtersTypeEnum.FiltersType.INTERACTIVE
   });
-  const columns = import_utils3.default.getColumns(specification, req);
   return {
-    dataTable: [dataTable],
+    dataTable,
     totals,
     filterData,
     columns,
@@ -231,7 +248,8 @@ const getReportRenderData = async ({
     reportUrl: pathname.replace("/download-disabled", "").replace("/download-disabled?", ""),
     reportSearch: url?.search,
     encodedSearch: url?.search ? encodeURIComponent(url.search) : void 0,
-    fullUrl
+    fullUrl,
+    template: specification.template
   };
 };
 const getRenderData = async ({
@@ -253,7 +271,16 @@ const getRenderData = async ({
   if (!specification) {
     throw new Error("No specicication found in definition");
   }
-  const reportRenderData = await getReportRenderData({ req, res, services, count, specification, reportQuery, data });
+  const reportRenderData = await getReportRenderData({
+    req,
+    res,
+    services,
+    count,
+    specification,
+    reportQuery,
+    data,
+    definition: reportDefinition
+  });
   const actions = setActions(
     csrfToken,
     reportDefinition,

package/dpr/routes/journeys/view-report/sync/report/utils.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../dpr/routes/journeys/view-report/sync/report/utils.ts"],
-  "sourcesContent": ["import parseUrl from 'parseurl'\nimport type { Request, Response } from 'express'\nimport Dict = NodeJS.Dict\nimport type { components } from '../../../../../types/api'\nimport type { DataTable } from '../../../../../utils/DataTableBuilder/types'\nimport type { ListWithWarnings } from '../../../../../data/types'\nimport type { Columns } from '../../../../../components/_reports/report-columns-form/types'\nimport type { Services } from '../../../../../types/Services'\nimport type { DownloadActionParams } from '../../../../../components/_reports/report-actions/types'\nimport { LoadType, ReportType, RequestStatus } from '../../../../../types/UserReports'\nimport ReportQuery from '../../../../../types/ReportQuery'\nimport { Template } from '../../../../../types/Templates'\nimport { FilterValue } from '../../../../../components/_filters/types'\n\nimport PaginationUtils from '../../../../../components/_reports/report-pagination/utils'\nimport TotalsUtils from '../../../../../components/_reports/report-totals/utils'\nimport ColumnUtils from '../../../../../components/_reports/report-columns-form/utils'\nimport ReportActionsUtils from '../../../../../components/_reports/report-actions/utils'\nimport FiltersUtils from '../../../../../components/_filters/utils'\nimport SelectedFiltersUtils from '../../../../../components/_filters/filters-selected/utils'\nimport LocalsHelper from '../../../../../utils/localsHelper'\nimport UserStoreItemBuilder from '../../../../../utils/UserStoreItemBuilder'\n\nimport DataTableBuilder from '../../../../../utils/DataTableBuilder/DataTableBuilder'\nimport { FiltersType } from '../../../../../components/_filters/filtersTypeEnum'\n\nexport const setActions = (\n  csrfToken: string,\n  reportDefinition: components['schemas']['SingleVariantReportDefinition'],\n  columns: Columns,\n  url: string,\n  canDownload: boolean,\n  count: number,\n  dataProductDefinitionsPath: string,\n  currentUrl: string,\n  currentQueryParams: string,\n  nestedBaseUrl: string,\n) => {\n  const { name: reportName, variant, id: reportId } = reportDefinition\n  const { name, id, printable } = variant\n\n  const downloadConfig: DownloadActionParams = {\n    enabled: count > 0,\n    name,\n    reportName,\n    csrfToken,\n    reportId,\n    id,\n    columns: columns.value,\n    loadType: LoadType.SYNC,\n    definitionPath: dataProductDefinitionsPath,\n    canDownload,\n    currentUrl,\n    currentQueryParams,\n    nestedBaseUrl,\n  }\n\n  return ReportActionsUtils.getActions({\n    download: downloadConfig,\n    print: {\n      enabled: Boolean(printable),\n    },\n    share: {\n      reportName,\n      name,\n      url,\n    },\n    copy: {\n      url,\n    },\n  })\n}\n\nconst setAsRecentlyViewed = async ({\n  req,\n  services,\n  reportName,\n  name,\n  description,\n  reportId,\n  id,\n  userId,\n  filters,\n}: {\n  req: Request\n  services: Services\n  reportName: string\n  name: string\n  description: string\n  reportId: string\n  id: string\n  userId: string\n  filters: FilterValue[]\n}) => {\n  const stateData = {\n    type: ReportType.REPORT,\n    reportId,\n    id,\n    reportName,\n    description,\n    name,\n  }\n\n  const interactiveQueryData: { query: Dict<string>; querySummary: Array<Dict<string>> } = {\n    query: <Dict<string>>req.query,\n    querySummary: SelectedFiltersUtils.getQuerySummary(<Dict<string>>req.query, filters),\n  }\n\n  const recentlyViewedData = new UserStoreItemBuilder(stateData)\n    .addInteractiveQuery(interactiveQueryData)\n    .addStatus(RequestStatus.READY)\n    .addTimestamp()\n    .addReportUrls(req)\n    .build()\n\n  await services.recentlyViewedService?.setRecentlyViewed(recentlyViewedData, userId)\n}\n\nexport const getReportData = async ({\n  services,\n  req,\n  token,\n  reportId,\n  id,\n  dataProductDefinitionsPath,\n}: {\n  services: Services\n  req: Request\n  token: string\n  reportId: string\n  id: string\n  dataProductDefinitionsPath?: string\n}) => {\n  const reportDefinition = await services.reportingService.getDefinition(\n    token,\n    reportId,\n    id,\n    dataProductDefinitionsPath,\n  )\n  const { variant } = reportDefinition\n  const { resourceName, specification } = variant\n\n  const reportQuery = new ReportQuery({\n    fields: specification?.fields || [],\n    template: (specification?.template as Template) || 'list',\n    queryParams: req.query,\n    definitionsPath: <string>dataProductDefinitionsPath,\n  })\n\n  return {\n    reportData: await services.reportingService.getListWithWarnings(resourceName, token, reportQuery),\n    reportDefinition,\n    reportQuery,\n  }\n}\n\nexport const getReport = async ({ req, res, services }: { req: Request; res: Response; services: Services }) => {\n  const { token, csrfToken, dprUser } = LocalsHelper.getValues(res)\n  const { reportId, id } = req.params\n  const dataProductDefinitionsPath = <string>req.query['dataProductDefinitionsPath']\n\n  const { reportData, reportDefinition, reportQuery } = await getReportData({\n    services,\n    req,\n    token,\n    reportId,\n    id,\n    dataProductDefinitionsPath,\n  })\n  const count = await services.reportingService.getCount(reportDefinition.variant.resourceName, token, reportQuery)\n  const canDownload = Boolean(\n    await services.downloadPermissionService?.downloadEnabledForReport(dprUser.id, reportId, id),\n  )\n  const bookmarked = Boolean(await services.bookmarkService?.isBookmarked(id, reportId, dprUser.id))\n\n  const renderData = await getRenderData({\n    req,\n    res,\n    services,\n    reportDefinition,\n    reportQuery,\n    reportData,\n    count,\n    csrfToken,\n    canDownload,\n  })\n\n  if (Object.keys(renderData).length) {\n    await setAsRecentlyViewed({\n      req,\n      services,\n      reportName: renderData.reportName,\n      name: renderData.name,\n      description: renderData.description || '',\n      reportId,\n      id,\n      userId: dprUser.id,\n      filters: renderData.filterData.filters,\n    })\n  }\n\n  return {\n    renderData: {\n      ...renderData,\n      csrfToken,\n      loadType: LoadType.SYNC,\n      reportId,\n      id,\n      bookmarked,\n      dataProductDefinitionsPath,\n    },\n  }\n}\n\nexport const getReportRenderData = async ({\n  req,\n  res,\n  services,\n  count,\n  specification,\n  reportQuery,\n  data,\n  filtersType,\n}: {\n  req: Request\n  res?: Response\n  services?: Services\n  count: number\n  specification: components['schemas']['Specification']\n  reportQuery: ReportQuery\n  data: Dict<string>[]\n  filtersType?: FiltersType\n}) => {\n  const url = parseUrl(req)\n  const fullUrl = `${req.protocol}://${req.get('host')}${req.originalUrl}`\n  const pathname = url?.search ? req.originalUrl.split(url.search)[0] : req.originalUrl\n\n  const dataTable: DataTable = new DataTableBuilder(specification.fields)\n    .withHeaderSortOptions(reportQuery)\n    .buildTable(data)\n\n  let pagination\n  let totals\n  if (url) {\n    pagination = PaginationUtils.getPaginationData(url, count, req)\n    totals = TotalsUtils.getTotals(\n      pagination.pageSize,\n      pagination.currentPage,\n      pagination.totalRows,\n      dataTable.rowCount,\n    )\n  }\n\n  const filterData = await FiltersUtils.getFilters({\n    fields: specification.fields,\n    req,\n    res,\n    services,\n    filtersType: filtersType || FiltersType.INTERACTIVE,\n  })\n\n  const columns = ColumnUtils.getColumns(specification, req)\n\n  return {\n    dataTable: [dataTable],\n    totals,\n    filterData,\n    columns,\n    pagination,\n    reportUrl: pathname.replace('/download-disabled', '').replace('/download-disabled?', ''),\n    reportSearch: url?.search,\n    encodedSearch: url?.search ? encodeURIComponent(url.search) : undefined,\n    fullUrl,\n  }\n}\n\nexport const getRenderData = async ({\n  req,\n  res,\n  services,\n  reportDefinition,\n  reportQuery,\n  reportData,\n  count,\n  csrfToken,\n  canDownload,\n}: {\n  req: Request\n  res: Response\n  services: Services\n  reportDefinition: components['schemas']['SingleVariantReportDefinition']\n  reportQuery: ReportQuery\n  reportData: ListWithWarnings\n  csrfToken: string\n  count: number\n  canDownload: boolean\n}) => {\n  const { dataProductDefinitionsPath } = req.query\n  const { nestedBaseUrl } = LocalsHelper.getValues(res)\n  const { name: reportName, description: reportDescription } = reportDefinition\n  const { specification, name, description, classification, printable } = reportDefinition.variant\n  const { data } = reportData\n\n  if (!specification) {\n    throw new Error('No specicication found in definition')\n  }\n\n  const reportRenderData = await getReportRenderData({ req, res, services, count, specification, reportQuery, data })\n\n  const actions = setActions(\n    csrfToken,\n    reportDefinition,\n    reportRenderData.columns,\n    `${req.protocol}://${req.get('host')}${req.originalUrl}`,\n    canDownload,\n    count,\n    <string>dataProductDefinitionsPath,\n    reportRenderData.reportUrl,\n    reportRenderData.reportSearch || '',\n    nestedBaseUrl,\n  )\n\n  return {\n    ...reportRenderData,\n    reportName,\n    name,\n    description: description || reportDescription,\n    count,\n    type: ReportType.REPORT,\n    classification,\n    printable,\n    actions,\n    warnings: reportData.warnings,\n    canDownload,\n    nestedBaseUrl,\n  }\n}\n\nexport default {\n  getRenderData,\n  getReport,\n  getReportData,\n  getReportRenderData,\n  setActions,\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAAqB;AASrB,yBAAoD;AACpD,yBAAwB;AAIxB,mBAA4B;AAC5B,IAAAA,gBAAwB;AACxB,IAAAA,gBAAwB;AACxB,IAAAA,gBAA+B;AAC/B,IAAAA,gBAAyB;AACzB,IAAAA,gBAAiC;AACjC,0BAAyB;AACzB,kCAAiC;AAEjC,8BAA6B;AAC7B,6BAA4B;AAErB,MAAM,aAAa,CACxB,WACA,kBACA,SACA,KACA,aACA,OACA,4BACA,YACA,oBACA,kBACG;AACH,QAAM,EAAE,MAAM,YAAY,SAAS,IAAI,SAAS,IAAI;AACpD,QAAM,EAAE,MAAM,IAAI,UAAU,IAAI;AAEhC,QAAM,iBAAuC;AAAA,IAC3C,SAAS,QAAQ;AAAA,IACjB;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,SAAS,QAAQ;AAAA,IACjB,UAAU,4BAAS;AAAA,IACnB,gBAAgB;AAAA,IAChB;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AAEA,SAAO,cAAAC,QAAmB,WAAW;AAAA,IACnC,UAAU;AAAA,IACV,OAAO;AAAA,MACL,SAAS,QAAQ,SAAS;AAAA,IAC5B;AAAA,IACA,OAAO;AAAA,MACL;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAAA,IACA,MAAM;AAAA,MACJ;AAAA,IACF;AAAA,EACF,CAAC;AACH;AAEA,MAAM,sBAAsB,OAAO;AAAA,EACjC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAUM;AACJ,QAAM,YAAY;AAAA,IAChB,MAAM,8BAAW;AAAA,IACjB;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AAEA,QAAM,uBAAmF;AAAA,IACvF,OAAqB,IAAI;AAAA,IACzB,cAAc,cAAAC,QAAqB,gBAA8B,IAAI,OAAO,OAAO;AAAA,EACrF;AAEA,QAAM,qBAAqB,IAAI,4BAAAC,QAAqB,SAAS,EAC1D,oBAAoB,oBAAoB,EACxC,UAAU,iCAAc,KAAK,EAC7B,aAAa,EACb,cAAc,GAAG,EACjB,MAAM;AAET,QAAM,SAAS,uBAAuB,kBAAkB,oBAAoB,MAAM;AACpF;AAEO,MAAM,gBAAgB,OAAO;AAAA,EAClC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAOM;AACJ,QAAM,mBAAmB,MAAM,SAAS,iBAAiB;AAAA,IACvD;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACA,QAAM,EAAE,QAAQ,IAAI;AACpB,QAAM,EAAE,cAAc,cAAc,IAAI;AAExC,QAAM,cAAc,IAAI,mBAAAC,QAAY;AAAA,IAClC,QAAQ,eAAe,UAAU,CAAC;AAAA,IAClC,UAAW,eAAe,YAAyB;AAAA,IACnD,aAAa,IAAI;AAAA,IACjB,iBAAyB;AAAA,EAC3B,CAAC;AAED,SAAO;AAAA,IACL,YAAY,MAAM,SAAS,iBAAiB,oBAAoB,cAAc,OAAO,WAAW;AAAA,IAChG;AAAA,IACA;AAAA,EACF;AACF;AAEO,MAAM,YAAY,OAAO,EAAE,KAAK,KAAK,SAAS,MAA2D;AAC9G,QAAM,EAAE,OAAO,WAAW,QAAQ,IAAI,oBAAAC,QAAa,UAAU,GAAG;AAChE,QAAM,EAAE,UAAU,GAAG,IAAI,IAAI;AAC7B,QAAM,6BAAqC,IAAI,MAAM,4BAA4B;AAEjF,QAAM,EAAE,YAAY,kBAAkB,YAAY,IAAI,MAAM,cAAc;AAAA,IACxE;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,CAAC;AACD,QAAM,QAAQ,MAAM,SAAS,iBAAiB,SAAS,iBAAiB,QAAQ,cAAc,OAAO,WAAW;AAChH,QAAM,cAAc;AAAA,IAClB,MAAM,SAAS,2BAA2B,yBAAyB,QAAQ,IAAI,UAAU,EAAE;AAAA,EAC7F;AACA,QAAM,aAAa,QAAQ,MAAM,SAAS,iBAAiB,aAAa,IAAI,UAAU,QAAQ,EAAE,CAAC;AAEjG,QAAM,aAAa,MAAM,cAAc;AAAA,IACrC;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,CAAC;AAED,MAAI,OAAO,KAAK,UAAU,EAAE,QAAQ;AAClC,UAAM,oBAAoB;AAAA,MACxB;AAAA,MACA;AAAA,MACA,YAAY,WAAW;AAAA,MACvB,MAAM,WAAW;AAAA,MACjB,aAAa,WAAW,eAAe;AAAA,MACvC;AAAA,MACA;AAAA,MACA,QAAQ,QAAQ;AAAA,MAChB,SAAS,WAAW,WAAW;AAAA,IACjC,CAAC;AAAA,EACH;AAEA,SAAO;AAAA,IACL,YAAY;AAAA,MACV,GAAG;AAAA,MACH;AAAA,MACA,UAAU,4BAAS;AAAA,MACnB;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAAA,EACF;AACF;AAEO,MAAM,sBAAsB,OAAO;AAAA,EACxC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MASM;AACJ,QAAM,UAAM,gBAAAC,SAAS,GAAG;AACxB,QAAM,UAAU,GAAG,IAAI,QAAQ,MAAM,IAAI,IAAI,MAAM,CAAC,GAAG,IAAI,WAAW;AACtE,QAAM,WAAW,KAAK,SAAS,IAAI,YAAY,MAAM,IAAI,MAAM,EAAE,CAAC,IAAI,IAAI;AAE1E,QAAM,YAAuB,IAAI,wBAAAC,QAAiB,cAAc,MAAM,EACnE,sBAAsB,WAAW,EACjC,WAAW,IAAI;AAElB,MAAI;AACJ,MAAI;AACJ,MAAI,KAAK;AACP,iBAAa,aAAAC,QAAgB,kBAAkB,KAAK,OAAO,GAAG;AAC9D,aAAS,cAAAC,QAAY;AAAA,MACnB,WAAW;AAAA,MACX,WAAW;AAAA,MACX,WAAW;AAAA,MACX,UAAU;AAAA,IACZ;AAAA,EACF;AAEA,QAAM,aAAa,MAAM,cAAAC,QAAa,WAAW;AAAA,IAC/C,QAAQ,cAAc;AAAA,IACtB;AAAA,IACA;AAAA,IACA;AAAA,IACA,aAAa,eAAe,mCAAY;AAAA,EAC1C,CAAC;AAED,QAAM,UAAU,cAAAC,QAAY,WAAW,eAAe,GAAG;AAEzD,SAAO;AAAA,IACL,WAAW,CAAC,SAAS;AAAA,IACrB;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,WAAW,SAAS,QAAQ,sBAAsB,EAAE,EAAE,QAAQ,uBAAuB,EAAE;AAAA,IACvF,cAAc,KAAK;AAAA,IACnB,eAAe,KAAK,SAAS,mBAAmB,IAAI,MAAM,IAAI;AAAA,IAC9D;AAAA,EACF;AACF;AAEO,MAAM,gBAAgB,OAAO;AAAA,EAClC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAUM;AACJ,QAAM,EAAE,2BAA2B,IAAI,IAAI;AAC3C,QAAM,EAAE,cAAc,IAAI,oBAAAN,QAAa,UAAU,GAAG;AACpD,QAAM,EAAE,MAAM,YAAY,aAAa,kBAAkB,IAAI;AAC7D,QAAM,EAAE,eAAe,MAAM,aAAa,gBAAgB,UAAU,IAAI,iBAAiB;AACzF,QAAM,EAAE,KAAK,IAAI;AAEjB,MAAI,CAAC,eAAe;AAClB,UAAM,IAAI,MAAM,sCAAsC;AAAA,EACxD;AAEA,QAAM,mBAAmB,MAAM,oBAAoB,EAAE,KAAK,KAAK,UAAU,OAAO,eAAe,aAAa,KAAK,CAAC;AAElH,QAAM,UAAU;AAAA,IACd;AAAA,IACA;AAAA,IACA,iBAAiB;AAAA,IACjB,GAAG,IAAI,QAAQ,MAAM,IAAI,IAAI,MAAM,CAAC,GAAG,IAAI,WAAW;AAAA,IACtD;AAAA,IACA;AAAA,IACQ;AAAA,IACR,iBAAiB;AAAA,IACjB,iBAAiB,gBAAgB;AAAA,IACjC;AAAA,EACF;AAEA,SAAO;AAAA,IACL,GAAG;AAAA,IACH;AAAA,IACA;AAAA,IACA,aAAa,eAAe;AAAA,IAC5B;AAAA,IACA,MAAM,8BAAW;AAAA,IACjB;AAAA,IACA;AAAA,IACA;AAAA,IACA,UAAU,WAAW;AAAA,IACrB;AAAA,IACA;AAAA,EACF;AACF;AAEA,IAAO,gBAAQ;AAAA,EACb;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF;",
-  "names": ["import_utils", "ReportActionsUtils", "SelectedFiltersUtils", "UserStoreItemBuilder", "ReportQuery", "LocalsHelper", "parseUrl", "DataTableBuilder", "PaginationUtils", "TotalsUtils", "FiltersUtils", "ColumnUtils"]
+  "sourcesContent": ["import parseUrl from 'parseurl'\nimport type { Request, Response } from 'express'\nimport Dict = NodeJS.Dict\nimport type { components } from '../../../../../types/api'\nimport type { DataTable } from '../../../../../utils/DataTableBuilder/types'\nimport type { ListWithWarnings } from '../../../../../data/types'\nimport type { Columns } from '../../../../../components/_reports/report-heading/report-columns/report-columns-form/types'\nimport type { Services } from '../../../../../types/Services'\nimport type { DownloadActionParams } from '../../../../../components/_reports/report-heading/report-actions/types'\nimport { LoadType, ReportType, RequestStatus } from '../../../../../types/UserReports'\nimport ReportQuery from '../../../../../types/ReportQuery'\nimport { Template } from '../../../../../types/Templates'\nimport { FilterValue } from '../../../../../components/_filters/types'\n\nimport PaginationUtils from '../../../../../components/_reports/report-page/report-template/report-pagination/utils'\nimport TotalsUtils from '../../../../../components/_reports/report-page/report-template/report-totals/utils'\nimport ColumnUtils from '../../../../../components/_reports/report-heading/report-columns/report-columns-form/utils'\nimport ReportActionsUtils from '../../../../../components/_reports/report-heading/report-actions/utils'\nimport FiltersUtils from '../../../../../components/_filters/utils'\nimport SelectedFiltersUtils from '../../../../../components/_filters/filters-selected/utils'\nimport LocalsHelper from '../../../../../utils/localsHelper'\nimport UserStoreItemBuilder from '../../../../../utils/UserStoreItemBuilder'\n\nimport { FiltersType } from '../../../../../components/_filters/filtersTypeEnum'\nimport { ReportTemplateData } from '../../../../../utils/TemplateBuilder/SectionedDataHelper/types'\nimport ReportTemplateUtils from '../../../../../components/_reports/report-page/report-template/utils'\n\nexport const setActions = (\n  csrfToken: string,\n  reportDefinition: components['schemas']['SingleVariantReportDefinition'],\n  columns: Columns,\n  url: string,\n  canDownload: boolean,\n  count: number,\n  dataProductDefinitionsPath: string,\n  currentUrl: string,\n  currentQueryParams: string,\n  nestedBaseUrl: string,\n) => {\n  const { name: reportName, variant, id: reportId } = reportDefinition\n  const { name, id, printable } = variant\n\n  const downloadConfig: DownloadActionParams = {\n    enabled: count > 0,\n    name,\n    reportName,\n    csrfToken,\n    reportId,\n    id,\n    columns: columns.value,\n    loadType: LoadType.SYNC,\n    definitionPath: dataProductDefinitionsPath,\n    canDownload,\n    currentUrl,\n    currentQueryParams,\n    nestedBaseUrl,\n  }\n\n  return ReportActionsUtils.getActions({\n    download: downloadConfig,\n    print: {\n      enabled: Boolean(printable),\n    },\n    share: {\n      reportName,\n      name,\n      url,\n    },\n    copy: {\n      url,\n    },\n  })\n}\n\nconst setAsRecentlyViewed = async ({\n  req,\n  services,\n  reportName,\n  name,\n  description,\n  reportId,\n  id,\n  userId,\n  filters,\n}: {\n  req: Request\n  services: Services\n  reportName: string\n  name: string\n  description: string\n  reportId: string\n  id: string\n  userId: string\n  filters: FilterValue[]\n}) => {\n  const stateData = {\n    type: ReportType.REPORT,\n    reportId,\n    id,\n    reportName,\n    description,\n    name,\n  }\n\n  const interactiveQueryData: { query: Dict<string>; querySummary: Array<Dict<string>> } = {\n    query: <Dict<string>>req.query,\n    querySummary: SelectedFiltersUtils.getQuerySummary(<Dict<string>>req.query, filters),\n  }\n\n  const recentlyViewedData = new UserStoreItemBuilder(stateData)\n    .addInteractiveQuery(interactiveQueryData)\n    .addStatus(RequestStatus.READY)\n    .addTimestamp()\n    .addReportUrls(req)\n    .build()\n\n  await services.recentlyViewedService?.setRecentlyViewed(recentlyViewedData, userId)\n}\n\nexport const getReportData = async ({\n  services,\n  req,\n  token,\n  reportId,\n  id,\n  dataProductDefinitionsPath,\n}: {\n  services: Services\n  req: Request\n  token: string\n  reportId: string\n  id: string\n  dataProductDefinitionsPath?: string\n}) => {\n  const reportDefinition = await services.reportingService.getDefinition(\n    token,\n    reportId,\n    id,\n    dataProductDefinitionsPath,\n  )\n  const { variant } = reportDefinition\n  const { resourceName, specification } = variant\n\n  const reportQuery = new ReportQuery({\n    fields: specification?.fields || [],\n    template: (specification?.template as Template) || 'list',\n    queryParams: req.query,\n    definitionsPath: <string>dataProductDefinitionsPath,\n  })\n\n  return {\n    reportData: await services.reportingService.getListWithWarnings(resourceName, token, reportQuery),\n    reportDefinition,\n    reportQuery,\n  }\n}\n\nexport const getReport = async ({ req, res, services }: { req: Request; res: Response; services: Services }) => {\n  const { token, csrfToken, dprUser } = LocalsHelper.getValues(res)\n  const { reportId, id } = req.params\n  const dataProductDefinitionsPath = <string>req.query['dataProductDefinitionsPath']\n\n  const { reportData, reportDefinition, reportQuery } = await getReportData({\n    services,\n    req,\n    token,\n    reportId,\n    id,\n    dataProductDefinitionsPath,\n  })\n  const count = await services.reportingService.getCount(reportDefinition.variant.resourceName, token, reportQuery)\n  const canDownload = Boolean(\n    await services.downloadPermissionService?.downloadEnabledForReport(dprUser.id, reportId, id),\n  )\n  const bookmarked = Boolean(await services.bookmarkService?.isBookmarked(id, reportId, dprUser.id))\n\n  const renderData = await getRenderData({\n    req,\n    res,\n    services,\n    reportDefinition,\n    reportQuery,\n    reportData,\n    count,\n    csrfToken,\n    canDownload,\n  })\n\n  if (Object.keys(renderData).length) {\n    await setAsRecentlyViewed({\n      req,\n      services,\n      reportName: renderData.reportName,\n      name: renderData.name,\n      description: renderData.description || '',\n      reportId,\n      id,\n      userId: dprUser.id,\n      filters: renderData.filterData.filters,\n    })\n  }\n\n  return {\n    renderData: {\n      ...renderData,\n      csrfToken,\n      loadType: LoadType.SYNC,\n      reportId,\n      id,\n      bookmarked,\n      dataProductDefinitionsPath,\n    },\n  }\n}\n\nexport const getReportRenderData = async ({\n  req,\n  res,\n  services,\n  count,\n  specification,\n  reportQuery,\n  data,\n  filtersType,\n  definition,\n}: {\n  req: Request\n  res?: Response\n  services?: Services\n  count: number\n  specification: components['schemas']['Specification']\n  reportQuery: ReportQuery\n  data: Dict<string>[]\n  filtersType?: FiltersType\n  definition: components['schemas']['SingleVariantReportDefinition']\n}) => {\n  const url = parseUrl(req)\n  const fullUrl = `${req.protocol}://${req.get('host')}${req.originalUrl}`\n  const pathname = url?.search ? req.originalUrl.split(url.search)[0] : req.originalUrl\n  const columns = ColumnUtils.getColumns(specification, req)\n  const reportDefinition = {\n    ...definition,\n    variant: {\n      ...definition.variant,\n      interactive: true,\n    },\n  }\n\n  // Get the data table\n  const dataTable: DataTable | ReportTemplateData = ReportTemplateUtils.createReportTemplateData(\n    reportDefinition,\n    columns,\n    data,\n    [], // child data - N/A for sync reports\n    [], // summaries data - N/A for sync reports\n    reportQuery,\n  )\n\n  let pagination\n  let totals\n  if (url) {\n    pagination = PaginationUtils.getPaginationData(url, count, req)\n    totals = TotalsUtils.getTotals(\n      pagination.pageSize,\n      pagination.currentPage,\n      pagination.totalRows,\n      dataTable.rowCount,\n    )\n  }\n\n  const filterData = await FiltersUtils.getFilters({\n    fields: specification.fields,\n    req,\n    res,\n    services,\n    filtersType: filtersType || FiltersType.INTERACTIVE,\n  })\n\n  return {\n    dataTable,\n    totals,\n    filterData,\n    columns,\n    pagination,\n    reportUrl: pathname.replace('/download-disabled', '').replace('/download-disabled?', ''),\n    reportSearch: url?.search,\n    encodedSearch: url?.search ? encodeURIComponent(url.search) : undefined,\n    fullUrl,\n    template: specification.template,\n  }\n}\n\nexport const getRenderData = async ({\n  req,\n  res,\n  services,\n  reportDefinition,\n  reportQuery,\n  reportData,\n  count,\n  csrfToken,\n  canDownload,\n}: {\n  req: Request\n  res: Response\n  services: Services\n  reportDefinition: components['schemas']['SingleVariantReportDefinition']\n  reportQuery: ReportQuery\n  reportData: ListWithWarnings\n  csrfToken: string\n  count: number\n  canDownload: boolean\n}) => {\n  const { dataProductDefinitionsPath } = req.query\n  const { nestedBaseUrl } = LocalsHelper.getValues(res)\n  const { name: reportName, description: reportDescription } = reportDefinition\n  const { specification, name, description, classification, printable } = reportDefinition.variant\n  const { data } = reportData\n\n  if (!specification) {\n    throw new Error('No specicication found in definition')\n  }\n\n  const reportRenderData = await getReportRenderData({\n    req,\n    res,\n    services,\n    count,\n    specification,\n    reportQuery,\n    data,\n    definition: reportDefinition,\n  })\n\n  const actions = setActions(\n    csrfToken,\n    reportDefinition,\n    reportRenderData.columns,\n    `${req.protocol}://${req.get('host')}${req.originalUrl}`,\n    canDownload,\n    count,\n    <string>dataProductDefinitionsPath,\n    reportRenderData.reportUrl,\n    reportRenderData.reportSearch || '',\n    nestedBaseUrl,\n  )\n\n  return {\n    ...reportRenderData,\n    reportName,\n    name,\n    description: description || reportDescription,\n    count,\n    type: ReportType.REPORT,\n    classification,\n    printable,\n    actions,\n    warnings: reportData.warnings,\n    canDownload,\n    nestedBaseUrl,\n  }\n}\n\nexport default {\n  getRenderData,\n  getReport,\n  getReportData,\n  getReportRenderData,\n  setActions,\n}\n"],
+  "mappings": "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",
+  "names": ["import_utils", "ReportActionsUtils", "SelectedFiltersUtils", "UserStoreItemBuilder", "ReportQuery", "LocalsHelper", "parseUrl", "ColumnUtils", "ReportTemplateUtils", "PaginationUtils", "TotalsUtils", "FiltersUtils"]
 }

package/dpr/routes/journeys/view-report/sync/report/utils.ts

@@ -4,25 +4,26 @@ import Dict = NodeJS.Dict
 import type { components } from '../../../../../types/api'
 import type { DataTable } from '../../../../../utils/DataTableBuilder/types'
 import type { ListWithWarnings } from '../../../../../data/types'
-import type { Columns } from '../../../../../components/_reports/report-columns-form/types'
+import type { Columns } from '../../../../../components/_reports/report-heading/report-columns/report-columns-form/types'
 import type { Services } from '../../../../../types/Services'
-import type { DownloadActionParams } from '../../../../../components/_reports/report-actions/types'
+import type { DownloadActionParams } from '../../../../../components/_reports/report-heading/report-actions/types'
 import { LoadType, ReportType, RequestStatus } from '../../../../../types/UserReports'
 import ReportQuery from '../../../../../types/ReportQuery'
 import { Template } from '../../../../../types/Templates'
 import { FilterValue } from '../../../../../components/_filters/types'
 
-import PaginationUtils from '../../../../../components/_reports/report-pagination/utils'
-import TotalsUtils from '../../../../../components/_reports/report-totals/utils'
-import ColumnUtils from '../../../../../components/_reports/report-columns-form/utils'
-import ReportActionsUtils from '../../../../../components/_reports/report-actions/utils'
+import PaginationUtils from '../../../../../components/_reports/report-page/report-template/report-pagination/utils'
+import TotalsUtils from '../../../../../components/_reports/report-page/report-template/report-totals/utils'
+import ColumnUtils from '../../../../../components/_reports/report-heading/report-columns/report-columns-form/utils'
+import ReportActionsUtils from '../../../../../components/_reports/report-heading/report-actions/utils'
 import FiltersUtils from '../../../../../components/_filters/utils'
 import SelectedFiltersUtils from '../../../../../components/_filters/filters-selected/utils'
 import LocalsHelper from '../../../../../utils/localsHelper'
 import UserStoreItemBuilder from '../../../../../utils/UserStoreItemBuilder'
 
-import DataTableBuilder from '../../../../../utils/DataTableBuilder/DataTableBuilder'
 import { FiltersType } from '../../../../../components/_filters/filtersTypeEnum'
+import { ReportTemplateData } from '../../../../../utils/TemplateBuilder/SectionedDataHelper/types'
+import ReportTemplateUtils from '../../../../../components/_reports/report-page/report-template/utils'
 
 export const setActions = (
   csrfToken: string,
@@ -221,6 +222,7 @@ export const getReportRenderData = async ({
   reportQuery,
   data,
   filtersType,
+  definition,
 }: {
   req: Request
   res?: Response
@@ -230,14 +232,29 @@ export const getReportRenderData = async ({
   reportQuery: ReportQuery
   data: Dict<string>[]
   filtersType?: FiltersType
+  definition: components['schemas']['SingleVariantReportDefinition']
 }) => {
   const url = parseUrl(req)
   const fullUrl = `${req.protocol}://${req.get('host')}${req.originalUrl}`
   const pathname = url?.search ? req.originalUrl.split(url.search)[0] : req.originalUrl
+  const columns = ColumnUtils.getColumns(specification, req)
+  const reportDefinition = {
+    ...definition,
+    variant: {
+      ...definition.variant,
+      interactive: true,
+    },
+  }
 
-  const dataTable: DataTable = new DataTableBuilder(specification.fields)
-    .withHeaderSortOptions(reportQuery)
-    .buildTable(data)
+  // Get the data table
+  const dataTable: DataTable | ReportTemplateData = ReportTemplateUtils.createReportTemplateData(
+    reportDefinition,
+    columns,
+    data,
+    [], // child data - N/A for sync reports
+    [], // summaries data - N/A for sync reports
+    reportQuery,
+  )
 
   let pagination
   let totals
@@ -259,10 +276,8 @@ export const getReportRenderData = async ({
     filtersType: filtersType || FiltersType.INTERACTIVE,
   })
 
-  const columns = ColumnUtils.getColumns(specification, req)
-
   return {
-    dataTable: [dataTable],
+    dataTable,
     totals,
     filterData,
     columns,
@@ -271,6 +286,7 @@ export const getReportRenderData = async ({
     reportSearch: url?.search,
     encodedSearch: url?.search ? encodeURIComponent(url.search) : undefined,
     fullUrl,
+    template: specification.template,
   }
 }
 
@@ -305,7 +321,16 @@ export const getRenderData = async ({
     throw new Error('No specicication found in definition')
   }
 
-  const reportRenderData = await getReportRenderData({ req, res, services, count, specification, reportQuery, data })
+  const reportRenderData = await getReportRenderData({
+    req,
+    res,
+    services,
+    count,
+    specification,
+    reportQuery,
+    data,
+    definition: reportDefinition,
+  })
 
   const actions = setActions(
     csrfToken,

package/dpr/routes/journeys/view-report/utils.js

@@ -37,7 +37,7 @@ var import_enum = require("../../../components/_filters/filter-input/enum");
 var import_localsHelper = __toESM(require("../../../utils/localsHelper"));
 var import_definitionUtils = __toESM(require("../../../utils/definitionUtils"));
 var import_DateMapper = __toESM(require("../../../utils/DateMapper/DateMapper"));
-var import_utils = __toESM(require("../../../components/_reports/report-columns-form/utils"));
+var import_utils = __toESM(require("../../../components/_reports/report-heading/report-columns/report-columns-form/utils"));
 const applyReportInteractiveQuery = async (req, res, services, applyType) => {
   const { reportId, id } = req.params;
   const { token, definitionsPath } = import_localsHelper.default.getValues(res);

package/dpr/routes/journeys/view-report/utils.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../dpr/routes/journeys/view-report/utils.ts"],
-  "sourcesContent": ["import { Request, Response } from 'express'\nimport { FilterType } from '../../../components/_filters/filter-input/enum'\nimport { components } from '../../../types/api'\nimport { StoredReportData } from '../../../types/UserReports'\nimport { Services } from '../../../types/Services'\nimport LocalsHelper from '../../../utils/localsHelper'\nimport definitionUtils from '../../../utils/definitionUtils'\nimport DateMapper from '../../../utils/DateMapper/DateMapper'\nimport ColumnsUtils from '../../../components/_reports/report-columns-form/utils'\n\nexport const applyReportInteractiveQuery = async (\n  req: Request,\n  res: Response,\n  services: Services,\n  applyType: 'columns' | 'filters',\n) => {\n  const { reportId, id } = req.params\n  const { token, definitionsPath } = LocalsHelper.getValues(res)\n\n  // Get the definition\n  const definition: components['schemas']['SingleVariantReportDefinition'] =\n    await services.reportingService.getDefinition(token, reportId, id, definitionsPath)\n  const fields = definition.variant.specification?.fields || []\n\n  return applyInteractiveQuery(req, res, services, applyType, fields)\n}\n\nexport const applyDashboardInteractiveQuery = async (\n  req: Request,\n  res: Response,\n  services: Services,\n  applyType: 'columns' | 'filters',\n) => {\n  const { reportId, id } = req.params\n  const { token, definitionsPath } = LocalsHelper.getValues(res)\n\n  // Get the definition\n  const definition: components['schemas']['DashboardDefinition'] = await services.dashboardService.getDefinition(\n    token,\n    reportId,\n    id,\n    definitionsPath,\n  )\n  const fields = definition.filterFields || []\n\n  return applyInteractiveQuery(req, res, services, applyType, fields)\n}\n\nconst applyInteractiveQuery = async (\n  req: Request,\n  res: Response,\n  services: Services,\n  applyType: 'columns' | 'filters',\n  fields: components['schemas']['FieldDefinition'][],\n) => {\n  const { tableId, id } = req.params\n  const { dprUser } = LocalsHelper.getValues(res)\n\n  // get the report state\n  let reportStateData: StoredReportData | undefined\n  if (tableId) {\n    // means its an async report\n    reportStateData = await services.recentlyViewedService?.getReportByTableId(tableId, dprUser.id)\n  } else {\n    // its a sync report and can be indentified by ID as will always only be 1\n    reportStateData = await services.recentlyViewedService?.getReportById(id, dprUser.id)\n  }\n\n  // Get the stored interactive query data\n  const interactiveQueryData = reportStateData?.interactiveQuery?.data\n\n  const preventDefault = interactiveQueryData?.['preventDefault']\n  const pageSize = interactiveQueryData?.['pageSize']\n  const selectedPage = applyType === 'columns' ? interactiveQueryData?.['selectedPage'] : 1\n  const sortColumn = interactiveQueryData?.['sortColumn']\n  const sortedAsc = interactiveQueryData?.['sortedAsc']\n\n  let filters = {}\n  if (interactiveQueryData) {\n    filters = Object.keys(interactiveQueryData)\n      .filter((key) => key.includes('filters.'))\n      .reduce((acc, key) => ({ ...acc, [key]: interactiveQueryData[key] }), {})\n  }\n\n  // Create merged form data\n  let formData: Record<string, string | string[]> = {\n    ...(preventDefault && { preventDefault }),\n    ...(selectedPage && { selectedPage }),\n    ...(pageSize && { pageSize }),\n    ...(sortColumn && { sortColumn }),\n    ...(sortedAsc && { sortedAsc }),\n    ...req.body,\n  }\n\n  if (applyType === 'columns') {\n    const { columns } = req.body\n    const mandatoryCols = ColumnsUtils.mandatoryColumns(fields)\n\n    let bodyColumns = []\n    if (columns) {\n      bodyColumns = Array.isArray(columns) ? columns : [columns]\n    }\n    const columnsData = [...mandatoryCols, ...bodyColumns]\n    formData = { ...formData, columns: columnsData, ...filters }\n  } else {\n    const columns = interactiveQueryData?.['columns'] || []\n    formData = { ...formData, columns }\n  }\n\n  // Create query string\n  const filtersString = createQueryParamsFromFormData({\n    formData,\n    fields,\n  })\n\n  // Redirect back to report\n  res.redirect(`${req.baseUrl}?${filtersString}`)\n}\n\nconst createQueryParamsFromFormData = ({\n  formData,\n  fields,\n}: {\n  fields: components['schemas']['FieldDefinition'][]\n  formData: Record<string, string | string[]>\n}) => {\n  // create the query string\n  const params = new URLSearchParams()\n  Object.keys(formData).forEach((key) => {\n    const value = formData[key]\n\n    if (value && key !== '_csrf') {\n      const fieldId = key.split('.')[1] // filters are prefixed with 'filters.'\n      if (fieldId) {\n        const filter = definitionUtils.getFilter(fields, fieldId)\n        if (filter) {\n          const { type: filterType } = filter\n          switch (filterType.toLocaleLowerCase()) {\n            // DATE RANGE TYPES\n            case FilterType.date.toLocaleLowerCase():\n            case FilterType.dateRange.toLocaleLowerCase():\n            case FilterType.granularDateRange.toLocaleLowerCase():\n              {\n                let dateValue: string = <string>value\n                const dateMapper = new DateMapper()\n                const currentDateFormat = dateMapper.getDateType(dateValue)\n                if (currentDateFormat !== 'none') {\n                  dateValue = dateMapper.toDateString(dateValue, 'iso') || ''\n                }\n                if (dateValue) {\n                  params.append(key, dateValue)\n                }\n              }\n              break\n\n            // MULTIVALUE TYPES: string[] || string if only one value selected\n            case FilterType.multiselect.toLocaleLowerCase():\n              if (Array.isArray(value)) {\n                const multiselectValue = <string[]>value\n                multiselectValue.forEach((v: string) => {\n                  params.append(key, v)\n                })\n              } else {\n                params.append(key, <string>value)\n              }\n              break\n\n            // OTHER TYPES - always a string\n            default:\n              params.append(key, <string>value)\n              break\n          }\n        }\n      } else if (Array.isArray(value)) {\n        value.forEach((v: string) => {\n          params.append(key, v)\n        })\n      } else {\n        params.append(key, value)\n      }\n    }\n  })\n\n  const encodedFilters = params.toString()\n  return decodeURIComponent(encodedFilters)\n}\n\nexport default {\n  applyDashboardInteractiveQuery,\n  applyReportInteractiveQuery,\n}\n"],
+  "sourcesContent": ["import { Request, Response } from 'express'\nimport { FilterType } from '../../../components/_filters/filter-input/enum'\nimport { components } from '../../../types/api'\nimport { StoredReportData } from '../../../types/UserReports'\nimport { Services } from '../../../types/Services'\nimport LocalsHelper from '../../../utils/localsHelper'\nimport definitionUtils from '../../../utils/definitionUtils'\nimport DateMapper from '../../../utils/DateMapper/DateMapper'\nimport ColumnsUtils from '../../../components/_reports/report-heading/report-columns/report-columns-form/utils'\n\nexport const applyReportInteractiveQuery = async (\n  req: Request,\n  res: Response,\n  services: Services,\n  applyType: 'columns' | 'filters',\n) => {\n  const { reportId, id } = req.params\n  const { token, definitionsPath } = LocalsHelper.getValues(res)\n\n  // Get the definition\n  const definition: components['schemas']['SingleVariantReportDefinition'] =\n    await services.reportingService.getDefinition(token, reportId, id, definitionsPath)\n  const fields = definition.variant.specification?.fields || []\n\n  return applyInteractiveQuery(req, res, services, applyType, fields)\n}\n\nexport const applyDashboardInteractiveQuery = async (\n  req: Request,\n  res: Response,\n  services: Services,\n  applyType: 'columns' | 'filters',\n) => {\n  const { reportId, id } = req.params\n  const { token, definitionsPath } = LocalsHelper.getValues(res)\n\n  // Get the definition\n  const definition: components['schemas']['DashboardDefinition'] = await services.dashboardService.getDefinition(\n    token,\n    reportId,\n    id,\n    definitionsPath,\n  )\n  const fields = definition.filterFields || []\n\n  return applyInteractiveQuery(req, res, services, applyType, fields)\n}\n\nconst applyInteractiveQuery = async (\n  req: Request,\n  res: Response,\n  services: Services,\n  applyType: 'columns' | 'filters',\n  fields: components['schemas']['FieldDefinition'][],\n) => {\n  const { tableId, id } = req.params\n  const { dprUser } = LocalsHelper.getValues(res)\n\n  // get the report state\n  let reportStateData: StoredReportData | undefined\n  if (tableId) {\n    // means its an async report\n    reportStateData = await services.recentlyViewedService?.getReportByTableId(tableId, dprUser.id)\n  } else {\n    // its a sync report and can be indentified by ID as will always only be 1\n    reportStateData = await services.recentlyViewedService?.getReportById(id, dprUser.id)\n  }\n\n  // Get the stored interactive query data\n  const interactiveQueryData = reportStateData?.interactiveQuery?.data\n\n  const preventDefault = interactiveQueryData?.['preventDefault']\n  const pageSize = interactiveQueryData?.['pageSize']\n  const selectedPage = applyType === 'columns' ? interactiveQueryData?.['selectedPage'] : 1\n  const sortColumn = interactiveQueryData?.['sortColumn']\n  const sortedAsc = interactiveQueryData?.['sortedAsc']\n\n  let filters = {}\n  if (interactiveQueryData) {\n    filters = Object.keys(interactiveQueryData)\n      .filter((key) => key.includes('filters.'))\n      .reduce((acc, key) => ({ ...acc, [key]: interactiveQueryData[key] }), {})\n  }\n\n  // Create merged form data\n  let formData: Record<string, string | string[]> = {\n    ...(preventDefault && { preventDefault }),\n    ...(selectedPage && { selectedPage }),\n    ...(pageSize && { pageSize }),\n    ...(sortColumn && { sortColumn }),\n    ...(sortedAsc && { sortedAsc }),\n    ...req.body,\n  }\n\n  if (applyType === 'columns') {\n    const { columns } = req.body\n    const mandatoryCols = ColumnsUtils.mandatoryColumns(fields)\n\n    let bodyColumns = []\n    if (columns) {\n      bodyColumns = Array.isArray(columns) ? columns : [columns]\n    }\n    const columnsData = [...mandatoryCols, ...bodyColumns]\n    formData = { ...formData, columns: columnsData, ...filters }\n  } else {\n    const columns = interactiveQueryData?.['columns'] || []\n    formData = { ...formData, columns }\n  }\n\n  // Create query string\n  const filtersString = createQueryParamsFromFormData({\n    formData,\n    fields,\n  })\n\n  // Redirect back to report\n  res.redirect(`${req.baseUrl}?${filtersString}`)\n}\n\nconst createQueryParamsFromFormData = ({\n  formData,\n  fields,\n}: {\n  fields: components['schemas']['FieldDefinition'][]\n  formData: Record<string, string | string[]>\n}) => {\n  // create the query string\n  const params = new URLSearchParams()\n  Object.keys(formData).forEach((key) => {\n    const value = formData[key]\n\n    if (value && key !== '_csrf') {\n      const fieldId = key.split('.')[1] // filters are prefixed with 'filters.'\n      if (fieldId) {\n        const filter = definitionUtils.getFilter(fields, fieldId)\n        if (filter) {\n          const { type: filterType } = filter\n          switch (filterType.toLocaleLowerCase()) {\n            // DATE RANGE TYPES\n            case FilterType.date.toLocaleLowerCase():\n            case FilterType.dateRange.toLocaleLowerCase():\n            case FilterType.granularDateRange.toLocaleLowerCase():\n              {\n                let dateValue: string = <string>value\n                const dateMapper = new DateMapper()\n                const currentDateFormat = dateMapper.getDateType(dateValue)\n                if (currentDateFormat !== 'none') {\n                  dateValue = dateMapper.toDateString(dateValue, 'iso') || ''\n                }\n                if (dateValue) {\n                  params.append(key, dateValue)\n                }\n              }\n              break\n\n            // MULTIVALUE TYPES: string[] || string if only one value selected\n            case FilterType.multiselect.toLocaleLowerCase():\n              if (Array.isArray(value)) {\n                const multiselectValue = <string[]>value\n                multiselectValue.forEach((v: string) => {\n                  params.append(key, v)\n                })\n              } else {\n                params.append(key, <string>value)\n              }\n              break\n\n            // OTHER TYPES - always a string\n            default:\n              params.append(key, <string>value)\n              break\n          }\n        }\n      } else if (Array.isArray(value)) {\n        value.forEach((v: string) => {\n          params.append(key, v)\n        })\n      } else {\n        params.append(key, value)\n      }\n    }\n  })\n\n  const encodedFilters = params.toString()\n  return decodeURIComponent(encodedFilters)\n}\n\nexport default {\n  applyDashboardInteractiveQuery,\n  applyReportInteractiveQuery,\n}\n"],
   "mappings": "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",
   "names": ["LocalsHelper", "ColumnsUtils", "definitionUtils", "DateMapper"]
 }

package/dpr/routes/journeys/view-report/utils.ts

@@ -6,7 +6,7 @@ import { Services } from '../../../types/Services'
 import LocalsHelper from '../../../utils/localsHelper'
 import definitionUtils from '../../../utils/definitionUtils'
 import DateMapper from '../../../utils/DateMapper/DateMapper'
-import ColumnsUtils from '../../../components/_reports/report-columns-form/utils'
+import ColumnsUtils from '../../../components/_reports/report-heading/report-columns/report-columns-form/utils'
 
 export const applyReportInteractiveQuery = async (
   req: Request,

package/dpr/services/reportingService.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../dpr/services/reportingService.ts"],
-  "sourcesContent": ["import { Response } from 'express'\nimport { components } from '../types/api'\nimport type ReportingClient from '../data/reportingClient'\nimport ReportQuery from '../types/ReportQuery'\nimport Dict = NodeJS.Dict\nimport { ListWithWarnings } from '../data/types'\n\nclass ReportingService {\n  constructor(private readonly reportingClient: ReportingClient) {\n    this.reportingClient = reportingClient\n  }\n\n  async getCount(resourceName: string, token: string, listRequest: ReportQuery): Promise<number> {\n    return this.reportingClient.getCount(resourceName, token, listRequest)\n  }\n\n  async getList(resourceName: string, token: string, listRequest: ReportQuery): Promise<Array<NodeJS.Dict<string>>> {\n    return this.reportingClient.getList(resourceName, token, listRequest)\n  }\n\n  async getListWithWarnings(resourceName: string, token: string, listRequest: ReportQuery): Promise<ListWithWarnings> {\n    return this.reportingClient.getListWithWarnings(resourceName, token, listRequest)\n  }\n\n  async getDefinitionSummary(\n    token: string,\n    reportId: string,\n    dataProductDefinitionsPath?: string,\n  ): Promise<components['schemas']['ReportDefinitionSummary']> {\n    return this.reportingClient.getDefinitionSummary(token, reportId, dataProductDefinitionsPath)\n  }\n\n  async getDefinitions(\n    token: string,\n    dataProductDefinitionsPath?: string,\n  ): Promise<Array<components['schemas']['ReportDefinitionSummary']>> {\n    return this.reportingClient.getDefinitions(token, dataProductDefinitionsPath)\n  }\n\n  async getDefinition(\n    token: string,\n    reportId: string,\n    variantId: string,\n    dataProductDefinitionsPath?: string,\n    query?: Dict<string | string[]>,\n  ): Promise<components['schemas']['SingleVariantReportDefinition']> {\n    return this.reportingClient.getDefinition(token, reportId, variantId, dataProductDefinitionsPath, query)\n  }\n\n  async requestAsyncReport(\n    token: string,\n    reportId: string,\n    variantId: string,\n    query: Record<string, string | boolean | number>,\n  ): Promise<Dict<string>> {\n    return this.reportingClient.requestAsyncReport(token, reportId, variantId, query)\n  }\n\n  async cancelAsyncRequest(\n    token: string,\n    reportId: string,\n    variantId: string,\n    executionId: string,\n    dataProductDefinitionsPath?: string,\n  ): Promise<Dict<string>> {\n    return this.reportingClient.cancelAsyncRequest(token, reportId, variantId, executionId, dataProductDefinitionsPath)\n  }\n\n  async downloadAsyncReport(\n    token: string,\n    reportId: string,\n    variantId: string,\n    tableId: string,\n    query: Record<string, string | string[]>,\n    res: Response,\n  ): Promise<void> {\n    return this.reportingClient.downloadAsyncReport(token, reportId, variantId, tableId, query, res)\n  }\n\n  async getAsyncReport(\n    token: string,\n    reportId: string,\n    variantId: string,\n    tableId: string,\n    query: Record<string, string | string[]>,\n  ): Promise<Array<Dict<string>>> {\n    return this.reportingClient.getAsyncReport(token, reportId, variantId, tableId, query)\n  }\n\n  async getAsyncSummaryReport(\n    token: string,\n    reportId: string,\n    variantId: string,\n    tableId: string,\n    summaryId: string,\n    query: Dict<string | number>,\n  ): Promise<Array<Dict<string>>> {\n    return this.reportingClient.getAsyncSummaryReport(token, reportId, variantId, tableId, summaryId, query)\n  }\n\n  async getAsyncReportStatus(\n    token: string,\n    reportId: string,\n    variantId: string,\n    executionId: string,\n    dataProductDefinitionsPath: string,\n    tableId: string,\n  ): Promise<components['schemas']['StatementExecutionStatus']> {\n    return this.reportingClient.getAsyncReportStatus(\n      token,\n      reportId,\n      variantId,\n      executionId,\n      dataProductDefinitionsPath,\n      tableId,\n    )\n  }\n\n  async getAsyncCount(token: string, tableId: string, dataProductDefinitionsPath?: string): Promise<number> {\n    return this.reportingClient.getAsyncCount(token, tableId, dataProductDefinitionsPath)\n  }\n\n  async getAsyncInteractiveCount(\n    token: string,\n    tableId: string,\n    reportId: string,\n    id: string,\n    filters: ReportQuery,\n  ): Promise<number> {\n    return this.reportingClient.getAsyncInteractiveCount(token, tableId, reportId, id, filters)\n  }\n}\n\nexport { ReportingService }\nexport default ReportingService\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAOA,MAAM,iBAAiB;AAAA,EACrB,YAA6B,iBAAkC;AAAlC;AAC3B,SAAK,kBAAkB;AAAA,EACzB;AAAA,EAEA,MAAM,SAAS,cAAsB,OAAe,aAA2C;AAC7F,WAAO,KAAK,gBAAgB,SAAS,cAAc,OAAO,WAAW;AAAA,EACvE;AAAA,EAEA,MAAM,QAAQ,cAAsB,OAAe,aAA+D;AAChH,WAAO,KAAK,gBAAgB,QAAQ,cAAc,OAAO,WAAW;AAAA,EACtE;AAAA,EAEA,MAAM,oBAAoB,cAAsB,OAAe,aAAqD;AAClH,WAAO,KAAK,gBAAgB,oBAAoB,cAAc,OAAO,WAAW;AAAA,EAClF;AAAA,EAEA,MAAM,qBACJ,OACA,UACA,4BAC2D;AAC3D,WAAO,KAAK,gBAAgB,qBAAqB,OAAO,UAAU,0BAA0B;AAAA,EAC9F;AAAA,EAEA,MAAM,eACJ,OACA,4BACkE;AAClE,WAAO,KAAK,gBAAgB,eAAe,OAAO,0BAA0B;AAAA,EAC9E;AAAA,EAEA,MAAM,cACJ,OACA,UACA,WACA,4BACA,OACiE;AACjE,WAAO,KAAK,gBAAgB,cAAc,OAAO,UAAU,WAAW,4BAA4B,KAAK;AAAA,EACzG;AAAA,EAEA,MAAM,mBACJ,OACA,UACA,WACA,OACuB;AACvB,WAAO,KAAK,gBAAgB,mBAAmB,OAAO,UAAU,WAAW,KAAK;AAAA,EAClF;AAAA,EAEA,MAAM,mBACJ,OACA,UACA,WACA,aACA,4BACuB;AACvB,WAAO,KAAK,gBAAgB,mBAAmB,OAAO,UAAU,WAAW,aAAa,0BAA0B;AAAA,EACpH;AAAA,EAEA,MAAM,oBACJ,OACA,UACA,WACA,SACA,OACA,KACe;AACf,WAAO,KAAK,gBAAgB,oBAAoB,OAAO,UAAU,WAAW,SAAS,OAAO,GAAG;AAAA,EACjG;AAAA,EAEA,MAAM,eACJ,OACA,UACA,WACA,SACA,OAC8B;AAC9B,WAAO,KAAK,gBAAgB,eAAe,OAAO,UAAU,WAAW,SAAS,KAAK;AAAA,EACvF;AAAA,EAEA,MAAM,sBACJ,OACA,UACA,WACA,SACA,WACA,OAC8B;AAC9B,WAAO,KAAK,gBAAgB,sBAAsB,OAAO,UAAU,WAAW,SAAS,WAAW,KAAK;AAAA,EACzG;AAAA,EAEA,MAAM,qBACJ,OACA,UACA,WACA,aACA,4BACA,SAC4D;AAC5D,WAAO,KAAK,gBAAgB;AAAA,MAC1B;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAAA,EACF;AAAA,EAEA,MAAM,cAAc,OAAe,SAAiB,4BAAsD;AACxG,WAAO,KAAK,gBAAgB,cAAc,OAAO,SAAS,0BAA0B;AAAA,EACtF;AAAA,EAEA,MAAM,yBACJ,OACA,SACA,UACA,IACA,SACiB;AACjB,WAAO,KAAK,gBAAgB,yBAAyB,OAAO,SAAS,UAAU,IAAI,OAAO;AAAA,EAC5F;AACF;AAGA,IAAO,2BAAQ;",
+  "sourcesContent": ["import { Response } from 'express'\nimport { components } from '../types/api'\nimport type ReportingClient from '../data/reportingClient'\nimport ReportQuery from '../types/ReportQuery'\nimport Dict = NodeJS.Dict\nimport { ListWithWarnings } from '../data/types'\n\nclass ReportingService {\n  constructor(private readonly reportingClient: ReportingClient) {\n    this.reportingClient = reportingClient\n  }\n\n  async getCount(resourceName: string, token: string, listRequest: ReportQuery): Promise<number> {\n    return this.reportingClient.getCount(resourceName, token, listRequest)\n  }\n\n  async getList(resourceName: string, token: string, listRequest: ReportQuery): Promise<Array<NodeJS.Dict<string>>> {\n    return this.reportingClient.getList(resourceName, token, listRequest)\n  }\n\n  async getListWithWarnings(resourceName: string, token: string, listRequest: ReportQuery): Promise<ListWithWarnings> {\n    return this.reportingClient.getListWithWarnings(resourceName, token, listRequest)\n  }\n\n  async getDefinitionSummary(\n    token: string,\n    reportId: string,\n    dataProductDefinitionsPath?: string,\n  ): Promise<components['schemas']['ReportDefinitionSummary']> {\n    return this.reportingClient.getDefinitionSummary(token, reportId, dataProductDefinitionsPath)\n  }\n\n  async getDefinitions(\n    token: string,\n    dataProductDefinitionsPath?: string,\n  ): Promise<Array<components['schemas']['ReportDefinitionSummary']>> {\n    return this.reportingClient.getDefinitions(token, dataProductDefinitionsPath)\n  }\n\n  async getDefinition(\n    token: string,\n    reportId: string,\n    variantId: string,\n    dataProductDefinitionsPath?: string,\n    query?: Dict<string | string[]>,\n  ): Promise<components['schemas']['SingleVariantReportDefinition']> {\n    return this.reportingClient.getDefinition(token, reportId, variantId, dataProductDefinitionsPath, query)\n  }\n\n  async requestAsyncReport(\n    token: string,\n    reportId: string,\n    variantId: string,\n    query: Record<string, string | boolean | number>,\n  ): Promise<Dict<string>> {\n    return this.reportingClient.requestAsyncReport(token, reportId, variantId, query)\n  }\n\n  async cancelAsyncRequest(\n    token: string,\n    reportId: string,\n    variantId: string,\n    executionId: string,\n    dataProductDefinitionsPath?: string,\n  ): Promise<Dict<string>> {\n    return this.reportingClient.cancelAsyncRequest(token, reportId, variantId, executionId, dataProductDefinitionsPath)\n  }\n\n  async downloadAsyncReport(\n    token: string,\n    reportId: string,\n    variantId: string,\n    tableId: string,\n    query: Record<string, string | string[]>,\n    res: Response,\n  ): Promise<void> {\n    return this.reportingClient.downloadAsyncReport(token, reportId, variantId, tableId, query, res)\n  }\n\n  async getAsyncReport(\n    token: string,\n    reportId: string,\n    variantId: string,\n    tableId: string,\n    query: Record<string, string | string[]>,\n  ): Promise<Array<Record<string, string>>> {\n    return this.reportingClient.getAsyncReport(token, reportId, variantId, tableId, query)\n  }\n\n  async getAsyncSummaryReport(\n    token: string,\n    reportId: string,\n    variantId: string,\n    tableId: string,\n    summaryId: string,\n    query: Dict<string | number>,\n  ): Promise<Array<Record<string, string>>> {\n    return this.reportingClient.getAsyncSummaryReport(token, reportId, variantId, tableId, summaryId, query)\n  }\n\n  async getAsyncReportStatus(\n    token: string,\n    reportId: string,\n    variantId: string,\n    executionId: string,\n    dataProductDefinitionsPath: string,\n    tableId: string,\n  ): Promise<components['schemas']['StatementExecutionStatus']> {\n    return this.reportingClient.getAsyncReportStatus(\n      token,\n      reportId,\n      variantId,\n      executionId,\n      dataProductDefinitionsPath,\n      tableId,\n    )\n  }\n\n  async getAsyncCount(token: string, tableId: string, dataProductDefinitionsPath?: string): Promise<number> {\n    return this.reportingClient.getAsyncCount(token, tableId, dataProductDefinitionsPath)\n  }\n\n  async getAsyncInteractiveCount(\n    token: string,\n    tableId: string,\n    reportId: string,\n    id: string,\n    filters: ReportQuery,\n  ): Promise<number> {\n    return this.reportingClient.getAsyncInteractiveCount(token, tableId, reportId, id, filters)\n  }\n}\n\nexport { ReportingService }\nexport default ReportingService\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAOA,MAAM,iBAAiB;AAAA,EACrB,YAA6B,iBAAkC;AAAlC;AAC3B,SAAK,kBAAkB;AAAA,EACzB;AAAA,EAEA,MAAM,SAAS,cAAsB,OAAe,aAA2C;AAC7F,WAAO,KAAK,gBAAgB,SAAS,cAAc,OAAO,WAAW;AAAA,EACvE;AAAA,EAEA,MAAM,QAAQ,cAAsB,OAAe,aAA+D;AAChH,WAAO,KAAK,gBAAgB,QAAQ,cAAc,OAAO,WAAW;AAAA,EACtE;AAAA,EAEA,MAAM,oBAAoB,cAAsB,OAAe,aAAqD;AAClH,WAAO,KAAK,gBAAgB,oBAAoB,cAAc,OAAO,WAAW;AAAA,EAClF;AAAA,EAEA,MAAM,qBACJ,OACA,UACA,4BAC2D;AAC3D,WAAO,KAAK,gBAAgB,qBAAqB,OAAO,UAAU,0BAA0B;AAAA,EAC9F;AAAA,EAEA,MAAM,eACJ,OACA,4BACkE;AAClE,WAAO,KAAK,gBAAgB,eAAe,OAAO,0BAA0B;AAAA,EAC9E;AAAA,EAEA,MAAM,cACJ,OACA,UACA,WACA,4BACA,OACiE;AACjE,WAAO,KAAK,gBAAgB,cAAc,OAAO,UAAU,WAAW,4BAA4B,KAAK;AAAA,EACzG;AAAA,EAEA,MAAM,mBACJ,OACA,UACA,WACA,OACuB;AACvB,WAAO,KAAK,gBAAgB,mBAAmB,OAAO,UAAU,WAAW,KAAK;AAAA,EAClF;AAAA,EAEA,MAAM,mBACJ,OACA,UACA,WACA,aACA,4BACuB;AACvB,WAAO,KAAK,gBAAgB,mBAAmB,OAAO,UAAU,WAAW,aAAa,0BAA0B;AAAA,EACpH;AAAA,EAEA,MAAM,oBACJ,OACA,UACA,WACA,SACA,OACA,KACe;AACf,WAAO,KAAK,gBAAgB,oBAAoB,OAAO,UAAU,WAAW,SAAS,OAAO,GAAG;AAAA,EACjG;AAAA,EAEA,MAAM,eACJ,OACA,UACA,WACA,SACA,OACwC;AACxC,WAAO,KAAK,gBAAgB,eAAe,OAAO,UAAU,WAAW,SAAS,KAAK;AAAA,EACvF;AAAA,EAEA,MAAM,sBACJ,OACA,UACA,WACA,SACA,WACA,OACwC;AACxC,WAAO,KAAK,gBAAgB,sBAAsB,OAAO,UAAU,WAAW,SAAS,WAAW,KAAK;AAAA,EACzG;AAAA,EAEA,MAAM,qBACJ,OACA,UACA,WACA,aACA,4BACA,SAC4D;AAC5D,WAAO,KAAK,gBAAgB;AAAA,MAC1B;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAAA,EACF;AAAA,EAEA,MAAM,cAAc,OAAe,SAAiB,4BAAsD;AACxG,WAAO,KAAK,gBAAgB,cAAc,OAAO,SAAS,0BAA0B;AAAA,EACtF;AAAA,EAEA,MAAM,yBACJ,OACA,SACA,UACA,IACA,SACiB;AACjB,WAAO,KAAK,gBAAgB,yBAAyB,OAAO,SAAS,UAAU,IAAI,OAAO;AAAA,EAC5F;AACF;AAGA,IAAO,2BAAQ;",
   "names": []
 }

package/dpr/services/reportingService.ts

@@ -83,7 +83,7 @@ class ReportingService {
     variantId: string,
     tableId: string,
     query: Record<string, string | string[]>,
-  ): Promise<Array<Dict<string>>> {
+  ): Promise<Array<Record<string, string>>> {
     return this.reportingClient.getAsyncReport(token, reportId, variantId, tableId, query)
   }
 
@@ -94,7 +94,7 @@ class ReportingService {
     tableId: string,
     summaryId: string,
     query: Dict<string | number>,
-  ): Promise<Array<Dict<string>>> {
+  ): Promise<Array<Record<string, string>>> {
     return this.reportingClient.getAsyncSummaryReport(token, reportId, variantId, tableId, summaryId, query)
   }
 

package/dpr/types/ReportQuery.js

@@ -34,7 +34,7 @@ __export(ReportQuery_exports, {
 });
 module.exports = __toCommonJS(ReportQuery_exports);
 var import_urlHelper = require("../utils/urlHelper");
-var import_utils = __toESM(require("../components/_reports/report-columns-form/utils"));
+var import_utils = __toESM(require("../components/_reports/report-heading/report-columns/report-columns-form/utils"));
 var import_UserReports = require("./UserReports");
 const DEFAULT_FILTERS_PREFIX = "filters.";
 class ReportQuery {