create-appraisejs 0.2.0-alpha.6 → 0.3.0-alpha.0

package/templates/default/src/app/(base)/locator-groups/modify/[id]/page.tsx

@@ -1,46 +1,46 @@
-import { getLocatorGroupByIdAction } from '@/actions/locator-groups/locator-group-actions'
-import { LocatorGroup, Module } from '@prisma/client'
-import React from 'react'
-import LocatorGroupForm from '../../locator-group-form'
-import { updateLocatorGroupAction } from '@/actions/locator-groups/locator-group-actions'
-import { getAllModulesAction } from '@/actions/modules/module-actions'
-import { Metadata } from 'next'
-
-export const metadata: Metadata = {
-  title: 'Appraise | Modify Locator Group',
-  description: 'Update locator group configuration',
-}
-
-const ModifyLocator = async ({ params }: { params: Promise<{ id: string }> }) => {
-  const { id } = await params
-  const { data, error } = await getLocatorGroupByIdAction(id)
-
-  if (error) {
-    return <div>Error: {error}</div>
-  }
-
-  const locatorGroup = data as LocatorGroup
-
-  const { data: moduleList, error: moduleListError } = await getAllModulesAction()
-
-  if (moduleListError) {
-    return <div>Error: {moduleListError}</div>
-  }
-
-  return (
-    <LocatorGroupForm
-      defaultValues={{
-        name: locatorGroup.name ?? '',
-        moduleId: locatorGroup.moduleId ?? '',
-        route: locatorGroup.route ?? '',
-      }}
-      successTitle="Locator Group updated"
-      successMessage="Locator Group updated successfully"
-      onSubmitAction={updateLocatorGroupAction}
-      id={id}
-      moduleList={moduleList as Module[]}
-    />
-  )
-}
-
-export default ModifyLocator
+import { getLocatorGroupByIdAction } from '@/actions/locator-groups/locator-group-actions'
+import { LocatorGroup, Module } from '@prisma/client'
+import React from 'react'
+import LocatorGroupForm from '../../locator-group-form'
+import { updateLocatorGroupAction } from '@/actions/locator-groups/locator-group-actions'
+import { getAllModulesAction } from '@/actions/modules/module-actions'
+import { Metadata } from 'next'
+
+export const metadata: Metadata = {
+  title: 'Appraise | Modify Locator Group',
+  description: 'Update locator group configuration',
+}
+
+const ModifyLocator = async ({ params }: { params: Promise<{ id: string }> }) => {
+  const { id } = await params
+  const { data, error } = await getLocatorGroupByIdAction(id)
+
+  if (error) {
+    return <div>Error: {error}</div>
+  }
+
+  const locatorGroup = data as LocatorGroup
+
+  const { data: moduleList, error: moduleListError } = await getAllModulesAction()
+
+  if (moduleListError) {
+    return <div>Error: {moduleListError}</div>
+  }
+
+  return (
+    <LocatorGroupForm
+      defaultValues={{
+        name: locatorGroup.name ?? '',
+        moduleId: locatorGroup.moduleId ?? '',
+        route: locatorGroup.route ?? '',
+      }}
+      successTitle="Locator Group updated"
+      successMessage="Locator Group updated successfully"
+      onSubmitAction={updateLocatorGroupAction}
+      id={id}
+      moduleList={moduleList as Module[]}
+    />
+  )
+}
+
+export default ModifyLocator

package/templates/default/src/app/(base)/locators/create/create-locator-workspace-helpers.test.ts

@@ -0,0 +1,71 @@
+import { describe, expect, it } from 'vitest'
+
+import {
+  applyPickedLocatorToWorkspaceState,
+  canLaunchPicker,
+  canSaveLocator,
+  createInitialWorkspaceState,
+  formatStatus,
+  statusTone,
+} from './create-locator-workspace-helpers'
+
+describe('create-locator-workspace helpers', () => {
+  it('computes save and launch eligibility from workspace state', () => {
+    const state = {
+      ...createInitialWorkspaceState([{ id: 'env-1' } as never]),
+      environmentId: 'env-1',
+      locatorName: 'Login button',
+      selector: 'button[data-testid="login"]',
+      resolutionMode: 'existing' as const,
+      existingLocatorGroupId: 'group-1',
+    }
+
+    expect(canLaunchPicker(state)).toBe(true)
+    expect(canSaveLocator(state)).toBe(true)
+  })
+
+  it('applies a picked locator suggestion to empty or auto-filled fields', () => {
+    const nextState = applyPickedLocatorToWorkspaceState(
+      createInitialWorkspaceState(
+        [{ id: 'env-1' } as never],
+        {
+          route: '/',
+        },
+      ),
+      {
+        sessionId: 'session-1',
+        launchSource: { url: 'https://example.com' },
+        browserName: 'chromium',
+        status: 'picked',
+        currentUrl: 'https://example.com/account/login',
+        currentPathname: '/account/login',
+        pageTitle: 'Login',
+        companionPid: 123,
+        startedAt: '2024-01-01T00:00:00.000Z',
+        updatedAt: '2024-01-01T00:00:01.000Z',
+        pickedLocator: {
+          sessionId: 'session-1',
+          selector: 'button[data-testid="login"]',
+          currentUrl: 'https://example.com/account/login',
+          pathname: '/account/login',
+          pageTitle: 'Login',
+          tagName: 'button',
+          accessibleName: 'Log in',
+        },
+      },
+      [],
+      [{ id: 'module-1', name: 'account', parentId: null } as never],
+    )
+
+    expect(nextState.selector).toBe('button[data-testid="login"]')
+    expect(nextState.locatorName).toBe('Log in')
+    expect(nextState.route).toBe('/account/login')
+    expect(nextState.newLocatorGroupName).toBe('Login')
+    expect(nextState.moduleId).toBe('module-1')
+  })
+
+  it('formats picker status labels and variants', () => {
+    expect(formatStatus('picked')).toBe('Picked')
+    expect(statusTone('error')).toBe('destructive')
+  })
+})

package/templates/default/src/app/(base)/locators/create/create-locator-workspace-helpers.ts

@@ -0,0 +1,333 @@
+import type { GroupResolutionMode as PickerGroupResolutionMode, LocatorPickerSession } from '@/types/locator-picker'
+import type { ActionResponseData } from '@/types/form/actionHandler'
+import type { Environment, Locator, LocatorGroup, Module } from '@prisma/client'
+
+import { inferGroupSuggestion, normalizeRoute, suggestLocatorName } from '@/lib/locator-picker/suggestions'
+
+export type LocatorSourceType = 'environment' | 'url'
+export type LocatorWorkspaceMode = 'create' | 'modify'
+export type GroupResolutionMode = PickerGroupResolutionMode
+
+export const locatorSourceTypes = ['environment', 'url'] as const
+export const locatorWorkspaceResolutionModes = ['existing', 'create'] as const
+
+export type LocatorWorkspaceInitialValues = {
+  locatorName?: string
+  selector?: string
+  resolutionMode?: GroupResolutionMode
+  existingLocatorGroupId?: string
+  newLocatorGroupName?: string
+  route?: string
+  moduleId?: string
+}
+
+export type CreateLocatorWorkspaceProps = {
+  environments: Environment[]
+  locatorGroups: LocatorGroup[]
+  modules: Module[]
+  mode?: LocatorWorkspaceMode
+  locatorId?: string
+  initialValues?: LocatorWorkspaceInitialValues
+}
+
+export type LocatorWorkspaceState = {
+  sourceType: LocatorSourceType
+  environmentId: string
+  url: string
+  locatorName: string
+  selector: string
+  resolutionMode: GroupResolutionMode
+  existingLocatorGroupId: string
+  newLocatorGroupName: string
+  route: string
+  moduleId: string
+  lastAutoLocatorName: string
+  lastAutoSelector: string
+  lastAutoExistingGroupId: string
+  lastAutoGroupName: string
+  lastAutoRoute: string
+  lastAutoModuleId: string
+}
+
+export function statusTone(status: LocatorPickerSession['status']) {
+  switch (status) {
+    case 'picked':
+      return 'default'
+    case 'saving':
+      return 'secondary'
+    case 'closed':
+      return 'outline'
+    case 'error':
+      return 'destructive'
+    case 'ready':
+      return 'secondary'
+    case 'starting':
+    default:
+      return 'secondary'
+  }
+}
+
+export function formatStatus(status: LocatorPickerSession['status']) {
+  return status === 'picked' ? 'Picked' : `${status.charAt(0).toUpperCase()}${status.slice(1)}`
+}
+
+export function createInitialWorkspaceState(
+  environments: Environment[],
+  initialValues?: LocatorWorkspaceInitialValues,
+): LocatorWorkspaceState {
+  const initialRoute = normalizeRoute(initialValues?.route ?? '/')
+
+  return {
+    sourceType: environments.length > 0 ? 'environment' : 'url',
+    environmentId: environments[0]?.id ?? '',
+    url: '',
+    locatorName: initialValues?.locatorName ?? '',
+    selector: initialValues?.selector ?? '',
+    resolutionMode: initialValues?.resolutionMode ?? 'existing',
+    existingLocatorGroupId: initialValues?.existingLocatorGroupId ?? '',
+    newLocatorGroupName: initialValues?.newLocatorGroupName ?? '',
+    route: initialRoute,
+    moduleId: initialValues?.moduleId ?? '',
+    lastAutoLocatorName: initialValues?.locatorName ?? '',
+    lastAutoSelector: initialValues?.selector ?? '',
+    lastAutoExistingGroupId: initialValues?.existingLocatorGroupId ?? '',
+    lastAutoGroupName: initialValues?.newLocatorGroupName ?? '',
+    lastAutoRoute: initialRoute,
+    lastAutoModuleId: initialValues?.moduleId ?? '',
+  }
+}
+
+export function getPickerPayloadSignature(session: LocatorPickerSession | null) {
+  const pickedLocator = session?.pickedLocator
+  if (!session || !pickedLocator) {
+    return ''
+  }
+
+  return `${session.updatedAt}:${pickedLocator.currentUrl}:${pickedLocator.selector}`
+}
+
+export function applyPickedLocatorToWorkspaceState(
+  currentState: LocatorWorkspaceState,
+  session: LocatorPickerSession,
+  locatorGroups: LocatorGroup[],
+  modules: Module[],
+): LocatorWorkspaceState {
+  const pickedLocator = session.pickedLocator
+  if (!pickedLocator) {
+    return currentState
+  }
+
+  const nextState = { ...currentState }
+
+  if (currentState.selector === '' || currentState.selector === currentState.lastAutoSelector) {
+    nextState.selector = pickedLocator.selector
+    nextState.lastAutoSelector = pickedLocator.selector
+  }
+
+  const suggestedName = suggestLocatorName(pickedLocator)
+  if (suggestedName && (currentState.locatorName === '' || currentState.locatorName === currentState.lastAutoLocatorName)) {
+    nextState.locatorName = suggestedName
+    nextState.lastAutoLocatorName = suggestedName
+  }
+
+  const suggestion = inferGroupSuggestion(pickedLocator.pathname, pickedLocator.pageTitle, locatorGroups, modules)
+
+  if (currentState.route === '/' || currentState.route === '' || currentState.route === currentState.lastAutoRoute) {
+    nextState.route = suggestion.route
+    nextState.lastAutoRoute = suggestion.route
+  }
+
+  if (suggestion.mode === 'existing') {
+    nextState.resolutionMode = currentState.resolutionMode === 'create' ? 'existing' : currentState.resolutionMode
+
+    const nextExistingGroupId = suggestion.existingLocatorGroupId ?? ''
+    if (
+      currentState.existingLocatorGroupId === '' ||
+      currentState.existingLocatorGroupId === currentState.lastAutoExistingGroupId
+    ) {
+      nextState.existingLocatorGroupId = nextExistingGroupId
+      nextState.lastAutoExistingGroupId = nextExistingGroupId
+    }
+  } else {
+    if (
+      currentState.resolutionMode === 'create' ||
+      currentState.existingLocatorGroupId === '' ||
+      currentState.existingLocatorGroupId === currentState.lastAutoExistingGroupId
+    ) {
+      nextState.resolutionMode = 'create'
+    }
+
+    if (currentState.newLocatorGroupName === '' || currentState.newLocatorGroupName === currentState.lastAutoGroupName) {
+      nextState.newLocatorGroupName = suggestion.suggestedGroupName
+      nextState.lastAutoGroupName = suggestion.suggestedGroupName
+    }
+
+    if (currentState.moduleId === '' || currentState.moduleId === currentState.lastAutoModuleId) {
+      const nextModuleId = suggestion.suggestedModuleId ?? ''
+      nextState.moduleId = nextModuleId
+      nextState.lastAutoModuleId = nextModuleId
+    }
+  }
+
+  return nextState
+}
+
+export function createWorkspaceAutoFillSnapshot(state: LocatorWorkspaceState) {
+  return {
+    lastAutoLocatorName: state.locatorName,
+    lastAutoSelector: state.selector,
+    lastAutoExistingGroupId: state.existingLocatorGroupId,
+    lastAutoGroupName: state.newLocatorGroupName,
+    lastAutoRoute: state.route,
+    lastAutoModuleId: state.moduleId,
+  }
+}
+
+export function canSaveLocator(state: LocatorWorkspaceState) {
+  return (
+    state.locatorName.trim() !== '' &&
+    state.selector.trim() !== '' &&
+    ((state.resolutionMode === 'existing' && state.existingLocatorGroupId !== '') ||
+      (state.resolutionMode === 'create' && state.newLocatorGroupName.trim() !== '' && state.moduleId !== ''))
+  )
+}
+
+export function canLaunchPicker(state: LocatorWorkspaceState) {
+  return state.sourceType === 'environment' ? state.environmentId !== '' : state.url.trim() !== ''
+}
+
+export function getLocatorSourceType(value: string): LocatorSourceType {
+  return locatorSourceTypes.find(sourceType => sourceType === value) ?? 'environment'
+}
+
+export function getLocatorWorkspaceResolutionMode(value: string): GroupResolutionMode {
+  return locatorWorkspaceResolutionModes.find(resolutionMode => resolutionMode === value) ?? 'existing'
+}
+
+function isEnvironmentRow(value: unknown): value is Environment {
+  return (
+    typeof value === 'object' &&
+    value !== null &&
+    'id' in value &&
+    typeof value.id === 'string' &&
+    'name' in value &&
+    typeof value.name === 'string' &&
+    'baseUrl' in value &&
+    typeof value.baseUrl === 'string' &&
+    'apiBaseUrl' in value &&
+    (typeof value.apiBaseUrl === 'string' || value.apiBaseUrl === null) &&
+    'username' in value &&
+    (typeof value.username === 'string' || value.username === null) &&
+    'password' in value &&
+    (typeof value.password === 'string' || value.password === null) &&
+    'createdAt' in value &&
+    value.createdAt instanceof Date &&
+    'updatedAt' in value &&
+    value.updatedAt instanceof Date
+  )
+}
+
+function isLocatorGroupRow(value: unknown): value is LocatorGroup {
+  return (
+    typeof value === 'object' &&
+    value !== null &&
+    'id' in value &&
+    typeof value.id === 'string' &&
+    'name' in value &&
+    typeof value.name === 'string' &&
+    'route' in value &&
+    typeof value.route === 'string' &&
+    'moduleId' in value &&
+    typeof value.moduleId === 'string' &&
+    'createdAt' in value &&
+    value.createdAt instanceof Date &&
+    'updatedAt' in value &&
+    value.updatedAt instanceof Date
+  )
+}
+
+function isModuleRow(value: unknown): value is Module {
+  return (
+    typeof value === 'object' &&
+    value !== null &&
+    'id' in value &&
+    typeof value.id === 'string' &&
+    'name' in value &&
+    typeof value.name === 'string' &&
+    'parentId' in value &&
+    (typeof value.parentId === 'string' || value.parentId === null) &&
+    'createdAt' in value &&
+    value.createdAt instanceof Date &&
+    'updatedAt' in value &&
+    value.updatedAt instanceof Date
+  )
+}
+
+function isLocatorRow(value: unknown): value is Locator & { locatorGroup?: LocatorGroup | null } {
+  return (
+    typeof value === 'object' &&
+    value !== null &&
+    'id' in value &&
+    typeof value.id === 'string' &&
+    'name' in value &&
+    typeof value.name === 'string' &&
+    'value' in value &&
+    typeof value.value === 'string' &&
+    'locatorGroupId' in value &&
+    (typeof value.locatorGroupId === 'string' || value.locatorGroupId === null) &&
+    'createdAt' in value &&
+    value.createdAt instanceof Date &&
+    'updatedAt' in value &&
+    value.updatedAt instanceof Date
+  )
+}
+
+function isLocatorPickerSession(value: unknown): value is LocatorPickerSession {
+  return (
+    typeof value === 'object' &&
+    value !== null &&
+    'sessionId' in value &&
+    typeof value.sessionId === 'string' &&
+    'launchSource' in value &&
+    typeof value.launchSource === 'object' &&
+    value.launchSource !== null &&
+    'url' in value.launchSource &&
+    typeof value.launchSource.url === 'string' &&
+    'browserName' in value &&
+    value.browserName === 'chromium' &&
+    'status' in value &&
+    typeof value.status === 'string' &&
+    'currentUrl' in value &&
+    typeof value.currentUrl === 'string' &&
+    'currentPathname' in value &&
+    typeof value.currentPathname === 'string' &&
+    'pageTitle' in value &&
+    typeof value.pageTitle === 'string' &&
+    'companionPid' in value &&
+    (typeof value.companionPid === 'number' || value.companionPid === null) &&
+    'startedAt' in value &&
+    typeof value.startedAt === 'string' &&
+    'updatedAt' in value &&
+    typeof value.updatedAt === 'string'
+  )
+}
+
+export function getEnvironmentRows(data: ActionResponseData | undefined): Environment[] {
+  return Array.isArray(data) ? data.filter(isEnvironmentRow) : []
+}
+
+export function getLocatorGroupRows(data: ActionResponseData | undefined): LocatorGroup[] {
+  return Array.isArray(data) ? data.filter(isLocatorGroupRow) : []
+}
+
+export function getModuleRows(data: ActionResponseData | undefined): Module[] {
+  return Array.isArray(data) ? data.filter(isModuleRow) : []
+}
+
+export function getLocatorRow(data: ActionResponseData | undefined) {
+  return isLocatorRow(data) ? data : null
+}
+
+export function getLocatorPickerSession(data: ActionResponseData | undefined) {
+  return isLocatorPickerSession(data) ? data : null
+}

package/templates/default/src/app/(base)/locators/create/create-locator-workspace.test.tsx

@@ -0,0 +1,125 @@
+// @vitest-environment jsdom
+
+import { fireEvent, render, screen, waitFor } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import { describe, expect, it, vi } from 'vitest'
+
+import CreateLocatorWorkspace from './create-locator-workspace'
+
+const { push, refresh, toast, startLocatorPickerSessionAction, savePickedLocatorAction } = vi.hoisted(() => ({
+  push: vi.fn(),
+  refresh: vi.fn(),
+  toast: vi.fn(),
+  startLocatorPickerSessionAction: vi.fn(),
+  savePickedLocatorAction: vi.fn(),
+}))
+
+vi.mock('next/navigation', () => ({
+  useRouter: () => ({
+    push,
+    refresh,
+  }),
+}))
+
+vi.mock('@/hooks/use-toast', () => ({
+  toast,
+}))
+
+vi.mock('@/actions/locator-picker/locator-picker-actions', () => ({
+  startLocatorPickerSessionAction,
+  getLocatorPickerSessionAction: vi.fn(),
+  savePickedLocatorAction,
+}))
+
+describe('CreateLocatorWorkspace', () => {
+  it('launches chromium from an environment', async () => {
+    const user = userEvent.setup()
+
+    startLocatorPickerSessionAction.mockResolvedValue({
+      status: 200,
+      data: {
+        sessionId: 'session-1',
+        launchSource: { environmentId: 'env-1', environmentName: 'Staging', url: 'https://example.com' },
+        browserName: 'chromium',
+        status: 'ready',
+        currentUrl: 'https://example.com',
+        currentPathname: '/',
+        pageTitle: 'Home',
+        companionPid: 123,
+        startedAt: '2024-01-01T00:00:00.000Z',
+        updatedAt: '2024-01-01T00:00:01.000Z',
+      },
+    })
+
+    render(
+      <CreateLocatorWorkspace
+        environments={[{ id: 'env-1', name: 'Staging' } as never]}
+        locatorGroups={[]}
+        modules={[]}
+      />,
+    )
+
+    await user.click(screen.getByRole('button', { name: 'Launch Chromium' }))
+
+    await waitFor(() => {
+      expect(startLocatorPickerSessionAction).toHaveBeenCalledWith({
+        environmentId: 'env-1',
+        url: undefined,
+      })
+    })
+
+    expect(toast).toHaveBeenCalledWith({
+      title: 'Chromium launched',
+      description:
+        'Use the in-browser Appraise picker panel to start picking, click one element, then confirm Use selector.',
+    })
+  })
+
+  it('saves a locator in create-group mode and navigates back to locators', async () => {
+    const user = userEvent.setup()
+
+    savePickedLocatorAction.mockResolvedValue({
+      status: 200,
+      message: 'Locator saved successfully',
+    })
+
+    render(
+      <CreateLocatorWorkspace
+        environments={[{ id: 'env-1', name: 'Staging' } as never]}
+        locatorGroups={[]}
+        modules={[{ id: 'module-1', name: 'Account' } as never]}
+        initialValues={{
+          resolutionMode: 'create',
+        }}
+      />,
+    )
+
+    await user.type(screen.getByLabelText('Locator Name'), 'Login button')
+    fireEvent.change(screen.getByLabelText('Selector'), {
+      target: { value: 'button[data-testid="login"]' },
+    })
+    await user.type(screen.getByLabelText('Locator Group Name'), 'Login')
+    await user.clear(screen.getByLabelText('Route'))
+    await user.type(screen.getByLabelText('Route'), '/account/login')
+    await user.click(screen.getByRole('combobox', { name: 'Module' }))
+    await user.click(screen.getByRole('option', { name: 'Account' }))
+    await user.click(screen.getByRole('button', { name: 'Save Locator' }))
+
+    await waitFor(() => {
+      expect(savePickedLocatorAction).toHaveBeenCalledWith({
+        locatorId: undefined,
+        sessionId: undefined,
+        locatorName: 'Login button',
+        selector: 'button[data-testid="login"]',
+        resolutionMode: 'create',
+        existingLocatorGroupId: undefined,
+        newLocatorGroupName: 'Login',
+        route: '/account/login',
+        moduleId: 'module-1',
+      })
+    })
+
+    expect(push).toHaveBeenCalledWith('/locators')
+    expect(refresh).toHaveBeenCalled()
+  })
+})