Test coverage and small fixes

src/js/apps/forms/form/form_app.js

@@ -283,7 +283,7 @@ export default App.extend({
 
     this.listenTo(sidebarApp, 'close', () => {
       sidebarApp.stop();
-      if (this.getState('isExpanded')) return;
+
       this.setState('isActionSidebar', false);
     });
   },

src/js/apps/globals/app-frame_app.js

@@ -46,6 +46,7 @@ export default App.extend({
     this.initFormsApp(FormsApp);
 
     new Promise(resolve => {
+      /* istanbul ignore next: Branch only for testing */
       _TEST_ ? resolve() : defer(resolve);
     }).then(() => {
       Backbone.history.loadUrl();

src/js/apps/patients/patient/patient_app.js

@@ -45,8 +45,8 @@ export default SubRouterApp.extend({
     ];
   },
 
+  /* istanbul ignore next: error handling */
   onFail({ currentRoute: { eventArgs: [patientId] } }, { response = {}, responseData = {} }) {
-    /* istanbul ignore else: other error scenarios handled elsewhere */
     if (response.status === 410) {
       if (!some(responseData.errors, error => {
         return get(error, ['source', 'parameter']) === 'actionId';
@@ -80,6 +80,7 @@ export default SubRouterApp.extend({
 
   onStop() {
     delete this._list;
+    delete this.action;
   },
 
   startList(list) {

src/js/apps/programs/program/program_app.js

@@ -52,12 +52,6 @@ export default SubRouterApp.extend({
 
     this.showSidebar();
 
-    // Show/Empty program sidebar based on app sidebar
-    this.listenTo(Radio.channel('sidebar'), {
-      'show': this.emptySidebar,
-      'close': this.showSidebar,
-    });
-
     this.startRoute(currentRoute);
 
     this.showView();
@@ -118,10 +112,6 @@ export default SubRouterApp.extend({
     this.showChildView('sidebar', sidebarView);
   },
 
-  emptySidebar() {
-    this.getRegion('sidebar').empty();
-  },
-
   onEdit() {
     const programSidebar = this.getChildApp('programSidebar');
     Radio.request('sidebar', 'start', programSidebar, { program: this.program });

src/js/views/globals/sidebar/sidebar.hbs

@@ -5,7 +5,7 @@
     </div>
     <div class="flex">
       <span data-menu-region></span>
-      <button class="button--icon js-close">{{fas "xmark"}}</button>
+      <button class="u-margin--l-8 button--icon js-close">{{fas "xmark"}}</button>
     </div>
   </div>
   <div class="u-margin--t-16" data-content-region></div>

src/js/views/patients/sidebar/patient/patient-sidebar_views.js

@@ -9,7 +9,7 @@ import 'scss/domain/patient-sidebar.scss';
 import './patient-sidebar.scss';
 
 const sidebarOptions = {
-  className: 'worklist-patient-sidebar flex',
+  className: 'worklist-patient-sidebar flex-region',
 };
 
 const SidebarWidgetsView = WidgetCollectionView.extend({

test/integration/patients/patient/patient-flow.js

@@ -1559,6 +1559,14 @@ context('patient flow page', function() {
       .find('.js-select')
       .click();
 
+    cy
+      .get('@firstRow')
+      .should('not.have.class', 'is-selected');
+
+    cy
+      .get('@firstRow')
+      .find('.js-select')
+      .click();
 
     cy
       .routeAction(fx => {
@@ -1593,7 +1601,7 @@ context('patient flow page', function() {
 
     cy
       .get('@firstRow')
-      .should('not.have.class', 'is-selected');
+      .should('have.class', 'is-selected');
 
     cy
       .get('[data-header-region]')
@@ -1624,6 +1632,10 @@ context('patient flow page', function() {
       .find('.js-bulk-edit')
       .should('not.exist');
 
+    cy
+      .get('@firstRow')
+      .should('not.have.class', 'is-selected');
+
     cy
       .get('[data-header-region]')
       .find('[data-state-region]')

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

@@ -669,6 +669,15 @@ context('action sidebar', function() {
       .should('contain', 'Due Time cleared')
       .should('contain', 'Form shared with Test Patient. Waiting for response.')
       .should('contain', 'Form sharing (Nurse) cancelled');
+
+    cy
+      .get('.sidebar')
+      .find('.js-close')
+      .click();
+
+    cy
+      .get('.sidebar')
+      .should('not.exist');
   });
 
   specify('action attachments', function() {

test/integration/patients/worklist/reduced-schedule.js

@@ -153,6 +153,26 @@ context('reduced schedule page', function() {
       .find('.schedule-list__day-list-row .js-select')
       .should('not.exist');
 
+    cy
+      .get('@scheduleList')
+      .find('.schedule-list__list-row')
+      .first()
+      .find('.js-patient-sidebar-button')
+      .click()
+      .wait('@routePatient');
+
+    cy
+      .get('.worklist-patient-sidebar')
+      .should('contain', 'First Last');
+
+    cy
+      .get('.worklist-patient-sidebar .js-close')
+      .click();
+
+    cy
+      .get('.worklist-patient-sidebar')
+      .should('not.exist');
+
     cy
       .get('@scheduleList')
       .find('.schedule-list__list-row')

test/integration/patients/worklist/schedule.js

@@ -77,6 +77,7 @@ context('schedule page', function() {
         },
       },
       {
+        id: '3',
         attributes: {
           name: 'Second Action',
           details: null,
@@ -86,10 +87,12 @@ context('schedule page', function() {
         relationships: {
           patient: getRelationship(testPatient1),
           form: getRelationship(),
+          flow: getRelationship(testFlow),
           state: getRelationship(stateInProgress),
         },
       },
       {
+        id: '4',
         attributes: {
           name: 'Third Action',
           due_date: testDate(),
@@ -98,8 +101,7 @@ context('schedule page', function() {
         relationships: {
           patient: getRelationship(testPatient1),
           form: getRelationship(),
-          flow: getRelationship(testFlow),
-          state: getRelationship(stateInProgress),
+          state: getRelationship(stateDone),
         },
       },
     ];
@@ -215,7 +217,13 @@ context('schedule page', function() {
       .find('tr')
       .eq(2)
       .should('contain', '2:00 PM')
-      .should('contain', 'Third Action');
+      .should('contain', 'Third Action')
+      .click();
+
+    cy
+      .url()
+      .should('contain', 'patient/archive/1/action/4')
+      .go('back');
 
     cy
       .get('@actionList')