From 69c225ac7216c68040780f07bf9ac0fedbd30e61 Mon Sep 17 00:00:00 2001
From: Kartik Sharma <kartik.sharma@marcoaiot.com>
Date: Thu, 25 Sep 2025 16:09:36 +0530
Subject: [PATCH] Adding Services dropdown in Organization Creation dropdown.

---
 src/components/Tenant/OrganizationInfo.jsx | 19 +++++++++++++++++++
 src/components/Tenant/TenantSchema.js      |  2 ++
 2 files changed, 21 insertions(+)

diff --git a/src/components/Tenant/OrganizationInfo.jsx b/src/components/Tenant/OrganizationInfo.jsx
index d1ae223a..a34c602f 100644
--- a/src/components/Tenant/OrganizationInfo.jsx
+++ b/src/components/Tenant/OrganizationInfo.jsx
@@ -6,11 +6,14 @@ import { useCreateTenant, useIndustries } from "../../hooks/useTenant";
 import { LogoUpload } from "./LogoUpload";
 import { orgSize, reference } from "../../utils/constants";
 import moment from "moment";
+import { useGlobalServices } from "../../hooks/masterHook/useMaster";
+import SelectMultiple from "../common/SelectMultiple";
 
 const OrganizationInfo = ({ onNext, onPrev, onSubmitTenant }) => {
   const { data, isError, isLoading: industryLoading } = useIndustries();
   const [logoPreview, setLogoPreview] = useState(null);
   const [logoName, setLogoName] = useState("");
+  const { data: services, isLoading: serviceLoading } = useGlobalServices();
   const {
     register,
     control,
@@ -42,6 +45,7 @@ const OrganizationInfo = ({ onNext, onPrev, onSubmitTenant }) => {
       "industryId",
       "reference",
       "logoImage",
+      "serviceIds",
     ]);
 
     if (valid) {
@@ -198,6 +202,21 @@ const OrganizationInfo = ({ onNext, onPrev, onSubmitTenant }) => {
         )}
       </div>
 
+      <div className="col-sm-6">
+        <SelectMultiple
+          required
+          name="serviceIds"
+          label="Services"
+          options={services?.data}
+          isLoading={serviceLoading}
+          labelKey="name"
+          valueKey="id"
+        />
+        {errors.serviceIds && (
+          <div className="danger-text">{errors.serviceIds.message}</div>
+        )}
+      </div>
+
 
       <div className="col-sm-12">
         <Label htmlFor="description">Description</Label>
diff --git a/src/components/Tenant/TenantSchema.js b/src/components/Tenant/TenantSchema.js
index a9be211c..846200d7 100644
--- a/src/components/Tenant/TenantSchema.js
+++ b/src/components/Tenant/TenantSchema.js
@@ -33,6 +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"),
 });
 
 export const tenantDefaultValues = {
@@ -51,6 +52,7 @@ export const tenantDefaultValues = {
   organizationSize: "",
   industryId: "", // should be a valid UUID if pre-filled
   reference: "",
+  serviceIds:[]
 };