chore: fix-logic-add-tests

Author: ryanbas21

.husky/install.mjs

@@ -3,4 +3,4 @@ if (process.env.NODE_ENV === 'production' || process.env.CI === 'true') {
   process.exit(0)
 }
 const husky = (await import('husky')).default
-console.log(husky.install())
+console.log(husky())

e2e/davinci-suites/src/form-fields.test.ts

@@ -1,18 +1,44 @@
 import { expect, test } from '@playwright/test';
-import { asyncEvents } from './utils/async-events.js';
 
-test('Test happy paths on test page', async ({ page }) => {
-  const { navigate } = asyncEvents(page);
-  await navigate('/?clientId=60de77d5-dd2c-41ef-8c40-f8bb2381a359');
+test('Should render form fields', async ({ page }) => {
+  await page.goto('http://localhost:5829/?clientId=60de77d5-dd2c-41ef-8c40-f8bb2381a359');
+  await page.getByRole('heading', { name: 'Select Test Form' }).click();
+  await page.getByRole('button', { name: 'Form Fields' }).click();
+  await page.getByRole('textbox', { name: 'Text Input Label' }).click();
+  await page.getByRole('textbox', { name: 'Text Input Label' }).click();
 
-  console.log(page.url());
-  expect(page.url()).toBe('http://localhost:5829/?clientId=60de77d5-dd2c-41ef-8c40-f8bb2381a359');
+  const txtInput = page.getByRole('textbox', { name: 'Text Input Label' });
+  await txtInput.fill('This is some text');
+  expect(txtInput).toHaveValue('This is some text');
 
-  await expect(page.getByText('Select Test Form')).toBeVisible();
+  const flowLink = page.getByRole('button', { name: 'Flow Link' });
+  await flowLink.click();
 
-  const formFields = page.getByRole('button', { name: 'Form Fields' });
-  const formValidation = page.getByRole('button', { name: 'Form Validation' });
+  const flowButton = page.getByRole('button', { name: 'Flow Button' });
+  await flowButton.click();
 
-  await expect(formFields).toBeVisible();
-  await expect(formValidation).toBeVisible();
+  await page.getByRole('button', { name: 'Submit' }).click();
+});
+
+test('should render form validation fields', async ({ page }) => {
+  await page.goto('http://localhost:5829/?clientId=60de77d5-dd2c-41ef-8c40-f8bb2381a359');
+  await expect(page.getByRole('link', { name: 'Vite logo' })).toBeVisible();
+  await expect(page.getByRole('button', { name: 'Form Validation' })).toBeVisible();
+  await expect(page.locator('#form')).toContainText('Form Validation');
+  await page.getByRole('button', { name: 'Form Validation' }).click();
+  await expect(page.getByRole('heading', { name: 'Form Fields Validation' })).toBeVisible();
+  await expect(page.getByText('Username')).toBeVisible();
+  await expect(page.getByRole('textbox', { name: 'Username' })).toBeVisible();
+  await expect(page.getByText('Email Address')).toBeVisible();
+  await expect(page.getByRole('textbox', { name: 'Email Address' })).toBeVisible();
+  await expect(page.getByRole('button', { name: 'Submit' })).toBeVisible();
+  await page.getByRole('textbox', { name: 'Username' }).click();
+  await page.getByRole('textbox', { name: 'Username' }).fill('sdk-user');
+  await expect(page.getByRole('textbox', { name: 'Username' })).toHaveValue('sdk-user');
+  await page.getByRole('textbox', { name: 'Email Address' }).click();
+  await page.getByRole('textbox', { name: 'Email Address' }).fill('[email protected]');
+  await expect(page.getByRole('textbox', { name: 'Email Address' })).toHaveValue(
+    '[email protected]',
+  );
+  await page.getByRole('button', { name: 'Submit' }).click();
 });

packages/davinci-client/src/lib/collector.utils.ts

@@ -112,6 +112,7 @@ export function returnSingleValueCollector<
   CollectorType extends SingleValueCollectorTypes = 'SingleValueCollector',
 >(field: Field, idx: number, collectorType: CollectorType, data?: string) {
   let error = '';
+  console.log('the field ', field);
   if (!('key' in field)) {
     error = `${error}Key is not found in the field object. `;
   }

packages/davinci-client/src/lib/davinci.utils.ts

@@ -172,12 +172,25 @@ export function handleResponse(cacheEntry: DaVinciCacheEntry, dispatch: Dispatch
    */
   if (cacheEntry.isSuccess) {
     const requestId = cacheEntry.requestId;
-    if ('eventName' in cacheEntry.data && cacheEntry.data.eventName === 'continue') {
-      const data = cacheEntry.data as DaVinciNextResponse;
-      dispatch(nodeSlice.actions.next({ data, requestId, httpStatus: status }));
-    } else if ('session' in cacheEntry.data || 'authorizeResponse' in cacheEntry.data) {
+    const hasNextUrl = () => {
+      const data = cacheEntry.data;
+
+      if ('_links' in data) {
+        if ('next' in data._links) {
+          if ('href' in data._links.next) {
+            return true;
+          }
+        }
+      }
+      return false;
+    };
+
+    if ('session' in cacheEntry.data || 'authorizeResponse' in cacheEntry.data) {
       const data = cacheEntry.data as DaVinciSuccessResponse;
       dispatch(nodeSlice.actions.success({ data, requestId, httpStatus: status }));
+    } else if (hasNextUrl()) {
+      const data = cacheEntry.data as DaVinciNextResponse;
+      dispatch(nodeSlice.actions.next({ data, requestId, httpStatus: status }));
     } else {
       // If we got here, the response type is unknown and therefore an unrecoverable failure
       const data = cacheEntry.data as DaVinciFailureResponse;