diff --git a/tests/e2e/default/contacts/fab-actionbar.wdio-spec.js b/tests/e2e/default/contacts/fab-actionbar.wdio-spec.js new file mode 100644 index 00000000000..c44ceb984fb --- /dev/null +++ b/tests/e2e/default/contacts/fab-actionbar.wdio-spec.js @@ -0,0 +1,86 @@ +const placeFactory = require('@factories/cht/contacts/place'); +const userFactory = require('@factories/cht/users/users'); +const personFactory = require('@factories/cht/contacts/person'); +const utils = require('@utils'); +const loginPage = require('@page-objects/default/login/login.wdio.page'); +const commonElements = require('@page-objects/default/common/common.wdio.page'); +const { genericForm } = require('@page-objects/default/contacts/contacts.wdio.page'); + +const places = placeFactory.generateHierarchy(); +const healthCenter = places.get('health_center'); +const onlineUser = userFactory.build({ place: healthCenter._id, roles: [ 'program_officer' ] }); +const patient = personFactory.build({ parent: { _id: healthCenter._id, parent: healthCenter.parent } }); +describe('FAB + Actionbar', () => { + before(async () => { + await utils.saveDocs([ ...places.values(), patient ]); + await utils.createUsers([ onlineUser ]); + await loginPage.login(onlineUser); + }); + + afterEach(async () => { + await utils.revertSettings(false); + }); + + describe('FAB', () => { + it('should show new household and new person create option', async () => { + await commonElements.goToPeople(healthCenter._id); + const fabLabels = await commonElements.getFastActionItemsLabels(); + + expect(fabLabels).to.have.members(['New household', 'New person']); + }); + + it('should show fab when user only has can_create_places permission', async () => { + await utils.updatePermissions(onlineUser.roles, [], ['can_create_people']); + await commonElements.goToPeople(healthCenter._id); + + await commonElements.clickFastActionFAB({ waitForList: false }); + const formTitle = await genericForm.getFormTitle(); + expect(formTitle).to.equal('New household'); + }); + + it('should show fab when user only has can_create_people permission', async () => { + await utils.updatePermissions(onlineUser.roles, [], ['can_create_places']); + await commonElements.goToPeople(healthCenter._id); + + await commonElements.clickFastActionFAB({ waitForList: false }); + const formTitle = await genericForm.getFormTitle(); + expect(formTitle).to.equal('New person'); + }); + }); + + describe('Action bar', () => { + it('should show new household and new person create option', async () => { + await utils.updatePermissions(onlineUser.roles, ['can_view_old_action_bar']); + await commonElements.goToPeople(healthCenter._id); + const actionBarLabels = await commonElements.getActionBarLabels(); + + expect(actionBarLabels).to.have.members([ + 'New household', + 'New person', + 'New action', + ]); + }); + + it('should not show new person when missing permission', async () => { + await utils.updatePermissions(onlineUser.roles, ['can_view_old_action_bar'], ['can_create_people']); + await commonElements.goToPeople(healthCenter._id); + const actionBarLabels = await commonElements.getActionBarLabels(); + + expect(actionBarLabels).to.have.members([ + 'New household', + 'New action', + ]); + }); + + it('should not show new place when missing permission', async () => { + await utils.updatePermissions(onlineUser.roles, ['can_view_old_action_bar'], ['can_create_places']); + await commonElements.goToPeople(healthCenter._id); + const actionBarLabels = await commonElements.getActionBarLabels(); + + expect(actionBarLabels).to.have.members([ + 'New person', + 'New action', + ]); + }); + }); +}); diff --git a/tests/e2e/default/sms/messages-breadcrumbs.wdio-spec.js b/tests/e2e/default/sms/messages-sender-data.wdio-spec.js similarity index 79% rename from tests/e2e/default/sms/messages-breadcrumbs.wdio-spec.js rename to tests/e2e/default/sms/messages-sender-data.wdio-spec.js index 988d9561960..7182669c193 100644 --- a/tests/e2e/default/sms/messages-breadcrumbs.wdio-spec.js +++ b/tests/e2e/default/sms/messages-sender-data.wdio-spec.js @@ -5,8 +5,9 @@ const userFactory = require('@factories/cht/users/users'); const placeFactory = require('@factories/cht/contacts/place'); const personFactory = require('@factories/cht/contacts/person'); const messagesPage = require('@page-objects/default/sms/messages.wdio.page'); +const contactsPage = require('@page-objects/default/contacts/contacts.wdio.page'); -describe('Message tab breadcrumbs', () => { +describe('Message Tab - Sender Data', () => { const places = placeFactory.generateHierarchy(); const clinic = places.get('clinic'); const health_center = places.get('health_center'); @@ -84,4 +85,19 @@ describe('Message tab breadcrumbs', () => { expect(lineage).to.equal(expectedLineage); }); + it('should display conversation with link and navigate to contact', async () => { + await loginPage.login(offlineUser); + await commonElements.waitForPageLoaded(); + await commonElements.goToMessages(); + + await messagesPage.openMessage(patient._id); + const header = await messagesPage.getMessageHeader(); + expect(header.name).to.equal(patient.name); + expect(header.phone).to.equal(patient.phone); + + await messagesPage.navigateFromConversationToContact(); + const title = await contactsPage.getContactInfoName(); + expect(title).to.equal(patient.name); + }); + }); diff --git a/tests/e2e/default/tasks/forms/home-visit.properties.json b/tests/e2e/default/tasks/forms/home-visit.properties.json index 7d629e5a219..be17f733fd1 100644 --- 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 index 138c9074685..6343411d1cb 100644 --- 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 index 7e3d10e93bf..36f319cc828 100644 --- 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/tests/page-objects/default/common/common.wdio.page.js b/tests/page-objects/default/common/common.wdio.page.js index 86646477066..d48f0aa6fda 100644 --- a/tests/page-objects/default/common/common.wdio.page.js +++ b/tests/page-objects/default/common/common.wdio.page.js @@ -12,6 +12,7 @@ const FAST_ACTION_LIST_CONTAINER = '.fast-action-content-wrapper'; const fastActionListContainer = () => $(FAST_ACTION_LIST_CONTAINER); const fastActionListCloseButton = () => $(`${FAST_ACTION_LIST_CONTAINER} .panel-header .panel-header-close`); const fastActionById = (id) => $(`${FAST_ACTION_LIST_CONTAINER} .fast-action-item[test-id="${id}"]`); +const fastActionItems = () => $$(`${FAST_ACTION_LIST_CONTAINER} .fast-action-item`); const moreOptionsMenu = () => $('.more-options-menu-container>.mat-mdc-menu-trigger'); const hamburgerMenuItemSelector = '#header-dropdown li'; const logoutButton = () => $(`${hamburgerMenuItemSelector} .fa-power-off`); @@ -28,6 +29,9 @@ const syncSuccess = () => $(`${hamburgerMenuItemSelector}.sync-status .success`) const syncRequired = () => $(`${hamburgerMenuItemSelector}.sync-status .required`); const jsonError = async () => (await $('pre')).getText(); +const actionBar = () => $('.detail-actions.right-pane'); +const actionBarActions = () => $$('.detail-actions.right-pane span'); + //languages const activeSnackbar = () => $('#snackbar.active'); const inactiveSnackbar = () => $('#snackbar:not(.active)'); @@ -82,6 +86,20 @@ const clickFastActionFAB = async ({ actionId, waitForList }) => { } }; +const getFastActionItemsLabels = async () => { + await closeHamburgerMenu(); + await (await fastActionFAB()).waitForDisplayed(); + await (await fastActionFAB()).waitForClickable(); + await (await fastActionFAB()).click(); + + await browser.pause(500); + await (await fastActionListContainer()).waitForDisplayed(); + + const items = await fastActionItems(); + const fastActionItemLabels = await Promise.all(items.map(item => item.getText())); + return fastActionItemLabels; +}; + const clickFastActionFlat = async ({ actionId, waitForList }) => { await (await fastActionFlat()).waitForDisplayed(); await (await fastActionFlat()).waitForClickable(); @@ -406,6 +424,14 @@ const loadNextInfiniteScrollPage = async () => { await waitForLoaderToDisappear(await $('.left-pane')); }; +const getActionBarLabels = async () => { + await (await actionBar()).waitForDisplayed(); + await (await actionBarActions())[0].waitForDisplayed(); + const items = await actionBarActions(); + const labels = await Promise.all(items.map(item => item.getText())); + return labels.filter(label => !!label); +}; + module.exports = { openMoreOptionsMenu, closeFastActionList, @@ -466,4 +492,6 @@ module.exports = { getAllButtonLabelsNames, loadNextInfiniteScrollPage, goToUrl, + getFastActionItemsLabels, + getActionBarLabels, }; diff --git a/tests/page-objects/default/sms/messages.wdio.page.js b/tests/page-objects/default/sms/messages.wdio.page.js index 83457876598..bf0f0fbda1b 100644 --- a/tests/page-objects/default/sms/messages.wdio.page.js +++ b/tests/page-objects/default/sms/messages.wdio.page.js @@ -45,6 +45,12 @@ const getMessageHeader = async () => { }; }; +const navigateFromConversationToContact = async () => { + await $(`${MESSAGE_HEADER} a.name`).waitForClickable(); + await $(`${MESSAGE_HEADER} a.name`).click(); + await commonPage.waitForPageLoaded(); +}; + const getMessageContent = async (index = 1) => { const sms = await $(`${MESSAGE_CONTENT} li:nth-child(${index})`); await sms.waitForDisplayed(); @@ -140,5 +146,6 @@ module.exports = { sendReply, replyAddRecipients, getAmountOfMessagesByPhone, + navigateFromConversationToContact, getMessagesModalDetails, }; diff --git a/webapp/src/ts/components/actionbar/actionbar.component.html b/webapp/src/ts/components/actionbar/actionbar.component.html index 9a5659ee81f..dc7c5723b3e 100644 --- a/webapp/src/ts/components/actionbar/actionbar.component.html +++ b/webapp/src/ts/components/actionbar/actionbar.component.html @@ -38,10 +38,10 @@
-
+
@@ -51,7 +51,7 @@
  • @@ -66,7 +66,7 @@
    - + [translateParams]="{ senderName: getName() || ( 'messages.unknown.sender' | translate ) }"> messages.sent.by - - {{ message.doc?.name || message.contact?.name || (!message.form && message.name) || message.from || message.sent_by || ('messages.unknown.sender' | translate) }} - + + {{ getName() }} + + {{ getName() || ( 'messages.unknown.sender' | translate ) }} + + {{ message.doc?.phone || message.contact?.phone || message.phone }} diff --git a/webapp/src/ts/components/sender/sender.component.ts b/webapp/src/ts/components/sender/sender.component.ts index 93d5fc06336..ce2162c4dba 100644 --- a/webapp/src/ts/components/sender/sender.component.ts +++ b/webapp/src/ts/components/sender/sender.component.ts @@ -10,5 +10,16 @@ export class SenderComponent { @Input() sentBy; @Input() hideLineage; - constructor() { } + getName() { + return this.message.doc?.name + || this.message.contact?.name + || (!this.message.form && this.message.name) + || this.message.from + || this.message.sent_by + || this.message.doc?.from; + } + + getId() { + return this.message.contact?._id || this.message.doc?._id; + } } diff --git a/webapp/src/ts/services/enketo.service.ts b/webapp/src/ts/services/enketo.service.ts index 62868cded91..0e54ec0064a 100644 --- 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/src/ts/services/fast-action-button.service.ts b/webapp/src/ts/services/fast-action-button.service.ts index d09c1b19785..1d17974c01f 100644 --- a/webapp/src/ts/services/fast-action-button.service.ts +++ b/webapp/src/ts/services/fast-action-button.service.ts @@ -65,7 +65,7 @@ export class FastActionButtonService { return xmlForms .map(form => ({ id: form.code, - label: this.getFormTitle(form.titleKey, form.title) || form.code, + label: this.getFormTitle(form.titleKey, form.title) ?? form.code, icon: { name: form.icon, type: IconType.RESOURCE }, alwaysOpenInPanel: true, canDisplay: () => this.authService.has('can_edit'), @@ -88,9 +88,12 @@ export class FastActionButtonService { return childContactTypes .map(contactType => ({ id: contactType.id, - label: this.getFormTitle(contactType.create_key) || contactType.id, + label: this.getFormTitle(contactType.create_key) ?? contactType.id, icon: { name: contactType.icon, type: IconType.RESOURCE }, - canDisplay: () => this.authService.has(['can_edit', 'can_create_places']), + canDisplay: () => this.authService.has([ + 'can_edit', + contactType.person ? 'can_create_people' : 'can_create_places' + ]), execute: () => { const route = ['/contacts', 'add', contactType.id]; if (parentFacilityId) { @@ -124,7 +127,7 @@ export class FastActionButtonService { this.executeMailto(`sms:${sendTo?.phone}`); return; } - callbackOpenSendMessage && callbackOpenSendMessage(sendTo?._id); + callbackOpenSendMessage?.(sendTo?._id); }, }; } diff --git a/webapp/tests/karma/ts/components/sender.component.spec.ts b/webapp/tests/karma/ts/components/sender.component.spec.ts index 757eb1df073..2249f4b1d78 100644 --- a/webapp/tests/karma/ts/components/sender.component.spec.ts +++ b/webapp/tests/karma/ts/components/sender.component.spec.ts @@ -1,4 +1,5 @@ import { TestBed } from '@angular/core/testing'; +import { RouterModule } from '@angular/router'; import { expect } from 'chai'; import { By } from '@angular/platform-browser'; import { TranslateFakeLoader, TranslateLoader, TranslateModule } from '@ngx-translate/core'; @@ -18,6 +19,7 @@ describe('sender directive', function() { imports: [ TranslateModule.forRoot({ loader: { provide: TranslateLoader, useClass: TranslateFakeLoader } }), PipesModule, + RouterModule.forRoot([]), ], declarations: [ SenderComponent, @@ -44,7 +46,7 @@ describe('sender directive', function() { fixture.detectChanges(); await fixture.whenStable(); - expect(getElement('div .name').innerText).to.equal('+123'); + expect(getElement('div span.name').innerText).to.equal('+123'); }); it('should render sender when message has sent by', async () => { @@ -55,7 +57,7 @@ describe('sender directive', function() { fixture.detectChanges(); await fixture.whenStable(); - expect(getElement('div .name').innerText).to.equal('+789'); + expect(getElement('div span.name').innerText).to.equal('+789'); }); it('should render sender when message has contact', async () => { @@ -80,10 +82,50 @@ describe('sender directive', function() { fixture.detectChanges(); await fixture.whenStable(); - expect(getElement('div .name').innerText).to.equal('Clark '); - expect(getElement('div .phone').innerText).to.equal('+123'); + expect(getElement('div span.name').innerText.trim()).to.equal('Clark'); + expect(getElement('div .phone').innerText.trim()).to.equal('+123'); expect(getElement('div .position .lineage li:nth-child(1)').innerText).to.equal('Clarks House'); expect(getElement('div .position .lineage li:nth-child(2)').innerText).to.equal('Smallville'); expect(getElement('div .position .lineage li:nth-child(3)').innerText).to.equal('Metropolis'); }); + + it('should render sender as a link when message has a contact with id', async () => { + fixture.componentInstance.message = { + sent_by: '+789', + from: '+123', + contact: { + _id: 'clark-123', + name: 'Clark', + phone: '+123', + parent: { + name: 'Clarks House', + parent: { name: 'Smallville', parent: { name: 'Metropolis' } }, + }, + }, + }; + + fixture.detectChanges(); + await fixture.whenStable(); + + expect(getElement('div a.name').innerText.trim()).to.equal('Clark'); + expect(getElement('div .phone').innerText.trim()).to.equal('+123'); + expect(getElement('div .position .lineage li:nth-child(1)').innerText).to.equal('Clarks House'); + expect(getElement('div .position .lineage li:nth-child(2)').innerText).to.equal('Smallville'); + expect(getElement('div .position .lineage li:nth-child(3)').innerText).to.equal('Metropolis'); + }); + + it('should render sender as a link when message has a doc with id', async () => { + fixture.componentInstance.message = { + sent_by: '+789', + from: '+123', + doc: { _id: 'jane-123', name: 'Jane', phone: '+123' }, + contact: null, + }; + + fixture.detectChanges(); + await fixture.whenStable(); + + expect(getElement('div a.name').innerText.trim()).to.equal('Jane'); + expect(getElement('div .phone').innerText.trim()).to.equal('+123'); + }); }); diff --git a/webapp/tests/karma/ts/services/enketo.service.spec.ts b/webapp/tests/karma/ts/services/enketo.service.spec.ts index 5fe2cbc5953..a0f7eebb201 100644 --- 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); + }); +}); diff --git a/webapp/tests/karma/ts/services/fast-action-button.service.spec.ts b/webapp/tests/karma/ts/services/fast-action-button.service.spec.ts index 8a9af448d38..d23f3e3c71e 100644 --- a/webapp/tests/karma/ts/services/fast-action-button.service.spec.ts +++ b/webapp/tests/karma/ts/services/fast-action-button.service.spec.ts @@ -198,6 +198,7 @@ describe('Session service', () => { childContactTypes: [ { id: 'child-place-1', create_key: 'child-place-1-title', icon: 'child-place-1-icon' }, { id: 'child-place-2', icon: 'child-place-2-icon' }, + { id: 'child-place-3', icon: 'child-place-3-icon', person: true }, ], xmlReportForms: [ { code: 'report-form-1', titleKey: 'report-form-1-title-key', icon: 'report-form-1-icon' }, @@ -214,12 +215,13 @@ describe('Session service', () => { const actions = await service.getContactRightSideActions(context); - expect(actions.length).to.equal(6); + expect(actions.length).to.equal(7); expect(authService.has.args).to.have.deep.members([ [ 'can_view_call_action' ], [ [ 'can_view_message_action', 'can_edit' ] ], [ [ 'can_edit', 'can_create_places' ] ], [ [ 'can_edit', 'can_create_places' ] ], + [ [ 'can_edit', 'can_create_people' ] ], [ 'can_edit' ], [ 'can_edit' ], [ 'can_edit' ], @@ -240,19 +242,26 @@ describe('Session service', () => { route: [ '/contacts', 'parent-facility-1', 'add', 'child-place-2' ], queryParams: null, }); - assertReportFormAction(actions[3], { + assertContactFormAction(actions[3], { + id: 'child-place-3', + label: 'child-place-3', + icon: 'child-place-3-icon', + route: [ '/contacts', 'parent-facility-1', 'add', 'child-place-3' ], + queryParams: null, + }); + assertReportFormAction(actions[4], { id: 'report-form-1', label: 'report-form-1-title-key', icon: 'report-form-1-icon', route: [ '/reports', 'add', 'report-form-1' ], }); - assertReportFormAction(actions[4], { + assertReportFormAction(actions[5], { id: 'report-form-2', label: 'report-form-2-title', icon: 'report-form-2-icon', route: [ '/reports', 'add', 'report-form-2' ], }); - assertReportFormAction(actions[5], { + assertReportFormAction(actions[6], { id: 'report-form-3', label: 'report-form-3', icon: 'report-form-3-icon', @@ -266,6 +275,7 @@ describe('Session service', () => { childContactTypes: [ { id: 'child-place-1', create_key: 'child-place-1-title', icon: 'child-place-1-icon' }, { id: 'child-place-2', icon: 'child-place-2-icon' }, + { id: 'child-place-3', icon: 'child-place-3-icon', person: true }, ], xmlReportForms: [ { code: 'report-form-1', titleKey: 'report-form-1-title-key', icon: 'report-form-1-icon' }, @@ -282,12 +292,13 @@ describe('Session service', () => { const actions = await service.getContactRightSideActions(context); - expect(actions.length).to.equal(7); + expect(actions.length).to.equal(8); expect(authService.has.args).to.have.deep.members([ [ 'can_view_call_action' ], [ [ 'can_view_message_action' ] ], [ [ 'can_edit', 'can_create_places' ] ], [ [ 'can_edit', 'can_create_places' ] ], + [ [ 'can_edit', 'can_create_people' ] ], [ 'can_edit' ], [ 'can_edit' ], [ 'can_edit' ], @@ -309,19 +320,26 @@ describe('Session service', () => { route: [ '/contacts', 'parent-facility-1', 'add', 'child-place-2' ], queryParams: null, }); - assertReportFormAction(actions[4], { + assertContactFormAction(actions[4], { + id: 'child-place-3', + label: 'child-place-3', + icon: 'child-place-3-icon', + route: [ '/contacts', 'parent-facility-1', 'add', 'child-place-3' ], + queryParams: null, + }); + assertReportFormAction(actions[5], { id: 'report-form-1', label: 'report-form-1-title-key', icon: 'report-form-1-icon', route: [ '/reports', 'add', 'report-form-1' ], }); - assertReportFormAction(actions[5], { + assertReportFormAction(actions[6], { id: 'report-form-2', label: 'report-form-2-title', icon: 'report-form-2-icon', route: [ '/reports', 'add', 'report-form-2' ], }); - assertReportFormAction(actions[6], { + assertReportFormAction(actions[7], { id: 'report-form-3', label: 'report-form-3', icon: 'report-form-3-icon',