Merge pull request #328 from sharique827/release-staging

feat: added local date time in stage environment

Author: mofahsan

frontend/src/components/ui/forms/config-form/config-form.tsx

@@ -73,7 +73,8 @@ export interface FormFieldConfigType {
         | "search_discover_product_fis13"
         | "trv11_210_select"
         | "trv11_210_update_end_station"
-        | "trv11_210_start_end_stop_selection";
+        | "trv11_210_start_end_stop_selection"
+        | "datetime-local";
     payloadField: string;
     values?: string[];
     defaultValue?: string;
@@ -107,12 +108,21 @@ export default function FormConfig({
         const formatedData: Record<string, string | number> = {};
         const formData: Record<string, string> = data;
         for (const key in data) {
-            const payloadField = formConfig.find((field) => field.name === key)?.payloadField;
+            const fieldConfig = formConfig.find((field) => field.name === key);
+            const payloadField = fieldConfig?.payloadField;
             if (payloadField) {
-                // Convert to integer if the payloadField contains 'count' or 'quantity'
                 if (payloadField.includes("count") || payloadField.includes("quantity")) {
                     formatedData[payloadField] = parseInt(data[key], 10) || 0;
                 }
+                // Convert datetime-local and date values to ISO 8601 format
+                else if (fieldConfig?.type === "datetime-local" || fieldConfig?.type === "date") {
+                    const dateValue = data[key];
+                    if (dateValue) {
+                        formatedData[payloadField] = new Date(dateValue).toISOString();
+                    } else {
+                        formatedData[payloadField] = dateValue;
+                    }
+                }
                 // Convert date to ISO 8601 format if payloadField contains 'timestamp' or 'time'
                 else if (payloadField.includes("timestamp") || payloadField.includes("time.")) {
                     const dateValue = data[key];
@@ -342,6 +352,16 @@ export default function FormConfig({
                                 // key={field.payloadField}
                             />
                         );
+                    case "datetime-local":
+                        return (
+                            <FormInput
+                                name={field.name}
+                                label={field.label}
+                                required={field.required !== false}
+                                type="datetime-local"
+                                // key={field.payloadField}
+                            />
+                        );
                     case "select":
                         return (
                             <FormSelect

frontend/src/components/ui/forms/custom-forms/trv-select.tsx

@@ -21,8 +21,19 @@ const FLOWS_WITH_ADD_ITEM_BUTTON: string[] = [
 
 type CatalogAddOn = { id: string };
 type CatalogItem = { id: string; parent_item_id?: string; add_ons?: CatalogAddOn[] };
-type CatalogFulfillment = { id: string };
-type CatalogProvider = { id: string; fulfillments: CatalogFulfillment[]; items?: CatalogItem[] };
+type CatalogFulfillmentStop = {
+    type: string;
+    instructions?: Record<string, unknown>;
+    time?: Record<string, unknown>;
+};
+type CatalogFulfillment = {
+    id: string;
+    type?: string;
+    stops?: CatalogFulfillmentStop[];
+    agent?: Record<string, unknown>;
+    vehicle?: Record<string, unknown>;
+};
+type CatalogProvider = { id: string; items?: CatalogItem[]; fulfillments?: CatalogFulfillment[] };
 type OnSearchPayload = { message?: { catalog?: { providers?: CatalogProvider[] } } };
 
 type FormItem = {
@@ -35,8 +46,8 @@ type FormItem = {
 
 type FormValues = {
     provider: string;
-    fulfillment?: string;
     items: FormItem[];
+    fulfillmentId: string;
 };
 
 export default function TRVSelect({
@@ -53,6 +64,7 @@ export default function TRVSelect({
         defaultValues: {
             provider: "",
             items: [{ itemId: "", count: 1, addOns: [], addOnsQuantity: 1 }],
+            fulfillmentId: "",
         },
     });
 
@@ -63,9 +75,26 @@ export default function TRVSelect({
 
     const selectedItems = watch("items");
     const [itemOptions, setItemOptions] = useState<ExtractedItem[]>([]);
+    const [fulfillmentOptions, setFulfillmentOptions] = useState<CatalogFulfillment[]>([]);
 
     const onSubmit = async (data: FormValues) => {
-        await submitEvent({ jsonPath: {}, formData: data as unknown as Record<string, string> });
+        const selectedFulfillment = fulfillmentOptions.find((f) => f.id === data.fulfillmentId);
+        const output = {
+            provider: data.provider,
+            items: data.items,
+            fulfillments: selectedFulfillment
+                ? [
+                      {
+                          id: selectedFulfillment.id,
+                          stops: (selectedFulfillment.stops || []).map((stop) => ({
+                              type: stop.type,
+                              time: stop.time,
+                          })),
+                      },
+                  ]
+                : [],
+        };
+        await submitEvent({ jsonPath: {}, formData: output as unknown as Record<string, string> });
     };
 
     const handlePaste = (payload: unknown) => {
@@ -77,15 +106,16 @@ export default function TRVSelect({
             const providers = parsed.message.catalog.providers;
 
             const results: ExtractedItem[] = [];
+            const allFulfillments: CatalogFulfillment[] = [];
 
             providers.forEach((provider: CatalogProvider) => {
                 const providerId = provider.id;
-                const fulfillmentId = provider.fulfillments[0]!.id;
-                if (!fulfillmentId) return;
 
-                if (!provider.items) return;
+                if (provider.fulfillments) {
+                    allFulfillments.push(...provider.fulfillments);
+                }
 
-                setValue("fulfillment", provider.fulfillments[0]!.id);
+                if (!provider.items) return;
 
                 provider.items.forEach((item: CatalogItem) => {
                     if (item.parent_item_id) {
@@ -100,6 +130,7 @@ export default function TRVSelect({
             });
 
             setItemOptions(results);
+            setFulfillmentOptions(allFulfillments);
         } catch (err) {
             setErrorWhilePaste("Invalid payload structure.");
             toast.error("Invalid payload structure. Please check the pasted data.");
@@ -281,6 +312,31 @@ export default function TRVSelect({
                     )}
                 </div>
 
+                {/* Fulfillment Selection */}
+                <div className="border p-3 rounded space-y-2">
+                    <div className={fieldWrapperStyle}>
+                        <label className={labelStyle}>Select Fulfillment</label>
+                        {fulfillmentOptions.length === 0 ? (
+                            <input
+                                type="text"
+                                {...register("fulfillmentId")}
+                                placeholder="Fulfillment ID"
+                                className={inputStyle}
+                            />
+                        ) : (
+                            <select {...register("fulfillmentId")} className={inputStyle}>
+                                <option value="">Select Fulfillment...</option>
+                                {fulfillmentOptions.map((f) => (
+                                    <option key={f.id} value={f.id}>
+                                        {f.id}
+                                        {f.type ? ` (${f.type})` : ""}
+                                    </option>
+                                ))}
+                            </select>
+                        )}
+                    </div>
+                </div>
+
                 <button
                     type="submit"
                     className="w-full bg-green-600 text-white py-2 rounded hover:bg-green-700"
@@ -291,55 +347,3 @@ export default function TRVSelect({
         </div>
     );
 }
-
-// type FormData = {
-//   provider: string;
-//   provider_location: string[];
-//   location_gps: string;
-//   location_pin_code: string;
-//   items: {
-//     itemId: string;
-//     quantity: number;
-//     location: string;
-//   }[];
-//   [key: string]: any; // to allow dynamic offer keys like offers_FLAT50
-// };
-
-// function validateFormData(data: FormData): {
-//   valid: boolean;
-//   errors: string[];
-// } {
-//   const errors: string[] = [];
-
-//   for (const key in data) {
-//     if (data[key] === undefined || data[key] === null || data[key] === "") {
-//       errors.push(`Field ${key} cannot be empty.`);
-//     }
-//   }
-
-//   // Rule 1: At least 2 items
-//   if (!data.items || data.items.length < 2) {
-//     errors.push("At least 2 items must be selected.");
-//   }
-
-//   // Rule 2: All items must be unique
-//   const itemIds = data.items.map((item) => item.itemId);
-//   const uniqueItemIds = new Set(itemIds);
-//   if (itemIds.length !== uniqueItemIds.size) {
-//     errors.push("All selected items must be unique.");
-//   }
-
-//   // Rule 3: Only one offer can be selected (non-falsy)
-//   const offerKeys = Object.keys(data).filter((key) =>
-//     key.startsWith("offers_")
-//   );
-//   const selectedOffers = offerKeys.filter((key) => Boolean(data[key]));
-//   if (selectedOffers.length > 1) {
-//     errors.push("Only one offer can be selected.");
-//   }
-
-//   return {
-//     valid: errors.length === 0,
-//     errors,
-//   };
-// }