Add Requested Changes

ohcnetwork · Nov 21, 2024 · de7d829 · de7d829
1 parent 7f5e000
commit de7d829
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 14 deletions.
diff --git a/src/Utils/utils.ts b/src/Utils/utils.ts
@@ -545,12 +545,9 @@ export const keysOf = <T extends object>(obj: T) => {
   return Object.keys(obj) as (keyof T)[];
 };
 
-export const handleNegativeValue = (
+export const sanitizeNumberInput = (
   event: React.FormEvent<HTMLInputElement>,
 ): void => {
   const input = event.currentTarget;
-  input.value = input.value.replace(/-/g, "");
-  if (isNaN(Number(input.value))) {
-    input.value = "";
-  }
+  input.value = input.value.replace(/[^0-9]/g, "");
 };
diff --git a/src/components/Form/FormFields/TextFormField.tsx b/src/components/Form/FormFields/TextFormField.tsx
@@ -32,8 +32,6 @@ export type TextFormFieldProps = FormFieldBaseProps<string> &
     trailingPadding?: string | undefined;
     leadingPadding?: string | undefined;
     suggestions?: string[];
-    min?: number | string;
-    max?: number | string;
     clearable?: boolean | undefined;
   };
 
@@ -102,8 +100,6 @@ const TextFormField = forwardRef((props: TextFormFieldProps, ref) => {
         type={props.type === "password" ? getPasswordFieldType() : props.type}
         name={field.name}
         value={field.value}
-        min={Number(props?.min || Number.MIN_SAFE_INTEGER)}
-        max={Number(props?.max || Number.MAX_SAFE_INTEGER)}
         required={field.required}
         onChange={(e) => field.handleChange(e.target.value)}
       />

diff --git a/src/components/Resource/ResourceCreate.tsx b/src/components/Resource/ResourceCreate.tsx
@@ -30,7 +30,7 @@ import * as Notification from "@/Utils/Notifications";
 import routes from "@/Utils/request/api";
 import request from "@/Utils/request/request";
 import useQuery from "@/Utils/request/useQuery";
-import { handleNegativeValue, parsePhoneNumber } from "@/Utils/utils";
+import { parsePhoneNumber, sanitizeNumberInput } from "@/Utils/utils";
 
 interface resourceProps {
   facilityId: number;
@@ -304,7 +304,7 @@ export default function ResourceCreate(props: resourceProps) {
           min={1}
           value={state.form.required_quantity}
           onChange={handleChange}
-          onInput={handleNegativeValue}
+          onInput={sanitizeNumberInput}
         />
 
         <div className="md:col-span-2">

diff --git a/src/components/Resource/ResourceDetailsUpdate.tsx b/src/components/Resource/ResourceDetailsUpdate.tsx
@@ -25,7 +25,7 @@ import * as Notification from "@/Utils/Notifications";
 import routes from "@/Utils/request/api";
 import request from "@/Utils/request/request";
 import useQuery from "@/Utils/request/useQuery";
-import { handleNegativeValue } from "@/Utils/utils";
+import { sanitizeNumberInput } from "@/Utils/utils";
 
 interface resourceProps {
   id: string;
@@ -275,7 +275,7 @@ export const ResourceDetailsUpdate = (props: resourceProps) => {
                 min={1}
                 value={state.form.requested_quantity}
                 onChange={handleChange}
-                onInput={handleNegativeValue}
+                onInput={sanitizeNumberInput}
               />
             </div>
             <div>
@@ -287,7 +287,7 @@ export const ResourceDetailsUpdate = (props: resourceProps) => {
                 value={state.form.assigned_quantity}
                 onChange={handleChange}
                 disabled={state.form.status !== "PENDING"}
-                onInput={handleNegativeValue}
+                onInput={sanitizeNumberInput}
               />
             </div>