Adding border in Group and Activities popup and Removing mandatory field in Tenant.

src/components/Tenant/OrganizationInfo.jsx

@@ -203,8 +203,7 @@ const OrganizationInfo = ({ onNext, onPrev, onSubmitTenant }) => {
       </div>
 
       <div className="col-sm-6">
-        <SelectMultiple
+        <SelectMultiple          
-          required
           name="serviceIds"
           label="Services"
           options={services?.data}

src/components/Tenant/TenantSchema.js

@@ -33,7 +33,7 @@ export const newTenantSchema = z.object({
   organizationSize: z.string().nonempty("Organization size is required"),
   industryId: z.string().uuid("Invalid industry ID"),
   reference: z.string().nonempty("Reference is required"),
-  serviceIds: z.array(z.string()).nonempty("Services is required"),
+  serviceIds: z.array(z.string()).optional(),
 });
 
 export const tenantDefaultValues = {

src/components/master/Services/ManageActivity.jsx

@@ -137,8 +137,8 @@ const ManageActivity = ({ activity = null, whichGroup = null, close }) => {
   return (
     <form onSubmit={handleSubmit(onSubmit)} className="px-7">
       {/* <h6>Create Activity</h6> */}
-      <div className="row">
+      <div className="row border border-1 border-secondary rounded-3 mt-2">
-        <div className="col-6 text-start">
+        <div className="col-6 text-start mt-3">
           <Label className="form-label" required>
             Activity
           </Label>
@@ -154,7 +154,7 @@ const ManageActivity = ({ activity = null, whichGroup = null, close }) => {
           )}
         </div>
 
-        <div className="col-6 text-start">
+        <div className="col-6 text-start mt-3">
           <Label className="form-label" required>
             Measurement
           </Label>
@@ -170,7 +170,7 @@ const ManageActivity = ({ activity = null, whichGroup = null, close }) => {
           )}
         </div>
 
-        <div className="col-md-12 text-start mt-1">
+        <div className="col-md-12 text-start mt-3">
           <label className="py-1 form-label my-0">
             Add Check List <i
               className="bx bx-plus-circle text-primary cursor-pointer"
@@ -248,7 +248,7 @@ const ManageActivity = ({ activity = null, whichGroup = null, close }) => {
         
         </div>
 
-        <div className="col-12 text-end mt-3">
+        <div className="col-12 text-end mt-3 mb-4">
           <button
             type="reset"
             className="btn btn-sm btn-label-secondary me-3"

src/components/master/Services/ManageGroup.jsx

@@ -53,55 +53,55 @@ const ManageGroup = ({ group = null, whichService = null, close }) => {
 
   let isPending = isCreating || isUpdating;
   return (
-    <form className="row px-12" onSubmit={handleSubmit(onSubmit)} cl>
+    <form className="row px-12" onSubmit={handleSubmit(onSubmit)} >
-      <div className="col-12 col-md-12 text-start">
+      <div className="border border-1 border-secondary rounded-3 p-2 mt-2">
-        <Label className="form-label" required>
+        <div className="col-12 col-md-12 text-start">
-          Group Name
+          <Label className="form-label" required>
-        </Label>
+            Group Name
-        <input
+          </Label>
-          type="text"
+          <input
-          {...register("name")}
+            type="text"
-          className={`form-control form-control-sm ${
+            {...register("name")}
-            errors.name ? "is-invalids" : ""
+            className={`form-control form-control-sm ${errors.name ? "is-invalids" : ""
-          }`}
+              }`}
-        />
+          />
-        {errors.name && (
+          {errors.name && (
-          <p className="danger-text m-0">{errors.name.message}</p>
+            <p className="danger-text m-0">{errors.name.message}</p>
-        )}
+          )}
-      </div>
+        </div>
-      <div className="col-12 col-md-12 text-start mb-2">
+        <div className="col-12 col-md-12 text-start mb-2">
-        <Label className="form-label" htmlFor="description" required>
+          <Label className="form-label" htmlFor="description" required>
-          Description
+            Description
-        </Label>
+          </Label>
-        <textarea
+          <textarea
-          rows="3"
+            rows="3"
-          {...register("description")}
+            {...register("description")}
-          className={`form-control form-control-sm ${
+            className={`form-control form-control-sm ${errors.description ? "is-invalids" : ""
-            errors.description ? "is-invalids" : ""
+              }`}
-          }`}
+          ></textarea>
-        ></textarea>
 
-        {errors.description && (
+          {errors.description && (
-          <p className="danger-text m-0">{errors.description.message}</p>
+            <p className="danger-text m-0">{errors.description.message}</p>
-        )}
+          )}
-      </div>
+        </div>
 
-      <div className="col-12 text-end">
+        <div className="col-12 text-end mt-5">
-        <button
+          <button
-          className="btn btn-xs btn-label-secondary me-3"
+            className="btn btn-sm btn-label-secondary me-3"
-          aria-label="Close"
+            aria-label="Close"
-          disabled={isPending}
+            disabled={isPending}
-          onClick={close}
+            onClick={close}
-        >
+          >
-          Cancel
+            Cancel
-        </button>
+          </button>
-        <button
+          <button
-          type="submit"
+            type="submit"
-          className="btn btn-xs btn-primary"
+            className="btn btn-sm btn-primary"
-          disabled={isPending}
+            disabled={isPending}
-        >
+          >
-          {isPending ? "Please Wait..." : group ? "Update" : "Submit"}
+            {isPending ? "Please Wait..." : group ? "Update" : "Submit"}
-        </button>
+          </button>
+        </div>
       </div>
     </form>
   );