fix(analysis): skip reset if edit is cancled

app/analysis/index/route.js

@@ -14,8 +14,11 @@ export default class AnalysisIndexRoute extends Route {
   model() {
     /* eslint-disable-next-line ember/no-controller-access-in-routes */
     const controller = this.controllerFor("analysis.index");
+    const skipReset = controller.skipResetOnSetup;
     next(() => {
-      controller._reset();
+      if (!skipReset) {
+        controller._reset();
+      }
     });
   }
 

app/components/task-selection/component.js

@@ -61,7 +61,7 @@
 
     if (this.args.liveTracking) {
       // we track "_activity" here since we can not track the public getters directly
       this.tracking.addObserver(
         "_activity",
         this.handleTrackingActiveActivityChanged.perform
       );
@@ -97,6 +97,8 @@
       task: null,
     };
 
+    const options = { preventAction: true };
+
     // the objects are possibily wrapped in a proxy which would
     // confuse the upcoming null check
     const [customer, project, task] = await Promise.all([
@@ -106,11 +108,11 @@
     ]);
 
     if (task) {
-      this.onTaskChange(task);
+      this.onTaskChange(task, options);
     } else if (project) {
-      this.onProjectChange(project);
+      this.onProjectChange(project, options);
     } else if (customer) {
-      this.onCustomerChange(customer);
+      this.onCustomerChange(customer, options);
     } else {
       this.tracking.fetchCustomers.perform();
     }

tests/acceptance/analysis-test.js

@@ -26,6 +26,10 @@ module("Acceptance | analysis", function (hooks) {
     await authenticateSession({ user_id: this.user.id });
 
     this.server.createList("report", 40, { userId: this.user.id });
+    this.reportIntersection = this.server.create("report-intersection", {
+      verified: false,
+      review: true,
+    });
   });
 
   test("can visit /analysis", async function (assert) {
@@ -169,6 +173,12 @@ module("Acceptance | analysis", function (hooks) {
 
     assert.ok(find("tbody > tr:first-child.selected"));
 
+    // check if selection remains after canceling the edit
+    await click("button[data-test-edit-selected]");
+    await click("button[data-test-cancel]");
+
+    assert.ok(find("tbody > tr:first-child.selected"));
+
     await click("tbody > tr:first-child");
 
     assert.notOk(find("tbody > tr:first-child.selected"));