Update PartnerProfileForm to use optional chaining for URL checks and enhance URL regex for better flexibility

Author: Odzen

frontend/src/components/PartnerProfileForm.js

@@ -141,7 +141,7 @@ function PartnerProfileForm({
           <Input />
         </Form.Item>
       )}
-      {(!hub_user || !hub_user.url.includes("AUAF")) && (
+      {(!hub_user || !hub_user.url?.includes("AUAF")) && (
         <Form.Item
           label={t("partnerProfile.organizationName")}
           name="organization"
@@ -195,7 +195,7 @@ function PartnerProfileForm({
           </Form.Item>
         </div>
       ) : null}
-      {hub_user && hub_user.url.includes("AUAF") && (
+      {hub_user && hub_user.url?.includes("AUAF") && (
         <Form.Item
           label={t("partnerProfile.title")}
           name="title"
@@ -210,7 +210,7 @@ function PartnerProfileForm({
           <Input />
         </Form.Item>
       )}
-      {(!hub_user || !hub_user.url.includes("AUAF")) && (
+      {(!hub_user || !hub_user.url?.includes("AUAF")) && (
         <Form.Item
           label={t("partnerProfile.location")}
           name="location"
@@ -227,7 +227,7 @@ function PartnerProfileForm({
       )}
       <Form.Item
         label={
-          hub_user && hub_user.url.includes("AUAF")
+          hub_user && hub_user.url?.includes("AUAF")
             ? t("partnerProfile.AUAFcontactFullName")
             : t("partnerProfile.contactFullName")
         }
@@ -241,7 +241,7 @@ function PartnerProfileForm({
       >
         <Input />
       </Form.Item>
-      {(!hub_user || !hub_user.url.includes("AUAF")) && (
+      {(!hub_user || !hub_user.url?.includes("AUAF")) && (
         <Form.Item
           label={t("partnerProfile.regionsWork")}
           name="regions"
@@ -257,7 +257,7 @@ function PartnerProfileForm({
       )}
       <Form.Item
         label={
-          hub_user && hub_user.url.includes("AUAF")
+          hub_user && hub_user.url?.includes("AUAF")
             ? t("partnerProfile.AUAFbriefIntro")
             : t("partnerProfile.briefIntro")
         }
@@ -271,7 +271,7 @@ function PartnerProfileForm({
       >
         <Input.TextArea rows={3} />
       </Form.Item>
-      {!hub_user || !hub_user.url.includes("AUAF") ? (
+      {!hub_user || !hub_user.url?.includes("AUAF") ? (
         <div className={styles.formGroup}>
           <Form.Item
             className={styles.formGroupItem}
@@ -340,10 +340,10 @@ function PartnerProfileForm({
       >
         <Select mode="multiple" options={getSDGs(t)} />
       </Form.Item>
-      {(!hub_user || !hub_user.url.includes("AUAF")) && (
+      {(!hub_user || !hub_user.url?.includes("AUAF")) && (
         <Form.Item
           label={
-            hub_user && hub_user.url === "GSRFoundation"
+            hub_user && hub_user.url?.includes("GSRFoundation")
               ? t("partnerProfile.projectNames_GSR")
               : t("partnerProfile.projectNames")
           }
@@ -353,12 +353,12 @@ function PartnerProfileForm({
         </Form.Item>
       )}
 
-      {hub_user && hub_user.url === "GSRFoundation" && (
+      {hub_user && hub_user.url?.includes("GSRFoundation") && (
         <Form.Item label={t("partnerProfile.success_GSR")} name="success">
           <Input.TextArea rows={3} />
         </Form.Item>
       )}
-      {(!hub_user || !hub_user.url.includes("AUAF")) && (
+      {(!hub_user || !hub_user.url?.includes("AUAF")) && (
         <div className={styles.formGroup}>
           <Form.Item
             label={t("partnerProfile.collaborationGrants")}

frontend/src/utils/misc.js

@@ -16,8 +16,13 @@ export const validateEmail = (email) => {
   return re.test(String(email).toLowerCase());
 };
 
+// More flexible URL regex that accepts:
+// - URLs with or without protocol (http/https)
+// - URLs starting with www.
+// - Domain names without protocol or www (e.g., example.com)
+// - LinkedIn URLs with special characters
 export const urlRegex =
-  /^(?:(?:(?:https?|ftp):)?\/\/)(?:\S+(?::\S*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})))(?::\d{2,5})?(?:[/?#]\S*)?$/i;
+  /^(?:(?:(?:https?|ftp):)?\/\/)?(?:www\.)?(?:\S+(?::\S*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})))(?::\d{2,5})?(?:[/?#]\S*)?$/i;
 
 export const validateUrl = (value) => {
   return urlRegex.test(value);