From 80410cf9cf60adffa903324f0c71e20c1d723814 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Riku=20Kestila=CC=88?= <riku.kestila@vincit.fi>
Date: Mon, 21 Oct 2024 11:47:18 +0300
Subject: [PATCH] fix: eslint issues

---
 .../handler/public/locales/en/common.json     |  7 ++-
 .../handler/public/locales/fi/common.json     |  3 +-
 .../handler/public/locales/sv/common.json     |  3 +-
 .../applicationReports/ApplicationReports.tsx | 45 +------------------
 .../applicationReports/ReportsSection.tsx     | 18 ++++++--
 5 files changed, 24 insertions(+), 52 deletions(-)

diff --git a/frontend/benefit/handler/public/locales/en/common.json b/frontend/benefit/handler/public/locales/en/common.json
index ec5104a05a..e9e93de03e 100644
--- a/frontend/benefit/handler/public/locales/en/common.json
+++ b/frontend/benefit/handler/public/locales/en/common.json
@@ -1498,9 +1498,7 @@
       "main": "Raportointi",
       "downloadAcceptedApplications": "Hyväksytyt hakemukset joita ei ole vielä ladattu",
       "downloadRejectedApplications": "Hylätyt hakemukset joita ei ole vielä ladattu",
-      "downloadApplicationsInTimeRange": "Lataa kaikki hakemukset tietyltä ajalta",
-      "downloadSmallerListOfApplicationsInTimeRange": "Lataa kompaktimpi lista hakemuksista tietyltä ajalta"
-    },
+      "downloadApplicationsInTimeRange": "Lataa kaikki hakemukset tietyltä ajalta"    },
     "fields": {
       "lastDownloadDateText": "Ladattu viimeksi {{date}}",
       "startDate": "Alkaen",
@@ -1509,7 +1507,8 @@
     "buttons": {
       "downloadAcceptedApplications": "Hyväksytyt hakemukset",
       "downloadRejectedApplications": "Hylätyt hakemukset",
-      "downloadApplicationsInTimeRange": "Kaikki hakemukset valitulta ajalta"
+      "downloadApplicationsInTimeRange": "Kaikki hakemukset valitulta ajalta",
+      "downloadCompactList": "Lataa kompaktimpi lista hakemuksista"
     }
   },
   "login": {
diff --git a/frontend/benefit/handler/public/locales/fi/common.json b/frontend/benefit/handler/public/locales/fi/common.json
index 23742966d1..790797d1cc 100644
--- a/frontend/benefit/handler/public/locales/fi/common.json
+++ b/frontend/benefit/handler/public/locales/fi/common.json
@@ -1507,7 +1507,8 @@
     "buttons": {
       "downloadAcceptedApplications": "Hyväksytyt hakemukset",
       "downloadRejectedApplications": "Hylätyt hakemukset",
-      "downloadApplicationsInTimeRange": "Kaikki hakemukset valitulta ajalta"
+      "downloadApplicationsInTimeRange": "Kaikki hakemukset valitulta ajalta",
+      "downloadCompactList": "Lataa kompaktimpi lista hakemuksista"
     }
   },
   "login": {
diff --git a/frontend/benefit/handler/public/locales/sv/common.json b/frontend/benefit/handler/public/locales/sv/common.json
index 399eeb28cf..4ce1b7141b 100644
--- a/frontend/benefit/handler/public/locales/sv/common.json
+++ b/frontend/benefit/handler/public/locales/sv/common.json
@@ -1508,7 +1508,8 @@
     "buttons": {
       "downloadAcceptedApplications": "Hyväksytyt hakemukset",
       "downloadRejectedApplications": "Hylätyt hakemukset",
-      "downloadApplicationsInTimeRange": "Kaikki hakemukset valitulta ajalta"
+      "downloadApplicationsInTimeRange": "Kaikki hakemukset valitulta ajalta",
+      "downloadCompactList": "Lataa kompaktimpi lista hakemuksista"
     }
   },
   "login": {
diff --git a/frontend/benefit/handler/src/components/applicationReports/ApplicationReports.tsx b/frontend/benefit/handler/src/components/applicationReports/ApplicationReports.tsx
index e58d335ec3..6ddeace660 100644
--- a/frontend/benefit/handler/src/components/applicationReports/ApplicationReports.tsx
+++ b/frontend/benefit/handler/src/components/applicationReports/ApplicationReports.tsx
@@ -28,50 +28,9 @@ const ApplicationReports: React.FC = () => {
         buttonText={`${t(
           `${translationsBase}.buttons.downloadApplicationsInTimeRange`
         )}`}
-        isCompact={false}
-      >
-        <$GridCell $colSpan={3} css="font-weight: 500;">{`${t(
-          `${translationsBase}.fields.startDate`
-        )}`}</$GridCell>
-        <$GridCell $colSpan={3} css="font-weight: 500;">{`${t(
-          `${translationsBase}.fields.endDate`
-        )}`}</$GridCell>
-        <$GridCell $colStart={1} $colSpan={3}>
-          <DateInputWithSeparator
-            id={`${t(`${translationsBase}.fields.startDate`)}`}
-            name={`${t(`${translationsBase}.fields.startDate`)}`}
-            placeholder={`${t(`${translationsBase}.fields.startDate`)}`}
-            value={convertToUIDateFormat(formik.values.startDate)}
-            onChange={(value) =>
-              formik.setFieldValue(fields.startDate.name, value)
-            }
-          />
-        </$GridCell>
-        <$GridCell $colSpan={3}>
-          <DateInput
-            id={`${t(`${translationsBase}.fields.endDate`)}`}
-            name={`${t(`${translationsBase}.fields.endDate`)}`}
-            placeholder={`${t(`${translationsBase}.fields.endDate`)}`}
-            value={convertToUIDateFormat(formik.values.endDate)}
-            onChange={(value) =>
-              formik.setFieldValue(
-                fields.endDate.name,
-                getCorrectEndDate(formik.values.startDate, value)
-              )
-            }
-          />
-        </$GridCell>
-      </ReportsSection>
-      <ReportsSection
-        exportFileType="csv"
-        onDownloadButtonClick={exportApplicationsInTimeRange}
-        header={`${t(
-          `${translationsBase}.headings.downloadSmallerListOfApplicationsInTimeRange`
-        )}`}
-        buttonText={`${t(
-          `${translationsBase}.buttons.downloadApplicationsInTimeRange`
+        compactButtonText={`${t(
+          `${translationsBase}.buttons.downloadCompactList`
         )}`}
-        isCompact={true}
       >
         <$GridCell $colSpan={3} css="font-weight: 500;">{`${t(
           `${translationsBase}.fields.startDate`
diff --git a/frontend/benefit/handler/src/components/applicationReports/ReportsSection.tsx b/frontend/benefit/handler/src/components/applicationReports/ReportsSection.tsx
index 6326b25b07..c8c4445c2e 100644
--- a/frontend/benefit/handler/src/components/applicationReports/ReportsSection.tsx
+++ b/frontend/benefit/handler/src/components/applicationReports/ReportsSection.tsx
@@ -15,8 +15,8 @@ export type ReportsSectionProp = {
   withDivider?: boolean;
   header: string;
   buttonText: string;
+  compactButtonText: string;
   onDownloadButtonClick: (type: ExportFileType, isCompact:boolean) => void;
-  isCompact?: boolean;
 };
 
 const ReportsSection: React.FC<ReportsSectionProp> = ({
@@ -24,9 +24,9 @@ const ReportsSection: React.FC<ReportsSectionProp> = ({
   children,
   header,
   buttonText,
+  compactButtonText,
   onDownloadButtonClick,
   withDivider = false,
-  isCompact = false
 }) => {
   const theme = useTheme();
 
@@ -58,11 +58,23 @@ const ReportsSection: React.FC<ReportsSectionProp> = ({
                 css={`
                   margin-top: ${theme.spacing.l};
                 `}
-                onClick={() => onDownloadButtonClick(exportFileType, isCompact)}
+                onClick={() => onDownloadButtonClick(exportFileType, false)}
               >
                 {buttonText} {String(exportFileType).toUpperCase()}
               </Button>
             </$GridCell>
+            <$GridCell>
+              <Button
+                theme="coat"
+                iconLeft={<IconDownload />}
+                css={`
+                  margin-top: ${theme.spacing.l};
+                `}
+                onClick={() => onDownloadButtonClick(exportFileType, true)}
+              >
+                {compactButtonText}
+              </Button>
+            </$GridCell>
           </$Grid>
         </$GridCell>
         {withDivider && (