@ministryofjustice/hmpps-digital-prison-reporting-frontend 4.17.4 → 4.17.5

package/dpr/types/DprUser.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/dpr/types/DprUser.ts"],
-  "sourcesContent": ["class DprUser {\n  // Auth token\n  token: string\n\n  // Nomis user uuid\n  id: string\n\n  // e.g. John Smith\n  displayName?: string\n\n  // e.g. MDI\n  activeCaseLoadId?: string\n\n  // Prison staff id in Nomis\n  staffId?: number\n\n  // Email address\n  emailAddress?: string\n}\n\nexport { DprUser }\nexport default DprUser\n"],
-  "mappings": "4ZAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAAA,MAAME,CAAQ,CAkBd,CAGA,IAAOC,EAAQD",
+  "sourcesContent": ["class DprUser {\n  // Auth token\n  token = ''\n\n  // Nomis user uuid\n  id = ''\n\n  // e.g. John Smith\n  displayName?: string\n\n  // e.g. MDI\n  activeCaseLoadId?: string\n\n  // Prison staff id in Nomis\n  staffId?: number\n\n  // Email address\n  emailAddress?: string\n}\n\nexport { DprUser }\nexport default DprUser\n"],
+  "mappings": "yaAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAAA,MAAME,CAAQ,CAAd,cAEE,WAAQ,GAGR,QAAK,GAaP,CAGA,IAAOC,EAAQD",
   "names": ["DprUser_exports", "__export", "DprUser", "DprUser_default", "__toCommonJS"]
 }

package/dpr/types/DprUser.ts

@@ -1,9 +1,9 @@
 class DprUser {
   // Auth token
-  token: string
+  token = ''
 
   // Nomis user uuid
-  id: string
+  id = ''
 
   // e.g. John Smith
   displayName?: string

package/dpr/types/EmbeddedReportUtils.js

@@ -1,2 +1,2 @@
-var i=Object.defineProperty;var s=Object.getOwnPropertyDescriptor;var a=Object.getOwnPropertyNames;var p=Object.prototype.hasOwnProperty;var m=(t,e)=>{for(var n in e)i(t,n,{get:e[n],enumerable:!0})},c=(t,e,n,r)=>{if(e&&typeof e=="object"||typeof e=="function")for(let o of a(e))!p.call(t,o)&&o!==n&&i(t,o,{get:()=>e[o],enumerable:!(r=s(e,o))||r.enumerable});return t};var l=t=>c(i({},"__esModule",{value:!0}),t);var u={};m(u,{EmbeddedReportFeaturesList:()=>d});module.exports=l(u);var d=(r=>(r.download="download",r.bookmark="bookmark",r.recentlyViewed="recentlyViewed",r))(d||{});0&&(module.exports={EmbeddedReportFeaturesList});
+"use strict";var i=Object.defineProperty;var s=Object.getOwnPropertyDescriptor;var a=Object.getOwnPropertyNames;var p=Object.prototype.hasOwnProperty;var m=(t,e)=>{for(var n in e)i(t,n,{get:e[n],enumerable:!0})},c=(t,e,n,r)=>{if(e&&typeof e=="object"||typeof e=="function")for(let o of a(e))!p.call(t,o)&&o!==n&&i(t,o,{get:()=>e[o],enumerable:!(r=s(e,o))||r.enumerable});return t};var l=t=>c(i({},"__esModule",{value:!0}),t);var u={};m(u,{EmbeddedReportFeaturesList:()=>d});module.exports=l(u);var d=(r=>(r.download="download",r.bookmark="bookmark",r.recentlyViewed="recentlyViewed",r))(d||{});0&&(module.exports={EmbeddedReportFeaturesList});
 //# sourceMappingURL=EmbeddedReportUtils.js.map

package/dpr/types/EmbeddedReportUtils.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../src/dpr/types/EmbeddedReportUtils.ts"],
   "sourcesContent": ["import { Response, Request, NextFunction, Router } from 'express'\nimport { Services } from './Services'\nimport UserDataStore, { RedisClient } from '../data/reportDataStore'\n\nexport interface EmbeddedReportUtilsParams {\n  req?: Request\n  res: Response\n  next?: NextFunction\n  services: Services\n  options?: EmbeddedReportOptions\n  features: EmbeddedReportFeatures\n}\n\nexport interface EmbeddedSyncParams {\n  router: Router\n  config?: EmbeddedSyncParamsConfig\n  services?: Services\n  options?: EmbeddedReportOptions\n  features?: EmbeddedReportFeatures\n}\n\nexport interface EmbeddedSyncParamsConfig {\n  layoutPath?: string\n  templatePath?: string\n  reportingClientArgs?: ReportingClientArgs\n}\n\nexport interface EmbeddedReportOptions {\n  dpdPath?: string\n}\n\nexport interface EmbeddedReportFeatures {\n  config: EmbeddedReportFeaturesConfig\n  list: EmbeddedReportFeaturesList[]\n}\n\nexport interface EmbeddedReportFeaturesConfig {\n  userId?: string\n  redisClient?: RedisClient\n  userDataStore?: UserDataStore\n}\n\ninterface ReportingClientArgs {\n  url: string\n  agent: { timeout: number }\n}\n\nexport enum EmbeddedReportFeaturesList {\n  download = 'download',\n  bookmark = 'bookmark',\n  recentlyViewed = 'recentlyViewed',\n}\n\nexport interface InitialisedFeatures {\n  download?: boolean\n  bookmark?: boolean\n  recentlyViewed?: boolean\n}\n"],
-  "mappings": "4ZAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,gCAAAE,IAAA,eAAAC,EAAAH,GA+CO,IAAKE,OACVA,EAAA,SAAW,WACXA,EAAA,SAAW,WACXA,EAAA,eAAiB,iBAHPA,OAAA",
+  "mappings": "yaAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,gCAAAE,IAAA,eAAAC,EAAAH,GA+CO,IAAKE,OACVA,EAAA,SAAW,WACXA,EAAA,SAAW,WACXA,EAAA,eAAiB,iBAHPA,OAAA",
   "names": ["EmbeddedReportUtils_exports", "__export", "EmbeddedReportFeaturesList", "__toCommonJS"]
 }

package/dpr/types/ExecutionData.d.js

@@ -1,2 +1,2 @@
-var n=Object.defineProperty;var o=Object.getOwnPropertyDescriptor;var c=Object.getOwnPropertyNames;var d=Object.prototype.hasOwnProperty;var x=(e,t,r,a)=>{if(t&&typeof t=="object"||typeof t=="function")for(let i of c(t))!d.call(e,i)&&i!==r&&n(e,i,{get:()=>t[i],enumerable:!(a=o(t,i))||a.enumerable});return e};var s=e=>x(n({},"__esModule",{value:!0}),e);var u={};module.exports=s(u);
+"use strict";var a=Object.defineProperty;var r=Object.getOwnPropertyDescriptor;var o=Object.getOwnPropertyNames;var c=Object.prototype.hasOwnProperty;var u=(e,t,d,i)=>{if(t&&typeof t=="object"||typeof t=="function")for(let n of o(t))!c.call(e,n)&&n!==d&&a(e,n,{get:()=>t[n],enumerable:!(i=r(t,n))||i.enumerable});return e};var x=e=>u(a({},"__esModule",{value:!0}),e);var s={};module.exports=x(s);
 //# sourceMappingURL=ExecutionData.d.js.map

package/dpr/types/ExecutionData.d.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/dpr/types/ExecutionData.d.ts"],
-  "sourcesContent": ["export interface ExecutionData {\n  executionId: string\n  tableId: string\n  dataProductDefinitionsPath?: string\n}\n\nexport interface ChildReportExecutionData extends ExecutionData {\n  variantId: string\n}\n"],
-  "mappings": "kWAAA,IAAAA,EAAA,kBAAAC,EAAAD",
+  "sourcesContent": ["export interface ExecutionData {\n  executionId?: string | undefined\n  tableId?: string | undefined\n  dataProductDefinitionsPath?: string\n}\n\nexport interface ChildReportExecutionData extends ExecutionData {\n  variantId: string\n}\n"],
+  "mappings": "+WAAA,IAAAA,EAAA,kBAAAC,EAAAD",
   "names": ["ExecutionData_d_exports", "__toCommonJS"]
 }

package/dpr/types/ExecutionData.d.ts

@@ -1,6 +1,6 @@
 export interface ExecutionData {
-  executionId: string
-  tableId: string
+  executionId?: string | undefined
+  tableId?: string | undefined
   dataProductDefinitionsPath?: string
 }
 

package/dpr/types/Metrics.js

@@ -1,2 +1,2 @@
-var t=Object.defineProperty;var g=Object.getOwnPropertyDescriptor;var i=Object.getOwnPropertyNames;var b=Object.prototype.hasOwnProperty;var o=(e,r,s,n)=>{if(r&&typeof r=="object"||typeof r=="function")for(let a of i(r))!b.call(e,a)&&a!==s&&t(e,a,{get:()=>r[a],enumerable:!(n=g(r,a))||n.enumerable});return e};var m=e=>o(t({},"__esModule",{value:!0}),e);var p={};module.exports=m(p);
+"use strict";var t=Object.defineProperty;var i=Object.getOwnPropertyDescriptor;var g=Object.getOwnPropertyNames;var b=Object.prototype.hasOwnProperty;var o=(r,e,s,n)=>{if(e&&typeof e=="object"||typeof e=="function")for(let a of g(e))!b.call(r,a)&&a!==s&&t(r,a,{get:()=>e[a],enumerable:!(n=i(e,a))||n.enumerable});return r};var u=r=>o(t({},"__esModule",{value:!0}),r);var d={};module.exports=u(d);
 //# sourceMappingURL=Metrics.js.map

package/dpr/types/Metrics.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/dpr/types/Metrics.ts"],
-  "sourcesContent": ["export interface DashboardDataResponse {\n  [key: string]: {\n    raw: number | string\n    rag?: number\n  }\n}\n\nexport interface DashboardDataResponseWithRag {\n  [key: string]: {\n    raw: number | string\n    rag: number\n  }\n}\n"],
-  "mappings": "kWAAA,IAAAA,EAAA,kBAAAC,EAAAD",
+  "sourcesContent": ["export interface DashboardDataResponse {\n  [key: string]: {\n    raw?: number | string | null | undefined\n    rag?: number\n  }\n}\n\nexport interface DashboardDataResponseWithRag {\n  [key: string]: {\n    raw: number | string\n    rag: number\n  }\n}\n"],
+  "mappings": "+WAAA,IAAAA,EAAA,kBAAAC,EAAAD",
   "names": ["Metrics_exports", "__toCommonJS"]
 }

package/dpr/types/Metrics.ts

@@ -1,6 +1,6 @@
 export interface DashboardDataResponse {
   [key: string]: {
-    raw: number | string
+    raw?: number | string | null | undefined
     rag?: number
   }
 }

package/dpr/types/ReportQuery.js

@@ -1,2 +1,2 @@
-var b=Object.create;var a=Object.defineProperty;var R=Object.getOwnPropertyDescriptor;var z=Object.getOwnPropertyNames;var C=Object.getPrototypeOf,F=Object.prototype.hasOwnProperty;var T=(n,i)=>{for(var s in i)a(n,s,{get:i[s],enumerable:!0})},h=(n,i,s,t)=>{if(i&&typeof i=="object"||typeof i=="function")for(let r of z(i))!F.call(n,r)&&r!==s&&a(n,r,{get:()=>i[r],enumerable:!(t=R(i,r))||t.enumerable});return n};var A=(n,i,s)=>(s=n!=null?b(C(n)):{},h(i||!n||!n.__esModule?a(s,"default",{value:n,enumerable:!0}):s,n)),O=n=>h(a({},"__esModule",{value:!0}),n);var v={};T(v,{DEFAULT_FILTERS_PREFIX:()=>D,ReportQuery:()=>m,default:()=>j});module.exports=O(v);var p=require("../utils/urlHelper"),u=A(require("../components/_reports/report-columns-form/utils")),S=require("./UserReports");const D="filters.";class m{constructor({fields:i,template:s,queryParams:t,definitionsPath:r,filtersPrefix:P=D,reportType:x}){if(this.selectedPage=t.selectedPage?Number(t.selectedPage):1,this.pageSize=this.getPageSize(t,s,x),this.sortColumn=t.sortColumn?t.sortColumn.toString():this.getDefaultSortColumn(i),this.sortedAsc=t.sortedAsc!=="false",this.dataProductDefinitionsPath=r??(t.dataProductDefinitionsPath?t.dataProductDefinitionsPath.toString():void 0),this.filtersPrefix=P,t.columns){const e=typeof t.columns=="string"?t.columns.split(","):t.columns;this.columns=u.default.ensureMandatoryColumns(i,e)}else this.columns=i.filter(e=>e.visible).map(e=>e.name);const o=i.find(e=>e.type==="date"&&e.filter&&e.filter.type==="daterange"||e.type==="date"&&e.filter&&e.filter.type==="date");let l,f;o&&o.filter&&(l=o.filter.min,f=o.filter.max),this.filters={},Object.keys(t).filter(e=>e.startsWith(this.filtersPrefix)).filter(e=>t[e]).forEach(e=>{const d=e.replace(this.filtersPrefix,""),g=t[e];let c=g?g.toString():"";d.includes(".start")&&l&&new Date(c)<new Date(l)&&(c=l),d.includes(".end")&&f&&new Date(c)>new Date(f)&&(c=f),c!=="no-filter"&&(this.filters[d]=c)}),o&&o.filter&&o.filter.type==="daterange"&&(l&&Object.keys(t).some(e=>e.includes(this.filtersPrefix))&&Object.keys(t).every(e=>!e.includes(".start"))&&(this.filters[`${o.name}.start`]=l),f&&Object.keys(t).some(e=>e.includes(this.filtersPrefix))&&Object.keys(t).every(e=>!e.includes(".end"))&&(this.filters[`${o.name}.end`]=f)),o&&o.filter&&o.filter.type==="date"&&l&&Object.keys(t).some(e=>e.includes(this.filtersPrefix))&&Object.keys(t).every(e=>!e.includes(o.name))&&(this.filters[`${o.name}.start`]=l)}getDefaultSortColumn(i){const s=i.find(t=>t.defaultsort);return s?s.name:i.find(t=>t.sortable)?.name}getPageSize(i,s,t){let r=20;return(!t||t===S.ReportType.REPORT)&&(i.pageSize?r=Number(i.pageSize):s&&(r=this.getDefaultPageSize(s))),r}toRecordWithFilterPrefix(i=!1){const s={selectedPage:this.selectedPage.toString(),...this.pageSize&&{pageSize:this.pageSize.toString()},...this.sortColumn&&{sortColumn:this.sortColumn},sortedAsc:this.sortedAsc.toString(),columns:this.columns};return this.dataProductDefinitionsPath&&(s.dataProductDefinitionsPath=this.dataProductDefinitionsPath),Object.keys(this.filters).forEach(t=>{const r=this.filters[t];(r&&!i||r!==p.clearFilterValue)&&(s[`${this.filtersPrefix}${t}`]=r)}),s}getDefaultPageSize(i){switch(i){case"list-section":case"summary-section":case"row-section-child":case"parent-child":case"parent-child-section":return 5e5;default:return 20}}}var j=m;0&&(module.exports={DEFAULT_FILTERS_PREFIX,ReportQuery});
+"use strict";var b=Object.create;var d=Object.defineProperty;var R=Object.getOwnPropertyDescriptor;var z=Object.getOwnPropertyNames;var C=Object.getPrototypeOf,F=Object.prototype.hasOwnProperty;var T=(n,i)=>{for(var s in i)d(n,s,{get:i[s],enumerable:!0})},g=(n,i,s,t)=>{if(i&&typeof i=="object"||typeof i=="function")for(let r of z(i))!F.call(n,r)&&r!==s&&d(n,r,{get:()=>i[r],enumerable:!(t=R(i,r))||t.enumerable});return n};var A=(n,i,s)=>(s=n!=null?b(C(n)):{},g(i||!n||!n.__esModule?d(s,"default",{value:n,enumerable:!0}):s,n)),O=n=>g(d({},"__esModule",{value:!0}),n);var v={};T(v,{DEFAULT_FILTERS_PREFIX:()=>D,ReportQuery:()=>m,default:()=>j});module.exports=O(v);var h=require("../utils/urlHelper"),p=A(require("../components/_reports/report-columns-form/utils")),S=require("./UserReports");const D="filters.";class m{constructor({fields:i,template:s,queryParams:t,definitionsPath:r,filtersPrefix:P=D,reportType:x}){if(this.selectedPage=t.selectedPage?Number(t.selectedPage):1,this.pageSize=this.getPageSize(t,s,x),this.sortColumn=t.sortColumn?t.sortColumn.toString():this.getDefaultSortColumn(i),this.sortedAsc=t.sortedAsc!=="false",this.dataProductDefinitionsPath=r??(t.dataProductDefinitionsPath?t.dataProductDefinitionsPath.toString():void 0),this.filtersPrefix=P,t.columns){const e=typeof t.columns=="string"?t.columns.split(","):t.columns;this.columns=p.default.ensureMandatoryColumns(i,e)}else this.columns=i.filter(e=>e.visible).map(e=>e.name);const o=i.find(e=>e.type==="date"&&e.filter&&e.filter.type==="daterange"||e.type==="date"&&e.filter&&e.filter.type==="date");let l,f;o&&o.filter&&(l=o.filter.min,f=o.filter.max),this.filters={},Object.keys(t).filter(e=>e.startsWith(this.filtersPrefix)).filter(e=>t[e]).forEach(e=>{const a=e.replace(this.filtersPrefix,""),u=t[e];let c=u?u.toString():"";a.includes(".start")&&l&&new Date(c)<new Date(l)&&(c=l),a.includes(".end")&&f&&new Date(c)>new Date(f)&&(c=f),c!=="no-filter"&&(this.filters[a]=c)}),o&&o.filter&&o.filter.type==="daterange"&&(l&&Object.keys(t).some(e=>e.includes(this.filtersPrefix))&&Object.keys(t).every(e=>!e.includes(".start"))&&(this.filters[`${o.name}.start`]=l),f&&Object.keys(t).some(e=>e.includes(this.filtersPrefix))&&Object.keys(t).every(e=>!e.includes(".end"))&&(this.filters[`${o.name}.end`]=f)),o&&o.filter&&o.filter.type==="date"&&l&&Object.keys(t).some(e=>e.includes(this.filtersPrefix))&&Object.keys(t).every(e=>!e.includes(o.name))&&(this.filters[`${o.name}.start`]=l)}getDefaultSortColumn(i){const s=i.find(t=>t.defaultsort);return s?s.name:i.find(t=>t.sortable)?.name}getPageSize(i,s,t){let r=20;return(!t||t===S.ReportType.REPORT)&&(i.pageSize?r=Number(i.pageSize):s&&(r=this.getDefaultPageSize(s))),r}toRecordWithFilterPrefix(i=!1){const s={selectedPage:this.selectedPage.toString(),...this.pageSize&&{pageSize:this.pageSize.toString()},...this.sortColumn&&{sortColumn:this.sortColumn},sortedAsc:this.sortedAsc.toString(),columns:this.columns};return this.dataProductDefinitionsPath&&(s.dataProductDefinitionsPath=this.dataProductDefinitionsPath),Object.keys(this.filters).forEach(t=>{const r=this.filters[t];(r&&!i||r!==h.clearFilterValue)&&(s[`${this.filtersPrefix}${t}`]=r)}),s}getDefaultPageSize(i){switch(i){case"list-section":case"summary-section":case"row-section-child":case"parent-child":case"parent-child-section":return 5e5;default:return 20}}}var j=m;0&&(module.exports={DEFAULT_FILTERS_PREFIX,ReportQuery});
 //# sourceMappingURL=ReportQuery.js.map

package/dpr/types/ReportQuery.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/dpr/types/ReportQuery.ts"],
-  "sourcesContent": ["import type { ParsedQs } from 'qs'\nimport { FilteredListRequest } from './index'\nimport Dict = NodeJS.Dict\nimport { components } from './api'\nimport { clearFilterValue } from '../utils/urlHelper'\nimport ColumnUtils from '../components/_reports/report-columns-form/utils'\nimport { Template } from './Templates'\nimport { ReportType } from './UserReports'\n\nexport const DEFAULT_FILTERS_PREFIX = 'filters.'\n\nclass ReportQuery implements FilteredListRequest {\n  selectedPage: number\n\n  pageSize: number\n\n  sortColumn?: string\n\n  columns: Array<string>\n\n  sortedAsc: boolean\n\n  filters: Dict<string>\n\n  filtersPrefix: string\n\n  dataProductDefinitionsPath?: string\n\n  constructor({\n    fields,\n    template,\n    queryParams,\n    definitionsPath,\n    filtersPrefix = DEFAULT_FILTERS_PREFIX,\n    reportType,\n  }: {\n    fields: components['schemas']['FieldDefinition'][]\n    template?: Template\n    queryParams: ParsedQs\n    definitionsPath?: string\n    filtersPrefix?: string\n    reportType?: ReportType\n  }) {\n    this.selectedPage = queryParams.selectedPage ? Number(queryParams.selectedPage) : 1\n    this.pageSize = this.getPageSize(queryParams, template, reportType)\n    this.sortColumn = queryParams.sortColumn ? queryParams.sortColumn.toString() : this.getDefaultSortColumn(fields)\n    this.sortedAsc = queryParams.sortedAsc !== 'false'\n    this.dataProductDefinitionsPath =\n      definitionsPath ??\n      (queryParams.dataProductDefinitionsPath ? queryParams.dataProductDefinitionsPath.toString() : undefined)\n    this.filtersPrefix = filtersPrefix\n\n    if (queryParams.columns) {\n      const columns =\n        typeof queryParams.columns === 'string' ? queryParams.columns.split(',') : (queryParams.columns as string[])\n      this.columns = ColumnUtils.ensureMandatoryColumns(fields, columns)\n    } else {\n      this.columns = fields.filter((f) => f.visible).map((f) => f.name)\n    }\n\n    const dateField: components['schemas']['FieldDefinition'] | undefined = fields.find((f) => {\n      return (\n        (f.type === 'date' && f.filter && f.filter.type === 'daterange') ||\n        (f.type === 'date' && f.filter && f.filter.type === 'date')\n      )\n    })\n\n    let min: string | undefined\n    let max: string | undefined\n    if (dateField && dateField.filter) {\n      min = dateField.filter.min\n      max = dateField.filter.max\n    }\n\n    this.filters = {}\n\n    Object.keys(queryParams)\n      .filter((key) => key.startsWith(this.filtersPrefix))\n      .filter((key) => queryParams[key])\n      .forEach((key) => {\n        const filter = key.replace(this.filtersPrefix, '')\n        const p = queryParams[key]\n        let value = p ? p.toString() : ''\n        if (filter.includes('.start') && min) {\n          if (new Date(value) < new Date(min)) value = min\n        }\n        if (filter.includes('.end') && max) {\n          if (new Date(value) > new Date(max)) value = max\n        }\n        if (value !== 'no-filter') {\n          this.filters[filter] = value\n        }\n      })\n\n    if (dateField && dateField.filter && dateField.filter.type === 'daterange') {\n      if (\n        min &&\n        Object.keys(queryParams).some((key) => key.includes(this.filtersPrefix)) &&\n        Object.keys(queryParams).every((key) => !key.includes('.start'))\n      ) {\n        this.filters[`${dateField.name}.start`] = min\n      }\n\n      if (\n        max &&\n        Object.keys(queryParams).some((key) => key.includes(this.filtersPrefix)) &&\n        Object.keys(queryParams).every((key) => !key.includes('.end'))\n      ) {\n        this.filters[`${dateField.name}.end`] = max\n      }\n    }\n\n    if (dateField && dateField.filter && dateField.filter.type === 'date') {\n      if (\n        min &&\n        Object.keys(queryParams).some((key) => key.includes(this.filtersPrefix)) &&\n        Object.keys(queryParams).every((key) => !key.includes(dateField.name))\n      ) {\n        this.filters[`${dateField.name}.start`] = min\n      }\n    }\n  }\n\n  private getDefaultSortColumn(fields: components['schemas']['FieldDefinition'][]) {\n    const defaultSortColumn = fields.find((f) => f.defaultsort)\n    return defaultSortColumn ? defaultSortColumn.name : fields.find((f) => f.sortable)?.name\n  }\n\n  getPageSize(queryParams: ParsedQs, template?: Template, reportType?: ReportType): number {\n    let pageSize = 20\n    if (!reportType || reportType === ReportType.REPORT) {\n      if (queryParams.pageSize) {\n        pageSize = Number(queryParams.pageSize)\n      } else if (template) {\n        pageSize = this.getDefaultPageSize(template)\n      }\n    }\n    return pageSize\n  }\n\n  toRecordWithFilterPrefix(removeClearedFilters = false): Record<string, string | Array<string>> {\n    const record: Record<string, string | Array<string>> = {\n      selectedPage: this.selectedPage.toString(),\n      ...(this.pageSize && { pageSize: this.pageSize.toString() }),\n      ...(this.sortColumn && { sortColumn: this.sortColumn }),\n      sortedAsc: this.sortedAsc.toString(),\n      columns: this.columns,\n    }\n\n    if (this.dataProductDefinitionsPath) {\n      record.dataProductDefinitionsPath = this.dataProductDefinitionsPath\n    }\n\n    Object.keys(this.filters).forEach((filterName) => {\n      const value = this.filters[filterName]\n      if ((value && !removeClearedFilters) || value !== clearFilterValue) {\n        record[`${this.filtersPrefix}${filterName}`] = <string>value\n      }\n    })\n\n    return record\n  }\n\n  private getDefaultPageSize(template: Template) {\n    const maxResultsSize = 500000\n    const standardPage = 20\n\n    switch (template) {\n      case 'list-section':\n      case 'summary-section':\n      case 'row-section-child':\n      case 'parent-child':\n      case 'parent-child-section':\n        return maxResultsSize\n\n      default:\n        return standardPage\n    }\n  }\n}\n\nexport { ReportQuery }\nexport default ReportQuery\n"],
-  "mappings": "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",
+  "sourcesContent": ["import type { ParsedQs } from 'qs'\nimport { FilteredListRequest } from './index'\nimport Dict = NodeJS.Dict\nimport { components } from './api'\nimport { clearFilterValue } from '../utils/urlHelper'\nimport ColumnUtils from '../components/_reports/report-columns-form/utils'\nimport { Template } from './Templates'\nimport { ReportType } from './UserReports'\n\nexport const DEFAULT_FILTERS_PREFIX = 'filters.'\n\nclass ReportQuery implements FilteredListRequest {\n  selectedPage: number\n\n  pageSize: number\n\n  sortColumn?: string | undefined\n\n  columns: Array<string>\n\n  sortedAsc: boolean\n\n  filters: Dict<string>\n\n  filtersPrefix: string\n\n  dataProductDefinitionsPath?: string | undefined\n\n  constructor({\n    fields,\n    template,\n    queryParams,\n    definitionsPath,\n    filtersPrefix = DEFAULT_FILTERS_PREFIX,\n    reportType,\n  }: {\n    fields: components['schemas']['FieldDefinition'][]\n    template?: Template\n    queryParams: ParsedQs\n    definitionsPath?: string\n    filtersPrefix?: string\n    reportType?: ReportType\n  }) {\n    this.selectedPage = queryParams['selectedPage'] ? Number(queryParams['selectedPage']) : 1\n    this.pageSize = this.getPageSize(queryParams, template, reportType)\n    this.sortColumn = queryParams['sortColumn']\n      ? queryParams['sortColumn'].toString()\n      : this.getDefaultSortColumn(fields)\n    this.sortedAsc = queryParams['sortedAsc'] !== 'false'\n    this.dataProductDefinitionsPath =\n      definitionsPath ??\n      (queryParams['dataProductDefinitionsPath'] ? queryParams['dataProductDefinitionsPath'].toString() : undefined)\n    this.filtersPrefix = filtersPrefix\n\n    if (queryParams['columns']) {\n      const columns =\n        typeof queryParams['columns'] === 'string'\n          ? queryParams['columns'].split(',')\n          : (queryParams['columns'] as string[])\n      this.columns = ColumnUtils.ensureMandatoryColumns(fields, columns)\n    } else {\n      this.columns = fields.filter((f) => f.visible).map((f) => f.name)\n    }\n\n    const dateField: components['schemas']['FieldDefinition'] | undefined = fields.find((f) => {\n      return (\n        (f.type === 'date' && f.filter && f.filter.type === 'daterange') ||\n        (f.type === 'date' && f.filter && f.filter.type === 'date')\n      )\n    })\n\n    let min: string | undefined\n    let max: string | undefined\n    if (dateField && dateField.filter) {\n      min = dateField.filter.min\n      max = dateField.filter.max\n    }\n\n    this.filters = {}\n\n    Object.keys(queryParams)\n      .filter((key) => key.startsWith(this.filtersPrefix))\n      .filter((key) => queryParams[key])\n      .forEach((key) => {\n        const filter = key.replace(this.filtersPrefix, '')\n        const p = queryParams[key]\n        let value = p ? p.toString() : ''\n        if (filter.includes('.start') && min) {\n          if (new Date(value) < new Date(min)) value = min\n        }\n        if (filter.includes('.end') && max) {\n          if (new Date(value) > new Date(max)) value = max\n        }\n        if (value !== 'no-filter') {\n          this.filters[filter] = value\n        }\n      })\n\n    if (dateField && dateField.filter && dateField.filter.type === 'daterange') {\n      if (\n        min &&\n        Object.keys(queryParams).some((key) => key.includes(this.filtersPrefix)) &&\n        Object.keys(queryParams).every((key) => !key.includes('.start'))\n      ) {\n        this.filters[`${dateField.name}.start`] = min\n      }\n\n      if (\n        max &&\n        Object.keys(queryParams).some((key) => key.includes(this.filtersPrefix)) &&\n        Object.keys(queryParams).every((key) => !key.includes('.end'))\n      ) {\n        this.filters[`${dateField.name}.end`] = max\n      }\n    }\n\n    if (dateField && dateField.filter && dateField.filter.type === 'date') {\n      if (\n        min &&\n        Object.keys(queryParams).some((key) => key.includes(this.filtersPrefix)) &&\n        Object.keys(queryParams).every((key) => !key.includes(dateField.name))\n      ) {\n        this.filters[`${dateField.name}.start`] = min\n      }\n    }\n  }\n\n  private getDefaultSortColumn(fields: components['schemas']['FieldDefinition'][]) {\n    const defaultSortColumn = fields.find((f) => f.defaultsort)\n    return defaultSortColumn ? defaultSortColumn.name : fields.find((f) => f.sortable)?.name\n  }\n\n  getPageSize(queryParams: ParsedQs, template?: Template, reportType?: ReportType): number {\n    let pageSize = 20\n    if (!reportType || reportType === ReportType.REPORT) {\n      if (queryParams['pageSize']) {\n        pageSize = Number(queryParams['pageSize'])\n      } else if (template) {\n        pageSize = this.getDefaultPageSize(template)\n      }\n    }\n    return pageSize\n  }\n\n  toRecordWithFilterPrefix(removeClearedFilters = false): Record<string, string | Array<string>> {\n    const record: Record<string, string | Array<string>> = {\n      selectedPage: this.selectedPage.toString(),\n      ...(this.pageSize && { pageSize: this.pageSize.toString() }),\n      ...(this.sortColumn && { sortColumn: this.sortColumn }),\n      sortedAsc: this.sortedAsc.toString(),\n      columns: this.columns,\n    }\n\n    if (this.dataProductDefinitionsPath) {\n      record['dataProductDefinitionsPath'] = this.dataProductDefinitionsPath\n    }\n\n    Object.keys(this.filters).forEach((filterName) => {\n      const value = this.filters[filterName]\n      if ((value && !removeClearedFilters) || value !== clearFilterValue) {\n        record[`${this.filtersPrefix}${filterName}`] = <string>value\n      }\n    })\n\n    return record\n  }\n\n  private getDefaultPageSize(template: Template) {\n    const maxResultsSize = 500000\n    const standardPage = 20\n\n    switch (template) {\n      case 'list-section':\n      case 'summary-section':\n      case 'row-section-child':\n      case 'parent-child':\n      case 'parent-child-section':\n        return maxResultsSize\n\n      default:\n        return standardPage\n    }\n  }\n}\n\nexport { ReportQuery }\nexport default ReportQuery\n"],
+  "mappings": "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",
   "names": ["ReportQuery_exports", "__export", "DEFAULT_FILTERS_PREFIX", "ReportQuery", "ReportQuery_default", "__toCommonJS", "import_urlHelper", "import_utils", "import_UserReports", "fields", "template", "queryParams", "definitionsPath", "filtersPrefix", "reportType", "columns", "ColumnUtils", "f", "dateField", "min", "max", "key", "filter", "p", "value", "defaultSortColumn", "pageSize", "removeClearedFilters", "record", "filterName"]
 }

package/dpr/types/ReportQuery.ts

@@ -14,7 +14,7 @@ class ReportQuery implements FilteredListRequest {
 
   pageSize: number
 
-  sortColumn?: string
+  sortColumn?: string | undefined
 
   columns: Array<string>
 
@@ -24,7 +24,7 @@ class ReportQuery implements FilteredListRequest {
 
   filtersPrefix: string
 
-  dataProductDefinitionsPath?: string
+  dataProductDefinitionsPath?: string | undefined
 
   constructor({
     fields,
@@ -41,18 +41,22 @@ class ReportQuery implements FilteredListRequest {
     filtersPrefix?: string
     reportType?: ReportType
   }) {
-    this.selectedPage = queryParams.selectedPage ? Number(queryParams.selectedPage) : 1
+    this.selectedPage = queryParams['selectedPage'] ? Number(queryParams['selectedPage']) : 1
     this.pageSize = this.getPageSize(queryParams, template, reportType)
-    this.sortColumn = queryParams.sortColumn ? queryParams.sortColumn.toString() : this.getDefaultSortColumn(fields)
-    this.sortedAsc = queryParams.sortedAsc !== 'false'
+    this.sortColumn = queryParams['sortColumn']
+      ? queryParams['sortColumn'].toString()
+      : this.getDefaultSortColumn(fields)
+    this.sortedAsc = queryParams['sortedAsc'] !== 'false'
     this.dataProductDefinitionsPath =
       definitionsPath ??
-      (queryParams.dataProductDefinitionsPath ? queryParams.dataProductDefinitionsPath.toString() : undefined)
+      (queryParams['dataProductDefinitionsPath'] ? queryParams['dataProductDefinitionsPath'].toString() : undefined)
     this.filtersPrefix = filtersPrefix
 
-    if (queryParams.columns) {
+    if (queryParams['columns']) {
       const columns =
-        typeof queryParams.columns === 'string' ? queryParams.columns.split(',') : (queryParams.columns as string[])
+        typeof queryParams['columns'] === 'string'
+          ? queryParams['columns'].split(',')
+          : (queryParams['columns'] as string[])
       this.columns = ColumnUtils.ensureMandatoryColumns(fields, columns)
     } else {
       this.columns = fields.filter((f) => f.visible).map((f) => f.name)
@@ -129,8 +133,8 @@ class ReportQuery implements FilteredListRequest {
   getPageSize(queryParams: ParsedQs, template?: Template, reportType?: ReportType): number {
     let pageSize = 20
     if (!reportType || reportType === ReportType.REPORT) {
-      if (queryParams.pageSize) {
-        pageSize = Number(queryParams.pageSize)
+      if (queryParams['pageSize']) {
+        pageSize = Number(queryParams['pageSize'])
       } else if (template) {
         pageSize = this.getDefaultPageSize(template)
       }
@@ -148,7 +152,7 @@ class ReportQuery implements FilteredListRequest {
     }
 
     if (this.dataProductDefinitionsPath) {
-      record.dataProductDefinitionsPath = this.dataProductDefinitionsPath
+      record['dataProductDefinitionsPath'] = this.dataProductDefinitionsPath
     }
 
     Object.keys(this.filters).forEach((filterName) => {

package/dpr/types/ReportStore.js

@@ -1,2 +1,2 @@
-var i=Object.defineProperty;var l=Object.getOwnPropertyDescriptor;var d=Object.getOwnPropertyNames;var s=Object.prototype.hasOwnProperty;var a=(o,e,n,r)=>{if(e&&typeof e=="object"||typeof e=="function")for(let t of d(e))!s.call(o,t)&&t!==n&&i(o,t,{get:()=>e[t],enumerable:!(r=l(e,t))||r.enumerable});return o};var f=o=>a(i({},"__esModule",{value:!0}),o);var m={};module.exports=f(m);
+"use strict";var i=Object.defineProperty;var l=Object.getOwnPropertyDescriptor;var d=Object.getOwnPropertyNames;var s=Object.prototype.hasOwnProperty;var a=(o,e,n,r)=>{if(e&&typeof e=="object"||typeof e=="function")for(let t of d(e))!s.call(o,t)&&t!==n&&i(o,t,{get:()=>e[t],enumerable:!(r=l(e,t))||r.enumerable});return o};var f=o=>a(i({},"__esModule",{value:!0}),o);var m={};module.exports=f(m);
 //# sourceMappingURL=ReportStore.js.map

package/dpr/types/ReportStore.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../src/dpr/types/ReportStore.ts"],
   "sourcesContent": ["import { defaultFilterConfig } from '../utils/Personalisation/types'\nimport { BookmarkStoreData } from './Bookmark'\nimport { DownloadPermissionConfig } from './Download'\nimport { RequestedReport, RecentlyViewedReport } from './UserReports'\n\nexport interface ReportStoreConfig {\n  requestedReports: RequestedReport[]\n  recentlyViewedReports: RecentlyViewedReport[]\n  bookmarks: BookmarkStoreData[]\n  downloadPermissions?: DownloadPermissionConfig[]\n  defaultFilters?: defaultFilterConfig[]\n  productCollectionInfo?: { selectedProductCollection: string }\n}\n"],
-  "mappings": "kWAAA,IAAAA,EAAA,kBAAAC,EAAAD",
+  "mappings": "+WAAA,IAAAA,EAAA,kBAAAC,EAAAD",
   "names": ["ReportStore_exports", "__toCommonJS"]
 }

package/dpr/types/Services.d.js

@@ -1,2 +1,2 @@
-var t=Object.defineProperty;var S=Object.getOwnPropertyDescriptor;var v=Object.getOwnPropertyNames;var l=Object.prototype.hasOwnProperty;var s=(r,e,c,o)=>{if(e&&typeof e=="object"||typeof e=="function")for(let i of v(e))!l.call(r,i)&&i!==c&&t(r,i,{get:()=>e[i],enumerable:!(o=S(e,i))||o.enumerable});return r};var n=r=>s(t({},"__esModule",{value:!0}),r);var d={};module.exports=n(d);
+"use strict";var c=Object.defineProperty;var S=Object.getOwnPropertyDescriptor;var v=Object.getOwnPropertyNames;var l=Object.prototype.hasOwnProperty;var s=(r,e,t,o)=>{if(e&&typeof e=="object"||typeof e=="function")for(let i of v(e))!l.call(r,i)&&i!==t&&c(r,i,{get:()=>e[i],enumerable:!(o=S(e,i))||o.enumerable});return r};var n=r=>s(c({},"__esModule",{value:!0}),r);var d={};module.exports=n(d);
 //# sourceMappingURL=Services.d.js.map

package/dpr/types/Services.d.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/dpr/types/Services.d.ts"],
-  "sourcesContent": ["import {\n  BookmarkService,\n  DashboardService,\n  DefaultFilterValuesService,\n  DownloadPermissionService,\n  RecentlyViewedStoreService,\n  ReportingService,\n  RequestedReportService,\n} from '../services'\nimport { ProductCollectionStoreService } from '../services/productCollection/productCollectionStoreService'\nimport MissingReportClient from '../services/missingReport/missingReportClient'\nimport ReportingService from '../services/reportingService'\nimport DashboardService from '../services/dashboardService'\nimport { ProductCollectionService } from '../services/productCollection/productCollectionService'\n\nexport type Services = UserStoreServices & {\n  reportingService: ReportingService\n  dashboardService: DashboardService\n  missingReportClient: MissingReportClient\n  productCollectionService: ProductCollectionService\n}\n\nexport interface UserStoreServices {\n  downloadPermissionService?: DownloadPermissionService\n  requestedReportService?: RequestedReportService\n  recentlyViewedService?: RecentlyViewedStoreService\n  bookmarkService?: BookmarkService\n  defaultFilterValuesService?: DefaultFilterValuesService\n  productCollectionStoreService?: ProductCollectionStoreService\n}\n"],
-  "mappings": "kWAAA,IAAAA,EAAA,kBAAAC,EAAAD",
+  "sourcesContent": ["import {\n  BookmarkService,\n  DashboardService,\n  DefaultFilterValuesService,\n  DownloadPermissionService,\n  RecentlyViewedStoreService,\n  ReportingService,\n  RequestedReportService,\n} from '../services'\nimport { ProductCollectionStoreService } from '../services/productCollection/productCollectionStoreService'\nimport MissingReportService from '../services/missingReport/missingReportService'\nimport ReportingService from '../services/reportingService'\nimport DashboardService from '../services/dashboardService'\nimport { ProductCollectionService } from '../services/productCollection/productCollectionService'\n\nexport type Services = UserStoreServices & {\n  reportingService: ReportingService\n  dashboardService: DashboardService\n  missingReportService: MissingReportService\n  productCollectionService: ProductCollectionService\n}\n\nexport interface UserStoreServices {\n  downloadPermissionService: DownloadPermissionService\n  requestedReportService: RequestedReportService\n  recentlyViewedService: RecentlyViewedStoreService\n  bookmarkService: BookmarkService\n  defaultFilterValuesService: DefaultFilterValuesService\n  productCollectionStoreService: ProductCollectionStoreService\n}\n"],
+  "mappings": "+WAAA,IAAAA,EAAA,kBAAAC,EAAAD",
   "names": ["Services_d_exports", "__toCommonJS"]
 }

package/dpr/types/Services.d.ts

@@ -8,7 +8,7 @@ import {
   RequestedReportService,
 } from '../services'
 import { ProductCollectionStoreService } from '../services/productCollection/productCollectionStoreService'
-import MissingReportClient from '../services/missingReport/missingReportClient'
+import MissingReportService from '../services/missingReport/missingReportService'
 import ReportingService from '../services/reportingService'
 import DashboardService from '../services/dashboardService'
 import { ProductCollectionService } from '../services/productCollection/productCollectionService'
@@ -16,15 +16,15 @@ import { ProductCollectionService } from '../services/productCollection/productC
 export type Services = UserStoreServices & {
   reportingService: ReportingService
   dashboardService: DashboardService
-  missingReportClient: MissingReportClient
+  missingReportService: MissingReportService
   productCollectionService: ProductCollectionService
 }
 
 export interface UserStoreServices {
-  downloadPermissionService?: DownloadPermissionService
-  requestedReportService?: RequestedReportService
-  recentlyViewedService?: RecentlyViewedStoreService
-  bookmarkService?: BookmarkService
-  defaultFilterValuesService?: DefaultFilterValuesService
-  productCollectionStoreService?: ProductCollectionStoreService
+  downloadPermissionService: DownloadPermissionService
+  requestedReportService: RequestedReportService
+  recentlyViewedService: RecentlyViewedStoreService
+  bookmarkService: BookmarkService
+  defaultFilterValuesService: DefaultFilterValuesService
+  productCollectionStoreService: ProductCollectionStoreService
 }

package/dpr/types/Templates.d.js

@@ -1,2 +1,2 @@
-var r=Object.defineProperty;var s=Object.getOwnPropertyDescriptor;var c=Object.getOwnPropertyNames;var l=Object.prototype.hasOwnProperty;var p=(t,e,i,a)=>{if(e&&typeof e=="object"||typeof e=="function")for(let o of c(e))!l.call(t,o)&&o!==i&&r(t,o,{get:()=>e[o],enumerable:!(a=s(e,o))||a.enumerable});return t};var n=t=>p(r({},"__esModule",{value:!0}),t);var m={};module.exports=n(m);
+"use strict";var r=Object.defineProperty;var s=Object.getOwnPropertyDescriptor;var c=Object.getOwnPropertyNames;var l=Object.prototype.hasOwnProperty;var p=(t,e,i,a)=>{if(e&&typeof e=="object"||typeof e=="function")for(let o of c(e))!l.call(t,o)&&o!==i&&r(t,o,{get:()=>e[o],enumerable:!(a=s(e,o))||a.enumerable});return t};var n=t=>p(r({},"__esModule",{value:!0}),t);var m={};module.exports=n(m);
 //# sourceMappingURL=Templates.d.js.map

package/dpr/types/Templates.d.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../src/dpr/types/Templates.d.ts"],
   "sourcesContent": ["export type Template =\n  | 'list'\n  | 'list-section'\n  | 'list-tab'\n  | 'summary'\n  | 'summary-section'\n  | 'parent-child'\n  | 'parent-child-section'\n  | 'row-section'\n  | 'row-section-child'\n\nexport type SummaryTemplate =\n  | 'table-header'\n  | 'table-footer'\n  | 'section-header'\n  | 'section-footer'\n  | 'page-header'\n  | 'page-footer'\n"],
-  "mappings": "kWAAA,IAAAA,EAAA,kBAAAC,EAAAD",
+  "mappings": "+WAAA,IAAAA,EAAA,kBAAAC,EAAAD",
   "names": ["Templates_d_exports", "__toCommonJS"]
 }

package/dpr/types/UserReports.js

@@ -1,2 +1,2 @@
-var s=Object.defineProperty;var d=Object.getOwnPropertyDescriptor;var m=Object.getOwnPropertyNames;var D=Object.prototype.hasOwnProperty;var c=(i,r)=>{for(var n in r)s(i,n,{get:r[n],enumerable:!0})},l=(i,r,n,t)=>{if(r&&typeof r=="object"||typeof r=="function")for(let a of m(r))!D.call(i,a)&&a!==n&&s(i,a,{get:()=>r[a],enumerable:!(t=d(r,a))||t.enumerable});return i};var y=i=>l(s({},"__esModule",{value:!0}),i);var R={};c(R,{LoadType:()=>g,ReportType:()=>p,RequestStatus:()=>o});module.exports=y(R);var o=(e=>(e.SUBMITTED="SUBMITTED",e.STARTED="STARTED",e.PICKED="PICKED",e.FINISHED="FINISHED",e.FAILED="FAILED",e.ABORTED="ABORTED",e.EXPIRED="EXPIRED",e.READY="READY",e.ALL="ALL",e))(o||{}),p=(t=>(t.REPORT="report",t.DASHBOARD="dashboard",t.UNAVAILABLE="unavailable",t))(p||{}),g=(t=>(t.SYNC="sync",t.ASYNC="async",t.SCHEDULED="scheduled",t))(g||{});0&&(module.exports={LoadType,ReportType,RequestStatus});
+"use strict";var s=Object.defineProperty;var g=Object.getOwnPropertyDescriptor;var m=Object.getOwnPropertyNames;var D=Object.prototype.hasOwnProperty;var c=(i,e)=>{for(var a in e)s(i,a,{get:e[a],enumerable:!0})},f=(i,e,a,t)=>{if(e&&typeof e=="object"||typeof e=="function")for(let n of m(e))!D.call(i,n)&&n!==a&&s(i,n,{get:()=>e[n],enumerable:!(t=g(e,n))||t.enumerable});return i};var l=i=>f(s({},"__esModule",{value:!0}),i);var y={};c(y,{LoadType:()=>p,ReportType:()=>d,RequestStatus:()=>o});module.exports=l(y);var o=(r=>(r.SUBMITTED="SUBMITTED",r.STARTED="STARTED",r.PICKED="PICKED",r.FINISHED="FINISHED",r.FAILED="FAILED",r.ABORTED="ABORTED",r.EXPIRED="EXPIRED",r.READY="READY",r.ALL="ALL",r))(o||{}),d=(t=>(t.REPORT="report",t.DASHBOARD="dashboard",t.UNAVAILABLE="unavailable",t))(d||{}),p=(t=>(t.SYNC="sync",t.ASYNC="async",t.SCHEDULED="scheduled",t))(p||{});0&&(module.exports={LoadType,ReportType,RequestStatus});
 //# sourceMappingURL=UserReports.js.map

package/dpr/types/UserReports.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/dpr/types/UserReports.ts"],
-  "sourcesContent": ["import Dict = NodeJS.Dict\nimport { SummaryTemplate, Template } from './Templates'\nimport { FieldDefinition } from '../utils/DataTableBuilder/types'\nimport { ChildReportExecutionData } from './ExecutionData'\n\nexport interface StoredReportData {\n  reportId: string\n  variantId?: string // NOTE variant ID exists fir V1 async routes\n  id: string\n  executionId?: string\n  tableId?: string\n  reportName: string\n  variantName?: string\n  name?: string\n  description: string\n  status?: RequestStatus\n  timestamp: AsyncReportsTimestamp\n  dataProductDefinitionsPath?: string\n  dpdPathFromQuery?: boolean\n  query?: AsyncReportQueryData\n  interactiveQuery?: AsyncReportQueryData\n  url?: AsyncReportUrlData\n  type: ReportType\n  loadType?: LoadType\n  childExecutionData?: Array<ChildReportExecutionData>\n}\n\nexport interface RequestedReport extends StoredReportData {\n  template: Template\n  errorMessage?: string\n  filters: ParamsConfig\n  sortBy: ParamsConfig\n}\n\nexport interface RequestedDashboard extends StoredReportData {\n  metrics: { name: string }[]\n}\n\nexport type RecentlyViewedReport = StoredReportData\nexport type UserReportData = RequestedReport | RecentlyViewedReport | StoredReportData | RequestedDashboard\n\nexport interface AsyncReportUrlData {\n  origin: string\n  request?: AsyncReportUrlItemData\n  report?: AsyncReportUrlItemData\n  polling?: AsyncReportUrlItemData\n}\n\nexport interface AsyncReportUrlItemData {\n  pathname?: string\n  fullUrl?: string\n  search?: string\n  default?: string\n}\n\nexport interface AsyncReportQueryData {\n  data: Dict<string | string[]>\n  summary: Array<Dict<string>>\n}\n\nexport interface ParamsConfig {\n  data: Dict<string>\n  queryString: string\n}\n\nexport enum RequestStatus {\n  SUBMITTED = 'SUBMITTED',\n  STARTED = 'STARTED',\n  PICKED = 'PICKED',\n  FINISHED = 'FINISHED',\n  FAILED = 'FAILED',\n  ABORTED = 'ABORTED',\n  EXPIRED = 'EXPIRED',\n  READY = 'READY',\n  ALL = 'ALL',\n}\n\nexport enum ReportType {\n  REPORT = 'report',\n  DASHBOARD = 'dashboard',\n  UNAVAILABLE = 'unavailable',\n}\n\nexport interface AsyncReportsTimestamp {\n  lastViewed?: Date\n  requested?: Date\n  completed?: Date\n  expired?: Date\n  failed?: Date\n  retried?: Date\n  aborted?: Date\n  refresh?: Date\n}\n\nexport interface AsyncSummary {\n  id: string\n  template: SummaryTemplate\n  fields: Array<FieldDefinition>\n  data: Array<Dict<string>>\n}\n\nexport interface FormattedUserReportData {\n  id: string\n  href: string\n  text: string\n  reportName: string\n  description: string\n  timestamp?: string\n  tag?: string\n  status?: string\n  type: ReportType\n  summary?: { name: string; value: string }[]\n  interactiveSummary?: { name: string; value: string }[]\n  meta?: meta\n}\n\nexport interface meta {\n  reportId: string\n  id: string\n  executionId: string\n  tableId: string\n  status?: string\n  type: ReportType\n  requestedAt?: Date\n  dataProductDefinitionsPath?: string\n  pollingUrl: string\n  reportUrl: string\n}\n\nexport interface RequestFormData {\n  dataProductDefinitionsPath: string\n  _csrf: string\n  reportId: string\n  name: string\n  reportName: string\n  description: string\n  type: string\n  pathname: string\n  origin: string\n  href: string\n  search: string\n  id: string\n  variantId?: string\n  template?: string\n  metrics?: { name: string }[]\n}\n\nexport enum LoadType {\n  SYNC = 'sync',\n  ASYNC = 'async',\n  SCHEDULED = 'scheduled',\n}\n\nexport interface DefinitionData {\n  reportName: string\n  reportId: string\n  id: string\n  name: string\n  description?: string\n  type: ReportType\n  reportDescription?: string\n  loadType: LoadType\n  authorised: boolean\n  isMissing?: boolean\n}\n"],
-  "mappings": "4ZAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,cAAAE,EAAA,eAAAC,EAAA,kBAAAC,IAAA,eAAAC,EAAAL,GAiEO,IAAKI,OACVA,EAAA,UAAY,YACZA,EAAA,QAAU,UACVA,EAAA,OAAS,SACTA,EAAA,SAAW,WACXA,EAAA,OAAS,SACTA,EAAA,QAAU,UACVA,EAAA,QAAU,UACVA,EAAA,MAAQ,QACRA,EAAA,IAAM,MATIA,OAAA,IAYAD,OACVA,EAAA,OAAS,SACTA,EAAA,UAAY,YACZA,EAAA,YAAc,cAHJA,OAAA,IAsEAD,OACVA,EAAA,KAAO,OACPA,EAAA,MAAQ,QACRA,EAAA,UAAY,YAHFA,OAAA",
+  "sourcesContent": ["import Dict = NodeJS.Dict\nimport { SummaryTemplate, Template } from './Templates'\nimport { FieldDefinition } from '../utils/DataTableBuilder/types'\nimport { ChildReportExecutionData } from './ExecutionData'\n\nexport interface StoredReportData {\n  reportId: string\n  variantId?: string // NOTE variant ID exists fir V1 async routes\n  id: string\n  executionId?: string | undefined\n  tableId?: string | undefined\n  reportName: string\n  variantName?: string\n  name: string\n  description: string\n  status?: RequestStatus\n  timestamp: AsyncReportsTimestamp\n  dataProductDefinitionsPath?: string\n  dpdPathFromQuery?: boolean\n  query?: AsyncReportQueryData\n  interactiveQuery?: AsyncReportQueryData\n  url?: AsyncReportUrlData\n  type: ReportType\n  loadType?: LoadType\n  childExecutionData?: Array<ChildReportExecutionData>\n}\n\nexport interface RequestedReport extends StoredReportData {\n  template: Template\n  errorMessage?: string\n  filters: ParamsConfig\n  sortBy: ParamsConfig\n}\n\nexport interface RequestedDashboard extends StoredReportData {\n  metrics: { name: string }[]\n}\n\nexport type RecentlyViewedReport = StoredReportData\nexport type UserReportData = RequestedReport | RecentlyViewedReport | StoredReportData | RequestedDashboard\n\nexport interface AsyncReportUrlData {\n  origin: string\n  request?: AsyncReportUrlItemData\n  report?: AsyncReportUrlItemData\n  polling?: AsyncReportUrlItemData\n}\n\nexport interface AsyncReportUrlItemData {\n  pathname?: string | undefined\n  fullUrl?: string | undefined\n  search?: string\n  default?: string\n}\n\nexport interface AsyncReportQueryData {\n  data: Dict<string | string[]>\n  summary: Array<Dict<string>>\n}\n\nexport interface ParamsConfig {\n  data: Dict<string>\n  queryString: string\n}\n\nexport enum RequestStatus {\n  SUBMITTED = 'SUBMITTED',\n  STARTED = 'STARTED',\n  PICKED = 'PICKED',\n  FINISHED = 'FINISHED',\n  FAILED = 'FAILED',\n  ABORTED = 'ABORTED',\n  EXPIRED = 'EXPIRED',\n  READY = 'READY',\n  ALL = 'ALL',\n}\n\nexport enum ReportType {\n  REPORT = 'report',\n  DASHBOARD = 'dashboard',\n  UNAVAILABLE = 'unavailable',\n}\n\nexport interface AsyncReportsTimestamp {\n  lastViewed?: Date\n  requested?: Date\n  completed?: Date\n  expired?: Date\n  failed?: Date\n  retried?: Date\n  aborted?: Date\n  refresh?: Date\n}\n\nexport interface AsyncSummary {\n  id: string\n  template: SummaryTemplate\n  fields: Array<FieldDefinition>\n  data: Array<Dict<string>>\n}\n\nexport interface FormattedUserReportData {\n  id?: string | undefined\n  href?: string | undefined\n  text: string\n  reportName: string\n  description: string\n  timestamp?: string\n  tag?: string\n  status?: string | undefined\n  type: ReportType\n  summary?: { name: string; value: string }[]\n  interactiveSummary?: { name: string; value: string }[]\n  meta: meta\n}\n\nexport interface FormattedBookmarkData {\n  id?: string\n  href?: string\n  text: string\n  reportName: string\n  description: string\n  timestamp?: string\n  tag?: string\n  status?: string\n  type: ReportType\n  summary?: { name: string; value: string }[]\n  interactiveSummary?: { name: string; value: string }[]\n}\n\nexport interface meta {\n  reportId: string\n  id: string\n  executionId?: string | undefined\n  tableId?: string | undefined\n  status?: string | undefined\n  type: ReportType\n  requestedAt?: Date | undefined\n  dataProductDefinitionsPath?: string | undefined\n  pollingUrl?: string | undefined\n  reportUrl?: string | undefined\n}\n\nexport interface RequestFormData {\n  dataProductDefinitionsPath: string\n  _csrf: string\n  reportId: string\n  name: string\n  reportName: string\n  description: string\n  type: string\n  pathname: string\n  origin: string\n  href: string\n  search: string\n  id: string\n  variantId?: string\n  template?: string\n  metrics?: { name: string }[]\n}\n\nexport enum LoadType {\n  SYNC = 'sync',\n  ASYNC = 'async',\n  SCHEDULED = 'scheduled',\n}\n\nexport interface DefinitionData {\n  reportName: string\n  reportId: string\n  id: string\n  name: string\n  description?: string\n  type: ReportType\n  reportDescription?: string\n  loadType: LoadType\n  authorised: boolean\n  isMissing?: boolean\n}\n"],
+  "mappings": "yaAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,cAAAE,EAAA,eAAAC,EAAA,kBAAAC,IAAA,eAAAC,EAAAL,GAiEO,IAAKI,OACVA,EAAA,UAAY,YACZA,EAAA,QAAU,UACVA,EAAA,OAAS,SACTA,EAAA,SAAW,WACXA,EAAA,OAAS,SACTA,EAAA,QAAU,UACVA,EAAA,QAAU,UACVA,EAAA,MAAQ,QACRA,EAAA,IAAM,MATIA,OAAA,IAYAD,OACVA,EAAA,OAAS,SACTA,EAAA,UAAY,YACZA,EAAA,YAAc,cAHJA,OAAA,IAoFAD,OACVA,EAAA,KAAO,OACPA,EAAA,MAAQ,QACRA,EAAA,UAAY,YAHFA,OAAA",
   "names": ["UserReports_exports", "__export", "LoadType", "ReportType", "RequestStatus", "__toCommonJS"]
 }

package/dpr/types/UserReports.ts

@@ -7,11 +7,11 @@ export interface StoredReportData {
   reportId: string
   variantId?: string // NOTE variant ID exists fir V1 async routes
   id: string
-  executionId?: string
-  tableId?: string
+  executionId?: string | undefined
+  tableId?: string | undefined
   reportName: string
   variantName?: string
-  name?: string
+  name: string
   description: string
   status?: RequestStatus
   timestamp: AsyncReportsTimestamp
@@ -47,8 +47,8 @@ export interface AsyncReportUrlData {
 }
 
 export interface AsyncReportUrlItemData {
-  pathname?: string
-  fullUrl?: string
+  pathname?: string | undefined
+  fullUrl?: string | undefined
   search?: string
   default?: string
 }
@@ -100,8 +100,23 @@ export interface AsyncSummary {
 }
 
 export interface FormattedUserReportData {
-  id: string
-  href: string
+  id?: string | undefined
+  href?: string | undefined
+  text: string
+  reportName: string
+  description: string
+  timestamp?: string
+  tag?: string
+  status?: string | undefined
+  type: ReportType
+  summary?: { name: string; value: string }[]
+  interactiveSummary?: { name: string; value: string }[]
+  meta: meta
+}
+
+export interface FormattedBookmarkData {
+  id?: string
+  href?: string
   text: string
   reportName: string
   description: string
@@ -111,20 +126,19 @@ export interface FormattedUserReportData {
   type: ReportType
   summary?: { name: string; value: string }[]
   interactiveSummary?: { name: string; value: string }[]
-  meta?: meta
 }
 
 export interface meta {
   reportId: string
   id: string
-  executionId: string
-  tableId: string
-  status?: string
+  executionId?: string | undefined
+  tableId?: string | undefined
+  status?: string | undefined
   type: ReportType
-  requestedAt?: Date
-  dataProductDefinitionsPath?: string
-  pollingUrl: string
-  reportUrl: string
+  requestedAt?: Date | undefined
+  dataProductDefinitionsPath?: string | undefined
+  pollingUrl?: string | undefined
+  reportUrl?: string | undefined
 }
 
 export interface RequestFormData {

package/dpr/types/api.d.js

@@ -1,2 +1,2 @@
-var o=Object.defineProperty;var a=Object.getOwnPropertyDescriptor;var i=Object.getOwnPropertyNames;var p=Object.prototype.hasOwnProperty;var c=(n,e,s,t)=>{if(e&&typeof e=="object"||typeof e=="function")for(let r of i(e))!p.call(n,r)&&r!==s&&o(n,r,{get:()=>e[r],enumerable:!(t=a(e,r))||t.enumerable});return n};var d=n=>c(o({},"__esModule",{value:!0}),n);var m={};module.exports=d(m);
+"use strict";var o=Object.defineProperty;var a=Object.getOwnPropertyDescriptor;var i=Object.getOwnPropertyNames;var p=Object.prototype.hasOwnProperty;var c=(n,e,s,t)=>{if(e&&typeof e=="object"||typeof e=="function")for(let r of i(e))!p.call(n,r)&&r!==s&&o(n,r,{get:()=>e[r],enumerable:!(t=a(e,r))||t.enumerable});return n};var d=n=>c(o({},"__esModule",{value:!0}),n);var m={};module.exports=d(m);
 //# sourceMappingURL=api.d.js.map