Merge branch 'master' into 185987214-drawing-tile-navigator-panel

concord-consortium · Sep 30, 2024 · 8bb86f2 · 8bb86f2
2 parents c12a82e + 3f37fc1
commit 8bb86f2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/cypress/support/elements/common/SortedWork.js b/cypress/support/elements/common/SortedWork.js
@@ -67,7 +67,7 @@ class SortedWork {
     return cy.get("[data-test=list-item-all]");
   }
   openSortWorkSection(sectionLabel) {
-    return cy.get(".sort-work-view .sorted-sections .section-header-label").contains(sectionLabel).get(".section-header-right .section-header-arrow").click({multiple: true});
+    return cy.get(".sort-work-view .sorted-sections .section-header-label").contains(".section-header-label", sectionLabel).find(".section-header-arrow").click();
   }
   checkDocumentInGroup(groupName, doc) {
     this.getSortWorkGroup(groupName).find(".documents-list .list-item .footer .info").should("contain", doc);

diff --git a/cypress/support/elements/tile/DataflowToolTile.js b/cypress/support/elements/tile/DataflowToolTile.js
@@ -242,13 +242,13 @@ class DataflowToolTile {
   recordData(samplingRate, timer) {
     this.selectSamplingRate(samplingRate);
     this.getRecordButton().click();
-    this.getCountdownTimer().should("contain", "000:0" + timer.toString());
+    this.getCountdownTimer({timeout: (timer + 2) * 1000}).should("contain", "000:0" + timer.toString());
     this.getStopButton().click();
   }
   recordDataWithoutStop(samplingRate, timer) {
     this.selectSamplingRate(samplingRate);
     this.getRecordButton().click();
-    this.getCountdownTimer().should("contain", "000:0" + timer.toString());
+    this.getCountdownTimer({timeout: (timer + 2) * 1000}).should("contain", "000:0" + timer.toString());
   }
   clearRecordedData() {
     this.getRecordingClearButton().click();

diff --git a/src/models/stores/sorted-documents.ts b/src/models/stores/sorted-documents.ts
@@ -1,4 +1,4 @@
-import { makeAutoObservable } from "mobx";
+import { makeAutoObservable, runInAction } from "mobx";
 import { types, Instance, SnapshotIn, applySnapshot, typecheck, unprotect } from "mobx-state-tree";
 import { union } from "lodash";
 import firebase from "firebase";
@@ -310,7 +310,8 @@ export class SortedDocuments {
         problem: doc.problem,
         unit: doc.unit
       });
-      docsMap.put(metadata);
+      // MST's unprotect doesn't disable MobX's strict mode warnings
+      runInAction(() => docsMap.put(metadata));
     });
     return docsMap;
   }