make multiple namespaces configurable and added to the form

integration-tests/api.test.ts

@@ -46,7 +46,7 @@ describe('import-controller api tests', () => {
       await request(app)
         .get('/input')
         .expect(200)
-        .expect('Content-Type', 'text/html; charset=UTF-8')
+        .expect('Content-Type', 'text/html; charset=utf-8')
         .expect((response) => {
           expect(response.text).toContain('<label for="manuscript-data">Input JSON:</label>');
         });
@@ -60,18 +60,26 @@ describe('import-controller api tests', () => {
         firstExecutionRunId: 4321,
       });
 
-      const url = 'http://localhost:8233/namespaces/default/workflows/1234/4321';
+      const url = 'http://localhost:8233/namespaces/foo/workflows/1234/4321';
 
       await request(app)
         .post('/input')
-        .send({ manuscript: { data: JSON.stringify(requiredManuscriptData) } })
+        .send({ manuscript: { data: JSON.stringify(requiredManuscriptData) }, temporalNamespace: 'foo' })
         .expect(200, `Import started <a href="${url}">${url}</a>`);
     });
 
+    it('returns 400 if namespace is not provided', async () => {
+      await request(app)
+        .post('/input')
+        .send({ manuscript: { data: JSON.stringify({ foo: 'bar' }) }})
+        .expect(400)
+        .expect((response) => expect(response.body.message).toStrictEqual('missing namespace'));
+    });
+
     it('returns 400 if the form will not validate', async () => {
       await request(app)
         .post('/input')
-        .send({ manuscript: { data: JSON.stringify({ foo: 'bar' }) } })
+        .send({ manuscript: { data: JSON.stringify({ foo: 'bar' }) }, temporalNamespace: 'foo' })
         .expect(400)
         .expect((response) => expect(response.body.message).toStrictEqual('validation failed'));
     });
@@ -81,7 +89,7 @@ describe('import-controller api tests', () => {
 
       await request(app)
         .post('/input')
-        .send({ manuscript: { data: JSON.stringify(requiredManuscriptData) } })
+        .send({ manuscript: { data: JSON.stringify(requiredManuscriptData) }, temporalNamespace: 'foo' })
         .expect(500, 'An error occurred while processing your request: Unknown error.');
     });
   });

src/app.ts

@@ -5,6 +5,7 @@ import { Client, Connection } from '@temporalio/client';
 import { randomBytes } from 'node:crypto';
 import { manuscriptDataSchema } from './form-validation';
 import { config } from './config';
+import { generateForm } from './form';
 
 const app: Express = express();
 
@@ -16,11 +17,23 @@ app.get('/', (_, res) => {
 });
 
 app.get('/input', (_, res) => {
-  res.sendFile(join(__dirname, 'index.html'));
+  res.send(generateForm());
 });
 
 app.post('/input', async (req, res) => {
   const input = JSON.parse(req.body.manuscript.data);
+  const namespace = req.body.temporalNamespace;
+  if (!namespace || namespace.length === 0) {
+    res.status(400).send({
+      result: false,
+      message: 'missing namespace',
+    });
+
+    // eslint-disable-next-line no-console
+    console.error('namespace was not provided');
+    return;
+  }
+
   // this is not destructured because for some reason that removes the type from the value property and marks it as an any
   const validationResult = manuscriptDataSchema.validate(input, { abortEarly: false, allowUnknown: true });
   // type for value only exists if its inside this check
@@ -34,7 +47,7 @@ app.post('/input', async (req, res) => {
 
     const client = new Client({
       connection,
-      namespace: config.temporalNamespace,
+      namespace,
     });
     // send to temporal
     await client.workflow.start('importManuscriptData', {
@@ -49,7 +62,7 @@ app.post('/input', async (req, res) => {
         validationResult.value,
       ],
     })
-      .then((result) => `${config.temporalUi}/namespaces/${config.temporalNamespace}/workflows/${result.workflowId}/${result.firstExecutionRunId}`)
+      .then((result) => `${config.temporalUi}/namespaces/${namespace}/workflows/${result.workflowId}/${result.firstExecutionRunId}`)
       .then((url) => res.status(200).send(`Import started <a href="${url}">${url}</a>`))
       .catch((error) => {
         // eslint-disable-next-line no-console

src/form.ts

@@ -0,0 +1,35 @@
+import { config } from './config';
+
+export const generateForm = () => (`
+  <!DOCTYPE html>
+  <html lang="en">
+    <head>
+      <meta charset="UTF-8">
+      <meta name="viewport" content="width=device-width, initial-scale=1.0">
+      <title>Import Manuscript</title>
+    </head>
+    <body>
+      
+      <form action="/input" method="post">
+        <h2>Manuscript Data</h2>
+        <label for="manuscript-data">Input JSON:</label>
+        <textarea id="manuscript-data" style="width: 600px; height: 280px;" name="manuscript[data]" required>
+    {
+      "id": "[ID]",
+      "versions": []
+    }
+        </textarea>
+        <br/>
+        <label for="temporal_namespace">Select a Namespace:</label>
+        <select id="temporal_namespace" name="temporalNamespace" required>
+            <option value="" disabled selected hidden>-- Please choose an option --</option>
+            ${config.temporalNamespace.split(',').map((ns) => `<option value="${ns}">${ns}</option>`).join('\n')}
+        </select>
+        <br><br>
+    
+        <button type="submit">Submit</button>
+    </form>
+    
+    </body>
+  </html>
+`);