npm - @ministryofjustice/hmpps-digital-prison-reporting-frontend - Versions diffs - 4.17.0 → 4.17.2 - Mend

@ministryofjustice/hmpps-digital-prison-reporting-frontend 4.17.0 → 4.17.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (169) hide show

package/dpr/utils/Personalisation/personalisationUtils.ts CHANGED Viewed

@@ -24,13 +24,17 @@ export const saveDefaults = async (type: FiltersType, res: Response, req: Reques
   const defaultValuesForReport = await getDefaultValues(req, res, services, type)
   const { dprUser } = localsHelper.getValues(res)
   const { reportId, id } = req.params
-  return services.defaultFilterValuesService.save(dprUser.id, reportId, id, defaultValuesForReport)
+  const { defaultFilterValuesService } = services
+  return defaultFilterValuesService
+    ? defaultFilterValuesService.save(dprUser.id, reportId, id, defaultValuesForReport)
+    : undefined
 }
 export const removeDefaults = async (type: FiltersType, res: Response, req: Request, services: Services) => {
   const { dprUser } = localsHelper.getValues(res)
   const { reportId, id } = req.params
-  return services.defaultFilterValuesService.delete(dprUser.id, reportId, id, type)
+  const { defaultFilterValuesService } = services
+  return defaultFilterValuesService ? defaultFilterValuesService.delete(dprUser.id, reportId, id, type) : undefined
 }
 const getDefaultValues = async (
@@ -42,10 +46,15 @@ const getDefaultValues = async (
   const { token, definitionsPath } = localsHelper.getValues(res)
   const { reportId, id, type } = req.params
-  const service = type === ReportType.REPORT ? services.reportingService : services.dashboardService
-  const definition = await service.getDefinition(token, reportId, id, definitionsPath)
-  const fields: components['schemas']['FieldDefinition'][] =
-    type === ReportType.REPORT ? definition.variant.specification.fields : definition.filterFields
+  let definition: components['schemas']['SingleVariantReportDefinition'] | components['schemas']['DashboardDefinition']
+  let fields = []
+  if (type === ReportType.REPORT) {
+    definition = await services.reportingService.getDefinition(token, reportId, id, definitionsPath)
+    fields = definition.variant.specification?.fields || []
+  } else {
+    definition = await services.dashboardService.getDefinition(token, reportId, id, definitionsPath)
+    fields = definition.filterFields || []
+  }
   const bodyFilterValues = Object.keys(req.body)
     .filter((k) => {

package/dpr/utils/UserStoreItemBuilder.js CHANGED Viewed

@@ -1,2 +1,2 @@
-var I=Object.create;var u=Object.defineProperty;var g=Object.getOwnPropertyDescriptor;var y=Object.getOwnPropertyNames;var D=Object.getPrototypeOf,R=Object.prototype.hasOwnProperty;var q=(r,t)=>{for(var e in t)u(r,e,{get:t[e],enumerable:!0})},d=(r,t,e,i)=>{if(t&&typeof t=="object"||typeof t=="function")for(let s of y(t))!R.call(r,s)&&s!==e&&u(r,s,{get:()=>t[s],enumerable:!(i=g(t,s))||i.enumerable});return r};var f=(r,t,e)=>(e=r!=null?I(D(r)):{},d(t||!r||!r.__esModule?u(e,"default",{value:r,enumerable:!0}):e,r)),U=r=>d(u({},"__esModule",{value:!0}),r);var b={};q(b,{UserStoreItemBuilder:()=>h,default:()=>E});module.exports=U(b);var p=f(require("parseurl")),o=require("../types/UserReports");class h{constructor(t,e){this.build=()=>this.userStoreItem;this.addReportData=({type:t,reportId:e,reportName:i,description:s,id:m,name:n})=>({type:t,reportId:e,reportName:i,description:s,id:m,name:n,timestamp:{}});this.addExecutionData=t=>(this.userStoreItem={...this.userStoreItem,...t},this);this.addChildExecutionData=t=>(this.userStoreItem={...this.userStoreItem,childExecutionData:t},this);this.addFilters=t=>{const e=new URLSearchParams(t).toString();return this.userStoreItem={...this.userStoreItem,filters:{data:t,queryString:e}},this};this.addSortData=t=>{const e=new URLSearchParams(t).toString();return this.userStoreItem={...this.userStoreItem,sortBy:{data:t,queryString:e}},this};this.addRequestUrls=t=>{const{origin:e,pathname:i,search:s,href:m}=this.requestFormData,{executionId:n,dataProductDefinitionsPath:S,dpdPathFromQuery:l}=this.userStoreItem;let a=t.baseUrl.replace("/filters",`/${n}/status`);l&&(a=`${a}?dataProductDefinitionsPath=${S}`);const c=`${e}${a}`;return this.userStoreItem={...this.userStoreItem,url:{origin:e,request:{fullUrl:m,pathname:i,search:s},polling:{fullUrl:c,pathname:a}}},this};this.addAsyncUrls=t=>(this.userStoreItem={...this.userStoreItem,url:t},this);this.addReportUrls=t=>{const e=t.get("host"),i=`${t.protocol}://${t.get("host")}${t.originalUrl}`,s=(0,p.default)(t);return this.userStoreItem={...this.userStoreItem,url:{origin:e||this.userStoreItem.url?.origin||"",...this.userStoreItem.url?.request&&{request:this.userStoreItem.url.request},...this.userStoreItem.url?.polling&&{polling:this.userStoreItem.url.polling},report:{...this.userStoreItem.url?.report&&this.userStoreItem.url.report,fullUrl:i,...s&&s.search&&{search:s.search}}}},this};this.addLoadType=t=>(this.userStoreItem={...this.userStoreItem,loadType:t},this);this.addQuery=t=>(this.userStoreItem={...this.userStoreItem,...t&&{query:{data:t.query,summary:t.querySummary}}},this);this.addInteractiveQuery=t=>(t&&(this.userStoreItem={...this.userStoreItem,interactiveQuery:{data:t.query,summary:t.querySummary}}),this);this.addStatus=t=>(this.userStoreItem={...this.userStoreItem,status:t},this);this.addMetrics=t=>(this.userStoreItem={...this.userStoreItem,metrics:t.filter(e=>e.display).map(e=>({name:e.display||""}))},this);this.addTimestamp=()=>{const{status:t}=this.userStoreItem,e=new Date;switch(t){case o.RequestStatus.FAILED:this.userStoreItem.timestamp.failed=e;break;case o.RequestStatus.EXPIRED:this.userStoreItem.timestamp.expired=e;break;case o.RequestStatus.ABORTED:this.userStoreItem.timestamp.aborted=e;break;case o.RequestStatus.FINISHED:this.userStoreItem.timestamp.completed=e;break;case o.RequestStatus.SUBMITTED:this.userStoreItem.timestamp.requested=e;break;case o.RequestStatus.STARTED:case o.RequestStatus.PICKED:break;default:this.userStoreItem.timestamp.lastViewed=e;break}return this};this.addDefinitionsPath=(t,e)=>(t&&(this.userStoreItem={...this.userStoreItem,dataProductDefinitionsPath:t,dpdPathFromQuery:e}),this);this.requestFormData=e||{},this.userStoreItem=this.addReportData(t)}}var E=h;0&&(module.exports={UserStoreItemBuilder});
+var I=Object.create;var u=Object.defineProperty;var g=Object.getOwnPropertyDescriptor;var y=Object.getOwnPropertyNames;var D=Object.getPrototypeOf,R=Object.prototype.hasOwnProperty;var f=(r,t)=>{for(var e in t)u(r,e,{get:t[e],enumerable:!0})},d=(r,t,e,i)=>{if(t&&typeof t=="object"||typeof t=="function")for(let s of y(t))!R.call(r,s)&&s!==e&&u(r,s,{get:()=>t[s],enumerable:!(i=g(t,s))||i.enumerable});return r};var q=(r,t,e)=>(e=r!=null?I(D(r)):{},d(t||!r||!r.__esModule?u(e,"default",{value:r,enumerable:!0}):e,r)),U=r=>d(u({},"__esModule",{value:!0}),r);var T={};f(T,{UserStoreItemBuilder:()=>h,default:()=>E});module.exports=U(T);var p=q(require("parseurl")),o=require("../types/UserReports");class h{constructor(t,e){this.build=()=>this.userStoreItem;this.addReportData=({type:t,reportId:e,reportName:i,description:s,id:m,name:n})=>({type:t,reportId:e,reportName:i,description:s,id:m,name:n,timestamp:{}});this.addExecutionData=t=>(this.userStoreItem={...this.userStoreItem,...t},this);this.addChildExecutionData=t=>(this.userStoreItem={...this.userStoreItem,childExecutionData:t},this);this.addFilters=t=>{const e=new URLSearchParams(t).toString();return this.userStoreItem={...this.userStoreItem,filters:{data:t,queryString:e}},this};this.addSortData=t=>{const e=new URLSearchParams(t).toString();return this.userStoreItem={...this.userStoreItem,sortBy:{data:t,queryString:e}},this};this.addRequestUrls=t=>{const{origin:e,pathname:i,search:s,href:m}=this.requestFormData,{executionId:n,dataProductDefinitionsPath:S,dpdPathFromQuery:l}=this.userStoreItem;let a=t.baseUrl.replace("/filters",`/${n}/status`);l&&(a=`${a}?dataProductDefinitionsPath=${S}`);const c=`${e}${a}`;return this.userStoreItem={...this.userStoreItem,url:{origin:e,request:{fullUrl:m,pathname:i,search:s},polling:{fullUrl:c,pathname:a}}},this};this.addAsyncUrls=t=>(this.userStoreItem={...this.userStoreItem,url:t},this);this.addReportUrls=t=>{const e=t.get("host"),i=`${t.protocol}://${t.get("host")}${t.originalUrl}`,s=(0,p.default)(t);return this.userStoreItem={...this.userStoreItem,url:{origin:e||this.userStoreItem.url?.origin||"",...this.userStoreItem.url?.request&&{request:this.userStoreItem.url.request},...this.userStoreItem.url?.polling&&{polling:this.userStoreItem.url.polling},report:{...this.userStoreItem.url?.report&&this.userStoreItem.url.report,fullUrl:i,...s&&s.search&&{search:s.search}}}},this};this.addLoadType=t=>(this.userStoreItem={...this.userStoreItem,loadType:t},this);this.addQuery=t=>(this.userStoreItem={...this.userStoreItem,...t&&{query:{data:t.query,summary:t.querySummary}}},this);this.addInteractiveQuery=t=>(t&&(this.userStoreItem={...this.userStoreItem,interactiveQuery:{data:t.query,summary:t.querySummary}}),this);this.addStatus=t=>(this.userStoreItem={...this.userStoreItem,status:t},this);this.addMetrics=t=>(this.userStoreItem={...this.userStoreItem,metrics:t.filter(e=>e.display).map(e=>({name:e.display||""}))},this);this.addTimestamp=()=>{const{status:t}=this.userStoreItem,e=new Date;switch(t){case o.RequestStatus.FAILED:this.userStoreItem.timestamp.failed=e;break;case o.RequestStatus.EXPIRED:this.userStoreItem.timestamp.expired=e;break;case o.RequestStatus.ABORTED:this.userStoreItem.timestamp.aborted=e;break;case o.RequestStatus.FINISHED:this.userStoreItem.timestamp.completed=e;break;case o.RequestStatus.SUBMITTED:this.userStoreItem.timestamp.requested=e;break;case o.RequestStatus.STARTED:case o.RequestStatus.PICKED:break;default:this.userStoreItem.timestamp.lastViewed=e;break}return this};this.addDefinitionsPath=(t,e)=>(t&&(this.userStoreItem={...this.userStoreItem,dataProductDefinitionsPath:t,dpdPathFromQuery:e}),this);this.requestFormData=e||{},this.userStoreItem=this.addReportData(t)}}var E=h;0&&(module.exports={UserStoreItemBuilder});
 //# sourceMappingURL=UserStoreItemBuilder.js.map

package/dpr/utils/UserStoreItemBuilder.js.map CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/dpr/utils/UserStoreItemBuilder.ts"],
-  "sourcesContent": ["import type { Request } from 'express'\nimport parseUrl from 'parseurl'\nimport {\n  AsyncReportUrlData,\n  LoadType,\n  ReportType,\n  RequestedReport,\n  RequestFormData,\n  RequestStatus,\n  UserReportData,\n} from '../types/UserReports'\nimport Dict = NodeJS.Dict\nimport { ChildReportExecutionData, ExecutionData } from '../types/ExecutionData'\nimport { DashboardSection } from '../components/_dashboards/dashboard/types'\n\nclass UserStoreItemBuilder {\n  userStoreItem: UserReportData\n\n  requestFormData: RequestFormData | Record<string, never>\n\n  constructor(\n    reportData: {\n      type: ReportType\n      reportId: string\n      reportName: string\n      description: string\n      id: string\n      name: string\n    },\n    requestFormData?: RequestFormData,\n  ) {\n    this.requestFormData = requestFormData || {}\n    this.userStoreItem = this.addReportData(reportData)\n  }\n\n  build = () => {\n    return this.userStoreItem as RequestedReport\n  }\n\n  addReportData = ({\n    type,\n    reportId,\n    reportName,\n    description,\n    id,\n    name,\n  }: {\n    type: ReportType\n    reportId: string\n    reportName: string\n    description: string\n    id: string\n    name: string\n  }) => {\n    return {\n      type: type as ReportType,\n      reportId,\n      reportName,\n      description,\n      id,\n      name,\n      timestamp: {},\n    }\n  }\n\n  addExecutionData = (executionData: ExecutionData) => {\n    this.userStoreItem = {\n      ...(<UserReportData>this.userStoreItem),\n      ...executionData,\n    }\n    return this\n  }\n\n  addChildExecutionData = (childExecutionData: Array<ChildReportExecutionData>) => {\n    this.userStoreItem = {\n      ...(<UserReportData>this.userStoreItem),\n      childExecutionData,\n    }\n    return this\n  }\n\n  addFilters = (filterData?: Record<string, string>) => {\n    const filtersQueryString = new URLSearchParams(filterData).toString()\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      ...{\n        filters: {\n          data: filterData,\n          queryString: filtersQueryString,\n        },\n      },\n    }\n    return this\n  }\n\n  addSortData = (sortData: Record<string, string>) => {\n    const sortByQueryString = new URLSearchParams(sortData).toString()\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      ...{\n        sortBy: {\n          data: sortData,\n          queryString: sortByQueryString,\n        },\n      },\n    }\n    return this\n  }\n\n  addRequestUrls = (req: Request) => {\n    const { origin, pathname, search, href } = this.requestFormData\n    const { executionId, dataProductDefinitionsPath, dpdPathFromQuery } = this.userStoreItem\n\n    // Polling path\n    let pollingPath = req.baseUrl.replace('/filters', `/${executionId}/status`)\n    if (dpdPathFromQuery) {\n      pollingPath = `${pollingPath}?dataProductDefinitionsPath=${dataProductDefinitionsPath}`\n    }\n    const pollingFullUrl = `${origin}${pollingPath}`\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      ...{\n        url: {\n          origin,\n          request: {\n            fullUrl: href,\n            pathname,\n            search,\n          },\n          polling: {\n            fullUrl: pollingFullUrl,\n            pathname: pollingPath,\n          },\n        },\n      },\n    }\n\n    return this\n  }\n\n  addAsyncUrls = (url: AsyncReportUrlData) => {\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      ...{\n        url,\n      },\n    }\n\n    return this\n  }\n\n  addReportUrls = (req: Request) => {\n    const origin = req.get('host')\n    const fullUrl = `${req.protocol}://${req.get('host')}${req.originalUrl}`\n    const urlData = parseUrl(req)\n\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      ...{\n        url: {\n          origin: origin || this.userStoreItem.url?.origin || '',\n          ...(this.userStoreItem.url?.request && { request: this.userStoreItem.url.request }),\n          ...(this.userStoreItem.url?.polling && { polling: this.userStoreItem.url.polling }),\n          report: {\n            ...(this.userStoreItem.url?.report && this.userStoreItem.url.report),\n            fullUrl,\n            ...(urlData && urlData.search && { search: urlData.search }),\n          },\n        },\n      },\n    }\n\n    return this\n  }\n\n  addLoadType = (loadType: LoadType) => {\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      loadType,\n    }\n\n    return this\n  }\n\n  addQuery = (queryData?: { query: Dict<string | string[]>; querySummary: Array<Dict<string>> }) => {\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      ...(queryData && {\n        query: {\n          data: queryData.query,\n          summary: queryData.querySummary,\n        },\n      }),\n    }\n    return this\n  }\n\n  addInteractiveQuery = (queryData?: { query: Dict<string | string[]>; querySummary: Array<Dict<string>> }) => {\n    if (queryData) {\n      this.userStoreItem = {\n        ...this.userStoreItem,\n        ...{\n          interactiveQuery: {\n            data: queryData.query,\n            summary: queryData.querySummary,\n          },\n        },\n      }\n    }\n    return this\n  }\n\n  addStatus = (status: RequestStatus) => {\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      status,\n    }\n    return this\n  }\n\n  addMetrics = (metrics: DashboardSection[]) => {\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      metrics: metrics.filter((metric) => metric.display).map((metric) => ({ name: metric.display || '' })),\n    }\n    return this\n  }\n\n  addTimestamp = () => {\n    const { status } = this.userStoreItem\n    const ts = new Date()\n    switch (status) {\n      case RequestStatus.FAILED:\n        this.userStoreItem.timestamp.failed = ts\n        break\n      case RequestStatus.EXPIRED:\n        this.userStoreItem.timestamp.expired = ts\n        break\n      case RequestStatus.ABORTED:\n        this.userStoreItem.timestamp.aborted = ts\n        break\n      case RequestStatus.FINISHED:\n        this.userStoreItem.timestamp.completed = ts\n        break\n      case RequestStatus.SUBMITTED:\n        this.userStoreItem.timestamp.requested = ts\n        break\n      case RequestStatus.STARTED:\n      case RequestStatus.PICKED:\n        break\n      default:\n        this.userStoreItem.timestamp.lastViewed = ts\n        break\n    }\n    return this\n  }\n\n  addDefinitionsPath = (definitionsPath: string, dpdPathFromQuery: boolean) => {\n    if (definitionsPath) {\n      this.userStoreItem = {\n        ...this.userStoreItem,\n        dataProductDefinitionsPath: definitionsPath,\n        dpdPathFromQuery,\n      }\n    }\n    return this\n  }\n}\n\nexport { UserStoreItemBuilder }\nexport default UserStoreItemBuilder\n"],
+  "sourcesContent": ["import type { Request } from 'express'\nimport parseUrl from 'parseurl'\nimport {\n  AsyncReportUrlData,\n  LoadType,\n  ReportType,\n  RequestedReport,\n  RequestFormData,\n  RequestStatus,\n  UserReportData,\n} from '../types/UserReports'\nimport Dict = NodeJS.Dict\nimport { ChildReportExecutionData, ExecutionData } from '../types/ExecutionData'\nimport { components } from '../types/api'\n\nclass UserStoreItemBuilder {\n  userStoreItem: UserReportData\n\n  requestFormData: RequestFormData | Record<string, never>\n\n  constructor(\n    reportData: {\n      type: ReportType\n      reportId: string\n      reportName: string\n      description: string\n      id: string\n      name: string\n    },\n    requestFormData?: RequestFormData,\n  ) {\n    this.requestFormData = requestFormData || {}\n    this.userStoreItem = this.addReportData(reportData)\n  }\n\n  build = () => {\n    return this.userStoreItem as RequestedReport\n  }\n\n  addReportData = ({\n    type,\n    reportId,\n    reportName,\n    description,\n    id,\n    name,\n  }: {\n    type: ReportType\n    reportId: string\n    reportName: string\n    description: string\n    id: string\n    name: string\n  }) => {\n    return {\n      type: type as ReportType,\n      reportId,\n      reportName,\n      description,\n      id,\n      name,\n      timestamp: {},\n    }\n  }\n\n  addExecutionData = (executionData: ExecutionData) => {\n    this.userStoreItem = {\n      ...(<UserReportData>this.userStoreItem),\n      ...executionData,\n    }\n    return this\n  }\n\n  addChildExecutionData = (childExecutionData: Array<ChildReportExecutionData>) => {\n    this.userStoreItem = {\n      ...(<UserReportData>this.userStoreItem),\n      childExecutionData,\n    }\n    return this\n  }\n\n  addFilters = (filterData?: Record<string, string>) => {\n    const filtersQueryString = new URLSearchParams(filterData).toString()\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      ...{\n        filters: {\n          data: filterData,\n          queryString: filtersQueryString,\n        },\n      },\n    }\n    return this\n  }\n\n  addSortData = (sortData: Record<string, string>) => {\n    const sortByQueryString = new URLSearchParams(sortData).toString()\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      ...{\n        sortBy: {\n          data: sortData,\n          queryString: sortByQueryString,\n        },\n      },\n    }\n    return this\n  }\n\n  addRequestUrls = (req: Request) => {\n    const { origin, pathname, search, href } = this.requestFormData\n    const { executionId, dataProductDefinitionsPath, dpdPathFromQuery } = this.userStoreItem\n\n    // Polling path\n    let pollingPath = req.baseUrl.replace('/filters', `/${executionId}/status`)\n    if (dpdPathFromQuery) {\n      pollingPath = `${pollingPath}?dataProductDefinitionsPath=${dataProductDefinitionsPath}`\n    }\n    const pollingFullUrl = `${origin}${pollingPath}`\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      ...{\n        url: {\n          origin,\n          request: {\n            fullUrl: href,\n            pathname,\n            search,\n          },\n          polling: {\n            fullUrl: pollingFullUrl,\n            pathname: pollingPath,\n          },\n        },\n      },\n    }\n\n    return this\n  }\n\n  addAsyncUrls = (url: AsyncReportUrlData) => {\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      ...{\n        url,\n      },\n    }\n\n    return this\n  }\n\n  addReportUrls = (req: Request) => {\n    const origin = req.get('host')\n    const fullUrl = `${req.protocol}://${req.get('host')}${req.originalUrl}`\n    const urlData = parseUrl(req)\n\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      ...{\n        url: {\n          origin: origin || this.userStoreItem.url?.origin || '',\n          ...(this.userStoreItem.url?.request && { request: this.userStoreItem.url.request }),\n          ...(this.userStoreItem.url?.polling && { polling: this.userStoreItem.url.polling }),\n          report: {\n            ...(this.userStoreItem.url?.report && this.userStoreItem.url.report),\n            fullUrl,\n            ...(urlData && urlData.search && { search: urlData.search }),\n          },\n        },\n      },\n    }\n\n    return this\n  }\n\n  addLoadType = (loadType: LoadType) => {\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      loadType,\n    }\n\n    return this\n  }\n\n  addQuery = (queryData?: { query: Dict<string | string[]>; querySummary: Array<Dict<string>> }) => {\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      ...(queryData && {\n        query: {\n          data: queryData.query,\n          summary: queryData.querySummary,\n        },\n      }),\n    }\n    return this\n  }\n\n  addInteractiveQuery = (queryData?: { query: Dict<string | string[]>; querySummary: Array<Dict<string>> }) => {\n    if (queryData) {\n      this.userStoreItem = {\n        ...this.userStoreItem,\n        ...{\n          interactiveQuery: {\n            data: queryData.query,\n            summary: queryData.querySummary,\n          },\n        },\n      }\n    }\n    return this\n  }\n\n  addStatus = (status: RequestStatus) => {\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      status,\n    }\n    return this\n  }\n\n  addMetrics = (metrics: components['schemas']['DashboardSectionDefinition'][]) => {\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      metrics: metrics.filter((metric) => metric.display).map((metric) => ({ name: metric.display || '' })),\n    }\n    return this\n  }\n\n  addTimestamp = () => {\n    const { status } = this.userStoreItem\n    const ts = new Date()\n    switch (status) {\n      case RequestStatus.FAILED:\n        this.userStoreItem.timestamp.failed = ts\n        break\n      case RequestStatus.EXPIRED:\n        this.userStoreItem.timestamp.expired = ts\n        break\n      case RequestStatus.ABORTED:\n        this.userStoreItem.timestamp.aborted = ts\n        break\n      case RequestStatus.FINISHED:\n        this.userStoreItem.timestamp.completed = ts\n        break\n      case RequestStatus.SUBMITTED:\n        this.userStoreItem.timestamp.requested = ts\n        break\n      case RequestStatus.STARTED:\n      case RequestStatus.PICKED:\n        break\n      default:\n        this.userStoreItem.timestamp.lastViewed = ts\n        break\n    }\n    return this\n  }\n\n  addDefinitionsPath = (definitionsPath: string, dpdPathFromQuery: boolean) => {\n    if (definitionsPath) {\n      this.userStoreItem = {\n        ...this.userStoreItem,\n        dataProductDefinitionsPath: definitionsPath,\n        dpdPathFromQuery,\n      }\n    }\n    return this\n  }\n}\n\nexport { UserStoreItemBuilder }\nexport default UserStoreItemBuilder\n"],
   "mappings": "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",
   "names": ["UserStoreItemBuilder_exports", "__export", "UserStoreItemBuilder", "UserStoreItemBuilder_default", "__toCommonJS", "import_parseurl", "import_UserReports", "reportData", "requestFormData", "type", "reportId", "reportName", "description", "id", "name", "executionData", "childExecutionData", "filterData", "filtersQueryString", "sortData", "sortByQueryString", "req", "origin", "pathname", "search", "href", "executionId", "dataProductDefinitionsPath", "dpdPathFromQuery", "pollingPath", "pollingFullUrl", "url", "fullUrl", "urlData", "parseUrl", "loadType", "queryData", "status", "metrics", "metric", "ts", "definitionsPath"]
 }

package/dpr/utils/UserStoreItemBuilder.ts CHANGED Viewed

@@ -11,7 +11,7 @@ import {
 } from '../types/UserReports'
 import Dict = NodeJS.Dict
 import { ChildReportExecutionData, ExecutionData } from '../types/ExecutionData'
-import { DashboardSection } from '../components/_dashboards/dashboard/types'
+import { components } from '../types/api'
 class UserStoreItemBuilder {
   userStoreItem: UserReportData
@@ -218,7 +218,7 @@ class UserStoreItemBuilder {
     return this
   }
-  addMetrics = (metrics: DashboardSection[]) => {
+  addMetrics = (metrics: components['schemas']['DashboardSectionDefinition'][]) => {
     this.userStoreItem = {
       ...this.userStoreItem,
       metrics: metrics.filter((metric) => metric.display).map((metric) => ({ name: metric.display || '' })),

package/dpr/utils/datasetHelper.js CHANGED Viewed

@@ -1,2 +1,2 @@
-var h=Object.defineProperty;var k=Object.getOwnPropertyDescriptor;var E=Object.getOwnPropertyNames;var O=Object.prototype.hasOwnProperty;var q=(e,s)=>{for(var n in s)h(e,n,{get:s[n],enumerable:!0})},T=(e,s,n,t)=>{if(s&&typeof s=="object"||typeof s=="function")for(let o of E(s))!O.call(e,o)&&o!==n&&h(e,o,{get:()=>s[o],enumerable:!(t=k(s,o))||t.enumerable});return e};var j=e=>T(h({},"__esModule",{value:!0}),e);var H={};q(H,{default:()=>B,filterKeys:()=>R,filterRowsByDisplayColumns:()=>I,getDatasetRows:()=>g,getEarliestDataset:()=>V,getGroupKey:()=>K,getKeyIds:()=>b,getKeyVariations:()=>y,getLastestDataset:()=>v,groupRowsByKey:()=>C,groupRowsByTimestamp:()=>x});module.exports=j(H);const g=(e,s)=>{const{keys:n,measures:t,filters:o,expectNulls:r}=e.columns,a=t.map(p=>p.id),i=n?.map(p=>p.id)||[],l=o?.map(p=>p.id)||[],u=n?.some(p=>p.optional);s.length&&s[0].ts&&i.unshift("ts");const m=s.filter(p=>{const w=[];return Object.keys(p).forEach(f=>{const c=p[f].raw;let d=!0;l.includes(f)?d=(o?o.filter(D=>D.id===f).map(D=>D.equals):[]).includes(c):i.includes(f)&&u?d=!0:i.includes(f)&&!u||a.includes(f)?d=c!==""&&c!==void 0&&c!==null:r&&(d=c===""||c===void 0||c===null),w.push(d)}),w.every(f=>f)});return u?R(m,n||[]):m},y=(e,s)=>{const n=[],t=s.map(a=>a.id),o=s.every(a=>a.optional),r=[...t];return t.reverse().forEach(a=>{const i=s.find(l=>l.id===a);n.push([...r]),i&&i.optional&&r.pop()}),o&&n.push([]),n},b=(e,s)=>{let n=[];return s.every(t=>{const o=[];return e.forEach(r=>{const a=[];Object.keys(r).forEach(i=>{const l=r[i].raw;let u=!0;t.includes(i)&&(u=l!==""&&l!==void 0&&l!==null),a.push(u)}),a.every(i=>i)&&o.push(r)}),o.length>0?(n=t,!1):(n=t,!0)}),n},R=(e,s)=>{const n=y(e,s),t=b(e,n);return e.filter(o=>{const r=[];return Object.keys(o).forEach(a=>{const i=o[a].raw;let l=!0;t.includes(a)&&(l=i!==""&&i!==void 0&&i!==null),r.push(l)}),r.every(a=>a)})},v=e=>{const s=e[e.length-1]?.ts?.raw;return s?e.filter(n=>n.ts.raw===s):e},V=e=>{const s=e[0]?.ts?.raw;return s?e.filter(n=>n.ts.raw===s):e},x=e=>[...new Set(e.map(n=>n.ts.raw))].map(n=>e.filter(t=>t.ts.raw===n)),C=(e,s)=>[...new Set(e.map(t=>t[s].raw))].map(t=>e.filter(o=>o[s].raw===t)),K=(e,s)=>{if(!e||!e.length||!s.length)return;const n=s[0];let t=e.length-1,o=!1;for(;!o;){const r=`${e[t]?.id}`;r&&t!==-1&&(!n[r]||!n[r].raw||n[r].raw===""||n[r].raw===null)?t-=1:o=!0}return t!==-1?e[t]:void 0},I=(e,s,n=!1)=>{const{keys:t,measures:o}=e.columns,r=t||[];let a=[...o];n&&(a=[...r,...o]);const i=a.map(l=>l.id);return s.map(l=>Object.keys(l).filter(u=>i.includes(u)).reduce((u,m)=>(u[m]=l[m],u),{}))};var B={getDatasetRows:g,getLastestDataset:v,getEarliestDataset:V,filterRowsByDisplayColumns:I,groupRowsByTimestamp:x,groupRowsByKey:C,getGroupKey:K,getKeyVariations:y,getKeyIds:b,filterKeys:R};0&&(module.exports={filterKeys,filterRowsByDisplayColumns,getDatasetRows,getEarliestDataset,getGroupKey,getKeyIds,getKeyVariations,getLastestDataset,groupRowsByKey,groupRowsByTimestamp});
+var h=Object.defineProperty;var k=Object.getOwnPropertyDescriptor;var E=Object.getOwnPropertyNames;var O=Object.prototype.hasOwnProperty;var q=(e,s)=>{for(var n in s)h(e,n,{get:s[n],enumerable:!0})},T=(e,s,n,o)=>{if(s&&typeof s=="object"||typeof s=="function")for(let t of E(s))!O.call(e,t)&&t!==n&&h(e,t,{get:()=>s[t],enumerable:!(o=k(s,t))||o.enumerable});return e};var j=e=>T(h({},"__esModule",{value:!0}),e);var B={};q(B,{default:()=>A,filterKeys:()=>R,filterRowsByDisplayColumns:()=>K,getDatasetRows:()=>w,getEarliestDataset:()=>x,getGroupKey:()=>I,getKeyIds:()=>b,getKeyVariations:()=>y,getLastestDataset:()=>v,groupRowsByKey:()=>V,groupRowsByTimestamp:()=>C});module.exports=j(B);const w=(e,s)=>{const{measures:n,filters:o,expectNulls:t}=e.columns,a=e.columns.keys,r=n.map(p=>p.id),i=a?.map(p=>p.id)||[],l=o?.map(p=>p.id)||[],u=a?.some(p=>p.optional);s.length&&s[0].ts&&i.unshift("ts");const d=s.filter(p=>{const g=[];return Object.keys(p).forEach(f=>{const c=p[f].raw;let m=!0;l.includes(f)?m=(o?o.filter(D=>D.id===f).map(D=>D.equals):[]).includes(c):i.includes(f)&&u?m=!0:i.includes(f)&&!u||r.includes(f)?m=c!==""&&c!==void 0&&c!==null:t&&(m=c===""||c===void 0||c===null),g.push(m)}),g.every(f=>f)});return u?R(d,a||[]):d},y=(e,s)=>{const n=[],o=s.map(r=>r.id),t=s.every(r=>r.optional),a=[...o];return o.reverse().forEach(r=>{const i=s.find(l=>l.id===r);n.push([...a]),i&&i.optional&&a.pop()}),t&&n.push([]),n},b=(e,s)=>{let n=[];return s.every(o=>{const t=[];return e.forEach(a=>{const r=[];Object.keys(a).forEach(i=>{const l=a[i].raw;let u=!0;o.includes(i)&&(u=l!==""&&l!==void 0&&l!==null),r.push(u)}),r.every(i=>i)&&t.push(a)}),t.length>0?(n=o,!1):(n=o,!0)}),n},R=(e,s)=>{const n=y(e,s),o=b(e,n);return e.filter(t=>{const a=[];return Object.keys(t).forEach(r=>{const i=t[r].raw;let l=!0;o.includes(r)&&(l=i!==""&&i!==void 0&&i!==null),a.push(l)}),a.every(r=>r)})},v=e=>{const s=e[e.length-1]?.ts?.raw;return s?e.filter(n=>n.ts.raw===s):e},x=e=>{const s=e[0]?.ts?.raw;return s?e.filter(n=>n.ts.raw===s):e},C=e=>[...new Set(e.map(n=>n.ts.raw))].map(n=>e.filter(o=>o.ts.raw===n)),V=(e,s)=>[...new Set(e.map(o=>o[s].raw))].map(o=>e.filter(t=>t[s].raw===o)),I=(e,s)=>{if(!e||!e.length||!s.length)return;const n=s[0];let o=e.length-1,t=!1;for(;!t;){const a=`${e[o]?.id}`;a&&o!==-1&&(!n[a]||!n[a].raw||n[a].raw===""||n[a].raw===null)?o-=1:t=!0}return o!==-1?e[o]:void 0},K=(e,s,n=!1)=>{const{keys:o,measures:t}=e.columns,a=o||[];let r=[...t];n&&(r=[...a,...t]);const i=r.map(l=>l.id);return s.map(l=>Object.keys(l).filter(u=>i.includes(u)).reduce((u,d)=>(u[d]=l[d],u),{}))};var A={getDatasetRows:w,getLastestDataset:v,getEarliestDataset:x,filterRowsByDisplayColumns:K,groupRowsByTimestamp:C,groupRowsByKey:V,getGroupKey:I,getKeyVariations:y,getKeyIds:b,filterKeys:R};0&&(module.exports={filterKeys,filterRowsByDisplayColumns,getDatasetRows,getEarliestDataset,getGroupKey,getKeyIds,getKeyVariations,getLastestDataset,groupRowsByKey,groupRowsByTimestamp});
 //# sourceMappingURL=datasetHelper.js.map

package/dpr/utils/datasetHelper.js.map CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/dpr/utils/datasetHelper.ts"],
-  "sourcesContent": ["import { DashboardDataResponse } from '../types/Metrics'\nimport { DashboardVisualisation, DashboardVisualisationColumnKey } from '../components/_dashboards/dashboard/types'\n\nexport const getDatasetRows = (listDefinition: DashboardVisualisation, dashboardData: DashboardDataResponse[]) => {\n  const { keys, measures, filters, expectNulls } = listDefinition.columns\n\n  const displayColumnsIds = measures.map((col) => col.id)\n  const keyColumnsIds = keys?.map((col) => col.id) || []\n  const filterColIds = filters?.map((col) => col.id) || []\n  const hasOptionalKeys = keys?.some((key) => key.optional)\n\n  if (dashboardData.length && dashboardData[0].ts) keyColumnsIds.unshift('ts')\n\n  const filtered = dashboardData.filter((datasetRow: DashboardDataResponse) => {\n    const validRow: boolean[] = []\n\n    Object.keys(datasetRow).forEach((datasetField) => {\n      const value = datasetRow[datasetField].raw\n      // All rows are valid until proven otherwise\n      let valid = true\n\n      // 1. check if the column value is equal to a defined column value\n      if (filterColIds.includes(datasetField)) {\n        const filterValues = filters ? filters.filter((f) => f.id === datasetField).map((f) => f.equals) : []\n        valid = filterValues.includes(value)\n\n        // 3. check keys exist in the defined columns\n      } else if (keyColumnsIds.includes(datasetField) && hasOptionalKeys) {\n        valid = true\n\n        // 3. check keys exist in the defined columns\n      } else if (keyColumnsIds.includes(datasetField) && !hasOptionalKeys) {\n        valid = value !== '' && value !== undefined && value !== null\n\n        // 2. check values exist in the defined columns\n      } else if (displayColumnsIds.includes(datasetField)) {\n        valid = value !== '' && value !== undefined && value !== null\n\n        // 3. check that all remaining columns are null.\n      } else if (expectNulls) {\n        valid = value === '' || value === undefined || value === null\n      }\n\n      validRow.push(valid)\n    })\n\n    return validRow.every((val) => val)\n  })\n\n  if (hasOptionalKeys) {\n    return filterKeys(filtered, keys || [])\n  }\n\n  return filtered\n}\n\nexport const getKeyVariations = (dashboardData: DashboardDataResponse[], keys: DashboardVisualisationColumnKey[]) => {\n  const colIdVariations: string[][] = []\n  const keyColumnsIds = keys.map((col) => col.id)\n  const allOptional = keys.every((key) => key.optional)\n  const colIdCopy = [...keyColumnsIds]\n\n  keyColumnsIds.reverse().forEach((id) => {\n    const key = keys.find((k) => k.id === id)\n    colIdVariations.push([...colIdCopy])\n    if (key && key.optional) {\n      colIdCopy.pop()\n    }\n  })\n\n  if (allOptional) colIdVariations.push([])\n  return colIdVariations\n}\n\nexport const getKeyIds = (dashboardData: DashboardDataResponse[], colIdVariations: string[][]) => {\n  let validHeadIds: string[] = []\n  colIdVariations.every((ids: string[]) => {\n    const validRows = []\n\n    dashboardData.forEach((datasetRow: DashboardDataResponse) => {\n      const validRow: boolean[] = []\n\n      Object.keys(datasetRow).forEach((datasetField) => {\n        const value = datasetRow[datasetField].raw\n        let valid = true\n        if (ids.includes(datasetField)) {\n          valid = value !== '' && value !== undefined && value !== null\n        }\n        validRow.push(valid)\n      })\n\n      if (validRow.every((val) => val)) {\n        validRows.push(datasetRow)\n      }\n    })\n\n    if (validRows.length > 0) {\n      validHeadIds = ids\n      return false\n    }\n    validHeadIds = ids\n    return true\n  })\n\n  return validHeadIds\n}\n\nexport const filterKeys = (dashboardData: DashboardDataResponse[], keys: DashboardVisualisationColumnKey[]) => {\n  const colIdVariations = getKeyVariations(dashboardData, keys)\n  const validHeadIds = getKeyIds(dashboardData, colIdVariations)\n\n  return dashboardData.filter((datasetRow: DashboardDataResponse) => {\n    const validRow: boolean[] = []\n    Object.keys(datasetRow).forEach((datasetField) => {\n      const value = datasetRow[datasetField].raw\n      let valid = true\n      if (validHeadIds.includes(datasetField)) {\n        valid = value !== '' && value !== undefined && value !== null\n      }\n      validRow.push(valid)\n    })\n\n    return validRow.every((val) => val)\n  })\n}\n\nexport const getLastestDataset = (dashboardData: DashboardDataResponse[]): DashboardDataResponse[] => {\n  const latestTimestamp = dashboardData[dashboardData.length - 1]?.ts?.raw\n  if (latestTimestamp) {\n    return dashboardData.filter((data) => data.ts.raw === latestTimestamp)\n  }\n  return dashboardData\n}\n\nexport const getEarliestDataset = (dashboardData: DashboardDataResponse[]): DashboardDataResponse[] => {\n  const latestTimestamp = dashboardData[0]?.ts?.raw\n  if (latestTimestamp) {\n    return dashboardData.filter((data) => data.ts.raw === latestTimestamp)\n  }\n  return dashboardData\n}\n\nexport const groupRowsByTimestamp = (dashboardData: DashboardDataResponse[]): DashboardDataResponse[][] => {\n  const uniqueTimestamps = [...new Set(dashboardData.map((item) => item.ts.raw))]\n  return uniqueTimestamps.map((ts) => {\n    return dashboardData.filter((d) => d.ts.raw === ts)\n  })\n}\n\nexport const groupRowsByKey = (dashboardData: DashboardDataResponse[], key: string): DashboardDataResponse[][] => {\n  const uniqueKeyValues = [...new Set(dashboardData.map((item) => item[key].raw))]\n  return uniqueKeyValues.map((keyValue) => {\n    return dashboardData.filter((d) => d[key].raw === keyValue)\n  })\n}\n\nexport const getGroupKey = (keys: DashboardVisualisationColumnKey[], rawData: DashboardDataResponse[]) => {\n  if (!keys || !keys.length || !rawData.length) {\n    return undefined\n  }\n\n  const data = rawData[0]\n  let index = keys.length - 1\n  let keyFound = false\n  while (!keyFound) {\n    const k = `${keys[index]?.id}`\n    if (k && index !== -1 && (!data[k] || !data[k].raw || data[k].raw === '' || data[k].raw === null)) {\n      index -= 1\n    } else {\n      keyFound = true\n    }\n  }\n\n  return index !== -1 ? keys[index] : undefined\n}\n\nexport const filterRowsByDisplayColumns = (\n  listDefinition: DashboardVisualisation,\n  dashboardData: DashboardDataResponse[],\n  includeKeys = false,\n) => {\n  const { keys: keyCols, measures } = listDefinition.columns\n  const keys = keyCols || []\n  let displayColumns = [...measures]\n  if (includeKeys) {\n    displayColumns = [...keys, ...measures]\n  }\n  const displayColumnsIds = displayColumns.map((col) => col.id)\n\n  return dashboardData.map((datasetRow: DashboardDataResponse) => {\n    return Object.keys(datasetRow)\n      .filter((key) => displayColumnsIds.includes(key))\n      .reduce((acc, key) => {\n        acc[key] = datasetRow[key]\n        return acc\n      }, {} as unknown as DashboardDataResponse)\n  })\n}\n\nexport default {\n  getDatasetRows,\n  getLastestDataset,\n  getEarliestDataset,\n  filterRowsByDisplayColumns,\n  groupRowsByTimestamp,\n  groupRowsByKey,\n  getGroupKey,\n  getKeyVariations,\n  getKeyIds,\n  filterKeys,\n}\n"],
-  "mappings": "4ZAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,eAAAC,EAAA,+BAAAC,EAAA,mBAAAC,EAAA,uBAAAC,EAAA,gBAAAC,EAAA,cAAAC,EAAA,qBAAAC,EAAA,sBAAAC,EAAA,mBAAAC,EAAA,yBAAAC,IAAA,eAAAC,EAAAb,GAGO,MAAMK,EAAiB,CAACS,EAAwCC,IAA2C,CAChH,KAAM,CAAE,KAAAC,EAAM,SAAAC,EAAU,QAAAC,EAAS,YAAAC,CAAY,EAAIL,EAAe,QAE1DM,EAAoBH,EAAS,IAAKI,GAAQA,EAAI,EAAE,EAChDC,EAAgBN,GAAM,IAAKK,GAAQA,EAAI,EAAE,GAAK,CAAC,EAC/CE,EAAeL,GAAS,IAAKG,GAAQA,EAAI,EAAE,GAAK,CAAC,EACjDG,EAAkBR,GAAM,KAAMS,GAAQA,EAAI,QAAQ,EAEpDV,EAAc,QAAUA,EAAc,CAAC,EAAE,IAAIO,EAAc,QAAQ,IAAI,EAE3E,MAAMI,EAAWX,EAAc,OAAQY,GAAsC,CAC3E,MAAMC,EAAsB,CAAC,EAE7B,cAAO,KAAKD,CAAU,EAAE,QAASE,GAAiB,CAChD,MAAMC,EAAQH,EAAWE,CAAY,EAAE,IAEvC,IAAIE,EAAQ,GAGRR,EAAa,SAASM,CAAY,EAEpCE,GADqBb,EAAUA,EAAQ,OAAQc,GAAMA,EAAE,KAAOH,CAAY,EAAE,IAAKG,GAAMA,EAAE,MAAM,EAAI,CAAC,GAC/E,SAASF,CAAK,EAG1BR,EAAc,SAASO,CAAY,GAAKL,EACjDO,EAAQ,GAGCT,EAAc,SAASO,CAAY,GAAK,CAACL,GAIzCJ,EAAkB,SAASS,CAAY,EAHhDE,EAAQD,IAAU,IAAMA,IAAU,QAAaA,IAAU,KAOhDX,IACTY,EAAQD,IAAU,IAAMA,IAAU,QAAaA,IAAU,MAG3DF,EAAS,KAAKG,CAAK,CACrB,CAAC,EAEMH,EAAS,MAAOK,GAAQA,CAAG,CACpC,CAAC,EAED,OAAIT,EACKrB,EAAWuB,EAAUV,GAAQ,CAAC,CAAC,EAGjCU,CACT,EAEajB,EAAmB,CAACM,EAAwCC,IAA4C,CACnH,MAAMkB,EAA8B,CAAC,EAC/BZ,EAAgBN,EAAK,IAAKK,GAAQA,EAAI,EAAE,EACxCc,EAAcnB,EAAK,MAAOS,GAAQA,EAAI,QAAQ,EAC9CW,EAAY,CAAC,GAAGd,CAAa,EAEnC,OAAAA,EAAc,QAAQ,EAAE,QAASe,GAAO,CACtC,MAAMZ,EAAMT,EAAK,KAAMsB,GAAMA,EAAE,KAAOD,CAAE,EACxCH,EAAgB,KAAK,CAAC,GAAGE,CAAS,CAAC,EAC/BX,GAAOA,EAAI,UACbW,EAAU,IAAI,CAElB,CAAC,EAEGD,GAAaD,EAAgB,KAAK,CAAC,CAAC,EACjCA,CACT,EAEa1B,EAAY,CAACO,EAAwCmB,IAAgC,CAChG,IAAIK,EAAyB,CAAC,EAC9B,OAAAL,EAAgB,MAAOM,GAAkB,CACvC,MAAMC,EAAY,CAAC,EAmBnB,OAjBA1B,EAAc,QAASY,GAAsC,CAC3D,MAAMC,EAAsB,CAAC,EAE7B,OAAO,KAAKD,CAAU,EAAE,QAASE,GAAiB,CAChD,MAAMC,EAAQH,EAAWE,CAAY,EAAE,IACvC,IAAIE,EAAQ,GACRS,EAAI,SAASX,CAAY,IAC3BE,EAAQD,IAAU,IAAMA,IAAU,QAAaA,IAAU,MAE3DF,EAAS,KAAKG,CAAK,CACrB,CAAC,EAEGH,EAAS,MAAOK,GAAQA,CAAG,GAC7BQ,EAAU,KAAKd,CAAU,CAE7B,CAAC,EAEGc,EAAU,OAAS,GACrBF,EAAeC,EACR,KAETD,EAAeC,EACR,GACT,CAAC,EAEMD,CACT,EAEapC,EAAa,CAACY,EAAwCC,IAA4C,CAC7G,MAAMkB,EAAkBzB,EAAiBM,EAAeC,CAAI,EACtDuB,EAAe/B,EAAUO,EAAemB,CAAe,EAE7D,OAAOnB,EAAc,OAAQY,GAAsC,CACjE,MAAMC,EAAsB,CAAC,EAC7B,cAAO,KAAKD,CAAU,EAAE,QAASE,GAAiB,CAChD,MAAMC,EAAQH,EAAWE,CAAY,EAAE,IACvC,IAAIE,EAAQ,GACRQ,EAAa,SAASV,CAAY,IACpCE,EAAQD,IAAU,IAAMA,IAAU,QAAaA,IAAU,MAE3DF,EAAS,KAAKG,CAAK,CACrB,CAAC,EAEMH,EAAS,MAAOK,GAAQA,CAAG,CACpC,CAAC,CACH,EAEavB,EAAqBK,GAAoE,CACpG,MAAM2B,EAAkB3B,EAAcA,EAAc,OAAS,CAAC,GAAG,IAAI,IACrE,OAAI2B,EACK3B,EAAc,OAAQ4B,GAASA,EAAK,GAAG,MAAQD,CAAe,EAEhE3B,CACT,EAEaT,EAAsBS,GAAoE,CACrG,MAAM2B,EAAkB3B,EAAc,CAAC,GAAG,IAAI,IAC9C,OAAI2B,EACK3B,EAAc,OAAQ4B,GAASA,EAAK,GAAG,MAAQD,CAAe,EAEhE3B,CACT,EAEaH,EAAwBG,GACV,CAAC,GAAG,IAAI,IAAIA,EAAc,IAAK6B,GAASA,EAAK,GAAG,GAAG,CAAC,CAAC,EACtD,IAAKC,GACpB9B,EAAc,OAAQ+B,GAAMA,EAAE,GAAG,MAAQD,CAAE,CACnD,EAGUlC,EAAiB,CAACI,EAAwCU,IAC7C,CAAC,GAAG,IAAI,IAAIV,EAAc,IAAK6B,GAASA,EAAKnB,CAAG,EAAE,GAAG,CAAC,CAAC,EACxD,IAAKsB,GACnBhC,EAAc,OAAQ+B,GAAMA,EAAErB,CAAG,EAAE,MAAQsB,CAAQ,CAC3D,EAGUxC,EAAc,CAACS,EAAyCgC,IAAqC,CACxG,GAAI,CAAChC,GAAQ,CAACA,EAAK,QAAU,CAACgC,EAAQ,OACpC,OAGF,MAAML,EAAOK,EAAQ,CAAC,EACtB,IAAIC,EAAQjC,EAAK,OAAS,EACtBkC,EAAW,GACf,KAAO,CAACA,GAAU,CAChB,MAAMZ,EAAI,GAAGtB,EAAKiC,CAAK,GAAG,EAAE,GACxBX,GAAKW,IAAU,KAAO,CAACN,EAAKL,CAAC,GAAK,CAACK,EAAKL,CAAC,EAAE,KAAOK,EAAKL,CAAC,EAAE,MAAQ,IAAMK,EAAKL,CAAC,EAAE,MAAQ,MAC1FW,GAAS,EAETC,EAAW,EAEf,CAEA,OAAOD,IAAU,GAAKjC,EAAKiC,CAAK,EAAI,MACtC,EAEa7C,EAA6B,CACxCU,EACAC,EACAoC,EAAc,KACX,CACH,KAAM,CAAE,KAAMC,EAAS,SAAAnC,CAAS,EAAIH,EAAe,QAC7CE,EAAOoC,GAAW,CAAC,EACzB,IAAIC,EAAiB,CAAC,GAAGpC,CAAQ,EAC7BkC,IACFE,EAAiB,CAAC,GAAGrC,EAAM,GAAGC,CAAQ,GAExC,MAAMG,EAAoBiC,EAAe,IAAKhC,GAAQA,EAAI,EAAE,EAE5D,OAAON,EAAc,IAAKY,GACjB,OAAO,KAAKA,CAAU,EAC1B,OAAQF,GAAQL,EAAkB,SAASK,CAAG,CAAC,EAC/C,OAAO,CAAC6B,EAAK7B,KACZ6B,EAAI7B,CAAG,EAAIE,EAAWF,CAAG,EAClB6B,GACN,CAAC,CAAqC,CAC5C,CACH,EAEA,IAAOpD,EAAQ,CACb,eAAAG,EACA,kBAAAK,EACA,mBAAAJ,EACA,2BAAAF,EACA,qBAAAQ,EACA,eAAAD,EACA,YAAAJ,EACA,iBAAAE,EACA,UAAAD,EACA,WAAAL,CACF",
-  "names": ["datasetHelper_exports", "__export", "datasetHelper_default", "filterKeys", "filterRowsByDisplayColumns", "getDatasetRows", "getEarliestDataset", "getGroupKey", "getKeyIds", "getKeyVariations", "getLastestDataset", "groupRowsByKey", "groupRowsByTimestamp", "__toCommonJS", "listDefinition", "dashboardData", "keys", "measures", "filters", "expectNulls", "displayColumnsIds", "col", "keyColumnsIds", "filterColIds", "hasOptionalKeys", "key", "filtered", "datasetRow", "validRow", "datasetField", "value", "valid", "f", "val", "colIdVariations", "allOptional", "colIdCopy", "id", "k", "validHeadIds", "ids", "validRows", "latestTimestamp", "data", "item", "ts", "d", "keyValue", "rawData", "index", "keyFound", "includeKeys", "keyCols", "displayColumns", "acc"]
+  "sourcesContent": ["import { DashboardDataResponse } from '../types/Metrics'\nimport { components } from '../types/api'\n\nexport const getDatasetRows = (\n  listDefinition: components['schemas']['DashboardVisualisationDefinition'],\n  dashboardData: DashboardDataResponse[],\n) => {\n  const { measures, filters, expectNulls } = listDefinition.columns\n  const keys = <Array<components['schemas']['DashboardVisualisationColumnDefinition'] & { optional: boolean }>>(\n    listDefinition.columns.keys\n  )\n\n  const displayColumnsIds = measures.map((col) => col.id)\n  const keyColumnsIds = keys?.map((col) => col.id) || []\n  const filterColIds = filters?.map((col) => col.id) || []\n  const hasOptionalKeys = keys?.some((key) => key.optional)\n\n  if (dashboardData.length && dashboardData[0].ts) keyColumnsIds.unshift('ts')\n\n  const filtered = dashboardData.filter((datasetRow: DashboardDataResponse) => {\n    const validRow: boolean[] = []\n\n    Object.keys(datasetRow).forEach((datasetField) => {\n      const value = datasetRow[datasetField].raw\n      // All rows are valid until proven otherwise\n      let valid = true\n\n      // 1. check if the column value is equal to a defined column value\n      if (filterColIds.includes(datasetField)) {\n        const filterValues = filters ? filters.filter((f) => f.id === datasetField).map((f) => f.equals) : []\n        valid = filterValues.includes(<string>value)\n\n        // 3. check keys exist in the defined columns\n      } else if (keyColumnsIds.includes(datasetField) && hasOptionalKeys) {\n        valid = true\n\n        // 3. check keys exist in the defined columns\n      } else if (keyColumnsIds.includes(datasetField) && !hasOptionalKeys) {\n        valid = value !== '' && value !== undefined && value !== null\n\n        // 2. check values exist in the defined columns\n      } else if (displayColumnsIds.includes(datasetField)) {\n        valid = value !== '' && value !== undefined && value !== null\n\n        // 3. check that all remaining columns are null.\n      } else if (expectNulls) {\n        valid = value === '' || value === undefined || value === null\n      }\n\n      validRow.push(valid)\n    })\n\n    return validRow.every((val) => val)\n  })\n\n  if (hasOptionalKeys) {\n    return filterKeys(filtered, keys || [])\n  }\n\n  return filtered\n}\n\nexport const getKeyVariations = (\n  dashboardData: DashboardDataResponse[],\n  keys: Array<components['schemas']['DashboardVisualisationColumnDefinition'] & { optional: boolean }>,\n) => {\n  const colIdVariations: string[][] = []\n  const keyColumnsIds = keys.map((col) => col.id)\n  const allOptional = keys.every((key) => key.optional)\n  const colIdCopy = [...keyColumnsIds]\n\n  keyColumnsIds.reverse().forEach((id) => {\n    const key = keys.find((k) => k.id === id)\n    colIdVariations.push([...colIdCopy])\n    if (key && key.optional) {\n      colIdCopy.pop()\n    }\n  })\n\n  if (allOptional) colIdVariations.push([])\n  return colIdVariations\n}\n\nexport const getKeyIds = (dashboardData: DashboardDataResponse[], colIdVariations: string[][]) => {\n  let validHeadIds: string[] = []\n  colIdVariations.every((ids: string[]) => {\n    const validRows = []\n\n    dashboardData.forEach((datasetRow: DashboardDataResponse) => {\n      const validRow: boolean[] = []\n\n      Object.keys(datasetRow).forEach((datasetField) => {\n        const value = datasetRow[datasetField].raw\n        let valid = true\n        if (ids.includes(datasetField)) {\n          valid = value !== '' && value !== undefined && value !== null\n        }\n        validRow.push(valid)\n      })\n\n      if (validRow.every((val) => val)) {\n        validRows.push(datasetRow)\n      }\n    })\n\n    if (validRows.length > 0) {\n      validHeadIds = ids\n      return false\n    }\n    validHeadIds = ids\n    return true\n  })\n\n  return validHeadIds\n}\n\nexport const filterKeys = (\n  dashboardData: DashboardDataResponse[],\n  keys: Array<components['schemas']['DashboardVisualisationColumnDefinition'] & { optional: boolean }>,\n) => {\n  const colIdVariations = getKeyVariations(dashboardData, keys)\n  const validHeadIds = getKeyIds(dashboardData, colIdVariations)\n\n  return dashboardData.filter((datasetRow: DashboardDataResponse) => {\n    const validRow: boolean[] = []\n    Object.keys(datasetRow).forEach((datasetField) => {\n      const value = datasetRow[datasetField].raw\n      let valid = true\n      if (validHeadIds.includes(datasetField)) {\n        valid = value !== '' && value !== undefined && value !== null\n      }\n      validRow.push(valid)\n    })\n\n    return validRow.every((val) => val)\n  })\n}\n\nexport const getLastestDataset = (dashboardData: DashboardDataResponse[]): DashboardDataResponse[] => {\n  const latestTimestamp = dashboardData[dashboardData.length - 1]?.ts?.raw\n  if (latestTimestamp) {\n    return dashboardData.filter((data) => data.ts.raw === latestTimestamp)\n  }\n  return dashboardData\n}\n\nexport const getEarliestDataset = (dashboardData: DashboardDataResponse[]): DashboardDataResponse[] => {\n  const latestTimestamp = dashboardData[0]?.ts?.raw\n  if (latestTimestamp) {\n    return dashboardData.filter((data) => data.ts.raw === latestTimestamp)\n  }\n  return dashboardData\n}\n\nexport const groupRowsByTimestamp = (dashboardData: DashboardDataResponse[]): DashboardDataResponse[][] => {\n  const uniqueTimestamps = [...new Set(dashboardData.map((item) => item.ts.raw))]\n  return uniqueTimestamps.map((ts) => {\n    return dashboardData.filter((d) => d.ts.raw === ts)\n  })\n}\n\nexport const groupRowsByKey = (dashboardData: DashboardDataResponse[], key: string): DashboardDataResponse[][] => {\n  const uniqueKeyValues = [...new Set(dashboardData.map((item) => item[key].raw))]\n  return uniqueKeyValues.map((keyValue) => {\n    return dashboardData.filter((d) => d[key].raw === keyValue)\n  })\n}\n\nexport const getGroupKey = (\n  keys: Array<components['schemas']['DashboardVisualisationColumnDefinition']>,\n  rawData: DashboardDataResponse[],\n) => {\n  if (!keys || !keys.length || !rawData.length) {\n    return undefined\n  }\n\n  const data = rawData[0]\n  let index = keys.length - 1\n  let keyFound = false\n  while (!keyFound) {\n    const k = `${keys[index]?.id}`\n    if (k && index !== -1 && (!data[k] || !data[k].raw || data[k].raw === '' || data[k].raw === null)) {\n      index -= 1\n    } else {\n      keyFound = true\n    }\n  }\n\n  return index !== -1 ? keys[index] : undefined\n}\n\nexport const filterRowsByDisplayColumns = (\n  listDefinition: components['schemas']['DashboardVisualisationDefinition'],\n  dashboardData: DashboardDataResponse[],\n  includeKeys = false,\n) => {\n  const { keys: keyCols, measures } = listDefinition.columns\n  const keys = keyCols || []\n  let displayColumns = [...measures]\n  if (includeKeys) {\n    displayColumns = [...keys, ...measures]\n  }\n  const displayColumnsIds = displayColumns.map((col) => col.id)\n\n  return dashboardData.map((datasetRow: DashboardDataResponse) => {\n    return Object.keys(datasetRow)\n      .filter((key) => displayColumnsIds.includes(key))\n      .reduce((acc, key) => {\n        acc[key] = datasetRow[key]\n        return acc\n      }, {} as unknown as DashboardDataResponse)\n  })\n}\n\nexport default {\n  getDatasetRows,\n  getLastestDataset,\n  getEarliestDataset,\n  filterRowsByDisplayColumns,\n  groupRowsByTimestamp,\n  groupRowsByKey,\n  getGroupKey,\n  getKeyVariations,\n  getKeyIds,\n  filterKeys,\n}\n"],
+  "mappings": "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",
+  "names": ["datasetHelper_exports", "__export", "datasetHelper_default", "filterKeys", "filterRowsByDisplayColumns", "getDatasetRows", "getEarliestDataset", "getGroupKey", "getKeyIds", "getKeyVariations", "getLastestDataset", "groupRowsByKey", "groupRowsByTimestamp", "__toCommonJS", "listDefinition", "dashboardData", "measures", "filters", "expectNulls", "keys", "displayColumnsIds", "col", "keyColumnsIds", "filterColIds", "hasOptionalKeys", "key", "filtered", "datasetRow", "validRow", "datasetField", "value", "valid", "f", "val", "colIdVariations", "allOptional", "colIdCopy", "id", "k", "validHeadIds", "ids", "validRows", "latestTimestamp", "data", "item", "ts", "d", "keyValue", "rawData", "index", "keyFound", "includeKeys", "keyCols", "displayColumns", "acc"]
 }

package/dpr/utils/datasetHelper.test.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { DashboardVisualisation, DashboardVisualisationColumn } from '../components/_dashboards/dashboard/types'
+import { components } from '../types/api'
 import { DashboardDataResponse } from '../types/Metrics'
 import DatasetHelper from './datasetHelper'
@@ -57,7 +57,7 @@ describe('DatasetHelper', () => {
               },
             ],
           },
-        } as unknown as DashboardVisualisation
+        } as unknown as components['schemas']['DashboardVisualisationDefinition']
         const result = DatasetHelper.getDatasetRows(definition, dataset)
         expect(result).toEqual(expectedResult)
@@ -121,7 +121,7 @@ describe('DatasetHelper', () => {
               },
             ],
           },
-        } as unknown as DashboardVisualisation
+        } as unknown as components['schemas']['DashboardVisualisationDefinition']
         const result = DatasetHelper.getDatasetRows(definition, dataset)
         expect(result).toEqual(expectedResult)
@@ -165,7 +165,7 @@ describe('DatasetHelper', () => {
             ],
             expectNulls: true,
           },
-        } as unknown as DashboardVisualisation
+        } as unknown as components['schemas']['DashboardVisualisationDefinition']
         const result = DatasetHelper.getDatasetRows(definition, dataset)
         expect(result).toEqual(expectedResult)
@@ -274,7 +274,7 @@ describe('DatasetHelper', () => {
               },
             ],
           },
-        } as unknown as DashboardVisualisation
+        } as unknown as components['schemas']['DashboardVisualisationDefinition']
         const result = DatasetHelper.getDatasetRows(definition, dataset)
         expect(result).toEqual(expectedResult)
@@ -396,7 +396,7 @@ describe('DatasetHelper', () => {
               },
             ],
           },
-        } as unknown as DashboardVisualisation
+        } as unknown as components['schemas']['DashboardVisualisationDefinition']
         const result = DatasetHelper.getDatasetRows(definition, dataset)
         expect(result).toEqual(expectedResult)
@@ -475,7 +475,7 @@ describe('DatasetHelper', () => {
             },
           ],
         },
-      } as unknown as DashboardVisualisation
+      } as unknown as components['schemas']['DashboardVisualisationDefinition']
       const data = [
         {
@@ -501,7 +501,7 @@ describe('DatasetHelper', () => {
   })
   describe('getChartGroupKey', () => {
-    let keys: DashboardVisualisationColumn[]
+    let keys: components['schemas']['DashboardVisualisationColumnDefinition'][]
     beforeEach(() => {
       keys = [
         {
@@ -513,7 +513,7 @@ describe('DatasetHelper', () => {
         {
           id: 'key3',
         },
-      ] as unknown as DashboardVisualisationColumn[]
+      ]
     })
     it('should set the correct key - value is empty string - key3', () => {
@@ -711,7 +711,7 @@ describe('DatasetHelper', () => {
   describe('getKeyVariations', () => {
     let data: DashboardDataResponse[]
-    let keys: DashboardVisualisationColumn[]
+    let keys: components['schemas']['DashboardVisualisationColumnDefinition'][]
     beforeEach(() => {
       data = [
@@ -904,7 +904,7 @@ describe('DatasetHelper', () => {
   describe('filterKeys', () => {
     let data: DashboardDataResponse[]
-    let keys: DashboardVisualisationColumn[]
+    let keys: components['schemas']['DashboardVisualisationColumnDefinition'][]
     it('should filter the data by the keys 1', () => {
       data = [

package/dpr/utils/datasetHelper.ts CHANGED Viewed

@@ -1,8 +1,14 @@
 import { DashboardDataResponse } from '../types/Metrics'
-import { DashboardVisualisation, DashboardVisualisationColumnKey } from '../components/_dashboards/dashboard/types'
+import { components } from '../types/api'
-export const getDatasetRows = (listDefinition: DashboardVisualisation, dashboardData: DashboardDataResponse[]) => {
-  const { keys, measures, filters, expectNulls } = listDefinition.columns
+export const getDatasetRows = (
+  listDefinition: components['schemas']['DashboardVisualisationDefinition'],
+  dashboardData: DashboardDataResponse[],
+) => {
+  const { measures, filters, expectNulls } = listDefinition.columns
+  const keys = <Array<components['schemas']['DashboardVisualisationColumnDefinition'] & { optional: boolean }>>(
+    listDefinition.columns.keys
+  )
   const displayColumnsIds = measures.map((col) => col.id)
   const keyColumnsIds = keys?.map((col) => col.id) || []
@@ -22,7 +28,7 @@ export const getDatasetRows = (listDefinition: DashboardVisualisation, dashboard
       // 1. check if the column value is equal to a defined column value
       if (filterColIds.includes(datasetField)) {
         const filterValues = filters ? filters.filter((f) => f.id === datasetField).map((f) => f.equals) : []
-        valid = filterValues.includes(value)
+        valid = filterValues.includes(<string>value)
         // 3. check keys exist in the defined columns
       } else if (keyColumnsIds.includes(datasetField) && hasOptionalKeys) {
@@ -54,7 +60,10 @@ export const getDatasetRows = (listDefinition: DashboardVisualisation, dashboard
   return filtered
 }
-export const getKeyVariations = (dashboardData: DashboardDataResponse[], keys: DashboardVisualisationColumnKey[]) => {
+export const getKeyVariations = (
+  dashboardData: DashboardDataResponse[],
+  keys: Array<components['schemas']['DashboardVisualisationColumnDefinition'] & { optional: boolean }>,
+) => {
   const colIdVariations: string[][] = []
   const keyColumnsIds = keys.map((col) => col.id)
   const allOptional = keys.every((key) => key.optional)
@@ -105,7 +114,10 @@ export const getKeyIds = (dashboardData: DashboardDataResponse[], colIdVariation
   return validHeadIds
 }
-export const filterKeys = (dashboardData: DashboardDataResponse[], keys: DashboardVisualisationColumnKey[]) => {
+export const filterKeys = (
+  dashboardData: DashboardDataResponse[],
+  keys: Array<components['schemas']['DashboardVisualisationColumnDefinition'] & { optional: boolean }>,
+) => {
   const colIdVariations = getKeyVariations(dashboardData, keys)
   const validHeadIds = getKeyIds(dashboardData, colIdVariations)
@@ -154,7 +166,10 @@ export const groupRowsByKey = (dashboardData: DashboardDataResponse[], key: stri
   })
 }
-export const getGroupKey = (keys: DashboardVisualisationColumnKey[], rawData: DashboardDataResponse[]) => {
+export const getGroupKey = (
+  keys: Array<components['schemas']['DashboardVisualisationColumnDefinition']>,
+  rawData: DashboardDataResponse[],
+) => {
   if (!keys || !keys.length || !rawData.length) {
     return undefined
   }
@@ -175,7 +190,7 @@ export const getGroupKey = (keys: DashboardVisualisationColumnKey[], rawData: Da
 }
 export const filterRowsByDisplayColumns = (
-  listDefinition: DashboardVisualisation,
+  listDefinition: components['schemas']['DashboardVisualisationDefinition'],
   dashboardData: DashboardDataResponse[],
   includeKeys = false,
 ) => {

package/dpr/utils/logger.js CHANGED Viewed

@@ -1,2 +1,2 @@
-var p=Object.create;var a=Object.defineProperty;var s=Object.getOwnPropertyDescriptor;var f=Object.getOwnPropertyNames;var c=Object.getPrototypeOf,b=Object.prototype.hasOwnProperty;var d=(o,t)=>{for(var r in t)a(o,r,{get:t[r],enumerable:!0})},m=(o,t,r,n)=>{if(t&&typeof t=="object"||typeof t=="function")for(let e of f(t))!b.call(o,e)&&e!==r&&a(o,e,{get:()=>t[e],enumerable:!(n=s(t,e))||n.enumerable});return o};var g=(o,t,r)=>(r=o!=null?p(c(o)):{},m(t||!o||!o.__esModule?a(r,"default",{value:o,enumerable:!0}):r,o)),x=o=>m(a({},"__esModule",{value:!0}),o);var v={};d(v,{default:()=>h,logger:()=>i});module.exports=x(v);var l=g(require("bunyan")),u=g(require("bunyan-format"));const y=(0,u.default)({outputMode:"short",color:!1}),i=l.default.createLogger({name:"Digital Prison Reporting:",stream:y,level:"debug"});var h=i;0&&(module.exports={logger});
+var p=Object.create;var a=Object.defineProperty;var u=Object.getOwnPropertyDescriptor;var c=Object.getOwnPropertyNames;var f=Object.getPrototypeOf,b=Object.prototype.hasOwnProperty;var d=(o,e)=>{for(var t in e)a(o,t,{get:e[t],enumerable:!0})},g=(o,e,t,s)=>{if(e&&typeof e=="object"||typeof e=="function")for(let r of c(e))!b.call(o,r)&&r!==t&&a(o,r,{get:()=>e[r],enumerable:!(s=u(e,r))||s.enumerable});return o};var l=(o,e,t)=>(t=o!=null?p(f(o)):{},g(e||!o||!o.__esModule?a(t,"default",{value:o,enumerable:!0}):t,o)),L=o=>g(a({},"__esModule",{value:!0}),o);var x={};d(x,{default:()=>v,logger:()=>i});module.exports=L(x);var n=l(require("bunyan")),m=l(require("bunyan-format"));const S=(0,m.default)({outputMode:"short",color:!1}),P=process.env.SUPPRESS_LOGS,i=n.default.createLogger({name:"Digital Prison Reporting:",stream:S,level:P?n.default.FATAL+1:"debug"});var v=i;0&&(module.exports={logger});
 //# sourceMappingURL=logger.js.map

package/dpr/utils/logger.js.map CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/dpr/utils/logger.ts"],
-  "sourcesContent": ["import bunyan from 'bunyan'\nimport bunyanFormat from 'bunyan-format'\n\nconst formatOut = bunyanFormat({ outputMode: 'short', color: false })\n\nexport const logger = bunyan.createLogger({ name: 'Digital Prison Reporting:', stream: formatOut, level: 'debug' })\n\nexport default logger\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,WAAAC,IAAA,eAAAC,EAAAJ,GAAA,IAAAK,EAAmB,qBACnBC,EAAyB,4BAEzB,MAAMC,KAAY,EAAAC,SAAa,CAAE,WAAY,QAAS,MAAO,EAAM,CAAC,EAEvDL,EAAS,EAAAM,QAAO,aAAa,CAAE,KAAM,4BAA6B,OAAQF,EAAW,MAAO,OAAQ,CAAC,EAElH,IAAOL,EAAQC",
-  "names": ["logger_exports", "__export", "logger_default", "logger", "__toCommonJS", "import_bunyan", "import_bunyan_format", "formatOut", "bunyanFormat", "bunyan"]
+  "sourcesContent": ["import bunyan from 'bunyan'\nimport bunyanFormat from 'bunyan-format'\n\nconst formatOut = bunyanFormat({ outputMode: 'short', color: false })\n\nconst disableLogs = process.env.SUPPRESS_LOGS\nexport const logger = bunyan.createLogger({\n  name: 'Digital Prison Reporting:',\n  stream: formatOut,\n  level: disableLogs ? bunyan.FATAL + 1 : 'debug',\n})\n\nexport default logger\n"],
+  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,WAAAC,IAAA,eAAAC,EAAAJ,GAAA,IAAAK,EAAmB,qBACnBC,EAAyB,4BAEzB,MAAMC,KAAY,EAAAC,SAAa,CAAE,WAAY,QAAS,MAAO,EAAM,CAAC,EAE9DC,EAAc,QAAQ,IAAI,cACnBN,EAAS,EAAAO,QAAO,aAAa,CACxC,KAAM,4BACN,OAAQH,EACR,MAAOE,EAAc,EAAAC,QAAO,MAAQ,EAAI,OAC1C,CAAC,EAED,IAAOR,EAAQC",
+  "names": ["logger_exports", "__export", "logger_default", "logger", "__toCommonJS", "import_bunyan", "import_bunyan_format", "formatOut", "bunyanFormat", "disableLogs", "bunyan"]
 }

package/dpr/utils/logger.ts CHANGED Viewed

@@ -3,6 +3,11 @@ import bunyanFormat from 'bunyan-format'
 const formatOut = bunyanFormat({ outputMode: 'short', color: false })
-export const logger = bunyan.createLogger({ name: 'Digital Prison Reporting:', stream: formatOut, level: 'debug' })
+const disableLogs = process.env.SUPPRESS_LOGS
+export const logger = bunyan.createLogger({
+  name: 'Digital Prison Reporting:',
+  stream: formatOut,
+  level: disableLogs ? bunyan.FATAL + 1 : 'debug',
+})
 export default logger

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@ministryofjustice/hmpps-digital-prison-reporting-frontend",
   "description": "The Digital Prison Reporting Frontend contains templates and code to help display data effectively in UI applications.",
-  "version": "4.17.0",
+  "version": "4.17.2",
   "main": "dpr/all.mjs",
   "sass": "dpr/all.scss",
   "engines": {
@@ -52,6 +52,7 @@
     "start-test-app": "npm run package && node $NODE_OPTIONS test-app/start-server.js",
     "start:dev": "USE_MOCK_CLIENTS=true concurrently -k -p \"[{name}]\" -n \"ESBuild,Node\" -c \"yellow.bold,cyan.bold\" \"node esbuild/esbuild.config.js --build --watch\" \"node esbuild/esbuild.config.js --dev-server\"",
     "start:dev:noMockClients": "concurrently -k -p \"[{name}]\" -n \"ESBuild,Node\" -c \"yellow.bold,cyan.bold\" \"node esbuild/esbuild.config.js --build --watch\" \"node esbuild/esbuild.config.js --dev-server\"",
+    "start:dev:noMockClients:noLogs": "SUPPRESS_LOGS=true concurrently -k -p \"[{name}]\" -n \"ESBuild,Node\" -c \"yellow.bold,cyan.bold\" \"node esbuild/esbuild.config.js --build --watch\" \"node esbuild/esbuild.config.js --dev-server\"",
     "start:server": "node esbuild/esbuild.config.js --dev-server",
     "security_audit": "npx audit-ci --config audit-ci.json",
     "int-test-cucumber": "cypress run --config-file cypress-tests/integration-tests/cypress.config.js",

package/dpr/components/_charts/chart/DashboardVisualisation.js DELETED Viewed

	@@ -1,2 +0,0 @@
1	- var o=Object.defineProperty;var u=Object.getOwnPropertyDescriptor;var r=Object.getOwnPropertyNames;var h=Object.prototype.hasOwnProperty;var l=(a,s)=>{for(var i in s)o(a,i,{get:s[i],enumerable:!0})},m=(a,s,i,e)=>{if(s&&typeof s=="object"\|\|typeof s=="function")for(let t of r(s))!h.call(a,t)&&t!==i&&o(a,t,{get:()=>s[t],enumerable:!(e=u(s,t))\|\|e.enumerable});return a};var p=a=>m(o({},"__esModule",{value:!0}),a);var D={};l(D,{DashboardVisualisationClass:()=>n,default:()=>d});module.exports=p(D);class n{constructor(s,i){this.initUnit=()=>{this.unit=this.columns.measures[0].unit?this.columns.measures[0].unit:void 0};this.definition=i,this.columns=i.columns,this.measures=this.columns.measures,this.keys=this.columns.keys,this.type=this.definition.type.split("-")[0],this.initUnit(),this.responseData=s}}var d=n;0&&(module.exports={DashboardVisualisationClass});
2	- //# sourceMappingURL=DashboardVisualisation.js.map

package/dpr/components/_charts/chart/DashboardVisualisation.js.map DELETED Viewed

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../../../src/dpr/components/_charts/chart/DashboardVisualisation.ts"],
-  "sourcesContent": ["/* eslint-disable prefer-destructuring */\nimport { ChartType, UnitType } from '../../../types/Charts'\nimport { DashboardDataResponse } from '../../../types/Metrics'\nimport {\n  DashboardVisualisation,\n  DashboardVisualisationColumnKey,\n  DashboardVisualisationColumnMeasure,\n  DashboardVisualisationColumns,\n} from '../../_dashboards/dashboard/types'\n\nclass DashboardVisualisationClass {\n  responseData: DashboardDataResponse[]\n\n  definition: DashboardVisualisation\n\n  columns: DashboardVisualisationColumns\n\n  measures: DashboardVisualisationColumnMeasure[]\n\n  keys: DashboardVisualisationColumnKey[]\n\n  unit: UnitType\n\n  type: ChartType\n\n  constructor(responseData: DashboardDataResponse[], definition: DashboardVisualisation) {\n    this.definition = definition\n    this.columns = definition.columns\n    this.measures = this.columns.measures\n    this.keys = this.columns.keys\n    this.type = this.definition.type.split('-')[0] as ChartType\n    this.initUnit()\n    this.responseData = responseData\n  }\n\n  initUnit = () => {\n    // todo\n    this.unit = this.columns.measures[0].unit ? this.columns.measures[0].unit : undefined\n  }\n}\n\nexport { DashboardVisualisationClass }\nexport default DashboardVisualisationClass\n"],
-  "mappings": "4ZAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,iCAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAUA,MAAME,CAA4B,CAehC,YAAYG,EAAuCC,EAAoC,CAUvF,cAAW,IAAM,CAEf,KAAK,KAAO,KAAK,QAAQ,SAAS,CAAC,EAAE,KAAO,KAAK,QAAQ,SAAS,CAAC,EAAE,KAAO,MAC9E,EAZE,KAAK,WAAaA,EAClB,KAAK,QAAUA,EAAW,QAC1B,KAAK,SAAW,KAAK,QAAQ,SAC7B,KAAK,KAAO,KAAK,QAAQ,KACzB,KAAK,KAAO,KAAK,WAAW,KAAK,MAAM,GAAG,EAAE,CAAC,EAC7C,KAAK,SAAS,EACd,KAAK,aAAeD,CACtB,CAMF,CAGA,IAAOF,EAAQD",
-  "names": ["DashboardVisualisation_exports", "__export", "DashboardVisualisationClass", "DashboardVisualisation_default", "__toCommonJS", "responseData", "definition"]
-}

package/dpr/components/_charts/chart/DashboardVisualisation.ts DELETED Viewed

@@ -1,43 +0,0 @@
-/* eslint-disable prefer-destructuring */
-import { ChartType, UnitType } from '../../../types/Charts'
-import { DashboardDataResponse } from '../../../types/Metrics'
-import {
-  DashboardVisualisation,
-  DashboardVisualisationColumnKey,
-  DashboardVisualisationColumnMeasure,
-  DashboardVisualisationColumns,
-} from '../../_dashboards/dashboard/types'
-class DashboardVisualisationClass {
-  responseData: DashboardDataResponse[]
-  definition: DashboardVisualisation
-  columns: DashboardVisualisationColumns
-  measures: DashboardVisualisationColumnMeasure[]
-  keys: DashboardVisualisationColumnKey[]
-  unit: UnitType
-  type: ChartType
-  constructor(responseData: DashboardDataResponse[], definition: DashboardVisualisation) {
-    this.definition = definition
-    this.columns = definition.columns
-    this.measures = this.columns.measures
-    this.keys = this.columns.keys
-    this.type = this.definition.type.split('-')[0] as ChartType
-    this.initUnit()
-    this.responseData = responseData
-  }
-  initUnit = () => {
-    // todo
-    this.unit = this.columns.measures[0].unit ? this.columns.measures[0].unit : undefined
-  }
-}
-export { DashboardVisualisationClass }
-export default DashboardVisualisationClass

package/dpr/components/_dashboards/dashboard/types.js DELETED Viewed

	@@ -1,2 +0,0 @@
1	- var e=Object.defineProperty;var u=Object.getOwnPropertyDescriptor;var d=Object.getOwnPropertyNames;var c=Object.prototype.hasOwnProperty;var p=(s,a)=>{for(var t in a)e(s,t,{get:a[t],enumerable:!0})},b=(s,a,t,r)=>{if(a&&typeof a=="object"\|\|typeof a=="function")for(let o of d(a))!c.call(s,o)&&o!==t&&e(s,o,{get:()=>a[o],enumerable:!(r=u(a,o))\|\|r.enumerable});return s};var m=s=>b(e({},"__esModule",{value:!0}),s);var x={};p(x,{AggregateType:()=>l,DashboardVisualisationType:()=>n});module.exports=m(x);var n=(i=>(i.LIST="list",i.DONUT="doughnut",i.BAR="bar",i.LINE="line",i.MATRIX="matrix",i.MATRIX_TIMESERIES="matrix-timeseries",i.BAR_TIMESERIES="bar-timeseries",i.LINE_TIMESERIES="line-timeseries",i.SCORECARD="scorecard",i.SCORECARD_GROUP="scorecard-group",i))(n\|\|{}),l=(t=>(t.SUM="sum",t.AVG="average",t))(l\|\|{});0&&(module.exports={AggregateType,DashboardVisualisationType});
2	- //# sourceMappingURL=types.js.map

package/dpr/components/_dashboards/dashboard/types.js.map DELETED Viewed

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../../../src/dpr/components/_dashboards/dashboard/types.ts"],
-  "sourcesContent": ["import { components } from '../../../types/api'\nimport { ChartCardData, MoJTable, UnitType } from '../../../types/Charts'\nimport { Scorecard, ScorecardGroup } from '../scorecard/types'\n\nexport interface DashboardDefinition {\n  id: string\n  name: string\n  description?: string\n  sections: DashboardSection[]\n  isMissing?: boolean\n  filterFields: components['schemas']['FieldDefinition'][]\n}\n\nexport interface DashboardSection {\n  id: string\n  display?: string\n  description?: string\n  visualisations: DashboardVisualisation[]\n}\n\nexport interface DashboardUISection {\n  id: string\n  title?: string\n  description?: string\n  visualisations?: DashboardUIVisualisation[]\n}\n\nexport interface DashboardUIVisualisation {\n  id: string\n  type: DashboardVisualisationType\n  title?: string\n  description?: string\n  data: Scorecard | Scorecard[] | ScorecardGroup[] | ChartCardData | { table: MoJTable; ts: string }\n}\n\nexport interface DashboardVisualisation {\n  id: string\n  type: DashboardVisualisationType\n  display?: string\n  description?: string\n  columns: DashboardVisualisationColumns\n  options: DashboardVisualisationOptions\n}\n\nexport type DashboardVisualisationOptions = ListDashboardVisualisationOptions | BucketDashboardVisualisationOptions\n\nexport interface ListDashboardVisualisationOptions {\n  showLatest?: boolean\n  columnsAsList?: boolean\n}\n\nexport interface BucketDashboardVisualisationOptions {\n  useRagColours?: boolean\n  buckets?: DashboardVisualisationBucket[]\n  baseColour?: string\n}\n\nexport interface DashboardVisualisationBucket {\n  min?: number\n  max?: number\n  hexColour?: string\n}\n\nexport interface ListVisualisation extends DashboardVisualisation {\n  type: DashboardVisualisationType.LIST\n}\n\nexport enum DashboardVisualisationType {\n  LIST = 'list',\n  DONUT = 'doughnut',\n  BAR = 'bar',\n  LINE = 'line',\n  MATRIX = 'matrix',\n  MATRIX_TIMESERIES = 'matrix-timeseries',\n  BAR_TIMESERIES = 'bar-timeseries',\n  LINE_TIMESERIES = 'line-timeseries',\n  SCORECARD = 'scorecard',\n  SCORECARD_GROUP = 'scorecard-group',\n}\n\nexport interface DashboardVisualisationColumns {\n  keys?: DashboardVisualisationColumnKey[]\n  measures: DashboardVisualisationColumnMeasure[]\n  filters?: DashboardVisualisationColumnFilter[]\n  expectNulls: boolean\n}\n\nexport interface DashboardVisualisationColumn {\n  id: string\n  display?: string\n}\n\nexport interface DashboardVisualisationColumnKey extends DashboardVisualisationColumn {\n  optional?: boolean\n}\n\nexport interface DashboardVisualisationColumnMeasure extends DashboardVisualisationColumn {\n  aggregate?: AggregateType\n  displayValue?: boolean\n  unit?: UnitType\n  axis?: 'x' | 'y'\n}\n\nexport interface DashboardVisualisationColumnFilter {\n  id: string\n  equals: string | number\n}\n\nexport interface BarChartVisualisationColumn extends DashboardVisualisationColumnMeasure {\n  axis?: 'x' | 'y'\n}\n\nexport interface ScorecardVisualisationColumn extends DashboardVisualisationColumn {\n  displayValue: boolean\n}\n\nexport enum AggregateType {\n  SUM = 'sum',\n  AVG = 'average',\n}\n"],
-  "mappings": "4ZAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,mBAAAE,EAAA,+BAAAC,IAAA,eAAAC,EAAAJ,GAmEO,IAAKG,OACVA,EAAA,KAAO,OACPA,EAAA,MAAQ,WACRA,EAAA,IAAM,MACNA,EAAA,KAAO,OACPA,EAAA,OAAS,SACTA,EAAA,kBAAoB,oBACpBA,EAAA,eAAiB,iBACjBA,EAAA,gBAAkB,kBAClBA,EAAA,UAAY,YACZA,EAAA,gBAAkB,kBAVRA,OAAA,IAiDAD,OACVA,EAAA,IAAM,MACNA,EAAA,IAAM,UAFIA,OAAA",
-  "names": ["types_exports", "__export", "AggregateType", "DashboardVisualisationType", "__toCommonJS"]
-}