fix(#8745): don't evaluate form context when opening a task (#8746)

#8745
medic · Dec 8, 2023 · 34edb11 · 34edb11
1 parent fec1410
commit 34edb11
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 2 deletions.
diff --git a/tests/e2e/default/tasks/forms/home-visit.properties.json b/tests/e2e/default/tasks/forms/home-visit.properties.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "expression": "!contact || contact.type === 'person'",
+    "expression": "false",
     "person": true,
     "place": false
   },

diff --git a/tests/e2e/default/tasks/tasks-breadcrumbs.wdio-spec.js b/tests/e2e/default/tasks/tasks-breadcrumbs.wdio-spec.js
@@ -110,6 +110,13 @@ describe('Tasks tab breadcrumbs', () => {
         },
       ]);
     });
+
+    it('should open task with expression', async () => {
+      await tasksPage.goToTasksTab();
+      const task = await tasksPage.getTaskByContactAndForm('patient1', 'person_create');
+      await task.click();
+      await tasksPage.waitForTaskContentLoaded('Home Visit');
+    });
   });
 
   describe('for supervisor', () => {

diff --git a/tests/e2e/default/tasks/tasks.wdio-spec.js b/tests/e2e/default/tasks/tasks.wdio-spec.js
@@ -20,7 +20,7 @@ const compileTasks = async (tasksFileName) => {
   return await chtConfUtils.compileNoolsConfig({ tasks: tasksFilePath });
 };
 
-describe('Task list', () => {
+describe('Tasks', () => {
   const places = placeFactory.generateHierarchy();
   const clinic = places.get('clinic');
   const healthCenter = places.get('health_center');

diff --git a/webapp/src/ts/services/enketo.service.ts b/webapp/src/ts/services/enketo.service.ts
@@ -644,6 +644,10 @@ export class EnketoFormContext {
   }
 
   shouldEvaluateExpression() {
+    if (this.type === 'task') {
+      return false;
+    }
+
     if (this.type === 'report' && this.editing) {
       return false;
     }

diff --git a/webapp/tests/karma/ts/services/enketo.service.spec.ts b/webapp/tests/karma/ts/services/enketo.service.spec.ts
@@ -1209,3 +1209,44 @@ describe('Enketo service', () => {
     }));
   });
 });
+
+describe('EnketoFormContext', () => {
+  it('should construct object correctly', () => {
+    const context = new EnketoFormContext('#sel', 'task', { doc: 1 }, { data: 1 });
+    expect(context).to.deep.include({
+      selector: '#sel',
+      type: 'task',
+      formDoc: { doc: 1 },
+      instanceData: { data: 1 },
+    });
+  });
+
+  it('shouldEvaluateExpression should return false for tasks', () => {
+    const ctx = new EnketoFormContext('a', 'task', {}, {});
+    expect(ctx.shouldEvaluateExpression()).to.eq(false);
+  });
+
+  it('shouldEvaluateExpression should return false for editing reports', () => {
+    const ctx = new EnketoFormContext('a', 'report', {}, {});
+    ctx.editing = true;
+    expect(ctx.shouldEvaluateExpression()).to.eq(false);
+  });
+
+  it('shouldEvaluateExpression should return true for reports and contact forms', () => {
+    const ctxReport = new EnketoFormContext('a', 'report', {}, {});
+    expect(ctxReport.shouldEvaluateExpression()).to.eq(true);
+
+    const ctxContact = new EnketoFormContext('a', 'contact', {}, {});
+    expect(ctxContact.shouldEvaluateExpression()).to.eq(true);
+  });
+
+  it('requiresContact should return true when type is not contact', () => {
+    const ctxReport = new EnketoFormContext('a', 'report', {}, {});
+    expect(ctxReport.requiresContact()).to.eq(true);
+  });
+
+  it('requiresContact should return false when type is contact', () => {
+    const ctxReport = new EnketoFormContext('a', 'contact', {}, {});
+    expect(ctxReport.requiresContact()).to.eq(false);
+  });
+});