From f822030c5dc445984a31b5f8fa1c9717405b578b Mon Sep 17 00:00:00 2001
From: Khalim Conn-Kowlessar <kconnkowlessar@gmail.com>
Date: Mon, 16 Oct 2023 12:50:32 +1100
Subject: [PATCH] fix the conditions checked in handleOnChange

---
 .../due-considerations/SelectFolder.tsx        |  5 +++--
 src/app/eco-spreadsheet/page.tsx               | 18 ++++++++++--------
 src/middleware.ts                              |  1 +
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/app/components/due-considerations/SelectFolder.tsx b/src/app/components/due-considerations/SelectFolder.tsx
index 57cef915..21f3e5ca 100644
--- a/src/app/components/due-considerations/SelectFolder.tsx
+++ b/src/app/components/due-considerations/SelectFolder.tsx
@@ -1,18 +1,19 @@
 "use client";
 
 import { Input } from "@/app/shadcn_components/ui/input";
-import { Label } from "@/app/shadcn_components/ui/label";
 
 export function SelectFolder({
   handleOnChange,
+  accept = ".xml,.pdf,.docx",
 }: {
   handleOnChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
+  accept?: string;
 }) {
   return (
     <Input
       id="folder-uploader"
       type="file"
-      accept=".xml,.pdf,.docx"
+      accept={accept}
       multiple={true}
       className="cursor-pointer"
       onChange={handleOnChange}
diff --git a/src/app/eco-spreadsheet/page.tsx b/src/app/eco-spreadsheet/page.tsx
index cccf9df6..8a27fe9b 100644
--- a/src/app/eco-spreadsheet/page.tsx
+++ b/src/app/eco-spreadsheet/page.tsx
@@ -183,9 +183,9 @@ export default function EcoSpreadsheetHome() {
 
       if (
         extensions.includes("xml") &&
-        extensions.includes(".pdf") &&
-        names.includes("epr") &&
-        names.includes("ventilation")
+        extensions.includes("pdf") &&
+        names.some((name) => name.includes("epr")) &&
+        names.some((name) => name.includes("ventilation"))
       ) {
         setFiles(filesArray);
         setButtonDisabled(false);
@@ -241,19 +241,21 @@ export default function EcoSpreadsheetHome() {
           <SelectFolder handleOnChange={handleOnChange} />
         </div>
 
-        <div className="mb-4">
-          Additionally, you can upload an optional ECO Excel spreadsheet if you
-          wish to add new records to an already populated spreadsheet
+        <div>{uploadMessage}</div>
+
+        <div className="mb-4 text-left">
+          Additionally, you can upload an optional ECO Excel spreadsheet
+          <br />
+          if you wish to add new records to an already populated spreadsheet
         </div>
 
         <div className="mb-5">
-          <SelectFolder handleOnChange={handleOnChangeExcel} />
+          <SelectFolder handleOnChange={handleOnChangeExcel} accept={".xlsx"} />
         </div>
 
         <div className="mb-4"></div>
 
         <div className="flex justify-between w-full">
-          <div>{uploadMessage}</div>
           <Button
             disabled={
               buttonDisabled || isGeneratingUrlLoading || isUploadLoading
diff --git a/src/middleware.ts b/src/middleware.ts
index 53a68085..e8158c37 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -5,6 +5,7 @@ export const config = {
     "/search/:path*",
     "/addresses/:path",
     "/due-considerations/:path",
+    "/eco-spreadsheet/:path",
   ],
 };