Merge pull request #2283 from frappe/develop

 chore(release): dev to main

Author: RitvikSardana

desk/package.json

@@ -26,7 +26,6 @@
     "lodash": "^4.17.21",
     "lucide-static": "^0.276.0",
     "mime": "^3.0.0",
-    "mitt": "^3.0.1",
     "pinia": "^2.0.33",
     "pluralize": "^8.0.0",
     "sanitize-html": "^2.10.0",

desk/src/components/EmptyMessage.vue

@@ -10,6 +10,12 @@
           >
             <span class="mb-2 block text-sm leading-4 text-gray-700">
               {{ field.label }}
+              <span
+                v-if="field.required"
+                class="place-self-center text-red-500"
+              >
+                *
+              </span>
             </span>
             <Input
               v-if="field.type === 'input'"
@@ -21,7 +27,6 @@
               v-else
               v-model="state[field.value]"
               :options="customerResource.data"
-              :value="state[field.value]"
               @update:model-value="handleCustomerChange"
             />
             <ErrorMessage :message="error[field.error]" />
@@ -76,7 +81,7 @@ const state = ref({
   firstName: "",
   lastName: "",
   phone: "",
-  selectedCustomer: "",
+  selectedCustomer: null,
 });
 
 const error = ref({
@@ -92,6 +97,7 @@ interface FormField {
   value: string;
   error: string;
   type: string;
+  required: boolean;
   action?: () => void;
 }
 
@@ -101,34 +107,38 @@ const formFields: FormField[] = [
     value: "emailID",
     error: "emailValidationError",
     type: "input",
+    required: true,
     action: () => validateEmailInput(state.value.emailID),
   },
   {
     label: "First Name",
     value: "firstName",
     error: "firstNameValidationError",
     type: "input",
+    required: true,
     action: () => validateFirstName(state.value.firstName),
   },
   {
     label: "Last Name",
     value: "lastName",
     error: "lastNameValidationError",
     type: "input",
+    required: false,
   },
   {
     label: "Phone",
     value: "phone",
     error: "phoneValidationError",
     type: "input",
+    required: false,
     action: () => validatePhone(state.value.phone),
   },
   {
     label: "Customer",
     value: "selectedCustomer",
     error: "customerValidationError",
     type: "autocomplete",
-    action: () => validateCustomer(state.value.selectedCustomer),
+    required: false,
   },
 ];
 
@@ -165,7 +175,7 @@ const contactResource = createResource({
       firstName: "",
       lastName: "",
       phone: "",
-      selectedCustomer: "",
+      selectedCustomer: null,
     };
     createToast({
       title: "Contact Created Successfully ",
@@ -184,31 +194,34 @@ function createContact() {
     first_name: state.value.firstName,
     last_name: state.value.lastName,
     email_ids: [{ email_id: state.value.emailID, is_primary: true }],
-    links: [
-      {
-        link_doctype: "HD Customer",
-        link_name: state.value.selectedCustomer,
-      },
-    ],
+    links: [],
     phone_nos: [],
   };
   if (state.value.phone) {
     doc.phone_nos = [{ phone: state.value.phone }];
   }
+  if (state.value.selectedCustomer) {
+    doc.links.push({
+      link_doctype: "HD Customer",
+      link_name: state.value.selectedCustomer,
+    });
+  }
 
   contactResource.submit({ doc });
 }
 
-function handleCustomerChange(item: AutoCompleteItem) {
-  if (!item) return;
-  state.value.selectedCustomer = item.value;
+function handleCustomerChange(item: AutoCompleteItem | null) {
+  if (!item || item.label === "No label") {
+    state.value.selectedCustomer = null;
+  } else {
+    state.value.selectedCustomer = item.value;
+  }
 }
 
 function validateInputs() {
   let error = validateEmailInput(state.value.emailID);
   error += validateFirstName(state.value.firstName);
   error += validatePhone(state.value.phone);
-  error += validateCustomer(state.value.selectedCustomer);
   return error;
 }
 
@@ -243,14 +256,6 @@ function validatePhone(value: string) {
   return error.value.phoneValidationError;
 }
 
-function validateCustomer(value: string) {
-  error.value.customerValidationError = "";
-  if (!value || value.trim() === "") {
-    error.value.customerValidationError = "Customer should not be empty";
-  }
-  return error.value.customerValidationError;
-}
-
 function existingContactEmails(contacts) {
   return contacts.map((contact) => contact.email_id);
 }

desk/src/components/desk/global/NewContactDialog.vue

@@ -1,19 +1,21 @@
 import { Field } from "@/types";
 
-export function setupCustomizations(data, obj) {
+export async function setupCustomizations(doc, obj) {
+  let data = doc?.data;
+  if (!data) return;
   if (!data._form_script) return [];
   let actions = [];
   let onChangeFieldMap = {};
   if (Array.isArray(data._form_script)) {
-    data._form_script.forEach((script) => {
-      const parsed = parseScript(script, obj);
+    for (const script of data._form_script) {
+      const parsed = await parseScript(script, obj);
       actions = actions.concat(parsed.actions);
       if (parsed.onChange) {
         parseOnChangeFn(onChangeFieldMap, parsed.onChange);
       }
-    });
+    }
   } else {
-    const parsed = parseScript(data._form_script, obj);
+    const parsed = await parseScript(data._form_script, obj);
     actions = parsed.actions;
     if (parsed.onChange) {
       parseOnChangeFn(onChangeFieldMap, parsed.onChange);
@@ -34,9 +36,9 @@ function parseOnChangeFn(fieldMap: object, currentField: object) {
   }
 }
 
-function parseScript(script, obj) {
+async function parseScript(script, obj) {
   const scriptFn = new Function(script + "\nreturn setupForm")();
-  const formScript = scriptFn(obj);
+  const formScript = await scriptFn(obj);
   return {
     actions: formScript?.actions || [],
     onChange: formScript?.onChange || null,