Fetch program along with action activity for sidebar

src/js/apps/patients/sidebar/action-sidebar_app.js

@@ -1,3 +1,4 @@
+import $ from 'jquery';
 import Radio from 'backbone.radio';
 
 import App from 'js/base/app';
@@ -17,7 +18,13 @@ export default App.extend({
   },
   beforeStart() {
     if (this.action.isNew()) return;
-    return Radio.request('entities', 'fetch:actionEvents:collection', this.action.id);
+    const d = $.Deferred();
+    const fetchActivity = Radio.request('entities', 'fetch:actionEvents:collection', this.action.id);
+    const fetchProgram = Radio.request('entities', 'fetch:program:model:byAction', this.action.id);
+    $.when(fetchActivity, fetchProgram).done(([activity], program) => {
+      d.resolve(activity);
+    });
+    return d.promise();
   },
   onStart(options, activity) {
     this.activity = activity;

src/js/entities-service/entities/events.js

@@ -28,6 +28,10 @@ const _Model = BaseModel.extend({
   getState() {
     return Radio.request('entities', 'states:model', this.get('_state'));
   },
+  getProgram() {
+    if (!this.get('_program')) return;
+    return Radio.request('entities', 'programs:model', this.get('_program'));
+  },
 });
 
 const Model = Store(_Model, TYPE);

src/js/entities-service/programs.js

@@ -1,3 +1,6 @@
+import $ from 'jquery';
+import Radio from 'backbone.radio';
+
 import BaseEntity from 'js/base/entity-service';
 import { _Model, Model, Collection } from './entities/programs';
 
@@ -8,6 +11,16 @@ const Entity = BaseEntity.extend({
     'programs:collection': 'getCollection',
     'fetch:programs:model': 'fetchModel',
     'fetch:programs:collection': 'fetchCollection',
+    'fetch:program:model:byAction': 'fetchProgramByAction',
+  },
+  fetchProgramByAction(actionId) {
+    const d = $.Deferred();
+    const program = Radio.request('entities', 'programs:model');
+    program.fetch({ url: `/api/actions/${ actionId }/program` })
+      .done(() => {
+        d.resolve(program);
+      });
+    return d;
   },
 });
 

src/js/i18n/en-US.yml

@@ -258,8 +258,9 @@ careOptsFrontend:
             cancelBtn: Cancel
             saveBtn: Save
         activityViews:
+          actionProgramAssigned: '<strong>{ name }</strong> ({ role }) added this Action from the { program } program'
           clinicianAssigned: '<strong>{ name }</strong> ({ role }) changed the Owner to { to_name }'
-          created: "<strong>{ name }</strong> ({ role }) added this Action"
+          created: '<strong>{ name }</strong> ({ role }) added this Action'
           createdAt: Created
           detailsUpdated: '<strong>{ name }</strong> ({ role }) changed the details of this Action'
           dueDateCleared: '<strong>{ name }</strong> ({ role }) cleared the Due Date'

src/js/views/patients/sidebar/action/action-sidebar-activity-views.js

@@ -15,6 +15,11 @@ const ClinicianAssignedTemplate = hbs`
   <div>{{formatMoment date "AT_TIME"}}</div>
 `;
 
+const ActionProgramAssignedTemplate = hbs`
+  {{formatHTMLMessage (intlGet "patients.sidebar.action.activityViews.actionProgramAssigned") name = name role = role program = program}}
+  <div>{{formatMoment date "AT_TIME"}}</div>
+`;
+
 const DetailsUpdatedTemplate = hbs`
   {{formatHTMLMessage (intlGet "patients.sidebar.action.activityViews.detailsUpdated") name = name role = role}}
   <div>{{formatMoment date "AT_TIME"}}</div>
@@ -59,6 +64,7 @@ const ActivityView = View.extend({
     const Templates = {
       ActionCreated: CreatedTemplate,
       ActionClinicianAssigned: ClinicianAssignedTemplate,
+      ActionProgramAssigned: ActionProgramAssignedTemplate,
       ActionDetailsUpdated: DetailsUpdatedTemplate,
       ActionDueDateUpdated: DueDateUpdatedTemplate,
       ActionDurationUpdated: DurationUpdatedTemplate,
@@ -72,6 +78,7 @@ const ActivityView = View.extend({
   templateContext() {
     const editor = this.model.getEditor();
     const clinician = this.model.getClinician();
+    const program = this.model.getProgram();
     const toClinician = _.trim(`${ clinician.get('first_name') } ${ clinician.get('last_name') }`);
     const role = editor.getRole().get('name');
     const name = _.trim(`${ editor.get('first_name') } ${ editor.get('last_name') }`);
@@ -82,6 +89,7 @@ const ActivityView = View.extend({
       to_clinician: toClinician,
       to_role: this.model.getRole().get('name'),
       to_state: this.model.getState().get('name'),
+      program: (program) ? program.get('name') : null,
     };
   },
 });

test/fixtures/config/events.js

@@ -45,7 +45,7 @@ module.exports = {
         };
 
         return {
-          relationships: _.clone(baseRelationships),
+          relationships,
           attributes: _.clone(baseAttributes),
         };
       },

test/integration/patients/sidebar/action-sidebar.js

@@ -18,6 +18,7 @@ context('action sidebar', function() {
       })
       .routePrograms()
       .routeAllProgramActions()
+      .routeProgramByAction()
       .visit('/patient/1/action')
       .wait('@routePatientActions')
       .wait('@routePatient')
@@ -237,8 +238,38 @@ context('action sidebar', function() {
         fx.data[0].relationships.editor.data = null;
         fx.data[0].attributes.date = now.format();
 
+        fx.data.push({
+          id: 'BBBBB',
+          type: 'events',
+          attributes: {
+            date: now.format(),
+            type: 'ActionProgramAssigned',
+          },
+          relationships: {
+            program: {
+              data: {
+                id: '1',
+                type: 'programs',
+              },
+            },
+            editor: {
+              data: {
+                id: '11111',
+                type: 'clinicians',
+              },
+            },
+          },
+        });
+
         return fx;
       })
+      .routeProgramByAction(fx => {
+        fx.data.id = '1';
+        fx.data.attributes.name = 'Test Program';
+
+        return fx;
+      })
+      .routeAllProgramActions()
       .routePatient()
       .visit('/patient/1/action/1')
       .wait('@routePatientActions')
@@ -471,7 +502,8 @@ context('action sidebar', function() {
       .should('contain', 'Clinician McTester (Nurse) cleared Duration')
       .should('contain', 'Clinician McTester (Nurse) changed the name of this Action from New Action to New Action Name Updated')
       .should('contain', 'Clinician McTester (Nurse) changed the Owner to Physician')
-      .should('contain', 'Clinician McTester (Nurse) changed State to Done');
+      .should('contain', 'Clinician McTester (Nurse) changed State to Done')
+      .should('contain', 'Clinician McTester (Nurse) added this Action from the Test Program program');
   });
 
   specify('deleted action', function() {

test/support/api/programs.js

@@ -32,3 +32,19 @@ Cypress.Commands.add('routeProgram', (mutator = _.identity) => {
   })
     .as('routeProgram');
 });
+
+Cypress.Commands.add('routeProgramByAction', (mutator = _.identity) => {
+  cy
+    .fixture('collections/programs').as('fxPrograms');
+
+  cy.route({
+    url: '/api/actions/**/program',
+    response() {
+      return mutator({
+        data: getResource(_.sample(this.fxPrograms), 'programs'),
+        included: [],
+      });
+    },
+  })
+    .as('routeProgramByAction');
+});