fix(report): fix report permissions and tests

adfinis · Apr 15, 2021 · fa9386b · fa9386b
1 parent 5b707bb
commit fa9386b
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 17 deletions.
diff --git a/app/abilities/report.js b/app/abilities/report.js
@@ -8,11 +8,7 @@ export default Ability.extend({
     function() {
       return (
         this.get("user.isSuperuser") ||
-        (!(
-          this.get("model.verifiedBy") &&
-          this.get("model.verifiedBy.id") &&
-          this.get("model.billed")
-        ) &&
+        (!(this.get("model.verifiedBy.id") && this.get("model.billed")) &&
           (this.get("model.user.id") === this.get("user.id") ||
             this.getWithDefault("model.user.supervisors", [])
               .mapBy("id")

diff --git a/app/components/report-row/component.js b/app/components/report-row/component.js
@@ -38,16 +38,18 @@ const ReportRowComponent = Component.extend({
 
   attributeBindings: ["title"],
 
-  editable() {
-    return this.cannot.can("edit report", this.get("report"));
-  },
+  editable: computed("report.{verifiedBy,billed}", {
+    get() {
+      return this.can.can("edit report", this.get("report"));
+    }
+  }),
 
-  title: computed("report.verifiedBy", function() {
-    return this.get("report.verifiedBy.id")
-      ? `This entry was already verified by ${this.get(
+  title: computed("editable", function() {
+    return this.editable
+      ? ""
+      : `This entry was already verified by ${this.get(
           "report.verifiedBy.fullName"
-        )} and therefore not editable anymore`
-      : "";
+        )} and therefore not editable anymore`;
   }),
 
   /**

diff --git a/app/components/report-row/template.hbs b/app/components/report-row/template.hbs
@@ -1,4 +1,4 @@
-{{#task-selection disabled=(cannot 'edit report' report) task=changeset.task as |t|}}
+{{#task-selection disabled=(not editable) task=changeset.task as |t|}}
   <div class="form-list-cell form-group {{if changeset.error.task 'has-error'}}">{{t.customer}}</div>
   <div class="form-list-cell form-group {{if changeset.error.task 'has-error'}}">{{t.project}}</div>
   <div class="form-list-cell form-group {{if changeset.error.task 'has-error'}}">{{t.task}}</div>
@@ -11,7 +11,7 @@
     placeholder="Comment"
     name="comment"
     value={{changeset.comment}}
-    disabled={{cannot 'edit report' report}}
+    disabled={{not editable}}
     onchange={{action (mut changeset.comment) value='target.value'}}
     data-test-report-comment
   >

diff --git a/app/index/reports/controller.js b/app/index/reports/controller.js
@@ -51,7 +51,10 @@ export default Controller.extend({
       });
 
       if (!reportsToday.filterBy("isNew", true).get("length")) {
-        this.store.createRecord("report", { date: this.get("model") });
+        this.store.createRecord("report", {
+          date: this.get("model"),
+          user: this.get("user")
+        });
       }
 
       return reportsToday.sort(a => (a.get("isNew") ? 1 : 0));

diff --git a/tests/integration/components/report-row/component-test.js b/tests/integration/components/report-row/component-test.js
@@ -56,7 +56,8 @@ module("Integration | Component | report row", function(hooks) {
         verifiedBy: EmberObject.create({
           id: 1,
           fullName: "John Doe"
-        })
+        }),
+        billed: true
       })
     );
-Original file line number
+Diff line change
@@ Expand Up @@
             verifiedBy: EmberObject.create({
               id: 1,
               fullName: "John Doe"
-            })
+            }),
+            billed: true
           })
         );
@@ Expand Down @@