Merge branch 'malj/2334' into staging

equinor · Jul 15, 2024 · 72bf1b5 · 72bf1b5
2 parents 2190cb8 + efe7c23
commit 72bf1b5
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 12 deletions.
diff --git a/sanityv3/schemas/textSnippets.ts b/sanityv3/schemas/textSnippets.ts
@@ -15,6 +15,16 @@ export const groups = {
   others: { title: 'Others' },
 }
 const snippets: textSnippet = {
+  country_code_format: {
+    title: 'e.g. +47',
+    defaultValue: 'e.g. +47',
+    group: groups.form,
+  },
+  all_fields_mandatory: {
+    title: 'All fields with * are mandatory',
+    defaultValue: 'All fields with * are mandatory',
+    group: groups.form,
+  },
   loading: {
     title: 'Loading',
     defaultValue: 'Loading...',
@@ -189,7 +199,7 @@ const snippets: textSnippet = {
   },
   contact_form_name: {
     title: 'Name',
-    defaultValue: 'Name',
+    defaultValue: 'Name *',
     group: groups.contactForm,
   },
   contact_form_name_placeholder: {
@@ -199,7 +209,7 @@ const snippets: textSnippet = {
   },
   contact_form_email: {
     title: 'Email',
-    defaultValue: 'Email',
+    defaultValue: 'Email *',
     group: groups.contactForm,
   },
   contact_form_name_validation: {
@@ -471,7 +481,7 @@ const snippets: textSnippet = {
   },
   careers_contact_form_name: {
     title: 'Name',
-    defaultValue: 'Your Name',
+    defaultValue: 'Your Name *',
     group: groups.careerContactForm,
   },
 

diff --git a/web/pageComponents/topicPages/Form/CareerFairForm.tsx b/web/pageComponents/topicPages/Form/CareerFairForm.tsx
@@ -170,10 +170,23 @@ const CareerFairForm = () => {
                 <FormTextField
                   {...props}
                   id={props.name}
-                  label={intl.formatMessage({
-                    id: ' career_fair_form_phone',
-                    defaultMessage: 'Phone Number',
-                  })}
+                  label={
+                    <>
+                      <span>
+                        {intl.formatMessage({
+                          id: ' career_fair_form_phone',
+                          defaultMessage: 'Phone Number',
+                        })}
+                      </span>
+                      <br />
+                      <span className="text-xs">
+                        {intl.formatMessage({
+                          id: 'country_code_format',
+                          defaultMessage: 'e.g. +47',
+                        })}
+                      </span>
+                    </>
+                  }
                   inputRef={ref}
                   inputIcon={invalid ? <Icon data={error_filled} title="error" /> : undefined}
                   helperText={error?.message}
@@ -306,6 +319,9 @@ const CareerFairForm = () => {
                 />
               )}
             />
+            <div className="pb-4 text-xs italic">
+              <FormattedMessage id="all_fields_mandatory" defaultMessage="All fields with *  are mandatory" />
+            </div>
             <StyledCheckBox
               label={intl.formatMessage({
                 id: 'career_fair_form_supporting_documents',

diff --git a/web/pageComponents/topicPages/Form/ContactEquinorForm.tsx b/web/pageComponents/topicPages/Form/ContactEquinorForm.tsx
@@ -256,7 +256,9 @@ const ContactEquinorForm = (props: ContactEquinorFormProps) => {
                 )
               }}
             />
-
+            <div className="pb-4 text-xs italic">
+              <FormattedMessage id="all_fields_mandatory" defaultMessage="All fields with *  are mandatory" />
+            </div>
             <FriendlyCaptcha
               doneCallback={() => {
                 setSubmitButtonEnabled(true)

diff --git a/web/pageComponents/topicPages/Form/OrderReportsForm.tsx b/web/pageComponents/topicPages/Form/OrderReportsForm.tsx
@@ -356,6 +356,9 @@ const OrderReportsForm = () => {
               />
             )}
           />
+          <div className="pb-4 text-xs italic">
+            <FormattedMessage id="all_fields_mandatory" defaultMessage="All fields with *  are mandatory" />
+          </div>
           <FriendlyCaptcha
             doneCallback={() => {
               setSubmitButtonEnabled(true)

diff --git a/web/pageComponents/topicPages/Form/SubscribeForm.tsx b/web/pageComponents/topicPages/Form/SubscribeForm.tsx
@@ -251,6 +251,9 @@ const SubscribeForm = () => {
               />
             )}
           />
+          <div className="pb-4 text-xs italic">
+            <FormattedMessage id="all_fields_mandatory" defaultMessage="All fields with *  are mandatory" />
+          </div>
           <FriendlyCaptcha
             doneCallback={() => {
               setSubmitButtonEnabled(true)

diff --git a/web/pageComponents/topicPages/Form/careersContactForm/CareersContactForm.tsx b/web/pageComponents/topicPages/Form/careersContactForm/CareersContactForm.tsx
@@ -141,10 +141,23 @@ const CareersContactForm = () => {
                 <FormTextField
                   {...props}
                   id={props.name}
-                  label={intl.formatMessage({
-                    id: 'careers_contact_form_phone',
-                    defaultMessage: 'Phone Number',
-                  })}
+                  label={
+                    <>
+                      <span>
+                        {intl.formatMessage({
+                          id: 'careers_contact_form_phone',
+                          defaultMessage: 'Phone Number',
+                        })}
+                      </span>
+                      <br />
+                      <span className="text-xs">
+                        {intl.formatMessage({
+                          id: 'country_code_format',
+                          defaultMessage: 'e.g. +47',
+                        })}
+                      </span>
+                    </>
+                  }
                   placeholder={intl.formatMessage({
                     id: 'careers_contact_form_phone_placeholder',
                     defaultMessage: 'Country code and phone number',
@@ -347,6 +360,9 @@ const CareersContactForm = () => {
                 />
               )}
             />
+            <div className="pb-4 text-xs italic">
+              <FormattedMessage id="all_fields_mandatory" defaultMessage="All fields with *  are mandatory" />
+            </div>
             <StyledCheckBox
               label={intl.formatMessage({
                 id: 'career_fair_form_supporting_documents',