Feature/form input required (#764)

* Making form fields required Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Basic checks for each task description to allow submission Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Fix e2e tests, select coe for patrol explicitly Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Splitting interface and refactoring validity check Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Delivery quantity to positive int field, and sku to text field, monitor null or empty value Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Disable submit when clean zone is removed Signed-off-by: Aaron Chong <aaronchongth@gmail.com> --------- Signed-off-by: Aaron Chong <aaronchongth@gmail.com>
open-rmf · Sep 8, 2023 · 8a4415e · 8a4415e
1 parent 3388e03
commit 8a4415e
Show file tree

Hide file tree

Showing 4 changed files with 195 additions and 152 deletions.
diff --git a/packages/dashboard-e2e/tests/ui-interactions/create-task-from-any-tab.test.ts b/packages/dashboard-e2e/tests/ui-interactions/create-task-from-any-tab.test.ts
@@ -5,7 +5,37 @@ describe('submit task', () => {
     const appBar = await getAppBar();
     await (await appBar.$('button[aria-label="System Overview"]')).click();
     await (await appBar.$('button[aria-label="new task"]')).click();
+    await (await $('#task-type')).click();
+    const getPatrolOption = async () => {
+      const options = await $$('[role=option]');
+      for (const opt of options) {
+        const text = await opt.getText();
+        if (text === 'Patrol') {
+          return opt;
+        }
+      }
+      return null;
+    };
+    await browser.waitUntil(async () => !!(await getPatrolOption()));
+    const patrolOption = (await getPatrolOption())!;
+    await patrolOption.click();
+
+    await (await $('#place-input')).click();
+    const getCoeOption = async () => {
+      const options = await $$('[role=option]');
+      for (const opt of options) {
+        const text = await opt.getText();
+        if (text === 'coe') {
+          return opt;
+        }
+      }
+      return null;
+    };
+    await browser.waitUntil(async () => !!(await getCoeOption()));
+    const coeOption = (await getCoeOption())!;
+    await coeOption.click();
+
     await (await $('button[aria-label="Submit Now"]')).click();
     await expect($('div=Successfully created task')).toBeDisplayed();
-  });
+  }).timeout(60000);
 });
diff --git a/packages/dashboard-e2e/tests/ui-interactions/submit-task.test.ts b/packages/dashboard-e2e/tests/ui-interactions/submit-task.test.ts
@@ -20,7 +20,20 @@ describe('submit task', () => {
     const patrolOption = (await getPatrolOption())!;
     await patrolOption.click();
 
-    await (await $('#place-input')).setValue('coe');
+    await (await $('#place-input')).click();
+    const getCoeOption = async () => {
+      const options = await $$('[role=option]');
+      for (const opt of options) {
+        const text = await opt.getText();
+        if (text === 'coe') {
+          return opt;
+        }
+      }
+      return null;
+    };
+    await browser.waitUntil(async () => !!(await getCoeOption()));
+    const coeOption = (await getCoeOption())!;
+    await coeOption.click();
 
     await (await $('button[aria-label="Submit Now"]')).click();
     await expect($('div=Successfully created task')).toBeDisplayed();

diff --git a/packages/react-components/lib/form-inputs.tsx b/packages/react-components/lib/form-inputs.tsx
@@ -19,7 +19,7 @@ export function PositiveIntField({ value = 0, onChange, ...props }: PositiveIntF
       {...props}
       type="number"
       value={valueInput}
-      inputProps={{ min: 0 }}
+      inputProps={{ min: 1 }}
       onKeyDown={(ev) => {
         if ('-+.'.indexOf(ev.key) >= 0) {
           ev.preventDefault();