Merge branch 'develop' into UN-1556

Author: iacopolea

package.json

@@ -5,7 +5,7 @@
   "dependencies": {
     "@analytics/google-tag-manager": "^0.6.0",
     "@appquality/languages": "1.4.3",
-    "@appquality/unguess-design-system": "4.0.49",
+    "@appquality/unguess-design-system": "4.0.50--canary.549.d20012e.0",
     "@atlaskit/pragmatic-drag-and-drop": "^1.7.4",
     "@atlaskit/pragmatic-drag-and-drop-flourish": "^2.0.3",
     "@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.1.0",

src/analytics.ts

@@ -15,7 +15,7 @@ const analytics = Analytics({
         }),
       }),
       userpilot({
-        token: isDev() ? 'STG-NX-54e88e10' : 'NX-54e88e10',
+        token: 'NX-54e88e10',
       }),
     ],
   }),

src/assets/icons/dashboard_customize.svg

@@ -19,6 +19,7 @@ export const Track = ({
   const { data: userData, isLoading, isSuccess } = useGetUsersMeQuery();
   const { activeWorkspace } = useActiveWorkspace();
   const { track, identify, page } = useAnalytics();
+  const utmSource = sessionStorage.getItem('utmSource');
   const location = useLocation();
 
   const defaultMeta = [
@@ -63,6 +64,7 @@ export const Track = ({
         email: userData.email,
         company: activeWorkspace.company,
         workspace: activeWorkspace,
+        ...((utmSource && { utm_source: utmSource }) || {}),
       });
 
       track(

src/common/Track.tsx

@@ -1,5 +1,6 @@
 import { User } from 'src/features/api';
 import { Userpilot } from 'userpilot';
+import { isDev } from '../isDevEnvironment';
 
 declare global {
   interface Window {
@@ -28,7 +29,14 @@ export default function userpilotPlugin(pluginSettings: UserpilotConfig) {
     name: 'userpilot',
     config: { ...pluginSettings },
     initialize: ({ config }: { config: UserpilotConfig }) => {
-      Userpilot.initialize(config.token);
+      if (isDev()) {
+        const previewEnabled = localStorage.getItem('userpilot_ug_preview');
+        if (previewEnabled !== null) {
+          Userpilot.initialize(config.token);
+        }
+      } else {
+        Userpilot.initialize(config.token);
+      }
     },
     identify: ({ payload }: { payload: IIdentifyPayload }) => {
       const { userId, traits } = payload;
@@ -56,6 +64,6 @@ export default function userpilotPlugin(pluginSettings: UserpilotConfig) {
       Userpilot.track(event, { ...properties, userId });
     },
 
-    loaded: () => !!window.userpilot,
+    loaded: () => true,
   };
 }

src/common/analytics-plugins/userpilot.ts

@@ -6,19 +6,7 @@ import {
   useGetCampaignsByCidQuery,
 } from 'src/features/api';
 import { useActiveWorkspace } from 'src/hooks/useActiveWorkspace';
-
-export type PlanComposedStatusType =
-  | 'UnquotedDraft'
-  | 'PrequotedDraft'
-  | 'PurchasableDraft'
-  | 'Submitted'
-  | 'OpsCheck'
-  | 'AwaitingApproval'
-  | 'Accepted'
-  | 'RunningPlan'
-  | 'AwaitingPayment'
-  | 'Paying'
-  | 'PurchasedPlan';
+import { PlanComposedStatusType } from 'src/types';
 
 const usePlan = (planId?: string) => {
   const { activeWorkspace } = useActiveWorkspace();
@@ -119,7 +107,7 @@ const usePlan = (planId?: string) => {
       default:
         throw new Error(`Unknown plan status for plan: ${plan.id}`);
     }
-  }, [plan, ci]);
+  }, [plan, ci, planCampaign, planTemplate]);
 
   if (!plan) {
     return {

src/pages/Plan/hooks/usePlan.ts renamed to src/hooks/usePlan.ts

@@ -0,0 +1,28 @@
+import { useTranslation } from 'react-i18next';
+import { PlanComposedStatusType } from 'src/types';
+
+export const usePlanStatusLabel = ({
+  planStatus,
+}: {
+  planStatus?: PlanComposedStatusType;
+}): string => {
+  const { t } = useTranslation();
+  if (!planStatus) {
+    return '';
+  }
+  const statusMap: Record<PlanComposedStatusType, string> = {
+    UnquotedDraft: t('___PLAN_STATUS_UNQUOTED_DRAFT'),
+    PrequotedDraft: t('___PLAN_STATUS_PREQUOTED_DRAFT'),
+    PurchasableDraft: t('___PLAN_STATUS_PURCHASABLE_DRAFT'),
+    Submitted: t('___PLAN_STATUS_SUBMITTED'),
+    OpsCheck: t('___PLAN_STATUS_OPS_CHECK'),
+    AwaitingApproval: t('___PLAN_STATUS_AWAITING_APPROVAL'),
+    Accepted: t('___PLAN_STATUS_ACCEPTED'),
+    RunningPlan: t('___PLAN_STATUS_RUNNING_PLAN'),
+    AwaitingPayment: t('___PLAN_STATUS_AWAITING_PAYMENT'),
+    Paying: t('___PLAN_STATUS_PAYING'),
+    PurchasedPlan: t('___PLAN_STATUS_PURCHASED_PLAN'),
+  };
+
+  return statusMap[`${planStatus}`];
+};

src/hooks/usePlanStatusLabel.ts

@@ -1,4 +1,15 @@
 {
+  "___PLAN_STATUS_ACCEPTED": "Accepted",
+  "___PLAN_STATUS_AWAITING_APPROVAL": "Waiting for you",
+  "___PLAN_STATUS_AWAITING_PAYMENT": "Waiting for you",
+  "___PLAN_STATUS_OPS_CHECK": "Under review",
+  "___PLAN_STATUS_PAYING": "Ongoing Payment",
+  "___PLAN_STATUS_PREQUOTED_DRAFT": "Draft",
+  "___PLAN_STATUS_PURCHASABLE_DRAFT": "Draft",
+  "___PLAN_STATUS_PURCHASED_PLAN": "Accepted",
+  "___PLAN_STATUS_RUNNING_PLAN": "Running",
+  "___PLAN_STATUS_SUBMITTED": "Under review",
+  "___PLAN_STATUS_UNQUOTED_DRAFT": "Draft",
   "__404_PAGE_BUTTON": "Back to home",
   "__404_PAGE_DESCRIPTION": "Let’s find a better place for you to go.",
   "__404_PAGE_SUB_TITLE MAX:80": "This page could have been removed or it’s unavailable.",
@@ -765,6 +776,7 @@
   "__PLAN_INSTRUCTION_NOTE_SIZE_ERROR_EMPTY": "Required field: enter a text to continue",
   "__PLAN_MISSING_MODULES_ERROR": "Some items are missing",
   "__PLAN_OUT_OF_SCOPE_SIZE_ERROR_TOO_LONG": "Character limit exceeded: Please reduce your text to 512 characters",
+  "__PLAN_PAGE_ADD_CUSTOM_FEATURE_BUTTON": "Add custom features",
   "__PLAN_PAGE_ADD_MODULE_BLOCK_BUTTON": "Add item",
   "__PLAN_PAGE_ADD_MODULE_BLOCK_MODAL_SUBTITLE": "Provide the necessary details to describe this activity",
   "__PLAN_PAGE_ADD_MODULE_BLOCK_MODAL_TITLE": "Available informations",
@@ -783,6 +795,8 @@
   "__PLAN_PAGE_DRAFT_ACTIVITY_INFO_STARTING_PRICE_INFO": "*Adding features may require a custom quote",
   "__PLAN_PAGE_DRAFT_ACTIVITY_INFO_TEMPLATE_TYPE": "STANDARD PACKAGE",
   "__PLAN_PAGE_DRAFT_ACTIVITY_INFO_TITLE": "Activity Info",
+  "__PLAN_PAGE_EXPERT_REVIEW_TOOLTIP_CONTENT": "Custom features require expert review (2 days) and personalized pricing. You can always return to the standard setup.",
+  "__PLAN_PAGE_EXPERT_REVIEW_WARNING": "Requires expert review",
   "__PLAN_PAGE_GROUP_TITLE_ACTIVITY_SCOPE": "Activity Scope",
   "__PLAN_PAGE_GROUP_TITLE_ADDITIONAL_DETAILS": "Additional Details",
   "__PLAN_PAGE_GROUP_TITLE_ADVANCED_CRITERIA": "Other",
@@ -847,7 +861,7 @@
   "__PLAN_PAGE_MODULE_BANK_REMOVE_TOOLTIP_BUTTON": "Delete",
   "__PLAN_PAGE_MODULE_BANK_TITLE": "Select participant banking providers",
   "__PLAN_PAGE_MODULE_BROWSER_ALL_LABEL": "All browsers",
-  "__PLAN_PAGE_MODULE_BROWSER_ALL_LABEL_HINT": "Users equally divided by browser",
+  "__PLAN_PAGE_MODULE_BROWSER_ALL_LABEL_HINT": "Participants equally divided by browser",
   "__PLAN_PAGE_MODULE_BROWSER_LABEL": "Browser selection",
   "__PLAN_PAGE_MODULE_BROWSER_REMOVE_TOOLTIP_BUTTON": "Delete",
   "__PLAN_PAGE_MODULE_BROWSER_TITLE": "Choose the browser you want to include in the activity",
@@ -964,6 +978,7 @@
   "__PLAN_PAGE_MODULE_SETUP_NOTE_DESCRIPTION_EDITOR_PLACEHOLDER": "In this section, you can set up the manual to guide testers during the activity.",
   "__PLAN_PAGE_MODULE_SETUP_NOTE_REMOVE_TOOLTIP_BUTTON": "Delete",
   "__PLAN_PAGE_MODULE_SETUP_NOTE_TITLE": "Before starting",
+  "__PLAN_PAGE_MODULE_TARGET_ALERT": "Custom participant numbers require expert review and may increase pricing",
   "__PLAN_PAGE_MODULE_TARGET_LABEL": "Enter number of participants",
   "__PLAN_PAGE_MODULE_TARGET_NOTE_BLOCK_TITLE": "Before Starting",
   "__PLAN_PAGE_MODULE_TARGET_NOTE_DESCRIPTION_EDITOR_HEADER_TITLE": "Write here",
@@ -1367,6 +1382,9 @@
   "_CAMPAIGN_WIDGET_UX_USER_ANALYSIS_DESCRIPTION_HEADER": "There are observations on",
   "_CAMPAIGN_WIDGET_UX_USER_ANALYSIS_HEADER": "Analyzed User Contributions",
   "_PAGE_PROFILE_HEADER_TEXT": "Manage your profile anytime: check and update your personal information whenever you need.",
+  "_PLAN_CARD_LABEL_CONFIRM": "Confirm & Launch",
+  "_PLAN_CARD_LABEL_FINALIZE": "Finalize Activity",
+  "_PLAN_CARD_LABEL_LOOK": "Take a look",
   "_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",
@@ -1426,6 +1444,7 @@
   "SIGNUP_FORM_EMAIL_IS_REQUIRED": "This field is required",
   "SIGNUP_FORM_EMAIL_LABEL": "Work Email",
   "SIGNUP_FORM_EMAIL_MUST_BE_A_VALID_EMAIL": "Oops! Check your email format",
+  "SIGNUP_FORM_EMAIL_MUST_BE_A_WORK_EMAIL": "Oops! It looks like a personal email. Please use your work email.",
   "SIGNUP_FORM_EMAIL_PLACEHOLDER": "Insert Email",
   "SIGNUP_FORM_GO_TO_STEP_2": "Create my account",
   "SIGNUP_FORM_GO_TO_STEP_3": "Next",

src/locales/en/translation.json

@@ -1,4 +1,15 @@
 {
+  "___PLAN_STATUS_ACCEPTED": "",
+  "___PLAN_STATUS_AWAITING_APPROVAL": "",
+  "___PLAN_STATUS_AWAITING_PAYMENT": "",
+  "___PLAN_STATUS_OPS_CHECK": "",
+  "___PLAN_STATUS_PAYING": "",
+  "___PLAN_STATUS_PREQUOTED_DRAFT": "",
+  "___PLAN_STATUS_PURCHASABLE_DRAFT": "",
+  "___PLAN_STATUS_PURCHASED_PLAN": "",
+  "___PLAN_STATUS_RUNNING_PLAN": "",
+  "___PLAN_STATUS_SUBMITTED": "",
+  "___PLAN_STATUS_UNQUOTED_DRAFT": "",
   "__404_PAGE_BUTTON": "Torna alla dashboard",
   "__404_PAGE_DESCRIPTION": "La direzione giusta ora è solo una.",
   "__404_PAGE_SUB_TITLE MAX:80": "L'abbiamo cercata ovunque ma non è disponibile.",
@@ -795,6 +806,7 @@
   "__PLAN_INSTRUCTION_NOTE_SIZE_ERROR_EMPTY": "",
   "__PLAN_MISSING_MODULES_ERROR": "",
   "__PLAN_OUT_OF_SCOPE_SIZE_ERROR_TOO_LONG": "",
+  "__PLAN_PAGE_ADD_CUSTOM_FEATURE_BUTTON": "",
   "__PLAN_PAGE_ADD_MODULE_BLOCK_BUTTON": "",
   "__PLAN_PAGE_ADD_MODULE_BLOCK_MODAL_SUBTITLE": "",
   "__PLAN_PAGE_ADD_MODULE_BLOCK_MODAL_TITLE": "",
@@ -813,6 +825,8 @@
   "__PLAN_PAGE_DRAFT_ACTIVITY_INFO_STARTING_PRICE_INFO": "",
   "__PLAN_PAGE_DRAFT_ACTIVITY_INFO_TEMPLATE_TYPE": "",
   "__PLAN_PAGE_DRAFT_ACTIVITY_INFO_TITLE": "",
+  "__PLAN_PAGE_EXPERT_REVIEW_TOOLTIP_CONTENT": "",
+  "__PLAN_PAGE_EXPERT_REVIEW_WARNING": "",
   "__PLAN_PAGE_GROUP_TITLE_ACTIVITY_SCOPE": "",
   "__PLAN_PAGE_GROUP_TITLE_ADDITIONAL_DETAILS": "",
   "__PLAN_PAGE_GROUP_TITLE_ADVANCED_CRITERIA": "",
@@ -997,6 +1011,7 @@
   "__PLAN_PAGE_MODULE_SETUP_NOTE_DESCRIPTION_EDITOR_PLACEHOLDER": "",
   "__PLAN_PAGE_MODULE_SETUP_NOTE_REMOVE_TOOLTIP_BUTTON": "",
   "__PLAN_PAGE_MODULE_SETUP_NOTE_TITLE": "",
+  "__PLAN_PAGE_MODULE_TARGET_ALERT": "",
   "__PLAN_PAGE_MODULE_TARGET_LABEL": "",
   "__PLAN_PAGE_MODULE_TARGET_NOTE_BLOCK_TITLE": "",
   "__PLAN_PAGE_MODULE_TARGET_NOTE_DESCRIPTION_EDITOR_HEADER_TITLE": "",
@@ -1409,6 +1424,9 @@
   "_CAMPAIGN_WIDGET_UX_USER_ANALYSIS_DESCRIPTION_HEADER": "Hai aggiunto osservazioni su",
   "_CAMPAIGN_WIDGET_UX_USER_ANALYSIS_HEADER": "Contributi utente analizzati",
   "_PAGE_PROFILE_HEADER_TEXT": "",
+  "_PLAN_CARD_LABEL_CONFIRM": "",
+  "_PLAN_CARD_LABEL_FINALIZE": "",
+  "_PLAN_CARD_LABEL_LOOK": "",
   "_PLAN_PAGE_MODULE_LANGUAGE_DESCRIPTION": "",
   "_PLAN_PAGE_MODULE_LANGUAGE_SUBTITLE": "",
   "_PROJECT_PAGE_PLANS_GROUP_SEE_ALL": "Vedi tutti",
@@ -1470,6 +1488,7 @@
   "SIGNUP_FORM_EMAIL_IS_REQUIRED": "",
   "SIGNUP_FORM_EMAIL_LABEL": "",
   "SIGNUP_FORM_EMAIL_MUST_BE_A_VALID_EMAIL": "",
+  "SIGNUP_FORM_EMAIL_MUST_BE_A_WORK_EMAIL": "",
   "SIGNUP_FORM_EMAIL_PLACEHOLDER": "",
   "SIGNUP_FORM_GO_TO_STEP_2": "",
   "SIGNUP_FORM_GO_TO_STEP_3": "",

src/locales/it/translation.json

@@ -0,0 +1,50 @@
+import { PlanCard as UGPlanCard } from '@appquality/unguess-design-system';
+import { get } from 'http';
+import { useTranslation } from 'react-i18next';
+import { useNavigate } from 'react-router-dom';
+import { GetWorkspacesByWidPlansApiResponse } from 'src/features/api';
+import { usePlan } from 'src/hooks/usePlan';
+import { usePlanStatusLabel } from 'src/hooks/usePlanStatusLabel';
+import { PlanComposedStatusType } from 'src/types';
+
+export const PlanCard = ({
+  plan,
+}: {
+  plan: GetWorkspacesByWidPlansApiResponse[number];
+}) => {
+  const { planComposedStatus } = usePlan(plan.id.toString());
+  const { t } = useTranslation();
+  const statusLabel = usePlanStatusLabel({ planStatus: planComposedStatus });
+  const navigate = useNavigate();
+  const navigateToPlan = () => {
+    navigate(`/plans/${plan.id}`);
+  };
+
+  const getPlanLabel = (planStatus?: PlanComposedStatusType) => {
+    switch (planStatus) {
+      case 'PurchasableDraft':
+      case 'UnquotedDraft':
+      case 'PrequotedDraft':
+        return t('_PLAN_CARD_LABEL_FINALIZE');
+      case 'Submitted':
+      case 'OpsCheck':
+      case 'Paying':
+        return t('_PLAN_CARD_LABEL_LOOK');
+      case 'AwaitingPayment':
+      case 'AwaitingApproval':
+        return t('_PLAN_CARD_LABEL_CONFIRM');
+      default:
+        return '';
+    }
+  };
+  return (
+    <UGPlanCard
+      status={planComposedStatus}
+      i18n={{ statusLabel, planLabel: getPlanLabel(planComposedStatus) }}
+      onClick={navigateToPlan}
+    >
+      <UGPlanCard.ProjectLabel>{plan.project.title}</UGPlanCard.ProjectLabel>
+      <UGPlanCard.Title>{plan.title}</UGPlanCard.Title>
+    </UGPlanCard>
+  );
+};