From 9b224f218a4f981a9d00f2cd24f10b4faddb4899 Mon Sep 17 00:00:00 2001
From: Nabarun Gogoi <nabarun@deepstacksoft.com>
Date: Wed, 27 Dec 2023 17:02:34 +0530
Subject: [PATCH] Show error messages and toasters in Environment variables
 settings tab (#29)

* Display error if fields are empty

* Show number of added variables in toast

* Show horizontal line between different environments

---------

Co-authored-by: neeraj <neeraj.rtly@gmail.com>
---
 .../settings/AddEnvironmentVariableRow.tsx    | 16 +++-
 .../settings/DisplayEnvironmentVariables.tsx  |  2 -
 .../settings/EnvironmentVariablesTabPanel.tsx | 80 +++++++++++++++----
 3 files changed, 78 insertions(+), 20 deletions(-)

diff --git a/packages/frontend/src/components/projects/project/settings/AddEnvironmentVariableRow.tsx b/packages/frontend/src/components/projects/project/settings/AddEnvironmentVariableRow.tsx
index c7726ed1..2ba7450c 100644
--- a/packages/frontend/src/components/projects/project/settings/AddEnvironmentVariableRow.tsx
+++ b/packages/frontend/src/components/projects/project/settings/AddEnvironmentVariableRow.tsx
@@ -9,12 +9,14 @@ interface AddEnvironmentVariableRowProps {
   onDelete: () => void;
   register: UseFormRegister<EnvironmentVariablesFormValues>;
   index: number;
+  isDeleteDisabled: boolean;
 }
 
 const AddEnvironmentVariableRow = ({
   onDelete,
   register,
   index,
+  isDeleteDisabled,
 }: AddEnvironmentVariableRowProps) => {
   return (
     <div className="flex gap-1 p-2">
@@ -22,18 +24,26 @@ const AddEnvironmentVariableRow = ({
         <Typography variant="small">Key</Typography>
         <Input
           crossOrigin={undefined}
-          {...register(`variables.${index}.key`)}
+          {...register(`variables.${index}.key`, {
+            required: 'Key field cannot be empty',
+          })}
         />
       </div>
       <div>
         <Typography variant="small">Value</Typography>
         <Input
           crossOrigin={undefined}
-          {...register(`variables.${index}.value`)}
+          {...register(`variables.${index}.value`, {
+            required: 'Value field cannot be empty',
+          })}
         />
       </div>
       <div className="self-end">
-        <IconButton size="sm" onClick={() => onDelete()}>
+        <IconButton
+          size="sm"
+          onClick={() => onDelete()}
+          disabled={isDeleteDisabled}
+        >
           {'>'}
         </IconButton>
       </div>
diff --git a/packages/frontend/src/components/projects/project/settings/DisplayEnvironmentVariables.tsx b/packages/frontend/src/components/projects/project/settings/DisplayEnvironmentVariables.tsx
index dc2e726e..4645dfbe 100644
--- a/packages/frontend/src/components/projects/project/settings/DisplayEnvironmentVariables.tsx
+++ b/packages/frontend/src/components/projects/project/settings/DisplayEnvironmentVariables.tsx
@@ -2,7 +2,6 @@ import React, { useState } from 'react';
 
 import { Card, Collapse, Typography } from '@material-tailwind/react';
 
-import HorizontalLine from '../../../HorizontalLine';
 import EditEnvironmentVariableRow from './EditEnvironmentVariableRow';
 import { Environments, EnvironmentVariable } from '../../../../types/project';
 
@@ -26,7 +25,6 @@ const DisplayEnvironmentVariables = ({
         <div>^</div>
         <div className="grow capitalize">{environment}</div>
         <div>{variables.length} variables</div>
-        <HorizontalLine />
       </div>
       <Collapse open={openCollapse}>
         {variables.length === 0 ? (
diff --git a/packages/frontend/src/components/projects/project/settings/EnvironmentVariablesTabPanel.tsx b/packages/frontend/src/components/projects/project/settings/EnvironmentVariablesTabPanel.tsx
index b48bf3f9..c9eddf64 100644
--- a/packages/frontend/src/components/projects/project/settings/EnvironmentVariablesTabPanel.tsx
+++ b/packages/frontend/src/components/projects/project/settings/EnvironmentVariablesTabPanel.tsx
@@ -1,6 +1,6 @@
-import React, { useCallback, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { useFieldArray, useForm } from 'react-hook-form';
-import { Toaster } from 'react-hot-toast';
+import toast, { Toaster } from 'react-hot-toast';
 
 import {
   Typography,
@@ -8,12 +8,14 @@ import {
   Card,
   Button,
   Checkbox,
+  Chip,
 } from '@material-tailwind/react';
 
 import AddEnvironmentVariableRow from './AddEnvironmentVariableRow';
 import DisplayEnvironmentVariables from './DisplayEnvironmentVariables';
 import environmentVariablesData from '../../../../assets/environment-variables.json';
 import { EnvironmentVariable, Environments } from '../../../../types/project';
+import HorizontalLine from '../../../HorizontalLine';
 
 export type EnvironmentVariablesFormValues = {
   variables: {
@@ -28,31 +30,59 @@ export type EnvironmentVariablesFormValues = {
 };
 
 export const EnvironmentVariablesTabPanel = () => {
-  const { handleSubmit, register, control } =
-    useForm<EnvironmentVariablesFormValues>({
-      defaultValues: {
-        variables: [{ key: '', value: '' }],
-        environment: {
-          development: false,
-          preview: false,
-          production: false,
-        },
+  const {
+    handleSubmit,
+    register,
+    control,
+    reset,
+    formState: { isSubmitSuccessful, errors },
+  } = useForm<EnvironmentVariablesFormValues>({
+    defaultValues: {
+      variables: [{ key: '', value: '' }],
+      environment: {
+        development: false,
+        preview: false,
+        production: false,
       },
-    });
-
+    },
+  });
   const [createNewVariable, setCreateNewVariable] = useState(false);
 
   const { fields, append, remove } = useFieldArray({
     name: 'variables',
     control,
+    rules: {
+      required: 'Add at least 1 environment variables',
+    },
   });
 
+  useEffect(() => {
+    if (isSubmitSuccessful) {
+      reset();
+    }
+  }, [isSubmitSuccessful, reset]);
+
   const getEnvironmentVariable = useCallback((environment: Environments) => {
     return (environmentVariablesData as EnvironmentVariable[]).filter((item) =>
       item.environments.includes(environment),
     );
   }, []);
 
+  const isFieldEmpty = useMemo(() => {
+    if (errors.variables) {
+      return fields.some((_, index) => {
+        if (
+          errors.variables![index]?.value?.type === 'required' ||
+          errors.variables![index]?.key?.type === 'required'
+        ) {
+          return true;
+        }
+      });
+    }
+
+    return false;
+  }, [fields, errors.variables]);
+
   return (
     <>
       <Typography variant="h6">Environment variables</Typography>
@@ -67,8 +97,17 @@ export const EnvironmentVariablesTabPanel = () => {
           + Create new variable
         </div>
         <Collapse open={createNewVariable}>
-          <Card className="bg-white">
-            <form onSubmit={handleSubmit(() => {})}>
+          <Card className="bg-white p-2">
+            <form
+              onSubmit={handleSubmit((data) => {
+                toast.success(
+                  data.variables.length > 1
+                    ? `${data.variables.length} variables added`
+                    : `Variable added`,
+                );
+                reset();
+              })}
+            >
               {fields.map((field, index) => {
                 return (
                   <AddEnvironmentVariableRow
@@ -76,6 +115,7 @@ export const EnvironmentVariablesTabPanel = () => {
                     index={index}
                     register={register}
                     onDelete={() => remove(index)}
+                    isDeleteDisabled={fields.length === 1}
                   />
                 );
               })}
@@ -96,6 +136,14 @@ export const EnvironmentVariablesTabPanel = () => {
                   ^ Import .env
                 </Button>
               </div>
+              {isFieldEmpty && (
+                <Chip
+                  value="^ Please ensure no fields are empty before saving."
+                  variant="outlined"
+                  color="red"
+                  size="sm"
+                />
+              )}
               <div>
                 <Checkbox
                   crossOrigin={undefined}
@@ -130,10 +178,12 @@ export const EnvironmentVariablesTabPanel = () => {
           environment={Environments.PRODUCTION}
           variables={getEnvironmentVariable(Environments.PRODUCTION)}
         />
+        <HorizontalLine />
         <DisplayEnvironmentVariables
           environment={Environments.PREVIEW}
           variables={getEnvironmentVariable(Environments.PREVIEW)}
         />
+        <HorizontalLine />
         <DisplayEnvironmentVariables
           environment={Environments.DEVELOPMENT}
           variables={getEnvironmentVariable(Environments.DEVELOPMENT)}