Add button to download regulated half hitas housing company report

City-of-Helsinki · May 31, 2024 · 286d8c7 · 286d8c7
1 parent 7a32509
commit 286d8c7
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 2 deletions.
diff --git a/frontend/src/common/services/hitasApi/reports.ts b/frontend/src/common/services/hitasApi/reports.ts
@@ -62,6 +62,9 @@ export const downloadSalesByPostalCodeAndAreaReportPDF = ({
 export const downloadRegulatedHousingCompaniesPDF = () =>
     fetchAndDownloadPDF("/reports/download-regulated-housing-companies-report");
 
+export const downloadRegulatedHalfHitasHousingCompaniesExcel = () =>
+    fetchAndDownloadPDF("/reports/download-regulated-half-hitas-housing-companies-report");
+
 export const downloadUnregulatedHousingCompaniesPDF = () =>
     fetchAndDownloadPDF("/reports/download-unregulated-housing-companies-report");
 

diff --git a/frontend/src/common/services/utils.ts b/frontend/src/common/services/utils.ts
@@ -54,7 +54,10 @@ export const fetchAndDownloadPDF = (url: string, method: "GET" | "POST" = "GET",
             }
         })
         // eslint-disable-next-line no-console
-        .catch((error) => console.error(error));
+        .catch((error) => {
+            console.error(error);
+            hdsToast.error(`Virhe ladattaessa tiedostoa. (${error?.message ?? error})`);
+        });
 };
 
 export const safeInvalidate = (error, tags) => (!error ? tags : []);
diff --git a/frontend/src/features/reports/ReportsPage.tsx b/frontend/src/features/reports/ReportsPage.tsx
@@ -2,6 +2,7 @@ import {Accordion} from "hds-react";
 import {Divider, Heading} from "../../common/components";
 import {
     HousingCompanyReportRegulated,
+    HousingCompanyReportRegulatedHalfHitas,
     HousingCompanyReportReleased,
     HousingCompanyStatusTable,
 } from "./components/HousingCompanyReports";
@@ -34,6 +35,8 @@ const ReportsPage = () => {
                     <Divider size="s" />
                     <HousingCompanyReportRegulated />
                     <Divider size="s" />
+                    <HousingCompanyReportRegulatedHalfHitas />
+                    <Divider size="s" />
                     <HousingCompanyReportReleased />
                 </Accordion>
 

diff --git a/frontend/src/features/reports/components/HousingCompanyReports.tsx b/frontend/src/features/reports/components/HousingCompanyReports.tsx
@@ -3,6 +3,7 @@ import {DownloadButton, Heading, QueryStateHandler} from "../../../common/compon
 import {IHousingCompanyState} from "../../../common/schemas";
 import {
     downloadHousingCompanyStatesReportPDF,
+    downloadRegulatedHalfHitasHousingCompaniesExcel,
     downloadRegulatedHousingCompaniesPDF,
     downloadUnregulatedHousingCompaniesPDF,
     useGetHousingCompanyStatesQuery,
@@ -70,6 +71,23 @@ export const HousingCompanyReportRegulated = () => {
     );
 };
 
+export const HousingCompanyReportRegulatedHalfHitas = () => {
+    return (
+        <div className="report-container">
+            <div className="column">
+                <Heading type="sub">Säännellyt Puolihitas-yhtiöt</Heading>
+                <span>Listaus sääntelyn piirissä olevista Puolihitas-taloyhtiöistä</span>
+                <div>
+                    <DownloadButton
+                        buttonText="Lataa raportti"
+                        onClick={downloadRegulatedHalfHitasHousingCompaniesExcel}
+                    />
+                </div>
+            </div>
+        </div>
+    );
+};
+
 export const HousingCompanyReportReleased = () => {
     return (
         <div className="report-container">

diff --git a/frontend/src/features/reports/components/OwnerReports.tsx b/frontend/src/features/reports/components/OwnerReports.tsx
@@ -1,4 +1,4 @@
-import {DownloadButton, Heading} from "../../../common/components";
+import {Divider, DownloadButton, Heading} from "../../../common/components";
 import {downloadMultipleOwnershipsReportPDF, downloadRegulatedOwnershipsReportExcel} from "../../../common/services";
 
 const OwnerReports = () => {
@@ -19,6 +19,7 @@ const OwnerReports = () => {
                     </div>
                 </div>
             </div>
+            <Divider size="s" />
             <div className="report-container">
                 <div className="column">
                     <Heading type="sub">Sääntelyn piirissä olevien Hitas-asuntojen omistajat</Heading>