Cursor/f6a8ad17 (#1014)

frontend/resources/vue/views/ArgumentForm.vue

@@ -174,7 +174,7 @@ function getInputType(arg) {
     return 'checkbox'
   }
 
-  if (arg.type === 'ascii_identifier' || arg.type === 'ascii') {
+  if (arg.type === 'ascii_identifier' || arg.type === 'ascii' || arg.type === 'ascii_sentence') {
     return 'text'
   }
 
@@ -390,6 +390,8 @@ async function startAction(actionArgs) {
 }
 
 async function handleSubmit(event) {
+  event.preventDefault()
+
   // Set custom validity for required fields
   for (const arg of actionArguments.value) {
     const value = argValues.value[arg.name]
@@ -410,8 +412,6 @@ async function handleSubmit(event) {
     return
   }
 
-  event.preventDefault()
-  
   const argvs = getArgumentValues()
   console.log('argument form has elements that passed validation')
 

integration-tests/tests/suggestionsBrowserKey/config.yaml

@@ -13,8 +13,10 @@ actions:
       - name: testInput
         title: Test Input
         description: "This input uses suggestionsBrowserKey"
+        type: ascii_sentence
         suggestionsBrowserKey: test-suggestions-key
       - name: testInput2
         title: Test Input 2
         description: "This input shares the same suggestionsBrowserKey"
+        type: ascii_sentence
         suggestionsBrowserKey: test-suggestions-key

integration-tests/tests/suggestionsBrowserKey/suggestionsBrowserKey.mjs

@@ -5,7 +5,6 @@ import {
   getRootAndWait,
   getActionButton,
   takeScreenshotOnFailure,
-  getTerminalBuffer,
 } from '../../lib/elements.js'
 
 async function openArgumentForm() {
@@ -45,7 +44,7 @@ async function waitForLogsPage() {
       const url = await webdriver.getCurrentUrl()
       return url.includes('/logs/') && !url.endsWith('/logs')
     }),
-    5000
+    15000
   )
 }
 
@@ -122,7 +121,9 @@ describe('config: suggestionsBrowserKey', function () {
     await openArgumentForm()
 
     const input = await getTestInput()
-    const testValue = 'test-value-123'
+    // Use default argument type "ascii" (alphanumeric only) so tests pass when
+    // config does not set a looser type (e.g. CI merge base without type lines).
+    const testValue = 'testvalue123'
     await input.clear()
     await input.sendKeys(testValue)
 
@@ -143,7 +144,7 @@ describe('config: suggestionsBrowserKey', function () {
     this.timeout(15000)
 
     // First, save a value to localStorage
-    const testValue = 'saved-suggestion-456'
+    const testValue = 'savedsuggestion456'
     await webdriver.executeScript(`
       const key = 'olivetin-suggestions-test-suggestions-key';
       localStorage.setItem(key, JSON.stringify(['${testValue}']));
@@ -181,7 +182,7 @@ describe('config: suggestionsBrowserKey', function () {
     await openArgumentForm()
     const input1 = await getTestInput()
     await input1.clear()
-    await input1.sendKeys('first-value')
+    await input1.sendKeys('firstvalue')
     await submitForm()
     await waitForLogsPage()
     await waitForExecutionComplete()
@@ -190,7 +191,7 @@ describe('config: suggestionsBrowserKey', function () {
     await openArgumentForm()
     const input2 = await getTestInput()
     await input2.clear()
-    await input2.sendKeys('second-value')
+    await input2.sendKeys('secondvalue')
     await submitForm()
     await waitForLogsPage()
     await waitForExecutionComplete()
@@ -201,9 +202,9 @@ describe('config: suggestionsBrowserKey', function () {
 
     const suggestions = JSON.parse(stored)
     expect(suggestions).to.be.an('array')
-    expect(suggestions).to.include('first-value')
+    expect(suggestions).to.include('firstvalue')
-    expect(suggestions).to.include('second-value')
+    expect(suggestions).to.include('secondvalue')
-    expect(suggestions[0]).to.equal('second-value') // Most recent should be first
+    expect(suggestions[0]).to.equal('secondvalue') // Most recent should be first
   })
 
   it('Empty values are not saved to localStorage', async function () {
@@ -243,7 +244,7 @@ describe('config: suggestionsBrowserKey', function () {
     await openArgumentForm()
     const input1 = await getTestInput()
     await input1.clear()
-    await input1.sendKeys('shared-value-from-input1')
+    await input1.sendKeys('sharedfrominput1')
     await submitForm()
     await waitForLogsPage()
     await waitForExecutionComplete()
@@ -258,7 +259,7 @@ describe('config: suggestionsBrowserKey', function () {
     let foundInInput1 = false
     for (const option of options1) {
       const value = await option.getAttribute('value')
-      if (value === 'shared-value-from-input1') {
+      if (value === 'sharedfrominput1') {
         foundInInput1 = true
         break
       }
@@ -272,7 +273,7 @@ describe('config: suggestionsBrowserKey', function () {
     let foundInInput2 = false
     for (const option of options2) {
       const value = await option.getAttribute('value')
-      if (value === 'shared-value-from-input1') {
+      if (value === 'sharedfrominput1') {
         foundInInput2 = true
         break
       }
@@ -282,7 +283,7 @@ describe('config: suggestionsBrowserKey', function () {
     // Now submit a value using the second input
     const input2 = await getTestInput2()
     await input2.clear()
-    await input2.sendKeys('shared-value-from-input2')
+    await input2.sendKeys('sharedfrominput2')
     await submitForm()
     await waitForLogsPage()
     await waitForExecutionComplete()
@@ -296,10 +297,10 @@ describe('config: suggestionsBrowserKey', function () {
     let foundValue2 = false
     for (const option of options1After) {
       const value = await option.getAttribute('value')
-      if (value === 'shared-value-from-input1') {
+      if (value === 'sharedfrominput1') {
         foundValue1 = true
       }
-      if (value === 'shared-value-from-input2') {
+      if (value === 'sharedfrominput2') {
         foundValue2 = true
       }
     }
@@ -312,10 +313,10 @@ describe('config: suggestionsBrowserKey', function () {
     foundValue2 = false
     for (const option of options2After) {
       const value = await option.getAttribute('value')
-      if (value === 'shared-value-from-input1') {
+      if (value === 'sharedfrominput1') {
         foundValue1 = true
       }
-      if (value === 'shared-value-from-input2') {
+      if (value === 'sharedfrominput2') {
         foundValue2 = true
       }
     }