@projectcaluma/ember-distribution 1.0.0-beta.3 → 1.0.0-beta.6

package/addon/components/inquiry-dialog.hbs

@@ -1,9 +1,11 @@
-<section>
-  {{#if this._inquiries.isRunning}}
-    <div class="uk-text-center"><UkSpinner @ratio={{2}} /></div>
-  {{else}}
+{{#if this._inquiries.isRunning}}
+  <div class="uk-text-center"><UkSpinner @ratio={{2}} /></div>
+{{else if this.inquiries.length}}
+  <section>
     {{#each this.inquiries as |inquiry|}}
       <InquiryDialog::Inquiry @inquiry={{inquiry}} />
     {{/each}}
-  {{/if}}
-</section>
+  </section>
+{{else}}
+  <Notfound />
+{{/if}}

package/addon/components/inquiry-dialog.js

@@ -1,5 +1,6 @@
+import { inject as service } from "@ember/service";
 import Component from "@glimmer/component";
-import { queryManager } from "ember-apollo-client";
+import { queryManager, getObservable } from "ember-apollo-client";
 import { dropTask } from "ember-concurrency";
 import { useTask } from "ember-resources";
 
@@ -7,6 +8,8 @@ import config from "@projectcaluma/ember-distribution/config";
 import inquiryDialogQuery from "@projectcaluma/ember-distribution/gql/queries/inquiry-dialog.graphql";
 
 export default class InquiryDialogComponent extends Component {
+  @service router;
+
   @config config;
 
   @queryManager apollo;
@@ -24,7 +27,7 @@ export default class InquiryDialogComponent extends Component {
 
   @dropTask
   *fetchDialog() {
-    return yield this.apollo.watchQuery({
+    const response = yield this.apollo.watchQuery({
       query: inquiryDialogQuery,
       variables: {
         from: this.args.from,
@@ -38,5 +41,25 @@ export default class InquiryDialogComponent extends Component {
         includeNavigationData: true,
       },
     });
+
+    /**
+     * Sadly this is necessary to handle what happens after the withdraw task in
+     * the inquiry part component because the mutation triggers a refresh of the
+     * query above in the same runloop instead of the next one.  This causes
+     * `this.inquiries` to be recomputed which then triggers a rerender of the
+     * component and therefore cancels the withdraw task before we can do a
+     * transition.
+     *
+     * TODO: If https://github.com/ember-graphql/ember-apollo-client/pull/421 is
+     * merged and released, we can rewrite this into an action that is triggered
+     * in the withdraw task of the child component.
+     */
+    getObservable(response).subscribe(({ data: { allWorkItems } }) => {
+      if (allWorkItems.edges.every((edge) => edge.node.status === "CANCELED")) {
+        this.router.transitionTo("index");
+      }
+    });
+
+    return response;
   }
 }

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

@@ -2,26 +2,28 @@
   @documentId={{decode-id this.inquiry.document.id}}
   @disabled={{cannot "edit inquiry" this.inquiry}}
   @loading={{this._inquiry.isRunning}}
-  as |content|
 >
-  <h1 class="uk-flex uk-flex-middle">
-    {{t "caluma.distribution.edit.title"}}
-    {{#if (eq this.inquiry.status "RUNNING")}}
-      <UkLabel
-        class="uk-margin-left"
-        @label={{t "caluma.distribution.status.draft"}}
-      />
-    {{/if}}
-  </h1>
+  <:default as |content|>
+    <h1 class="uk-flex uk-flex-middle">
+      {{t "caluma.distribution.edit.title"}}
+      {{#if (eq this.inquiry.status "RUNNING")}}
+        <UkLabel
+          class="uk-margin-left"
+          @label={{t "caluma.distribution.status.draft"}}
+        />
+      {{/if}}
+    </h1>
 
-  <content.form />
+    <content.form />
 
-  <DocumentValidity @document={{content.document}} as |isValid validate|>
-    <UkButton
-      @type="submit"
-      @color="primary"
-      @disabled={{or (not isValid) this.send.isRunning}}
-      @onClick={{perform this.send validate}}
-    >{{t "caluma.distribution.edit.send"}}</UkButton>
-  </DocumentValidity>
+    <DocumentValidity @document={{content.document}} as |isValid validate|>
+      <UkButton
+        @type="submit"
+        @color="primary"
+        @disabled={{or (not isValid) this.send.isRunning}}
+        @onClick={{perform this.send validate}}
+      >{{t "caluma.distribution.edit.send"}}</UkButton>
+    </DocumentValidity>
+  </:default>
+  <:notfound><Notfound /></:notfound>
 </CfContent>

package/addon/components/inquiry-edit-form.js

@@ -11,6 +11,7 @@ import inquiryEditQuery from "@projectcaluma/ember-distribution/gql/queries/inqu
 export default class InquiryEditFormComponent extends Component {
   @service notification;
   @service router;
+  @service intl;
 
   @config config;
 
@@ -43,7 +44,7 @@ export default class InquiryEditFormComponent extends Component {
         variables: { workItem: this.args.inquiry },
       });
 
-      yield this.router.transitionTo("distribution.inquiry.index");
+      yield this.router.transitionTo("inquiry.index");
     } catch (error) {
       this.notification.danger(
         this.intl.t("caluma.distribution.edit.send-error")

package/addon/components/inquiry-new-form.hbs

@@ -1,109 +1,121 @@
-<h1>{{t "caluma.distribution.new.title"}}</h1>
+{{#if this.controls.workItems.isRunning}}
+  <div class="uk-text-center"><UkSpinner @ratio={{2}} /></div>
+{{else if (can "create inquiry of distribution")}}
+  <h1>{{t "caluma.distribution.new.title"}}</h1>
 
-{{#if this.selectedGroups.length}}
-  <div class="uk-flex uk-flex-middle">
-    <div class="uk-width-expand">
-      <button type="button" class="uk-link uk-text-light">
-        {{t "caluma.distribution.new.groups" count=this.selectedGroups.length}}
-      </button>
-      <div uk-dropdown class="uk-width-auto">
-        <ul
-          class="uk-list uk-list-bullet uk-margin-remove uk-padding-remove"
-          data-test-selected-groups
-        >
-          {{#each this.selectedGroups as |identifier|}}
-            <li class="uk-text-nowrap">{{group-name identifier}}</li>
-          {{/each}}
-        </ul>
+  {{#if this.selectedGroups.length}}
+    <div class="uk-flex uk-flex-middle">
+      <div class="uk-width-expand">
+        <a href="">
+          {{t
+            "caluma.distribution.new.groups"
+            count=this.selectedGroups.length
+          }}
+        </a>
+        <div uk-dropdown class="uk-width-auto">
+          <ul
+            class="uk-list uk-list-bullet uk-margin-remove uk-padding-remove"
+            data-test-selected-groups
+          >
+            {{#each this.selectedGroups as |identifier|}}
+              <li class="uk-text-nowrap">{{group-name identifier}}</li>
+            {{/each}}
+          </ul>
+        </div>
+        {{t
+          "caluma.distribution.new.selected"
+          count=this.selectedGroups.length
+        }}
+      </div>
+      <div>
+        <UkButton
+          @label={{t "caluma.distribution.new.reset"}}
+          @onClick={{this.clearSelectedGroups}}
+          data-test-reset
+        />
+        <UkButton
+          @color="primary"
+          @label={{t "caluma.distribution.new.create-draft"}}
+          @type="submit"
+          @loading={{this.submit.isRunning}}
+          @disabled={{this.submit.isRunning}}
+          @onClick={{perform this.submit}}
+          data-test-submit
+        />
       </div>
-      {{t "caluma.distribution.new.selected" count=this.selectedGroups.length}}
-    </div>
-    <div>
-      <UkButton
-        @label={{t "caluma.distribution.new.reset"}}
-        @onClick={{this.clearSelectedGroups}}
-        data-test-reset
-      />
-      <UkButton
-        @color="primary"
-        @label={{t "caluma.distribution.new.create-draft"}}
-        @type="submit"
-        @loading={{this.submit.isRunning}}
-        @disabled={{this.submit.isRunning}}
-        @onClick={{perform this.submit}}
-        data-test-submit
-      />
     </div>
-  </div>
-  <hr />
-{{/if}}
-
-<div class="uk-margin-bottom uk-button-group">
-  {{#each-in this.config.new.types as |slug config|}}
-    {{#unless config.disabled}}
-      <UkButton
-        data-test-type={{slug}}
-        @label={{t config.label}}
-        @color={{if (includes slug @selectedTypes) "primary" "default"}}
-        @onClick={{fn this.updateSelectedTypes slug}}
-      />
-    {{/unless}}
-  {{/each-in}}
-</div>
+    <hr />
+  {{/if}}
 
-<div class="uk-search uk-search-default uk-width-1-1">
-  <span class="uk-search-icon-flip" uk-search-icon></span>
-  <input
-    placeholder={{t "caluma.distribution.new.search"}}
-    aria-label={{t "caluma.distribution.new.search"}}
-    class="uk-search-input"
-    type="search"
-    value={{@search}}
-    data-test-search
-    {{on "input" (perform this.updateSearch)}}
-  />
-</div>
+  <div class="uk-margin-bottom uk-button-group">
+    {{#each-in this.config.new.types as |slug config|}}
+      {{#unless config.disabled}}
+        <UkButton
+          data-test-type={{slug}}
+          @label={{t config.label}}
+          @color={{if (includes slug @selectedTypes) "primary" "default"}}
+          @onClick={{fn this.updateSelectedTypes slug}}
+        />
+      {{/unless}}
+    {{/each-in}}
+  </div>
 
-{{#if this.groups.isRunning}}
-  <div class="uk-text-center uk-margin">
-    <UkSpinner @ratio={{2}} />
+  <div class="uk-search uk-search-default uk-width-1-1">
+    <span class="uk-search-icon-flip" uk-search-icon></span>
+    <input
+      placeholder={{t "caluma.distribution.new.search"}}
+      aria-label={{t "caluma.distribution.new.search"}}
+      class="uk-search-input"
+      type="search"
+      value={{@search}}
+      data-test-search
+      {{on "input" (perform this.updateSearch)}}
+    />
   </div>
-{{else if this.groups.value.length}}
-  <ul class="uk-list uk-list-striped">
-    {{#each this.groups.value as |group|}}
-      {{! template-lint-disable require-presentational-children }}
-      <li
-        role="checkbox"
-        class="uk-flex uk-flex-between uk-flex-middle"
-        data-test-group={{group.identifier}}
-        {{on "click" (fn this.updateSelectedGroups group.identifier)}}
-      >
-        {{! template-lint-disable no-nested-interactive }}
-        <label for="group-{{group.identifier}}">
-          <input
-            type="checkbox"
-            class="uk-checkbox uk-margin-small-right"
-            checked={{includes group.identifier this.selectedGroups}}
-            id="group-{{group.identifier}}"
-          />
-          {{group-name group.identifier}}
-        </label>
-        {{#if group.config.icon}}
-          {{svg-jar
-            group.config.icon
-            width="20"
-            height="20"
-            class=(concat "uk-text-" group.config.iconColor)
-          }}
-        {{/if}}
-      </li>
-    {{/each}}
-  </ul>
+
+  {{#if this.groups.isRunning}}
+    <div class="uk-text-center uk-margin">
+      <UkSpinner @ratio={{2}} />
+    </div>
+  {{else if this.groups.value.length}}
+    <ul class="uk-list uk-list-striped">
+      {{#each this.groups.value as |group|}}
+        {{! template-lint-disable require-presentational-children }}
+        <li
+          role="checkbox"
+          class="uk-flex uk-flex-between uk-flex-middle"
+          data-test-group={{group.identifier}}
+          {{on "click" (fn this.updateSelectedGroups group.identifier)}}
+        >
+          {{! template-lint-disable no-nested-interactive }}
+          <label for="group-{{group.identifier}}">
+            <input
+              type="checkbox"
+              class="uk-checkbox uk-margin-small-right"
+              checked={{includes group.identifier this.selectedGroups}}
+              id="group-{{group.identifier}}"
+            />
+            {{group-name group.identifier}}
+          </label>
+          {{#if group.config.icon}}
+            {{svg-jar
+              group.config.icon
+              width="20"
+              height="20"
+              class=(concat "uk-text-" group.config.iconColor)
+            }}
+          {{/if}}
+        </li>
+      {{/each}}
+    </ul>
+  {{else}}
+    <div class="uk-text-center">
+      <UkIcon @icon="search" @ratio={{10}} class="uk-margin-top" />
+      <p class="uk-text-muted">
+        {{t "caluma.distribution.new.empty"}}
+      </p>
+    </div>
+  {{/if}}
 {{else}}
-  <div class="uk-text-center">
-    <UkIcon @icon="search" @ratio={{10}} class="uk-margin-top" />
-    <p class="uk-text-muted">
-      {{t "caluma.distribution.new.empty"}}
-    </p>
-  </div>
+  <Notfound />
 {{/if}}

package/addon/components/inquiry-new-form.js

@@ -1,6 +1,6 @@
-import { getOwner } from "@ember/application";
 import { action } from "@ember/object";
 import { inject as service } from "@ember/service";
+import { macroCondition, isTesting } from "@embroider/macros";
 import Component from "@glimmer/component";
 import { tracked } from "@glimmer/tracking";
 import { queryManager } from "ember-apollo-client";
@@ -10,8 +10,6 @@ import { useTask } from "ember-resources";
 import { decodeId } from "@projectcaluma/ember-core/helpers/decode-id";
 import config from "@projectcaluma/ember-distribution/config";
 import createInquiryMutation from "@projectcaluma/ember-distribution/gql/mutations/create-inquiry.graphql";
-import controlWorkItemsQuery from "@projectcaluma/ember-distribution/gql/queries/control-work-items.graphql";
-import inquiryNavigationQuery from "@projectcaluma/ember-distribution/gql/queries/inquiry-navigation.graphql";
 
 const toggle = (value, array) => {
   const set = new Set(array);
@@ -26,6 +24,7 @@ export default class InquiryNewFormComponent extends Component {
   @service notification;
   @service intl;
   @service router;
+  @service distribution;
 
   @queryManager apollo;
 
@@ -63,10 +62,10 @@ export default class InquiryNewFormComponent extends Component {
   *updateSearch(e) {
     e.preventDefault();
 
-    const { environment } =
-      getOwner(this).resolveRegistration("config:environment");
-
-    if (environment !== "test") {
+    /* istanbul ignore next */
+    if (macroCondition(isTesting())) {
+      // no timeout
+    } else {
       yield timeout(500);
     }
 
@@ -80,54 +79,37 @@ export default class InquiryNewFormComponent extends Component {
     if (!this.selectedGroups.length) return;
 
     try {
-      // get create inquiry work item to complete, this will not trigger a
-      // network request since it's already fetch in the controls
-      const controlsData = yield this.apollo.watchQuery(
-        {
-          query: controlWorkItemsQuery,
-          variables: {
-            caseId: this.args.caseId,
-            currentGroup: String(this.calumaOptions.currentGroupId),
-            createTask: this.config.controls.createTask,
-            completeTask: this.config.controls.completeTask,
-          },
-        },
-        "create.edges"
+      // get create inquiry work item to complete
+      const createId = decodeId(
+        this.distribution.controls.value?.create.edges[0].node.id
       );
 
       // create new inquiries
       yield this.apollo.mutate({
         mutation: createInquiryMutation,
         variables: {
-          id: decodeId(controlsData[0].node.id),
+          id: createId,
           context: JSON.stringify({
             addressed_groups: this.selectedGroups.map(String),
           }),
         },
       });
 
-      // refetch navigation data
-      const navigationData = yield this.apollo.query(
+      // refetch navigation and controls data
+      yield this.distribution.refetch();
+
+      const lastControlling =
+        this.distribution.navigation.value.controlling.edges[0].node;
+
+      // transition to last added inquiry
+      this.router.transitionTo(
+        "inquiry.detail.index",
         {
-          query: inquiryNavigationQuery,
-          fetchPolicy: "network-only",
-          variables: {
-            caseId: this.args.caseId,
-            task: this.config.inquiry.task,
-            currentGroup: String(this.calumaOptions.currentGroupId),
-            statusQuestion: this.config.inquiry.answer.statusQuestion,
-            deadlineQuestion: this.config.inquiry.deadlineQuestion,
-            includeNavigationData: true,
-          },
+          from: lastControlling.controllingGroups[0],
+          to: lastControlling.addressedGroups[0],
         },
-        "controlling.edges"
+        decodeId(lastControlling.id)
       );
-
-      // transition to last added inquiry
-      this.router.transitionTo("distribution.inquiry", {
-        from: navigationData[0].node.controllingGroups[0],
-        to: navigationData[0].node.addressedGroups[0],
-      });
     } catch (e) {
       this.notification.danger(
         this.intl.t("caluma.distribution.new.error", {

package/addon/components/notfound.hbs

@@ -0,0 +1,12 @@
+<div class="uk-text-center">
+  <h1 class="uk-heading-xlarge">
+    {{t "caluma.distribution.notfound.title"}}
+  </h1>
+  <h2 class="uk-heading-small uk-margin-remove-top uk-text-muted">
+    {{t "caluma.distribution.notfound.subtitle"}}
+  </h2>
+  <p class="uk-text-muted">
+    {{t "caluma.distribution.notfound.back"}}
+    <LinkTo @route="index">{{t "caluma.distribution.notfound.link"}}</LinkTo>
+  </p>
+</div>

package/addon/config.js

@@ -15,6 +15,7 @@ export default function config(target, property) {
     get() {
       return merge(
         {
+          ui: { stack: false, small: false },
           controls: {
             createTask: "create-inquiry",
             completeTask: "complete-distribution",

package/addon/controllers/application.js

@@ -0,0 +1,7 @@
+import Controller from "@ember/controller";
+
+import config from "@projectcaluma/ember-distribution/config";
+
+export default class ApplicationController extends Controller {
+  @config config;
+}

package/addon/controllers/{distribution/new.js → new.js}

@@ -3,7 +3,7 @@ import { dedupeTracked, cached } from "tracked-toolbox";
 
 import config from "@projectcaluma/ember-distribution/config";
 
-export default class DistributionNewController extends Controller {
+export default class NewController extends Controller {
   @config config;
 
   queryParams = ["types", "search"];

package/addon/gql/mutations/withdraw-inquiry.graphql

@@ -0,0 +1,8 @@
+mutation WithdrawInquiry($workItem: ID!) {
+  cancelWorkItem(input: { id: $workItem }) {
+    workItem {
+      id
+      status
+    }
+  }
+}

package/addon/gql/queries/control-work-items.graphql

@@ -1,6 +1,7 @@
 query ControlWorkItems(
   $createTask: ID!
   $completeTask: ID!
+  $inquiryTask: ID!
   $caseId: ID!
   $currentGroup: String!
 ) {
@@ -11,11 +12,11 @@ query ControlWorkItems(
       { status: READY }
       { addressedGroups: [$currentGroup] }
     ]
-    first: 1
   ) {
     edges {
       node {
         id
+        status
       }
     }
   }
@@ -26,11 +27,26 @@ query ControlWorkItems(
       { status: READY }
       { addressedGroups: [$currentGroup] }
     ]
-    first: 1
   ) {
     edges {
       node {
         id
+        status
+      }
+    }
+  }
+  send: allWorkItems(
+    filter: [
+      { case: $caseId }
+      { task: $inquiryTask }
+      { status: SUSPENDED }
+      { controllingGroups: [$currentGroup] }
+    ]
+  ) {
+    edges {
+      node {
+        id
+        status
       }
     }
   }

package/addon/gql/queries/inquiry-navigation.graphql

@@ -13,6 +13,7 @@ query InquiryNavigation(
       { case: $caseId }
       { task: $task }
       { controllingGroups: [$currentGroup] }
+      { status: CANCELED, invert: true }
     ]
     order: [{ attribute: CREATED_AT, direction: DESC }]
   ) {
@@ -28,6 +29,7 @@ query InquiryNavigation(
       { task: $task }
       { addressedGroups: [$currentGroup] }
       { status: SUSPENDED, invert: true }
+      { status: CANCELED, invert: true }
     ]
     order: [{ attribute: CREATED_AT, direction: DESC }]
   ) {

package/addon/modifiers/pikaday.js

@@ -0,0 +1,2 @@
+import "ember-pikaday/pikaday.css";
+export { default } from "ember-pikaday/modifiers/pikaday";

package/addon/routes/{distribution.js → application.js}

@@ -1,6 +1,6 @@
 import Route from "@ember/routing/route";
 
-export default class DistributionRoute extends Route {
+export default class ApplicationRoute extends Route {
   model(params) {
     return params.case;
   }

package/addon/routes/{distribution/index.js → index.js}

@@ -6,7 +6,7 @@ import config from "@projectcaluma/ember-distribution/config";
 import inquiryNavigationQuery from "@projectcaluma/ember-distribution/gql/queries/inquiry-navigation.graphql";
 import uniqueByGroups from "@projectcaluma/ember-distribution/utils/unique-by-groups";
 
-export default class DistributionIndexRoute extends Route {
+export default class IndexRoute extends Route {
   @service router;
   @service calumaOptions;
 
@@ -35,7 +35,7 @@ export default class DistributionIndexRoute extends Route {
     }, {});
 
     if (models.length) {
-      return this.router.replaceWith("distribution.inquiry", models[0]);
+      return this.router.replaceWith("inquiry", models[0]);
     }
   }
 }

package/addon/routes/inquiry/detail/answer.js

@@ -0,0 +1,7 @@
+import Route from "@ember/routing/route";
+
+export default class InquiryDetailAnswerRoute extends Route {
+  model() {
+    return this.modelFor("inquiry.detail");
+  }
+}

package/addon/routes/inquiry/detail/index.js

@@ -0,0 +1,7 @@
+import Route from "@ember/routing/route";
+
+export default class InquiryDetailIndexRoute extends Route {
+  model() {
+    return this.modelFor("inquiry.detail");
+  }
+}

package/addon/routes/{distribution/inquiry → inquiry}/detail.js

@@ -1,6 +1,6 @@
 import Route from "@ember/routing/route";
 
-export default class DistributionInquiryDetailRoute extends Route {
+export default class InquiryDetailRoute extends Route {
   model({ inquiry }) {
     return inquiry;
   }

package/addon/routes/inquiry/index.js

@@ -0,0 +1,10 @@
+import Route from "@ember/routing/route";
+
+export default class InquiryIndexRoute extends Route {
+  model() {
+    return {
+      ...this.modelFor("inquiry"),
+      case: this.modelFor("application"),
+    };
+  }
+}