@projectcaluma/ember-distribution 11.0.0-beta.35 → 11.0.0-beta.37

package/addon/abilities/inquiry.js

@@ -57,12 +57,9 @@ export default class InquiryAbility extends Ability {
   get canEdit() {
     return (
       this.hasBasePermission &&
-      // Since editing in the status ready has the same character as sending an
-      // inquiry, we need to make sure that permission would be given
-      (this.isSuspended ||
-        (this.isReady &&
-          this.hasCustomPermission("sendInquiry", this.model))) &&
-      this.isControlling
+      (this.isSuspended || this.isReady) &&
+      this.isControlling &&
+      this.hasCustomPermission("editInquiry", this.model)
     );
   }
 

package/addon/components/cd-document-header.hbs

@@ -5,7 +5,7 @@
       ({{group-name @group}})
     {{/if}}
     {{#if @status}}
-      <UkLabel @label={{@status}} class="uk-margin-left uk-text-default" />
+      <UkLabel @label={{@status}} class="uk-margin-left" />
     {{/if}}
   </div>
   {{yield}}

package/addon/components/cd-inquiry-dialog/inquiry-part.hbs

@@ -7,10 +7,7 @@
       >
         {{group-name @inquiry.controllingGroups}}
         {{#if this.status}}
-          <UkLabel
-            @label={{this.status}}
-            class="uk-margin-left uk-text-default"
-          />
+          <UkLabel @label={{this.status}} class="uk-margin-left" />
         {{/if}}
       </div>
     {{else if (eq @type "answer")}}

package/addon/components/cd-inquiry-dialog/inquiry-part.js

@@ -33,10 +33,7 @@ export default class CdInquiryDialogInquiryPartComponent extends Component {
 
     const inquiry = this.args.inquiry;
 
-    if (
-      inquiry.status === "SUSPENDED" &&
-      this.abilities.can("edit inquiry", inquiry)
-    ) {
+    if (inquiry.status === "SUSPENDED") {
       return this.intl.t("caluma.distribution.status.draft");
     } else if (this.abilities.can("answer inquiry", inquiry)) {
       return this.answerStatus;

package/addon/components/cd-inquiry-dialog.js

@@ -84,6 +84,8 @@ export default class CdInquiryDialogComponent extends Component {
 
     yield this.distribution.createInquiry.perform([this.args.to]);
 
+    yield getObservable(this._inquiries.value).refetch();
+
     this.router.transitionTo(
       "inquiry.detail.index",
       {

package/addon/components/cd-inquiry-edit-form.hbs

@@ -16,6 +16,7 @@
     {{#if
       (and
         (cannot "send inquiry" this.inquiry)
+        (can "edit inquiry" this.inquiry)
         (eq this.inquiry.status "SUSPENDED")
       )
     }}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-distribution",
-  "version": "11.0.0-beta.35",
+  "version": "11.0.0-beta.37",
   "description": "Ember engine for the Caluma distribution module.",
   "keywords": [
     "ember-addon",
@@ -23,9 +23,9 @@
     "@embroider/macros": "^1.9.0",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
-    "@projectcaluma/ember-core": "^11.0.0-beta.35",
-    "@projectcaluma/ember-form": "^11.0.0-beta.35",
-    "@projectcaluma/ember-workflow": "^11.0.0-beta.35",
+    "@projectcaluma/ember-core": "^11.0.0-beta.37",
+    "@projectcaluma/ember-form": "^11.0.0-beta.37",
+    "@projectcaluma/ember-workflow": "^11.0.0-beta.37",
     "ember-apollo-client": "~4.0.2",
     "ember-auto-import": "^2.4.3",
     "ember-can": "^4.2.0",
@@ -36,14 +36,14 @@
     "ember-fetch": "^8.1.2",
     "ember-flatpickr": "^3.2.3",
     "ember-intl": "^5.7.2",
-    "ember-resources": "^5.5.0",
+    "ember-resources": "^5.6.0",
     "ember-svg-jar": "^2.4.2",
     "ember-test-selectors": "^6.0.0",
-    "ember-uikit": "^6.1.0",
+    "ember-uikit": "^6.1.1",
     "graphql": "^15.8.0",
     "graphql-tag": "^2.12.6",
     "lodash.merge": "^4.6.2",
-    "luxon": "^3.0.4",
+    "luxon": "^3.1.0",
     "tracked-toolbox": "^1.2.3"
   },
   "devDependencies": {
@@ -51,7 +51,7 @@
     "@ember/test-helpers": "2.7.0",
     "@embroider/test-setup": "1.8.3",
     "@faker-js/faker": "7.6.0",
-    "@projectcaluma/ember-testing": "11.0.0-beta.35",
+    "@projectcaluma/ember-testing": "11.0.0-beta.37",
     "broccoli-asset-rev": "3.0.0",
     "ember-cli": "4.8.0",
     "ember-cli-code-coverage": "1.0.3",
@@ -66,16 +66,16 @@
     "ember-load-initializers": "2.1.2",
     "ember-qunit": "6.0.0",
     "ember-resolver": "8.0.3",
-    "ember-source": "4.8.0",
+    "ember-source": "4.8.2",
     "ember-source-channel-url": "3.0.0",
     "ember-try": "2.0.0",
     "loader.js": "4.7.0",
-    "miragejs": "0.1.45",
+    "miragejs": "0.1.46",
     "npm-run-all": "4.1.5",
     "qunit": "2.19.3",
     "qunit-dom": "2.0.0",
-    "sass": "1.55.0",
-    "webpack": "5.74.0"
+    "sass": "1.56.1",
+    "webpack": "5.75.0"
   },
   "engines": {
     "node": "14.* || 16.* || >= 18"