feat(newBrain): update data validation logic and add * on required fi…

…elds (#1065) * feat(createBrain): add * on required fields * fix: update brain data validation logic
QuivrHQ · Aug 30, 2023 · 182099c · 182099c
1 parent f84b1b3
commit 182099c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/...anagement/[brainId]/components/BrainManagementTabs/components/SettingsTab/SettingsTab.tsx b/...anagement/[brainId]/components/BrainManagementTabs/components/SettingsTab/SettingsTab.tsx
@@ -59,6 +59,7 @@ export const SettingsTab = ({ brainId }: SettingsTabProps): JSX.Element => {
             placeholder={t("brainNamePlaceholder", { ns: "brain" })}
             autoComplete="off"
             className="flex-1"
+            required
             {...register("name")}
           />
         </div>

diff --git a/...t/[brainId]/components/BrainManagementTabs/components/SettingsTab/hooks/useSettingsTab.ts b/...t/[brainId]/components/BrainManagementTabs/components/SettingsTab/hooks/useSettingsTab.ts
@@ -209,9 +209,9 @@ export const useSettingsTab = ({ brainId }: UseSettingsTabProps) => {
     if (!hasChanges && checkDirty) {
       return;
     }
-    const { name: isNameDirty } = dirtyFields;
     const { name, openAiKey: openai_api_key } = getValues();
-    if (isNameDirty !== undefined && isNameDirty && name.trim() === "") {
+
+    if (name.trim() === "") {
       publish({
         variant: "danger",
         text: t("nameRequired", { ns: "config" }),
@@ -222,6 +222,7 @@ export const useSettingsTab = ({ brainId }: UseSettingsTabProps) => {
 
     if (
       openai_api_key !== undefined &&
+      openai_api_key !== "" &&
       !(await validateOpenAIKey(
         openai_api_key,
         {

diff --git a/frontend/lib/components/AddBrainModal/AddBrainModal.tsx b/frontend/lib/components/AddBrainModal/AddBrainModal.tsx
@@ -63,6 +63,7 @@ export const AddBrainModal = (): JSX.Element => {
           placeholder={t("brainNamePlaceholder", { ns: "brain" })}
           autoComplete="off"
           className="flex-1"
+          required
           {...register("name")}
         />
 

diff --git a/frontend/lib/components/ui/Field.tsx b/frontend/lib/components/ui/Field.tsx
@@ -18,12 +18,16 @@ interface FieldProps
 }
 
 const Field = forwardRef(
-  ({ label, className, name, ...props }: FieldProps, forwardedRef) => {
+  (
+    { label, className, name, required = false, ...props }: FieldProps,
+    forwardedRef
+  ) => {
     return (
       <fieldset className={cn("flex flex-col w-full", className)} name={name}>
         {label && (
           <label htmlFor={name} className="text-sm">
             {label}
+            {required && <span>*</span>}
           </label>
         )}
         <input