fix(web): workflow run test tab and failing e2e tests (#5637)

apps/web/src/components/layout/components/EnsureOnboardingComplete.tsx

@@ -6,9 +6,9 @@ import { useBlueprint } from '../../../hooks/index';
 export function EnsureOnboardingComplete({ children }: any) {
   useBlueprint();
   const location = useLocation();
-  const { currentUser } = useAuth();
+  const { claims } = useAuth();
 
-  if ((!currentUser?.organizationId || !currentUser?.environmentId) && location.pathname !== ROUTES.AUTH_APPLICATION) {
+  if ((!claims?.organizationId || !claims?.environmentId) && location.pathname !== ROUTES.AUTH_APPLICATION) {
     return <Navigate to={ROUTES.AUTH_APPLICATION} replace />;
   }
 

apps/web/src/pages/auth/LoginPage.tsx

@@ -12,7 +12,7 @@ import { ROUTES } from '../../constants/routes.enum';
 
 export default function LoginPage() {
   useBlueprint();
-  const { login, token: oldToken, currentUser } = useAuth();
+  const { login, token: oldToken, currentUser, claims } = useAuth();
   const segment = useSegment();
   const navigate = useNavigate();
   const [params] = useSearchParams();
@@ -28,7 +28,7 @@ export default function LoginPage() {
 
   useEffect(() => {
     if (token) {
-      if (!invitationToken && currentUser?._id && (!currentUser?.organizationId || !currentUser?.environmentId)) {
+      if (!invitationToken && currentUser?._id && (!claims?.organizationId || !claims?.environmentId)) {
         const authApplicationLink = isFromVercel
           ? `${ROUTES.AUTH_APPLICATION}?code=${code}&next=${next}`
           : ROUTES.AUTH_APPLICATION;

apps/web/src/pages/auth/components/HubspotSignupForm.tsx

@@ -17,7 +17,7 @@ import { successMessage } from '@novu/design-system';
 export function HubspotSignupForm() {
   const [loading, setLoading] = useState<boolean>();
   const navigate = useNavigate();
-  const { login, token, currentUser } = useAuth();
+  const { login, token, claims, currentUser } = useAuth();
   const { startVercelSetup } = useVercelIntegration();
   const { isFromVercel } = useVercelParams();
   const { colorScheme } = useMantineColorScheme();
@@ -32,7 +32,7 @@ export function HubspotSignupForm() {
 
   useEffect(() => {
     if (token) {
-      if (currentUser?.environmentId) {
+      if (claims?.environmentId) {
         if (isFromVercel) {
           startVercelSetup();
 
@@ -42,7 +42,7 @@ export function HubspotSignupForm() {
         navigate(ROUTES.HOME);
       }
     }
-  }, [token, navigate, isFromVercel, startVercelSetup, currentUser]);
+  }, [token, navigate, isFromVercel, startVercelSetup, claims]);
 
   async function createOrganization(data: IOrganizationCreateForm) {
     const { organizationName, jobTitle, ...rest } = data;
@@ -64,7 +64,7 @@ export function HubspotSignupForm() {
 
     setLoading(true);
 
-    if (!currentUser?.organizationId) {
+    if (!claims?.organizationId) {
       await createOrganization({ ...data });
     }
 

apps/web/src/pages/auth/components/QuestionnaireForm.tsx

@@ -34,7 +34,7 @@ export function QuestionnaireForm() {
     control,
   } = useForm<IOrganizationCreateForm>({});
   const navigate = useNavigate();
-  const { login, token, currentUser } = useAuth();
+  const { login, token, claims } = useAuth();
   const { startVercelSetup } = useVercelIntegration();
   const { isFromVercel } = useVercelParams();
   const { parse } = useDomainParser();
@@ -47,7 +47,7 @@ export function QuestionnaireForm() {
 
   useEffect(() => {
     if (token) {
-      if (currentUser?.environmentId) {
+      if (claims?.environmentId) {
         if (isFromVercel) {
           startVercelSetup();
 
@@ -57,7 +57,7 @@ export function QuestionnaireForm() {
         navigate(ROUTES.HOME);
       }
     }
-  }, [token, navigate, isFromVercel, startVercelSetup, currentUser]);
+  }, [token, navigate, isFromVercel, startVercelSetup, claims]);
 
   async function createOrganization(data: IOrganizationCreateForm) {
     const { organizationName, ...rest } = data;
@@ -72,7 +72,7 @@ export function QuestionnaireForm() {
 
     setLoading(true);
 
-    if (!currentUser?.organizationId) {
+    if (!claims?.organizationId) {
       await createOrganization({ ...data });
     }
 

apps/web/src/pages/templates/components/TestWorkflow.tsx

@@ -60,12 +60,6 @@ export function TestWorkflow({ trigger }) {
     return [{ name: 'subscriberId' }, ...(trigger?.subscriberVariables || [])];
   }, [trigger]);
 
-  const currentUserDependencies = subscriberVariables.map((variable) =>
-    currentUser ? currentUser[variable.name === 'subscriberId' ? '_id' : variable.name] : null
-  );
-  // eslint-disable-next-line react-hooks/exhaustive-deps
-  const memoizedCurrentUser = useMemo(() => currentUser, [...currentUserDependencies]);
-
   const variables = useMemo(() => [...(trigger?.variables || [])], [trigger]);
   const reservedVariables = useMemo(() => [...(trigger?.reservedVariables || [])], [trigger]);
 
@@ -97,8 +91,8 @@ export function TestWorkflow({ trigger }) {
   const { setValues } = form;
 
   useEffect(() => {
-    setValues({ toValue: makeToValue(subscriberVariables, memoizedCurrentUser) });
-  }, [setValues, subscriberVariables, memoizedCurrentUser]);
+    setValues({ toValue: makeToValue(subscriberVariables, currentUser) });
+  }, [setValues, subscriberVariables, currentUser]);
 
   const onTrigger = async ({ toValue, payloadValue, overridesValue, snippetValue }) => {
     const to = JSON.parse(toValue);

apps/web/tests/main-functionality.spec.ts

@@ -80,7 +80,7 @@ test('should update to empty data when switching from editor to customHtml', asy
   await subjectEl.clear();
   await subjectEl.fill('new email subject');
 
-  await updateWorkflowButtonClick(page, { noWaitAfter: true });
+  await updateWorkflowButtonClick(page);
 
   const templatesLinkPage = getByTestId(page, 'side-nav-templates-link');
   await templatesLinkPage.click();
@@ -326,7 +326,7 @@ test('should show the brand logo on main page', async ({ page }) => {
   await addAndEditChannel(page, 'email');
 
   const brandLogo = getByTestId(page, 'brand-logo');
-  await expect(brandLogo).toHaveAttribute('src', 'https://web.novu.co/static/images/logo-light.webp');
+  await expect(brandLogo).toHaveAttribute('src', 'https://web.novu.co/static/images/logo-light.png');
 });
 
 test('should support RTL text content', async ({ page }) => {

apps/web/tests/utils.ts/integrations.ts

@@ -13,7 +13,7 @@ export const navigateToGetStarted = async (page: Page, card = 'channel-card-emai
 
   const integrationsModal = getByTestId(page, 'integrations-list-modal');
   await expect(integrationsModal).toBeVisible();
-  await expect(integrationsModal).toContainText('Integrations Store');
+  await expect(integrationsModal.getByRole('heading')).toContainText('Integration Store');
 };
 
 export const checkTableLoading = async (page: Page | Locator) => {

libs/shared-web/src/hooks/useAuth.ts

@@ -150,12 +150,7 @@ export function useAuth() {
     inPublicRoute,
     inPrivateRoute,
     isLoading: inPrivateRoute && (isUserLoading || isOrganizationLoading),
-    // TODO: Remove orgId and envId from currentUser and add them to the useAuth hook returned object
-    currentUser: {
-      ...user,
-      organizationId: claims?.organizationId,
-      environmentId: claims?.environmentId,
-    } satisfies IUserWithContext,
+    currentUser: user,
     organizations,
     currentOrganization,
     token,

libs/testing/src/testing-queue.service.ts

@@ -19,9 +19,5 @@ export class TestingQueueService {
         removeOnComplete: true,
       },
     });
-
-    if (process.env.NODE_ENV === 'test' && !process.env.CI) {
-      this.queue.obliterate({ force: true });
-    }
   }
 }