Merge pull request #1416 from AppQuality/develop

release-2025-08-28

Author: sinatragianpaolo

src/common/components/ServiceTiles/index.tsx

@@ -28,15 +28,15 @@ const ServiceTiles = ({ onClick, promoTemplates }: ServiceTilesProps) => {
         role="list"
         title="promo-templates"
       >
-        {promoTemplates.map((template) => {
+        {promoTemplates.map((template, i) => {
           if (!template.strapi) return null;
           const { title, price, tags, image, background, pre_title } =
             template.strapi;
           const outputs = tags.map((output) => {
             const { text, icon } = output;
             return (
               <AdditionalInfoTag
-                key={text}
+                key={text.toLowerCase().replace(/\s+/g, '_')}
                 color={appTheme.palette.grey[700]}
                 hue="#ffff"
                 isPill
@@ -53,7 +53,12 @@ const ServiceTiles = ({ onClick, promoTemplates }: ServiceTilesProps) => {
           };
 
           return (
-            <ScrollingGrid.Item key={template.id} role="listitem" title={title}>
+            <ScrollingGrid.Item
+              key={template.id}
+              role="listitem"
+              title={title}
+              data-qa={`service-tile-${i}`}
+            >
               <ServiceTile
                 title={title}
                 description={pre_title}

src/common/schema.ts

@@ -305,6 +305,9 @@ export interface paths {
       };
     };
   };
+  "/companies/sizes": {
+    get: operations["get-companies-sizes"];
+  };
   "/insights/{iid}": {
     get: operations["get-insights-iid"];
     delete: operations["delete-insights-iid"];
@@ -623,9 +626,6 @@ export interface paths {
       };
     };
   };
-  "/companies/sizes": {
-    get: operations["get-companies-sizes"];
-  };
 }
 
 export interface components {
@@ -1526,6 +1526,7 @@ export interface components {
     };
     /** User */
     User: {
+      company_size: string;
       customer_role: string;
       /** Format: email */
       email: string;
@@ -3107,6 +3108,19 @@ export interface operations {
       500: components["responses"]["Error"];
     };
   };
+  "get-companies-sizes": {
+    responses: {
+      /** OK */
+      200: {
+        content: {
+          "application/json": {
+            id: number;
+            name: string;
+          }[];
+        };
+      };
+    };
+  };
   "get-insights-iid": {
     parameters: {
       path: {
@@ -3636,6 +3650,7 @@ export interface operations {
       200: {
         content: {
           "application/json": {
+            companySize?: string;
             name?: string;
             role?: string;
             surname?: string;
@@ -3648,6 +3663,7 @@ export interface operations {
     requestBody: {
       content: {
         "application/json": {
+          companySizeId?: number;
           name?: string;
           password?: {
             current: string;
@@ -4432,19 +4448,6 @@ export interface operations {
       };
     };
   };
-  "get-companies-sizes": {
-    responses: {
-      /** OK */
-      200: {
-        content: {
-          "application/json": {
-            id: number;
-            name: string;
-          }[];
-        };
-      };
-    };
-  };
 }
 
 export interface external {}

src/features/api/index.ts

@@ -1664,12 +1664,14 @@ export type HeadUsersByEmailByEmailApiArg = {
 export type GetUsersMeApiResponse = /** status 200  */ User;
 export type GetUsersMeApiArg = void;
 export type PatchUsersMeApiResponse = /** status 200 OK */ {
+  companySize?: string;
   name?: string;
   role?: string;
   surname?: string;
 };
 export type PatchUsersMeApiArg = {
   body: {
+    companySizeId?: number;
     name?: string;
     password?: {
       current: string;
@@ -2768,6 +2770,7 @@ export type Feature = {
   slug?: string;
 };
 export type User = {
+  company_size: string;
   customer_role: string;
   email: string;
   features?: Feature[];

src/locales/en/translation.json

@@ -1136,6 +1136,7 @@
   "__PROFILE_MODAL_NOTIFICATIONS_TOGGLE_TITLE": "Allow notifications",
   "__PROFILE_MODAL_NOTIFICATIONS_UPDATED": "Changes saved",
   "__PROFILE_MODAL_PRIVACY_ITEM_LABEL": "Privacy settings",
+  "__PROFILE_PAGE_COMPANY_SIZE_REQUIRED_ERROR": "Company size is required",
   "__PROFILE_PAGE_CONFIRM_PASSWORD_MUST_MATCH_NEW_PASSWORD": "The confirmation password must match the new password",
   "__PROFILE_PAGE_NAME_REQUIRED_ERROR": "Name is required",
   "__PROFILE_PAGE_NAV_ITEM_PASSWORD": "Password settings",
@@ -1151,6 +1152,8 @@
   "__PROFILE_PAGE_TOAST_ERROR_UPDATING_PROFILE": "An error occurred while updating your profile. Please try again.",
   "__PROFILE_PAGE_TOAST_SUCCESS_PASSWORD_UPDATED": "Password updated successfully",
   "__PROFILE_PAGE_UPDATE_SUCCESS": "Profile updated successfully",
+  "__PROFILE_PAGE_USER_CARD_COMPANY_SIZE_LABEL": "Company size",
+  "__PROFILE_PAGE_USER_CARD_COMPANY_SIZE_PLACEHOLDER": "Select a Company size",
   "__PROFILE_PAGE_USER_CARD_EMAIL_LABEL": "Work email",
   "__PROFILE_PAGE_USER_CARD_LABEL": "Profile settings",
   "__PROFILE_PAGE_USER_CARD_NAME_LABEL": "First name",
@@ -1319,7 +1322,7 @@
   "_CAMPAIGN_WIDGET_UX_TEST_PROGRESS_MONITORING_HEADER": "Test Progress",
   "_CAMPAIGN_WIDGET_UX_USER_ANALYSIS_DESCRIPTION_HEADER": "There are observations on",
   "_CAMPAIGN_WIDGET_UX_USER_ANALYSIS_HEADER": "Analyzed User Contributions",
-  "_PAGE_PROFILE_HEADER_TEXT": "Keep your profile up to date: edit your name, role, or password anytime to make UNGUESS truly yours.",
+  "_PAGE_PROFILE_HEADER_TEXT": "Manage your profile anytime: check and update your personal information whenever you need.",
   "_PLAN_PAGE_MODULE_LANGUAGE_DESCRIPTION": "You’ll receive feedback in the language you’re selecting",
   "_PLAN_PAGE_MODULE_LANGUAGE_SUBTITLE": "Select participants' preferred language",
   "_PROJECT_PAGE_PLANS_GROUP_SEE_ALL": "View more",

src/locales/it/translation.json

@@ -1167,6 +1167,7 @@
   "__PROFILE_MODAL_NOTIFICATIONS_TOGGLE_TITLE": "Vuoi ricevere le notifiche?",
   "__PROFILE_MODAL_NOTIFICATIONS_UPDATED": "Modifiche salvate",
   "__PROFILE_MODAL_PRIVACY_ITEM_LABEL": "Opzioni Privacy",
+  "__PROFILE_PAGE_COMPANY_SIZE_REQUIRED_ERROR": "",
   "__PROFILE_PAGE_CONFIRM_PASSWORD_MUST_MATCH_NEW_PASSWORD": "",
   "__PROFILE_PAGE_NAME_REQUIRED_ERROR": "",
   "__PROFILE_PAGE_NAV_ITEM_PASSWORD": "",
@@ -1182,6 +1183,8 @@
   "__PROFILE_PAGE_TOAST_ERROR_UPDATING_PROFILE": "",
   "__PROFILE_PAGE_TOAST_SUCCESS_PASSWORD_UPDATED": "",
   "__PROFILE_PAGE_UPDATE_SUCCESS": "",
+  "__PROFILE_PAGE_USER_CARD_COMPANY_SIZE_LABEL": "",
+  "__PROFILE_PAGE_USER_CARD_COMPANY_SIZE_PLACEHOLDER": "",
   "__PROFILE_PAGE_USER_CARD_EMAIL_LABEL": "",
   "__PROFILE_PAGE_USER_CARD_LABEL": "",
   "__PROFILE_PAGE_USER_CARD_NAME_LABEL": "",

src/pages/Dashboard/SuggestedCampaigns.tsx

@@ -43,8 +43,11 @@ export const SuggestedCampaigns = () => {
       </Row>
       <ScrollingGrid id="suggested-campaigns-scrolling-grid">
         {!!items.plans.length &&
-          items.plans.map((plan) => (
-            <ScrollingGrid.Item key={`suggested_plan_${plan.id}`}>
+          items.plans.map((plan, i) => (
+            <ScrollingGrid.Item
+              key={`suggested_plan_${plan.id}`}
+              data-qa={`tracked-activity-${i}`}
+            >
               <PlanCard
                 status={getPlanStatus(plan, t).status}
                 i18n={{

src/pages/Dashboard/project-items/Plans.tsx

@@ -56,8 +56,15 @@ export const Plans = ({ projectId }: { projectId: number }) => {
       </Row>
       <Separator style={{ margin: `${appTheme.space.md} 0` }} />
       <Row>
-        {plans.map((plan) => (
-          <Col size={4} xs={12} md={6} lg={4}>
+        {plans.map((plan, i) => (
+          <Col
+            size={4}
+            xs={12}
+            md={6}
+            lg={4}
+            key={`project_plan_${plan.id}`}
+            data-qa={`setup-activity-${i}`}
+          >
             <PlanCard
               status={getPlanStatus(plan, t).status}
               i18n={{

src/pages/JoinPage/useJoinSubmit.tsx

@@ -15,6 +15,20 @@ export function useJoinSubmit(isInvited: boolean) {
   const { token, profile } = useParams();
   const sendGTMevent = useSendGTMevent({ loggedUser: false });
 
+  const templateParam = searchParams.get('template');
+  let templateId: number | undefined;
+
+  if (templateParam !== null) {
+    const parsed = Number(templateParam);
+    if (!Number.isInteger(parsed)) {
+      searchParams.delete('template');
+      const url = window.location.origin + window.location.pathname;
+      window.history.replaceState({}, '', url);
+      window.location.reload();
+    }
+    templateId = parsed;
+  }
+
   const onSubmit = useCallback(
     async (
       values: JoinFormValues,
@@ -28,7 +42,9 @@ export function useJoinSubmit(isInvited: boolean) {
         surname: values.surname,
         roleId: values.roleId,
         companySizeId: values.companySizeId,
+        ...(templateId !== undefined && { templateId }),
       };
+
       sendGTMevent({
         event: 'sign-up-flow',
         category: `is invited: ${isInvited}`,

src/pages/Plan/common/ModulesBottomNavigation.tsx

@@ -72,7 +72,7 @@ export const ModulesBottomNavigation = () => {
       <Button
         isBasic
         size="small"
-        data-qa={`modules-bottom-navigation-${nextTab}`}
+        data-qa={`modules-bottom-navigation-${nextTab.name}`}
         onClick={() => {
           setActiveTab(nextTab);
           if (main) {

src/pages/Profile/FormProfile.tsx

@@ -16,6 +16,7 @@ export const FormProfile = () => {
 
   const initialValues: ProfileFormValues = {
     roleId: data?.roleId || 0,
+    companySizeId: data?.companySizeId || 0,
     name: data?.name || '',
     surname: data?.surname || '',
     email: data?.email || '',
@@ -29,6 +30,9 @@ export const FormProfile = () => {
     roleId: Yup.number()
       .min(1, t('__PROFILE_PAGE_ROLE_REQUIRED_ERROR'))
       .required(t('__PROFILE_PAGE_ROLE_REQUIRED_ERROR')),
+    companySizeId: Yup.number()
+      .min(1, t('__PROFILE_PAGE_COMPANY_SIZE_REQUIRED_ERROR'))
+      .required(t('__PROFILE_PAGE_COMPANY_SIZE_REQUIRED_ERROR')),
   });
 
   return (
@@ -45,6 +49,7 @@ export const FormProfile = () => {
             name: values.name,
             surname: values.surname,
             roleId: values.roleId,
+            companySizeId: values.companySizeId,
           },
         })
           .unwrap()