@ministryofjustice/hmpps-digital-prison-reporting-frontend 4.27.0 → 4.28.0

package/dpr/routes/journeys/download-report/tests.cy.js

@@ -1,2 +1,105 @@
-"use strict";var s=require("test-app/routes/integrationTests/appStateUtils"),o=require("../../../../../cypress-tests/cypressUtils");context("Download report",()=>{const d="/embedded/platform/";let t,l;before(()=>{(0,o.executeReportStubs)(),cy.task("stubDefinitionRequestExamplesSuccess"),cy.task("stubRequestSuccessResult20"),cy.task("stubRequestSuccessResult100"),cy.visit(d),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(e,i)=>!!i.textContent?.includes("Successful Report")&&!!i.textContent?.includes("this will succeed")}).within(()=>{cy.findByRole("link",{name:"Request report"}).click()})}),(0,o.checkA11y)(),cy.findByRole("button",{name:/Request/}).click(),(0,o.checkA11y)(),cy.findByRole("heading",{level:1,name:/Successful Report/}).should("be.visible"),cy.url().then(e=>{l=e})}),beforeEach(()=>{cy.visit(l)}),describe("Enabling download",()=>{it("should show the enable download button",()=>{cy.findByLabelText(/Enable download/).should("exist").should("be.visible"),cy.findByRole("heading",{name:"To download this report"}).should("not.exist")}),it("should show the download disabled message with link to form",()=>{cy.findByLabelText(/Enable download/).click(),cy.url().should("have.string","/report/download-disabled"),cy.findByRole("heading",{name:"To download this report"}).should("be.visible"),cy.findByRole("link",{name:"Fill out a form"})}),it("should go to the request download form",()=>{cy.findByLabelText(/Enable download/).click(),cy.findByRole("link",{name:"Fill out a form"}).click(),cy.url().then(e=>{t=e}),cy.url().should("match",/\/embedded\/platform\/dpr\/download-report\/request-download\/request-examples\/request-example-success\/tableId\/tblId_[0-9]+\/form/),cy.location().should(e=>{expect(e.search).to.match(/.*reportUrl=\/embedded\/platform\/dpr\/view-report\/async\/report\/request-examples\/request-example-success\/tblId_[0-9]+\/report/)})})}),describe("Requesting download",()=>{it("should prefill the user data in the request form",()=>{cy.visit(t),cy.findByRole("textbox",{name:"What is your Full name?"}).should("have.value","Test User"),cy.findByRole("textbox",{name:"What is your Email address?"}).should("have.value","test@user.com")}),it("should validate the required fields",()=>{cy.visit(t),cy.findByRole("alert").should("not.exist"),cy.findAllByRole("paragraph").contains("Enter your Job title").should("not.exist"),cy.findAllByRole("paragraph").contains("provide information on how you will use this data").should("not.exist"),cy.get("#more-detail-error").should("not.be.visible"),cy.findByRole("button",{name:/Submit request/}).click(),cy.findByRole("alert").should("exist"),cy.findAllByRole("paragraph").contains("Enter your Job title").should("exist"),cy.findAllByRole("paragraph").contains("provide information on how you will use this data").should("exist")}),it("should submit the download request",()=>{cy.visit(t),cy.findByRole("textbox",{name:"What is your Job title?"}).type("Software engineer"),cy.findByRole("textbox",{name:"Can you provide more detail"}).type("I like this report"),cy.findByRole("button",{name:"Submit request"}).click(),cy.findByText(/You have been granted permission/).should("be.visible"),cy.url().as("downloadRequestSubmittedPage"),cy.url().and("match",/dpr\/download-report\/request-download\/request-examples\/request-example-success\/tableId\/tblId_[0-9]+\/form\/submitted/),cy.findByRole("link",{name:/Return to report to download/}).click(),cy.findAllByRole("heading").contains("Successful Report").should("exist"),cy.findByRole("button",{name:/download/}).should("be.visible"),cy.task("stubRequestSuccessResult10MissingFirstRow"),cy.findByRole("button",{name:/download/}).click(),cy.task("checkContents10RowExcelValid").should("equal",!0)}),it("should redirect on trying to download after having the permission to download removed",()=>{(0,s.updateRedisState)("downloadPermissions",[]),cy.findByRole("heading",{name:/To download this report/}).should("not.exist"),cy.findByRole("button",{name:/download/}).click(),cy.findByRole("heading",{name:/To download this report/}).should("be.visible")})})});
+"use strict";
+var import_appStateUtils = require("test-app/routes/integrationTests/appStateUtils");
+var import_cypressUtils = require("../../../../../cypress-tests/cypressUtils");
+context("Download report", () => {
+  const path = "/embedded/platform/";
+  let downloadRequestFormPage;
+  let viewReportUrl;
+  before(() => {
+    (0, import_cypressUtils.executeReportStubs)();
+    cy.task("stubDefinitionRequestExamplesSuccess");
+    cy.task("stubRequestSuccessResult20");
+    cy.task("stubRequestSuccessResult100");
+    cy.visit(path);
+    cy.findByLabelText(/Reports catalogue.*/i).within(() => {
+      cy.findByRole("row", {
+        name: (_, element) => {
+          return Boolean(element.textContent?.includes("Successful Report")) && Boolean(element.textContent?.includes("this will succeed"));
+        }
+      }).within(() => {
+        cy.findByRole("link", { name: "Request report" }).click();
+      });
+    });
+    (0, import_cypressUtils.checkA11y)();
+    cy.findByRole("button", { name: /Request/ }).click();
+    (0, import_cypressUtils.checkA11y)();
+    cy.findByRole("heading", { level: 1, name: /Successful Report/ }).should("be.visible");
+    cy.url().then((url) => {
+      viewReportUrl = url;
+    });
+  });
+  beforeEach(() => {
+    cy.visit(viewReportUrl);
+  });
+  describe("Enabling download", () => {
+    it("should show the enable download button", () => {
+      cy.findByLabelText(/Enable download/).should("exist").should("be.visible");
+      cy.findByRole("heading", { name: "To download this report" }).should("not.exist");
+    });
+    it("should show the download disabled message with link to form", () => {
+      cy.findByLabelText(/Enable download/).click();
+      cy.url().should("have.string", "/report/download-disabled");
+      cy.findByRole("heading", { name: "To download this report" }).should("be.visible");
+      cy.findByRole("link", { name: "Fill out a form" });
+    });
+    it("should go to the request download form", () => {
+      cy.findByLabelText(/Enable download/).click();
+      cy.findByRole("link", { name: "Fill out a form" }).click();
+      cy.url().then((url) => {
+        downloadRequestFormPage = url;
+      });
+      cy.url().should(
+        "match",
+        /\/embedded\/platform\/dpr\/download-report\/request-download\/request-examples\/request-example-success\/tableId\/tblId_[0-9]+\/form/
+      );
+      cy.location().should((location) => {
+        expect(location.search).to.match(
+          /.*reportUrl=\/embedded\/platform\/dpr\/view-report\/async\/report\/request-examples\/request-example-success\/tblId_[0-9]+\/report/
+        );
+      });
+    });
+  });
+  describe("Requesting download", () => {
+    it("should prefill the user data in the request form", () => {
+      cy.visit(downloadRequestFormPage);
+      cy.findByRole("textbox", { name: "What is your Full name?" }).should("have.value", "Test User");
+      cy.findByRole("textbox", { name: "What is your Email address?" }).should("have.value", "test@user.com");
+    });
+    it("should validate the required fields", () => {
+      cy.visit(downloadRequestFormPage);
+      cy.findByRole("alert").should("not.exist");
+      cy.findAllByRole("paragraph").contains("Enter your Job title").should("not.exist");
+      cy.findAllByRole("paragraph").contains("provide information on how you will use this data").should("not.exist");
+      cy.get("#more-detail-error").should("not.be.visible");
+      cy.findByRole("button", { name: /Submit request/ }).click();
+      cy.findByRole("alert").should("exist");
+      cy.findAllByRole("paragraph").contains("Enter your Job title").should("exist");
+      cy.findAllByRole("paragraph").contains("provide information on how you will use this data").should("exist");
+    });
+    it("should submit the download request", () => {
+      cy.visit(downloadRequestFormPage);
+      cy.findByRole("textbox", { name: "What is your Job title?" }).type("Software engineer");
+      cy.findByRole("textbox", { name: "Can you provide more detail" }).type("I like this report");
+      cy.findByRole("button", { name: "Submit request" }).click();
+      cy.findByText(/You have been granted permission/).should("be.visible");
+      cy.url().as("downloadRequestSubmittedPage");
+      cy.url().and(
+        "match",
+        /dpr\/download-report\/request-download\/request-examples\/request-example-success\/tableId\/tblId_[0-9]+\/form\/submitted/
+      );
+      cy.findByRole("link", { name: /Return to report to download/ }).click();
+      cy.findAllByRole("heading").contains("Successful Report").should("exist");
+      cy.findByRole("button", { name: /download/ }).should("be.visible");
+      cy.task("stubRequestSuccessResult10MissingFirstRow");
+      cy.findByRole("button", { name: /download/ }).click();
+      cy.task("checkContents10RowExcelValid").should("equal", true);
+    });
+    it("should redirect on trying to download after having the permission to download removed", () => {
+      (0, import_appStateUtils.updateRedisState)("downloadPermissions", []);
+      cy.findByRole("heading", { name: /To download this report/ }).should("not.exist");
+      cy.findByRole("button", { name: /download/ }).click();
+      cy.findByRole("heading", { name: /To download this report/ }).should("be.visible");
+    });
+  });
+});
 //# sourceMappingURL=tests.cy.js.map

package/dpr/routes/journeys/download-report/tests.cy.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../../src/dpr/routes/journeys/download-report/tests.cy.ts"],
   "sourcesContent": ["import { updateRedisState } from 'test-app/routes/integrationTests/appStateUtils'\nimport { checkA11y, executeReportStubs } from '../../../../../cypress-tests/cypressUtils'\n\ncontext('Download report', () => {\n  const path = '/embedded/platform/'\n  let downloadRequestFormPage: string\n  let viewReportUrl: string\n\n  before(() => {\n    executeReportStubs()\n    cy.task('stubDefinitionRequestExamplesSuccess')\n    cy.task('stubRequestSuccessResult20')\n    cy.task('stubRequestSuccessResult100')\n    cy.visit(path)\n    cy.findByLabelText(/Reports catalogue.*/i).within(() => {\n      cy.findByRole('row', {\n        name: (_, element) => {\n          return (\n            Boolean(element.textContent?.includes('Successful Report')) &&\n            Boolean(element.textContent?.includes('this will succeed'))\n          )\n        },\n      }).within(() => {\n        cy.findByRole('link', { name: 'Request report' }).click()\n      })\n    })\n    checkA11y()\n    cy.findByRole('button', { name: /Request/ }).click()\n    checkA11y()\n    cy.findByRole('heading', { level: 1, name: /Successful Report/ }).should('be.visible')\n    cy.url().then((url) => {\n      viewReportUrl = url\n    })\n  })\n\n  beforeEach(() => {\n    cy.visit(viewReportUrl)\n  })\n\n  describe('Enabling download', () => {\n    it('should show the enable download button', () => {\n      cy.findByLabelText(/Enable download/)\n        .should('exist')\n        .should('be.visible')\n      cy.findByRole('heading', { name: 'To download this report' }).should('not.exist')\n    })\n\n    it('should show the download disabled message with link to form', () => {\n      cy.findByLabelText(/Enable download/).click()\n      cy.url().should('have.string', '/report/download-disabled')\n      cy.findByRole('heading', { name: 'To download this report' }).should('be.visible')\n      cy.findByRole('link', { name: 'Fill out a form' })\n    })\n\n    it('should go to the request download form', () => {\n      cy.findByLabelText(/Enable download/).click()\n      cy.findByRole('link', { name: 'Fill out a form' }).click()\n\n      cy.url().then((url) => {\n        downloadRequestFormPage = url\n      })\n\n      cy.url().should(\n        'match',\n        /\\/embedded\\/platform\\/dpr\\/download-report\\/request-download\\/request-examples\\/request-example-success\\/tableId\\/tblId_[0-9]+\\/form/,\n      )\n      cy.location().should((location) => {\n        expect(location.search).to.match(\n          /.*reportUrl=\\/embedded\\/platform\\/dpr\\/view-report\\/async\\/report\\/request-examples\\/request-example-success\\/tblId_[0-9]+\\/report/,\n        )\n      })\n    })\n  })\n\n  describe('Requesting download', () => {\n    it('should prefill the user data in the request form', () => {\n      cy.visit(downloadRequestFormPage)\n      cy.findByRole('textbox', { name: 'What is your Full name?' }).should('have.value', 'Test User')\n      cy.findByRole('textbox', { name: 'What is your Email address?' }).should('have.value', 'test@user.com')\n    })\n\n    it('should validate the required fields', () => {\n      cy.visit(downloadRequestFormPage)\n      cy.findByRole('alert').should('not.exist')\n\n      cy.findAllByRole('paragraph').contains('Enter your Job title').should('not.exist')\n      cy.findAllByRole('paragraph').contains('provide information on how you will use this data').should('not.exist')\n      cy.get('#more-detail-error').should('not.be.visible')\n\n      cy.findByRole('button', { name: /Submit request/ }).click()\n\n      cy.findByRole('alert').should('exist')\n      cy.findAllByRole('paragraph').contains('Enter your Job title').should('exist')\n      cy.findAllByRole('paragraph').contains('provide information on how you will use this data').should('exist')\n    })\n\n    it('should submit the download request', () => {\n      cy.visit(downloadRequestFormPage)\n      cy.findByRole('textbox', { name: 'What is your Job title?' }).type('Software engineer')\n      cy.findByRole('textbox', { name: 'Can you provide more detail' }).type('I like this report')\n\n      cy.findByRole('button', { name: 'Submit request' }).click()\n      cy.findByText(/You have been granted permission/).should('be.visible')\n\n      cy.url().as('downloadRequestSubmittedPage')\n\n      cy.url().and(\n        'match',\n        /dpr\\/download-report\\/request-download\\/request-examples\\/request-example-success\\/tableId\\/tblId_[0-9]+\\/form\\/submitted/,\n      )\n      cy.findByRole('link', { name: /Return to report to download/ }).click()\n      cy.findAllByRole('heading').contains('Successful Report').should('exist')\n      cy.findByRole('button', { name: /download/ }).should('be.visible')\n\n      cy.task('stubRequestSuccessResult10MissingFirstRow')\n      cy.findByRole('button', { name: /download/ }).click()\n      cy.task('checkContents10RowExcelValid').should('equal', true)\n    })\n\n    it('should redirect on trying to download after having the permission to download removed', () => {\n      updateRedisState('downloadPermissions', [])\n      cy.findByRole('heading', { name: /To download this report/ }).should('not.exist')\n      cy.findByRole('button', { name: /download/ }).click()\n      cy.findByRole('heading', { name: /To download this report/ }).should('be.visible')\n    })\n  })\n})\n"],
-  "mappings": "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",
-  "names": ["import_appStateUtils", "import_cypressUtils", "path", "downloadRequestFormPage", "viewReportUrl", "_", "element", "url", "location"]
+  "mappings": "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",
+  "names": []
 }

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

@@ -1,2 +1,197 @@
-"use strict";var N=Object.create;var m=Object.defineProperty;var O=Object.getOwnPropertyDescriptor;var x=Object.getOwnPropertyNames;var H=Object.getPrototypeOf,K=Object.prototype.hasOwnProperty;var V=(n,t)=>{for(var e in t)m(n,e,{get:t[e],enumerable:!0})},w=(n,t,e,i)=>{if(t&&typeof t=="object"||typeof t=="function")for(let o of x(t))!K.call(n,o)&&o!==e&&m(n,o,{get:()=>t[o],enumerable:!(i=O(t,o))||i.enumerable});return n};var R=(n,t,e)=>(e=n!=null?N(H(n)):{},w(t||!n||!n.__esModule?m(e,"default",{value:n,enumerable:!0}):e,n)),E=n=>w(m({},"__esModule",{value:!0}),n);var W={};V(W,{default:()=>$,downloadReport:()=>L,getKeys:()=>y});module.exports=E(W);var C=require("json-2-csv"),T=require("../../../types/UserReports"),q=R(require("../../../utils/localsHelper")),u=R(require("../../../types/ReportQuery"));const F=(n,t)=>(0,C.json2csv)(n,t),y=(n,t)=>{const e=[],i=[];return n.forEach(o=>{Object.keys(o).forEach(s=>{const a=t.find(r=>r.name===s);a&&!i.includes(s)&&(i.push(s),e.push({field:s,title:a.display}))})}),e},J=(n,t)=>n.map(e=>Object.keys(e).filter(i=>t.includes(i)).reduce((i,o)=>(i[o]=e[o],i),{})),j=(n,t)=>{const{specification:e}=t.variant;if(e){const{fields:i}=e,o=i.filter(s=>s.type==="HTML");o.length&&n.map(s=>(o.forEach(a=>{const{name:r}=a,c=s[r];if(c){const p=/target="_blank">(.*?)<\/a>/g.exec(c);s[r]=p?p[1]:c}}),s))}return n},z=async n=>{const{token:t,services:e,tableId:i,reportId:o,id:s,queryParams:a}=n,r=await e.reportingService.getAsyncCount(t,i),c={...a,pageSize:r.toString()};return e.reportingService.getAsyncReport(t,o,s,i,c)},Q=async n=>{const{token:t,services:e,queryParams:i,definition:o}=n,{variant:s}=o,{resourceName:a,specification:r}=s;let c=[];if(r){const p=new u.default({fields:r.fields,template:r.template,queryParams:i,definitionsPath:i.dataProductDefinitionsPath}),l=await e.reportingService.getCount(a,t,p),f=new u.default({fields:r.fields,template:r.template,queryParams:{...i,pageSize:l.toString()},definitionsPath:i.dataProductDefinitionsPath});c=(await e.reportingService.getListWithWarnings(a,t,f)).data}return c},L=async({req:n,services:t,res:e,redirect:i,loadType:o})=>{const{dprUser:s,token:a}=q.default.getValues(e),{reportId:r,id:c,tableId:p,dataProductDefinitionsPath:l,reportName:f,name:D,cols:v,sortedAsc:S,sortColumn:h}=n.body,{downloadPermissionService:b}=t;if(!await b.downloadEnabledForReport(s.id,r,c))e.redirect(i);else{const g=await t.reportingService.getDefinition(a,r,c,l),P={dataProductDefinitionsPath:l,...S&&{sortedAsc:S},...h&&{sortColumn:h}};let d;o===T.LoadType.SYNC?d=await Q({definition:g,services:t,token:a,queryParams:P}):d=await z({services:t,token:a,reportId:r,id:c,tableId:p,queryParams:P}),v&&(d=J(d,JSON.parse(v))),d=j(d,g);const k=g.variant.specification?.fields||[],A=y(d,k),I=F(d,{keys:A,emptyFieldValue:""});e.setHeader("Content-Type","application/json"),e.setHeader("Content-disposition",`attachment; filename=${f}-${D}-${new Date().toISOString()}.csv`),e.end(I)}};var $={downloadReport:L,getKeys:y};0&&(module.exports={downloadReport,getKeys});
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var utils_exports = {};
+__export(utils_exports, {
+  default: () => utils_default,
+  downloadReport: () => downloadReport,
+  getKeys: () => getKeys
+});
+module.exports = __toCommonJS(utils_exports);
+var import_json_2_csv = require("json-2-csv");
+var import_UserReports = require("../../../types/UserReports");
+var import_localsHelper = __toESM(require("../../../utils/localsHelper"));
+var import_ReportQuery = __toESM(require("../../../types/ReportQuery"));
+const convertToCsv = (reportData, options) => {
+  const csvData = (0, import_json_2_csv.json2csv)(reportData, options);
+  return csvData;
+};
+const getKeys = (reportData, fields) => {
+  const keys = [];
+  const keyNames = [];
+  reportData.forEach((row) => {
+    Object.keys(row).forEach((key) => {
+      const field = fields.find((f) => f.name === key);
+      if (field && !keyNames.includes(key)) {
+        keyNames.push(key);
+        keys.push({
+          field: key,
+          title: field.display
+        });
+      }
+    });
+  });
+  return keys;
+};
+const applyColumnsAndSort = (data, columns) => {
+  return data.map((row) => {
+    return Object.keys(row).filter((key) => columns.includes(key)).reduce((obj, key) => {
+      obj[key] = row[key];
+      return obj;
+    }, {});
+  });
+};
+const removeHtmlTags = (reportData, reportDefinition) => {
+  const { specification } = reportDefinition.variant;
+  if (specification) {
+    const { fields } = specification;
+    const htmlFields = fields.filter((field) => {
+      return field.type === "HTML";
+    });
+    if (htmlFields.length) {
+      reportData.map((d) => {
+        htmlFields.forEach((field) => {
+          const { name } = field;
+          const colValue = d[name];
+          if (colValue) {
+            const innerText = /target="_blank">(.*?)<\/a>/g.exec(colValue);
+            d[name] = innerText ? innerText[1] : colValue;
+          }
+        });
+        return d;
+      });
+    }
+  }
+  return reportData;
+};
+const dowloadAsyncData = async (args) => {
+  const { token, services, tableId, reportId, id, queryParams } = args;
+  const pageSize = await services.reportingService.getAsyncCount(token, tableId);
+  const query = {
+    ...queryParams,
+    pageSize: pageSize.toString()
+  };
+  return services.reportingService.getAsyncReport(token, reportId, id, tableId, query);
+};
+const downloadSyncData = async (args) => {
+  const { token, services, queryParams, definition } = args;
+  const { variant } = definition;
+  const { resourceName, specification } = variant;
+  let data = [];
+  if (specification) {
+    const countReportQuery = new import_ReportQuery.default({
+      fields: specification.fields,
+      template: specification.template,
+      queryParams,
+      definitionsPath: queryParams.dataProductDefinitionsPath
+    });
+    const count = await services.reportingService.getCount(resourceName, token, countReportQuery);
+    const dataReportQuery = new import_ReportQuery.default({
+      fields: specification.fields,
+      template: specification.template,
+      queryParams: {
+        ...queryParams,
+        pageSize: count.toString()
+      },
+      definitionsPath: queryParams.dataProductDefinitionsPath
+    });
+    const reportData = await services.reportingService.getListWithWarnings(resourceName, token, dataReportQuery);
+    data = reportData.data;
+  }
+  return data;
+};
+const downloadReport = async ({
+  req,
+  services,
+  res,
+  redirect,
+  loadType
+}) => {
+  const { dprUser, token } = import_localsHelper.default.getValues(res);
+  const {
+    reportId,
+    id,
+    tableId,
+    dataProductDefinitionsPath,
+    reportName,
+    name,
+    cols: columns,
+    sortedAsc,
+    sortColumn
+  } = req.body;
+  const { downloadPermissionService } = services;
+  const canDownloadReport = await downloadPermissionService.downloadEnabledForReport(dprUser.id, reportId, id);
+  if (!canDownloadReport) {
+    res.redirect(redirect);
+  } else {
+    const definition = await services.reportingService.getDefinition(token, reportId, id, dataProductDefinitionsPath);
+    const queryParams = {
+      dataProductDefinitionsPath,
+      ...sortedAsc && { sortedAsc },
+      ...sortColumn && { sortColumn }
+    };
+    let reportData;
+    if (loadType === import_UserReports.LoadType.SYNC) {
+      reportData = await downloadSyncData({
+        definition,
+        services,
+        token,
+        queryParams
+      });
+    } else {
+      reportData = await dowloadAsyncData({
+        services,
+        token,
+        reportId,
+        id,
+        tableId,
+        queryParams
+      });
+    }
+    if (columns) {
+      reportData = applyColumnsAndSort(reportData, JSON.parse(columns));
+    }
+    reportData = removeHtmlTags(reportData, definition);
+    const fields = definition.variant.specification?.fields || [];
+    const keys = getKeys(reportData, fields);
+    const csvData = convertToCsv(reportData, { keys, emptyFieldValue: "" });
+    res.setHeader("Content-Type", "application/json");
+    res.setHeader("Content-disposition", `attachment; filename=${reportName}-${name}-${(/* @__PURE__ */ new Date()).toISOString()}.csv`);
+    res.end(csvData);
+  }
+};
+var utils_default = {
+  downloadReport,
+  getKeys
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  downloadReport,
+  getKeys
+});
 //# sourceMappingURL=utils.js.map

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

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../../src/dpr/routes/journeys/download-report/utils.ts"],
   "sourcesContent": ["import { Response, Request } from 'express'\nimport { json2csv, Json2CsvOptions } from 'json-2-csv'\nimport { KeysList } from 'json-2-csv/lib/types'\nimport { Services } from '../../../types/Services'\nimport Dict = NodeJS.Dict\nimport { LoadType } from '../../../types/UserReports'\nimport { components } from '../../../types/api'\nimport LocalsHelper from '../../../utils/localsHelper'\nimport { Template } from '../../../types/Templates'\nimport ReportQuery from '../../../types/ReportQuery'\n\nconst convertToCsv = (reportData: Dict<string>[], options: Json2CsvOptions) => {\n  const csvData = json2csv(reportData, options)\n  return csvData\n}\n\nexport const getKeys = (reportData: Dict<string>[], fields: components['schemas']['FieldDefinition'][]): KeysList => {\n  const keys: KeysList = []\n  const keyNames: string[] = []\n  reportData.forEach((row) => {\n    Object.keys(row).forEach((key) => {\n      const field = fields.find((f) => f.name === key)\n      if (field && !keyNames.includes(key)) {\n        keyNames.push(key)\n        keys.push({\n          field: key,\n          title: field.display,\n        })\n      }\n    })\n  })\n  return keys\n}\n\nconst applyColumnsAndSort = (data: Dict<string>[], columns: string[]) => {\n  return data.map((row) => {\n    return Object.keys(row)\n      .filter((key) => columns.includes(key))\n      .reduce((obj: Dict<string>, key) => {\n        // eslint-disable-next-line no-param-reassign\n        obj[key] = row[key]\n        return obj\n      }, {})\n  })\n}\n\nconst removeHtmlTags = (\n  reportData: Dict<string>[],\n  reportDefinition: components['schemas']['SingleVariantReportDefinition'],\n) => {\n  // Find HMTL field + name\n  const { specification } = reportDefinition.variant\n  if (specification) {\n    const { fields } = specification\n    const htmlFields = fields.filter((field) => {\n      return field.type === 'HTML'\n    })\n\n    if (htmlFields.length) {\n      reportData.map((d) => {\n        htmlFields.forEach((field) => {\n          const { name } = field\n          const colValue = d[name]\n          if (colValue) {\n            const innerText = /target=\"_blank\">(.*?)<\\/a>/g.exec(colValue)\n            // eslint-disable-next-line prefer-destructuring, no-param-reassign\n            d[name] = innerText ? innerText[1] : colValue\n          }\n        })\n        return d\n      })\n    }\n  }\n  return reportData\n}\n\nconst dowloadAsyncData = async (args: {\n  services: Services\n  token: string\n  tableId: string\n  reportId: string\n  id: string\n  queryParams: {\n    dataProductDefinitionsPath: string\n    sortedAsc?: string\n    sortColumn?: string\n  }\n}) => {\n  const { token, services, tableId, reportId, id, queryParams } = args\n  const pageSize = await services.reportingService.getAsyncCount(token, tableId)\n  const query: Record<string, string | string[]> = {\n    ...queryParams,\n    pageSize: pageSize.toString(),\n  }\n  return services.reportingService.getAsyncReport(token, reportId, id, tableId, query)\n}\n\nconst downloadSyncData = async (args: {\n  definition: components['schemas']['SingleVariantReportDefinition']\n  services: Services\n  token: string\n  queryParams: {\n    dataProductDefinitionsPath: string\n    sortedAsc?: string\n    sortColumn?: string\n  }\n}) => {\n  const { token, services, queryParams, definition } = args\n  const { variant } = definition\n  const { resourceName, specification } = variant\n  let data: Dict<string>[] = []\n\n  if (specification) {\n    const countReportQuery = new ReportQuery({\n      fields: specification.fields,\n      template: specification.template as Template,\n      queryParams,\n      definitionsPath: <string>queryParams.dataProductDefinitionsPath,\n    })\n    const count = await services.reportingService.getCount(resourceName, token, countReportQuery)\n\n    const dataReportQuery = new ReportQuery({\n      fields: specification.fields,\n      template: specification.template as Template,\n      queryParams: {\n        ...queryParams,\n        pageSize: count.toString(),\n      },\n      definitionsPath: <string>queryParams.dataProductDefinitionsPath,\n    })\n    const reportData = await services.reportingService.getListWithWarnings(resourceName, token, dataReportQuery)\n    data = reportData.data\n  }\n\n  return data\n}\n\nexport const downloadReport = async ({\n  req,\n  services,\n  res,\n  redirect,\n  loadType,\n}: {\n  req: Request\n  services: Services\n  res: Response\n  redirect: string\n  loadType?: LoadType\n}) => {\n  const { dprUser, token } = LocalsHelper.getValues(res)\n  const {\n    reportId,\n    id,\n    tableId,\n    dataProductDefinitionsPath,\n    reportName,\n    name,\n    cols: columns,\n    sortedAsc,\n    sortColumn,\n  } = req.body\n  const { downloadPermissionService } = services\n  const canDownloadReport = await downloadPermissionService.downloadEnabledForReport(dprUser.id, reportId, id)\n  if (!canDownloadReport) {\n    res.redirect(redirect)\n  } else {\n    const definition = await services.reportingService.getDefinition(token, reportId, id, dataProductDefinitionsPath)\n    const queryParams = {\n      dataProductDefinitionsPath,\n      ...(sortedAsc && { sortedAsc }),\n      ...(sortColumn && { sortColumn }),\n    }\n\n    let reportData\n    if (loadType === LoadType.SYNC) {\n      reportData = await downloadSyncData({\n        definition,\n        services,\n        token,\n        queryParams,\n      })\n    } else {\n      reportData = await dowloadAsyncData({\n        services,\n        token,\n        reportId,\n        id,\n        tableId,\n        queryParams,\n      })\n    }\n    if (columns) {\n      reportData = applyColumnsAndSort(reportData, JSON.parse(columns))\n    }\n    reportData = removeHtmlTags(reportData, definition)\n    const fields = definition.variant.specification?.fields || []\n    const keys: KeysList = getKeys(reportData, fields)\n    const csvData = convertToCsv(reportData, { keys, emptyFieldValue: '' })\n\n    res.setHeader('Content-Type', 'application/json')\n    res.setHeader('Content-disposition', `attachment; filename=${reportName}-${name}-${new Date().toISOString()}.csv`)\n    res.end(csvData)\n  }\n}\n\nexport default {\n  downloadReport,\n  getKeys,\n}\n"],
-  "mappings": "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",
-  "names": ["utils_exports", "__export", "utils_default", "downloadReport", "getKeys", "__toCommonJS", "import_json_2_csv", "import_UserReports", "import_localsHelper", "import_ReportQuery", "convertToCsv", "reportData", "options", "fields", "keys", "keyNames", "row", "key", "field", "f", "applyColumnsAndSort", "data", "columns", "obj", "removeHtmlTags", "reportDefinition", "specification", "htmlFields", "d", "name", "colValue", "innerText", "dowloadAsyncData", "args", "token", "services", "tableId", "reportId", "id", "queryParams", "pageSize", "query", "downloadSyncData", "definition", "variant", "resourceName", "countReportQuery", "ReportQuery", "count", "dataReportQuery", "req", "res", "redirect", "loadType", "dprUser", "LocalsHelper", "dataProductDefinitionsPath", "reportName", "sortedAsc", "sortColumn", "downloadPermissionService", "csvData"]
+  "mappings": "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",
+  "names": ["ReportQuery", "LocalsHelper"]
 }

package/dpr/routes/journeys/my-reports/bookmarks/controller.js

@@ -1,2 +1,59 @@
-"use strict";var k=Object.create;var i=Object.defineProperty;var n=Object.getOwnPropertyDescriptor;var v=Object.getOwnPropertyNames;var u=Object.getPrototypeOf,h=Object.prototype.hasOwnProperty;var y=(e,r)=>{for(var o in r)i(e,o,{get:r[o],enumerable:!0})},d=(e,r,o,s)=>{if(r&&typeof r=="object"||typeof r=="function")for(let t of v(r))!h.call(e,t)&&t!==o&&i(e,t,{get:()=>r[t],enumerable:!(s=n(r,t))||s.enumerable});return e};var S=(e,r,o)=>(o=e!=null?k(u(e)):{},d(r||!e||!e.__esModule?i(o,"default",{value:e,enumerable:!0}):o,e)),f=e=>d(i({},"__esModule",{value:!0}),e);var g={};y(g,{BookmarkController:()=>a,default:()=>b});module.exports=f(g);var l=S(require("../../../../utils/localsHelper"));class a{layoutPath;services;constructor(r,o){this.layoutPath=r,this.services=o}POST=async(r,o)=>{const{dprUser:s}=l.default.getValues(o),{reportId:t,id:c,reportType:m,type:p}=r.body;p==="add"?await this.services.bookmarkService.addBookmark(s.id,t,c,m):await this.services.bookmarkService.removeBookmark(s.id,c,t),o.end()}}var b=a;0&&(module.exports={BookmarkController});
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var controller_exports = {};
+__export(controller_exports, {
+  BookmarkController: () => BookmarkController,
+  default: () => controller_default
+});
+module.exports = __toCommonJS(controller_exports);
+var import_localsHelper = __toESM(require("../../../../utils/localsHelper"));
+class BookmarkController {
+  layoutPath;
+  services;
+  constructor(layoutPath, services) {
+    this.layoutPath = layoutPath;
+    this.services = services;
+  }
+  POST = async (req, res) => {
+    const { dprUser } = import_localsHelper.default.getValues(res);
+    const { reportId, id, reportType, type } = req.body;
+    if (type === "add") {
+      await this.services.bookmarkService.addBookmark(dprUser.id, reportId, id, reportType);
+    } else {
+      await this.services.bookmarkService.removeBookmark(dprUser.id, id, reportId);
+    }
+    res.end();
+  };
+}
+var controller_default = BookmarkController;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  BookmarkController
+});
 //# sourceMappingURL=controller.js.map

package/dpr/routes/journeys/my-reports/bookmarks/controller.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../../../src/dpr/routes/journeys/my-reports/bookmarks/controller.ts"],
   "sourcesContent": ["import { RequestHandler } from 'express'\nimport { Services } from '../../../../types/Services'\nimport LocalsHelper from '../../../../utils/localsHelper'\n\nclass BookmarkController {\n  layoutPath: string\n\n  services: Services\n\n  constructor(layoutPath: string, services: Services) {\n    this.layoutPath = layoutPath\n    this.services = services\n  }\n\n  POST: RequestHandler = async (req, res) => {\n    const { dprUser } = LocalsHelper.getValues(res)\n    const { reportId, id, reportType, type } = req.body\n    if (type === 'add') {\n      await this.services.bookmarkService.addBookmark(dprUser.id, reportId, id, reportType)\n    } else {\n      await this.services.bookmarkService.removeBookmark(dprUser.id, id, reportId)\n    }\n    res.end()\n  }\n}\n\nexport { BookmarkController }\nexport default BookmarkController\n"],
-  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,wBAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAEA,IAAAK,EAAyB,6CAEzB,MAAMH,CAAmB,CACvB,WAEA,SAEA,YAAYI,EAAoBC,EAAoB,CAClD,KAAK,WAAaD,EAClB,KAAK,SAAWC,CAClB,CAEA,KAAuB,MAAOC,EAAKC,IAAQ,CACzC,KAAM,CAAE,QAAAC,CAAQ,EAAI,EAAAC,QAAa,UAAUF,CAAG,EACxC,CAAE,SAAAG,EAAU,GAAAC,EAAI,WAAAC,EAAY,KAAAC,CAAK,EAAIP,EAAI,KAC3CO,IAAS,MACX,MAAM,KAAK,SAAS,gBAAgB,YAAYL,EAAQ,GAAIE,EAAUC,EAAIC,CAAU,EAEpF,MAAM,KAAK,SAAS,gBAAgB,eAAeJ,EAAQ,GAAIG,EAAID,CAAQ,EAE7EH,EAAI,IAAI,CACV,CACF,CAGA,IAAON,EAAQD",
-  "names": ["controller_exports", "__export", "BookmarkController", "controller_default", "__toCommonJS", "import_localsHelper", "layoutPath", "services", "req", "res", "dprUser", "LocalsHelper", "reportId", "id", "reportType", "type"]
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,0BAAyB;AAEzB,MAAM,mBAAmB;AAAA,EACvB;AAAA,EAEA;AAAA,EAEA,YAAY,YAAoB,UAAoB;AAClD,SAAK,aAAa;AAClB,SAAK,WAAW;AAAA,EAClB;AAAA,EAEA,OAAuB,OAAO,KAAK,QAAQ;AACzC,UAAM,EAAE,QAAQ,IAAI,oBAAAA,QAAa,UAAU,GAAG;AAC9C,UAAM,EAAE,UAAU,IAAI,YAAY,KAAK,IAAI,IAAI;AAC/C,QAAI,SAAS,OAAO;AAClB,YAAM,KAAK,SAAS,gBAAgB,YAAY,QAAQ,IAAI,UAAU,IAAI,UAAU;AAAA,IACtF,OAAO;AACL,YAAM,KAAK,SAAS,gBAAgB,eAAe,QAAQ,IAAI,IAAI,QAAQ;AAAA,IAC7E;AACA,QAAI,IAAI;AAAA,EACV;AACF;AAGA,IAAO,qBAAQ;",
+  "names": ["LocalsHelper"]
 }

package/dpr/routes/journeys/my-reports/bookmarks/list/controller.js

@@ -1,2 +1,57 @@
-"use strict";var n=Object.create;var o=Object.defineProperty;var c=Object.getOwnPropertyDescriptor;var k=Object.getOwnPropertyNames;var u=Object.getPrototypeOf,d=Object.prototype.hasOwnProperty;var h=(r,t)=>{for(var e in t)o(r,e,{get:t[e],enumerable:!0})},l=(r,t,e,i)=>{if(t&&typeof t=="object"||typeof t=="function")for(let s of k(t))!d.call(r,s)&&s!==e&&o(r,s,{get:()=>t[s],enumerable:!(i=c(t,s))||i.enumerable});return r};var p=(r,t,e)=>(e=r!=null?n(u(r)):{},l(t||!r||!r.__esModule?o(e,"default",{value:r,enumerable:!0}):e,r)),v=r=>l(o({},"__esModule",{value:!0}),r);var f={};h(f,{BookmarkListingController:()=>a,default:()=>y});module.exports=v(f);var m=p(require("../../../../../components/user-reports/bookmarks/utils"));class a{layoutPath;services;constructor(t,e){this.layoutPath=t,this.services=e}GET=async(t,e,i)=>{e.render("dpr/routes/journeys/my-reports/view",{title:"Bookmarks",layoutPath:this.layoutPath,id:"dpr-bookmarks-list",...await m.default.renderBookmarkList({services:this.services,res:e})})}}var y=a;0&&(module.exports={BookmarkListingController});
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var controller_exports = {};
+__export(controller_exports, {
+  BookmarkListingController: () => BookmarkListingController,
+  default: () => controller_default
+});
+module.exports = __toCommonJS(controller_exports);
+var import_utils = __toESM(require("../../../../../components/user-reports/bookmarks/utils"));
+class BookmarkListingController {
+  layoutPath;
+  services;
+  constructor(layoutPath, services) {
+    this.layoutPath = layoutPath;
+    this.services = services;
+  }
+  GET = async (_req, res, _next) => {
+    res.render(`dpr/routes/journeys/my-reports/view`, {
+      title: "Bookmarks",
+      layoutPath: this.layoutPath,
+      id: "dpr-bookmarks-list",
+      ...await import_utils.default.renderBookmarkList({ services: this.services, res })
+    });
+  };
+}
+var controller_default = BookmarkListingController;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  BookmarkListingController
+});
 //# sourceMappingURL=controller.js.map

package/dpr/routes/journeys/my-reports/bookmarks/list/controller.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../../../../src/dpr/routes/journeys/my-reports/bookmarks/list/controller.ts"],
   "sourcesContent": ["import { RequestHandler } from 'express'\nimport BookmarklistUtils from '../../../../../components/user-reports/bookmarks/utils'\nimport { Services } from '../../../../../types/Services'\n\nclass BookmarkListingController {\n  layoutPath: string\n\n  services: Services\n\n  constructor(layoutPath: string, services: Services) {\n    this.layoutPath = layoutPath\n    this.services = services\n  }\n\n  GET: RequestHandler = async (_req, res, _next) => {\n    res.render(`dpr/routes/journeys/my-reports/view`, {\n      title: 'Bookmarks',\n      layoutPath: this.layoutPath,\n      id: 'dpr-bookmarks-list',\n      ...(await BookmarklistUtils.renderBookmarkList({ services: this.services, res })),\n    })\n  }\n}\n\nexport { BookmarkListingController }\nexport default BookmarkListingController\n"],
-  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,+BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAA8B,qEAG9B,MAAMH,CAA0B,CAC9B,WAEA,SAEA,YAAYI,EAAoBC,EAAoB,CAClD,KAAK,WAAaD,EAClB,KAAK,SAAWC,CAClB,CAEA,IAAsB,MAAOC,EAAMC,EAAKC,IAAU,CAChDD,EAAI,OAAO,sCAAuC,CAChD,MAAO,YACP,WAAY,KAAK,WACjB,GAAI,qBACJ,GAAI,MAAM,EAAAE,QAAkB,mBAAmB,CAAE,SAAU,KAAK,SAAU,IAAAF,CAAI,CAAC,CACjF,CAAC,CACH,CACF,CAGA,IAAON,EAAQD",
-  "names": ["controller_exports", "__export", "BookmarkListingController", "controller_default", "__toCommonJS", "import_utils", "layoutPath", "services", "_req", "res", "_next", "BookmarklistUtils"]
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,mBAA8B;AAG9B,MAAM,0BAA0B;AAAA,EAC9B;AAAA,EAEA;AAAA,EAEA,YAAY,YAAoB,UAAoB;AAClD,SAAK,aAAa;AAClB,SAAK,WAAW;AAAA,EAClB;AAAA,EAEA,MAAsB,OAAO,MAAM,KAAK,UAAU;AAChD,QAAI,OAAO,uCAAuC;AAAA,MAChD,OAAO;AAAA,MACP,YAAY,KAAK;AAAA,MACjB,IAAI;AAAA,MACJ,GAAI,MAAM,aAAAA,QAAkB,mBAAmB,EAAE,UAAU,KAAK,UAAU,IAAI,CAAC;AAAA,IACjF,CAAC;AAAA,EACH;AACF;AAGA,IAAO,qBAAQ;",
+  "names": ["BookmarklistUtils"]
 }

package/dpr/routes/journeys/my-reports/bookmarks/list/routes.js

@@ -1,2 +1,48 @@
-"use strict";var a=Object.create;var n=Object.defineProperty;var l=Object.getOwnPropertyDescriptor;var f=Object.getOwnPropertyNames;var p=Object.getPrototypeOf,g=Object.prototype.hasOwnProperty;var v=(r,o)=>{for(var t in o)n(r,t,{get:o[t],enumerable:!0})},s=(r,o,t,i)=>{if(o&&typeof o=="object"||typeof o=="function")for(let e of f(o))!g.call(r,e)&&e!==t&&n(r,e,{get:()=>o[e],enumerable:!(i=l(o,e))||i.enumerable});return r};var k=(r,o,t)=>(t=r!=null?a(p(r)):{},s(o||!r||!r.__esModule?n(t,"default",{value:r,enumerable:!0}):t,r)),x=r=>s(n({},"__esModule",{value:!0}),r);var S={};v(S,{default:()=>P,routes:()=>c});module.exports=x(S);var m=require("express"),u=k(require("./controller"));function c({layoutPath:r,services:o}){const t=(0,m.Router)({mergeParams:!0}),i=new u.default(r,o);return t.get("/",i.GET),t}var P=c;0&&(module.exports={routes});
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var routes_exports = {};
+__export(routes_exports, {
+  default: () => routes_default,
+  routes: () => routes
+});
+module.exports = __toCommonJS(routes_exports);
+var import_express = require("express");
+var import_controller = __toESM(require("./controller"));
+function routes({ layoutPath, services }) {
+  const router = (0, import_express.Router)({ mergeParams: true });
+  const controller = new import_controller.default(layoutPath, services);
+  router.get(`/`, controller.GET);
+  return router;
+}
+var routes_default = routes;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  routes
+});
 //# sourceMappingURL=routes.js.map