Merge pull request #1259 from RoundingWell/bugfix/worklist-filter

If worklist is restarting, don't set new sort comparator
RoundingWell · May 9, 2024 · 501085e · 501085e
2 parents f75c42b + d20ce66
commit 501085e
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 2 deletions.
diff --git a/src/js/base/app.js b/src/js/base/app.js
@@ -23,14 +23,16 @@ export default App.extend({
   },
   beforeStart: noop,
   onSyncData(fetchId, options, args = []) {
+    if (!this._isRunning || this._fetchId !== fetchId) return;
+
     this._isLoading = false;
-    if (!this.isRunning() || this._fetchId !== fetchId) return;
 
     this.finallyStart.call(this, options, ...args);
   },
   triggerSyncFail(fetchId, options, ...args) {
+    if (!this._isRunning || this._fetchId !== fetchId) return;
+
     this._isLoading = false;
-    if (!this.isRunning() || this._fetchId !== fetchId) return;
 
     this.triggerMethod('fail', options, ...args);
   },

diff --git a/test/integration/patients/worklist/worklist.js b/test/integration/patients/worklist/worklist.js
@@ -4132,4 +4132,38 @@ context('worklist page', function() {
       .find('button')
       .should('not.exist');
   });
+
+  // NOTE: needs to be moved to base class component tests
+  specify('change sort before list is done loading', function() {
+    cy
+      .routesForPatientAction()
+      .routeFlows()
+      .routeActions()
+      .routeFlow()
+      .routeFlowActions()
+      .routePatientByFlow()
+      .routePatientField();
+
+    cy
+      .intercept('GET', '/api/actions*', { delay: 1000, body: { data: [] } })
+      .visit('/worklist/owned-by');
+
+    cy
+      .get('[data-date-filter-region]')
+      .should('contain', 'Added:')
+      .should('contain', 'This Month')
+      .click();
+
+    cy
+      .get('.app-frame__pop-region')
+      .contains('Last Week')
+      .click();
+
+    cy
+      .get('.worklist-list__filter-sort')
+      .click()
+      .get('.picklist')
+      .contains('Patient Last: A')
+      .click();
+  });
 });