Fix max expiry shown on uploads page

Author: jake-walker

.gitignore

@@ -207,3 +207,4 @@ $RECYCLE.BIN/
 accessgrant.txt
 cleanup/backup-*
 app/cypress/downloads
+cleanup/prod.env

app/src/components/AdvancedControls.jsx

@@ -18,21 +18,24 @@ export const validationRules = {
   }).safeParse(value).success
 }
 
-export function AdvancedControls({ form }) {
+export function AdvancedControls({ form, maxDays = null }) {
   const [opened, setOpened] = useState(false);
 
-  const dates = [1, 7, 30, 60, 90, -1].map((days) => {
-    if (days === -1) return {
-      value: days.toString(),
-      label: "Never"
-    };
-    const date = new Date();
-    date.setDate(date.getDate() + days);
-    return {
-      value: days.toString(),
-      label: `in ${days} day${(days > 1) ? 's' : ''}`
-    }
-  })
+  const dates = [1, 7, 14, 30, 60, 90, -1]
+    // remove days that are over the maximum if the maximum is set
+    .filter((days) => maxDays != null ? days <= maxDays && days > 0 : true)
+    .map((days) => {
+      if (days === -1) return {
+        value: days.toString(),
+        label: "Never"
+      };
+      const date = new Date();
+      date.setDate(date.getDate() + days);
+      return {
+        value: days.toString(),
+        label: `in ${days} day${(days > 1) ? 's' : ''}`
+      }
+    });
 
   return (
     <>

app/src/components/CreateInfo.jsx

@@ -8,7 +8,7 @@ export function CreateInfo({ form, type }) {
       {type} that
       {form.values.expireDays == "-1"
         ? " will never expire"
-        : ` will expire in ${form.values.expireDays} days`}
+        : ` will expire in ${form.values.expireDays} day${form.values.expireDays != "1" ? "s" : ""}`}
       .
     </Text>
   )

app/src/components/UploadForm.jsx

@@ -1,16 +1,19 @@
 import { useState } from "react";
 import { upload } from "../controller";
 import { Dropzone } from '@mantine/dropzone';
-import { Alert, Group, Text } from "@mantine/core";
-import { Info, Upload } from "react-feather";
-import { useForm } from "@mantine/form";
+import { Group, Text } from "@mantine/core";
+import { Upload } from "react-feather";
+import { useForm } from "@mantine/hooks";
 import { AdvancedControls, initialValues, validationRules } from "./AdvancedControls";
 import { CreateInfo } from "./CreateInfo";
 
 export function UploadForm({ onResponse, onError }) {
   const [loading, setLoading] = useState(false);
   const form = useForm({
-    initialValues,
+    initialValues: {
+      ...initialValues,
+      expireDays: "30"
+    },
     validationRules
   });
 
@@ -40,9 +43,6 @@ export function UploadForm({ onResponse, onError }) {
 
   return (
     <>
-      <Alert icon={<Info size={32} />} color="blue" mb="sm">
-        Uploaded files last a maximum of 30 days.
-      </Alert>
       <Dropzone
         id="upload-file"
         onDrop={onDrop}
@@ -63,7 +63,7 @@ export function UploadForm({ onResponse, onError }) {
           </div>
         </Group>
       </Dropzone>
-      <AdvancedControls form={form} />
+      <AdvancedControls form={form} maxDays={30} />
       <CreateInfo form={form} type="upload" />
     </>
   )

app/yarn.lock

@@ -1235,9 +1235,9 @@ callsites@^3.0.0:
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
 caniuse-lite@^1.0.30001286:
-  version "1.0.30001304"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001304.tgz#38af55ed3fc8220cb13e35e6e7309c8c65a05559"
-  integrity sha512-bdsfZd6K6ap87AGqSHJP/s1V+U6Z5lyrcbBu3ovbCCf8cSYpwTtGrCBObMpJqwxfTbLW6YTIdbb1jEeTelcpYQ==
+  version "1.0.30001469"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001469.tgz"
+  integrity sha512-Rcp7221ScNqQPP3W+lVOYDyjdR6dC+neEQCttoNr5bAyz54AboB4iwpnWgyi8P4YUsPybVzT4LgWiBbI3drL4g==
 
 chalk@^2.0.0:
   version "2.4.2"