Merge pull request #1445 from AppQuality/develop

Release 20251006

Author: cannarocks

package.json

@@ -5,10 +5,11 @@
   "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",
+    "@emotion/is-prop-valid": "^1.4.0",
     "@headwayapp/react-widget": "^0.0.4",
     "@reduxjs/toolkit": "^1.8.0",
     "@sentry/react": "^8.32.0",

src/analytics.ts

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

src/app/App.tsx

@@ -3,49 +3,63 @@ import {
   ThemeProvider,
   ToastProvider,
 } from '@appquality/unguess-design-system';
+import isPropValid from '@emotion/is-prop-valid';
 import Helmet from 'react-helmet';
 import { useTranslation } from 'react-i18next';
 import { Provider } from 'react-redux';
+import analytics from 'src/analytics';
 import { appTheme } from 'src/app/theme';
-import { AnalyticsProvider } from 'use-analytics';
 import Pages from 'src/common/Pages';
-import analytics from 'src/analytics';
+import { StyleSheetManager } from 'styled-components';
+import { AnalyticsProvider } from 'use-analytics';
 import '../i18n';
 import { store } from './store';
 
+// This implements the default behavior from styled-components v5
+function shouldForwardProp(propName: string, target: any) {
+  if (typeof target === 'string') {
+    // For HTML elements, forward the prop if it is a valid HTML attribute
+    return isPropValid(propName);
+  }
+  // For other elements, forward all props
+  return true;
+}
+
 const App = () => {
   const { t } = useTranslation();
   return (
-    <Provider store={store}>
-      <AnalyticsProvider instance={analytics}>
-        <ThemeProvider theme={appTheme}>
-          <GlobalStyle />
-          <Helmet>
-            <meta
-              property="og:title"
-              content={`UNGUESS - ${t('__APP_META_PAYOFF')}`}
-            />
-            <title>UNGUESS - {t('__APP_META_PAYOFF')}</title>
-            <meta name="description" content={t('__APP_META_DESCRIPTION')} />
-          </Helmet>
-          <ToastProvider
-            limit={5}
-            zIndex={500}
-            placementProps={{
-              top: {
-                style: {
-                  top:
-                    parseInt(appTheme.components.chrome.header.height, 10) +
-                    appTheme.space.base * 4,
+    <StyleSheetManager shouldForwardProp={shouldForwardProp}>
+      <Provider store={store}>
+        <AnalyticsProvider instance={analytics}>
+          <ThemeProvider theme={appTheme}>
+            <GlobalStyle />
+            <Helmet>
+              <meta
+                property="og:title"
+                content={`UNGUESS - ${t('__APP_META_PAYOFF')}`}
+              />
+              <title>UNGUESS - {t('__APP_META_PAYOFF')}</title>
+              <meta name="description" content={t('__APP_META_DESCRIPTION')} />
+            </Helmet>
+            <ToastProvider
+              limit={5}
+              zIndex={500}
+              placementProps={{
+                top: {
+                  style: {
+                    top:
+                      parseInt(appTheme.components.chrome.header.height, 10) +
+                      appTheme.space.base * 4,
+                  },
                 },
-              },
-            }}
-          >
-            <Pages />
-          </ToastProvider>
-        </ThemeProvider>
-      </AnalyticsProvider>
-    </Provider>
+              }}
+            >
+              <Pages />
+            </ToastProvider>
+          </ThemeProvider>
+        </AnalyticsProvider>
+      </Provider>
+    </StyleSheetManager>
   );
 };
 

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

@@ -377,6 +377,15 @@ export interface paths {
       };
     };
   };
+  "/plans/{pid}/rules-evaluation": {
+    /** Usefull endpoint when a purchasable plan have some failed rules */
+    get: operations["get-plans-pid-rules-evaluation"];
+    parameters: {
+      path: {
+        pid: string;
+      };
+    };
+  };
   "/plans/{pid}/status": {
     /**  */
     patch: operations["patch-workspaces-wid-plans-pid-status"];
@@ -1424,6 +1433,16 @@ export interface components {
       name: string;
       workspaceId: number;
     };
+    /**
+     * PurchasablePlanRules
+     * @enum {string}
+     */
+    PurchasablePlanRules:
+      | "number_of_modules"
+      | "module_type"
+      | "number_of_testers"
+      | "number_of_tasks"
+      | "task_type";
     /** Report */
     Report: {
       creation_date?: string;
@@ -3344,8 +3363,12 @@ export interface operations {
             config: {
               modules: components["schemas"]["Module"][];
             };
+            from_template?: {
+              id: number;
+              title: string;
+            };
             id: number;
-            is_frozen?: number;
+            price?: string;
             project: {
               id: number;
               name: string;
@@ -3421,6 +3444,24 @@ export interface operations {
       500: components["responses"]["Error"];
     };
   };
+  /** Usefull endpoint when a purchasable plan have some failed rules */
+  "get-plans-pid-rules-evaluation": {
+    parameters: {
+      path: {
+        pid: string;
+      };
+    };
+    responses: {
+      /** OK */
+      200: {
+        content: {
+          "application/json": {
+            failed: components["schemas"]["PurchasablePlanRules"][];
+          };
+        };
+      };
+    };
+  };
   /**  */
   "patch-workspaces-wid-plans-pid-status": {
     parameters: {

src/common/schema.ts

@@ -36,6 +36,8 @@ export const apiSlice = createApi({
     'Archive',
     'Plans',
     'Users',
+    'EvaluationRules',
+    'CheckoutItem',
   ],
   endpoints: () => ({}),
 });

src/features/api/api.ts

@@ -307,13 +307,16 @@ unguessApi.enhanceEndpoints({
       },
     },
     patchPlansByPid: {
-      invalidatesTags: ['Plans'],
+      invalidatesTags: ['Plans', 'EvaluationRules'],
     },
     postWorkspacesByWidPlans: {
       invalidatesTags: ['Plans'],
     },
     patchPlansByPidStatus: {
-      invalidatesTags: ['Plans', 'Projects'],
+      invalidatesTags: ['Plans', 'Projects', 'CheckoutItem'],
+    },
+    getPlansByPidCheckoutItem: {
+      providesTags: ['CheckoutItem'],
     },
     deleteProjectsByPid: {
       invalidatesTags: ['Projects'],
@@ -324,6 +327,9 @@ unguessApi.enhanceEndpoints({
     getWorkspacesByWidTemplates: {
       providesTags: ['Templates'],
     },
+    getPlansByPidRulesEvaluation: {
+      providesTags: ['EvaluationRules'],
+    },
   },
 });
 

src/features/api/apiTags.ts

@@ -459,6 +459,12 @@ const injectedRtkApi = api.injectEndpoints({
     >({
       query: (queryArg) => ({ url: `/plans/${queryArg.pid}/checkoutItem` }),
     }),
+    getPlansByPidRulesEvaluation: build.query<
+      GetPlansByPidRulesEvaluationApiResponse,
+      GetPlansByPidRulesEvaluationApiArg
+    >({
+      query: (queryArg) => ({ url: `/plans/${queryArg.pid}/rules-evaluation` }),
+    }),
     patchPlansByPidStatus: build.mutation<
       PatchPlansByPidStatusApiResponse,
       PatchPlansByPidStatusApiArg
@@ -1553,8 +1559,12 @@ export type GetPlansByPidApiResponse = /** status 200 OK */ {
   config: {
     modules: Module[];
   };
+  from_template?: {
+    id: number;
+    title: string;
+  };
   id: number;
-  is_frozen?: number;
+  price?: string;
   project: {
     id: number;
     name: string;
@@ -1587,6 +1597,12 @@ export type GetPlansByPidCheckoutItemApiResponse = /** status 200 OK */ {
 export type GetPlansByPidCheckoutItemApiArg = {
   pid: string;
 };
+export type GetPlansByPidRulesEvaluationApiResponse = /** status 200 OK */ {
+  failed: PurchasablePlanRules[];
+};
+export type GetPlansByPidRulesEvaluationApiArg = {
+  pid: string;
+};
 export type PatchPlansByPidStatusApiResponse = /** status 200 OK */ {};
 export type PatchPlansByPidStatusApiArg = {
   pid: string;
@@ -2670,8 +2686,7 @@ export type OutputModuleTouchpointsAppTablet = {
   kind: 'app';
   os: {
     ios?: string;
-    linux?: string;
-    windows?: string;
+    android?: string;
   };
 };
 export type OutputModuleTouchpointsAppSmartphone = {
@@ -2811,6 +2826,13 @@ export type Module =
   | ModuleGasSupply
   | ModuleAnnualIncomeRange;
 export type PlanStatus = 'pending_review' | 'draft' | 'approved' | 'paying';
+export type PurchasablePlanRules =
+  | 'number_of_modules'
+  | 'module_type'
+  | 'number_of_testers'
+  | 'number_of_tasks'
+  | 'task_type'
+  | 'duplicate_touchpoint_form_factors';
 export type Project = {
   campaigns_count: number;
   description?: string;
@@ -2991,6 +3013,7 @@ export const {
   useGetPlansByPidQuery,
   usePatchPlansByPidMutation,
   useGetPlansByPidCheckoutItemQuery,
+  useGetPlansByPidRulesEvaluationQuery,
   usePatchPlansByPidStatusMutation,
   usePostProjectsMutation,
   useDeleteProjectsByPidMutation,