@projectcaluma/ember-distribution 11.0.0-beta.30 → 11.0.0-beta.31

package/addon/components/cd-inquiry-new-form/bulk-edit.js

@@ -97,17 +97,20 @@ export default class CdInquiryNewFormBulkEditComponent extends Component {
       answers: this.answers,
     });
 
-    const lastControlling =
-      this.distribution.navigation.value.controlling.edges[0].node;
+    const firstCreated = this.distribution.navigation.value.controlling.edges
+      .map((edge) => edge.node)
+      .find((node) =>
+        node.addressedGroups.includes(String(this.args.selectedGroups[0]))
+      );
 
-    // transition to last added inquiry
+    // transition to inquiry addressed to the first selected group
     this.router.transitionTo(
       "inquiry.detail.index",
       {
-        from: lastControlling.controllingGroups[0],
-        to: lastControlling.addressedGroups[0],
+        from: firstCreated.controllingGroups[0],
+        to: firstCreated.addressedGroups[0],
       },
-      decodeId(lastControlling.id)
+      decodeId(firstCreated.id)
     );
   }
 }

package/addon/components/cd-navigation/section.hbs

@@ -1,4 +1,4 @@
-{{#if @inquiries.length}}
+{{#if this.inquiries.length}}
   <li class="uk-margin-small uk-width-auto {{if this.isActive 'uk-active'}}">
     <a href="" {{on "click" this.toggle}}>
       <span class="uk-width-expand">

package/addon/components/cd-navigation/section.js

@@ -4,6 +4,7 @@ import Component from "@glimmer/component";
 import { tracked } from "@glimmer/tracking";
 
 export default class CdNavigationSectionComponent extends Component {
+  @service distribution;
   @service router;
 
   @tracked expanded = true;
@@ -19,23 +20,14 @@ export default class CdNavigationSectionComponent extends Component {
     );
   }
 
+  get inquiries() {
+    return this.distribution.inquiries?.[this.args.type] ?? [];
+  }
+
   @action
   toggle(e) {
     e.preventDefault();
 
     this.expanded = !this.expanded;
   }
-
-  get inquiries() {
-    const sortProperty =
-      this.args.type === "addressed"
-        ? "controllingGroupName"
-        : "addressedGroupName";
-
-    return (
-      this.args.inquiries?.sort((a, b) =>
-        a[sortProperty].localeCompare(b[sortProperty])
-      ) ?? []
-    );
-  }
 }

package/addon/components/cd-navigation.hbs

@@ -1,13 +1,6 @@
 <ul class="uk-tab uk-tab-left uk-margin-remove-bottom uk-width-auto">
   <CdNavigation::Controls />
-
-  <CdNavigation::Section
-    @type="addressed"
-    @inquiries={{this.inquiries.addressed}}
-  />
-  <CdNavigation::Section
-    @type="controlling"
-    @inquiries={{this.inquiries.controlling}}
-  />
-  <CdNavigation::Section @type="more" @inquiries={{this.inquiries.more}} />
+  <CdNavigation::Section @type="addressed" />
+  <CdNavigation::Section @type="controlling" />
+  <CdNavigation::Section @type="more" />
 </ul>

package/addon/config.js

@@ -57,6 +57,23 @@ export default function config(target, property) {
                   status: "caluma.distribution.answer.buttons.adjust.status",
                 },
               },
+              details: (inquiry) => [
+                {
+                  label: "caluma.distribution.inquiry.created-at",
+                  value: inquiry.createdAt,
+                  type: "date",
+                },
+                {
+                  label: "caluma.distribution.inquiry.assigned-user",
+                  value: inquiry.assignedUsers,
+                  type: "user",
+                },
+                {
+                  label: "caluma.distribution.inquiry.closed-at",
+                  value: inquiry.closedAt,
+                  type: "date",
+                },
+              ],
             },
           },
           new: {

package/addon/gql/fragments/inquiry-answer.graphql

@@ -0,0 +1,57 @@
+fragment InquiryAnswerStatus on Document {
+  status: answers(filter: [{ question: $statusQuestion }]) {
+    edges {
+      node {
+        id
+        ... on StringAnswer {
+          value
+          selectedOption {
+            slug
+            label
+          }
+        }
+      }
+    }
+  }
+}
+
+fragment InquiryAnswerButtons on Case {
+  workItems(
+    filter: [
+      { tasks: $buttonTasks }
+      { status: CANCELED, invert: true }
+      { status: SKIPPED, invert: true }
+    ]
+  ) {
+    edges {
+      node {
+        id
+        status
+        closedAt
+        task {
+          id
+          slug
+        }
+      }
+    }
+  }
+}
+
+fragment InquiryAnswer on Document {
+  ...InquiryAnswerStatus
+  info: answers(filter: [{ questions: $answerInfoQuestions }]) {
+    edges {
+      node {
+        id
+        question {
+          id
+          label
+          slug
+        }
+        ... on StringAnswer {
+          value
+        }
+      }
+    }
+  }
+}

package/addon/gql/fragments/inquiry-request.graphql

@@ -0,0 +1,26 @@
+fragment InquiryRequestDeadline on Document {
+  deadline: answers(filter: [{ question: $deadlineQuestion }]) {
+    edges {
+      node {
+        id
+        ... on DateAnswer {
+          value
+        }
+      }
+    }
+  }
+}
+
+fragment InquiryRequest on Document {
+  ...InquiryRequestDeadline
+  info: answers(filter: [{ question: $infoQuestion }]) {
+    edges {
+      node {
+        id
+        ... on StringAnswer {
+          value
+        }
+      }
+    }
+  }
+}

package/addon/gql/mutations/complete-inquiry-work-item.graphql

@@ -1,9 +1,12 @@
-#import InquiryStatusDocument from '../fragments/inquiry.graphql'
+# import InquiryAnswer, InquiryAnswerButtons, InquiryAnswerStatus from '../fragments/inquiry-answer.graphql'
 
 mutation CompleteInquiryWorkItem(
   $workItem: ID!
   $statusQuestion: ID!
   $buttonTasks: [String]!
+  $checkTask: ID!
+  $currentGroup: String!
+  $answerInfoQuestions: [ID]!
 ) {
   completeWorkItem(input: { id: $workItem }) {
     workItem {
@@ -13,23 +16,31 @@ mutation CompleteInquiryWorkItem(
         id
         document {
           id
-          ...InquiryStatusDocument
-        }
-        workItems(filter: [{ tasks: $buttonTasks }, { status: READY }]) {
-          edges {
-            node {
-              id
-              task {
-                id
-                slug
-              }
-            }
-          }
+          ...InquiryAnswer
         }
+        ...InquiryAnswerButtons
         parentWorkItem {
           id
           status
           isRedoable
+          # This is needed to remove the check inquiries button if that work
+          # item is closed automatically after completing an inquiry.
+          case {
+            id
+            workItems(
+              filter: [
+                { task: $checkTask }
+                { addressedGroups: [$currentGroup] }
+              ]
+            ) {
+              edges {
+                node {
+                  id
+                  status
+                }
+              }
+            }
+          }
         }
       }
     }

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

@@ -1,4 +1,4 @@
-#import InquiryStatusDocument from '../fragments/inquiry.graphql'
+# import InquiryAnswerButtons, InquiryAnswerStatus from '../fragments/inquiry-answer.graphql'
 
 mutation ReopenInquiry(
   $workItem: ID!
@@ -14,19 +14,9 @@ mutation ReopenInquiry(
         id
         document {
           id
-          ...InquiryStatusDocument
-        }
-        workItems(filter: [{ tasks: $buttonTasks }, { status: READY }]) {
-          edges {
-            node {
-              id
-              task {
-                id
-                slug
-              }
-            }
-          }
+          ...InquiryAnswerStatus
         }
+        ...InquiryAnswerButtons
       }
     }
   }

package/addon/gql/queries/{control-work-items.graphql → controls.graphql}

@@ -1,4 +1,4 @@
-query ControlWorkItems(
+query Controls(
   $createTask: ID!
   $completeTask: ID!
   $inquiryTask: ID!

package/addon/gql/queries/incomplete-inquiries.graphql

@@ -1,4 +1,4 @@
-query InquiryIncomplete($caseId: ID!, $task: ID!) {
+query IncompleteInquiries($caseId: ID!, $task: ID!) {
   allWorkItems(
     filter: [
       { case: $caseId }

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

@@ -1,4 +1,5 @@
-#import InquiryAnswerButtons, InquiryDeadlineDocument, InquiryRequest from '../fragments/inquiry.graphql'
+# import InquiryAnswerButtons from '../fragments/inquiry-answer.graphql'
+# import InquiryRequest, InquiryRequestDeadline from '../fragments/inquiry-request.graphql'
 
 query InquiryAnswer(
   $inquiry: ID!
@@ -13,6 +14,8 @@ query InquiryAnswer(
         status
         addressedGroups
         controllingGroups
+        assignedUsers
+        closedByUser
         createdAt
         closedAt
         task {
@@ -20,6 +23,7 @@ query InquiryAnswer(
           slug
         }
         document {
+          id
           ...InquiryRequest
         }
         childCase {

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

@@ -1,4 +1,33 @@
-#import InquiryAnswerButtons, InquiryDialog, InquiryDeadlineDocument, InquiryStatusDocument, InquiryRequest from '../fragments/inquiry.graphql'
+# import InquiryAnswer, InquiryAnswerButtons, InquiryAnswerStatus from '../fragments/inquiry-answer.graphql'
+# import InquiryRequest, InquiryRequestDeadline from '../fragments/inquiry-request.graphql'
+
+fragment DialogInquiry on WorkItem {
+  id
+  addressedGroups
+  controllingGroups
+  assignedUsers
+  createdAt
+  closedAt
+  status
+  isRedoable
+  task {
+    id
+    slug
+  }
+  meta
+  document {
+    id
+    ...InquiryRequest
+  }
+  childCase {
+    id
+    ...InquiryAnswerButtons
+    document {
+      id
+      ...InquiryAnswer
+    }
+  }
+}
 
 query InquiryDialog(
   $task: ID!
@@ -22,7 +51,7 @@ query InquiryDialog(
   ) {
     edges {
       node {
-        ...InquiryDialog
+        ...DialogInquiry
       }
     }
   }

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

@@ -1,4 +1,4 @@
-#import FieldQuestion, FieldTableQuestion, SimpleQuestion from '@projectcaluma/ember-form/gql/fragments/field.graphql'
+# import FieldQuestion, FieldTableQuestion, SimpleQuestion from '@projectcaluma/ember-form/gql/fragments/field.graphql'
 
 query InquiryForm($inquiryTask: String!) {
   allTasks(filter: [{ slug: $inquiryTask }], first: 1) {

package/addon/gql/queries/{inquiry-navigation.graphql → navigation.graphql}

@@ -1,12 +1,30 @@
-#import Inquiry, InquiryDeadlineDocument, InquiryStatusDocument from '../fragments/inquiry.graphql'
+# import InquiryAnswerStatus from '../fragments/inquiry-answer.graphql'
+# import InquiryRequestDeadline from '../fragments/inquiry-request.graphql'
 
-query InquiryNavigation(
+fragment NavigationInquiry on WorkItem {
+  id
+  status
+  addressedGroups
+  controllingGroups
+  document {
+    id
+    ...InquiryRequestDeadline
+  }
+  childCase {
+    id
+    document {
+      id
+      ...InquiryAnswerStatus
+    }
+  }
+}
+
+query Navigation(
   $task: ID!
   $statusQuestion: ID
   $deadlineQuestion: ID
   $currentGroup: String!
   $caseId: ID!
-  $includeNavigationData: Boolean!
 ) {
   controlling: allWorkItems(
     filter: [
@@ -19,7 +37,7 @@ query InquiryNavigation(
   ) {
     edges {
       node {
-        ...Inquiry
+        ...NavigationInquiry
       }
     }
   }
@@ -35,7 +53,7 @@ query InquiryNavigation(
   ) {
     edges {
       node {
-        ...Inquiry
+        ...NavigationInquiry
       }
     }
   }
@@ -52,7 +70,7 @@ query InquiryNavigation(
   ) {
     edges {
       node {
-        ...Inquiry
+        ...NavigationInquiry
       }
     }
   }

package/addon/routes/application.js

@@ -1,7 +1,14 @@
 import Route from "@ember/routing/route";
+import { inject as service } from "@ember/service";
 
 export default class ApplicationRoute extends Route {
+  @service distribution;
+
   model(params) {
     return params.case;
   }
+
+  afterModel(model) {
+    this.distribution.caseId = model;
+  }
 }

package/addon/routes/index.js

@@ -1,41 +1,28 @@
 import Route from "@ember/routing/route";
 import { inject as service } from "@ember/service";
-import { queryManager } from "ember-apollo-client";
-
-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 IndexRoute extends Route {
+  @service("-scheduler") scheduler;
+  @service distribution;
   @service router;
-  @service calumaOptions;
 
-  @config config;
+  async redirect() {
+    // trigger resource
+    this.distribution.navigation.value;
 
-  @queryManager apollo;
+    // wait for navigation request and group resolver
+    await this.distribution.fetchNavigation.last;
+    await this.scheduler.resolveGroup.last;
 
-  async redirect(model) {
-    const response = await this.apollo.query({
-      query: inquiryNavigationQuery,
-      variables: {
-        caseId: model,
-        task: this.config.inquiry.task,
-        currentGroup: String(this.calumaOptions.currentGroupId),
-        includeNavigationData: false,
-      },
-    });
+    const inquiries = this.distribution.inquiries;
 
-    const models = Object.entries(response).flatMap(([, objects]) => {
-      return uniqueByGroups(objects.edges.map((edge) => edge.node)).map(
-        (inquiry) => ({
-          from: inquiry.controllingGroups[0],
-          to: inquiry.addressedGroups[0],
-        })
-      );
-    }, {});
+    const firstInquiry = inquiries.addressed[0] ?? inquiries.controlling[0];
 
-    if (models.length) {
-      return this.router.replaceWith("inquiry", models[0]);
+    if (firstInquiry) {
+      return this.router.replaceWith("inquiry", {
+        from: firstInquiry.controllingGroups[0],
+        to: firstInquiry.addressedGroups[0],
+      });
     }
   }
 }

package/addon/routes/inquiry/index.js

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

package/addon/routes/new.js

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

package/addon/services/distribution.js

@@ -1,14 +1,17 @@
-import { getOwner } from "@ember/application";
 import Service, { inject as service } from "@ember/service";
+import { tracked } from "@glimmer/tracking";
 import { queryManager, getObservable } from "ember-apollo-client";
 import { dropTask } from "ember-concurrency";
 import { trackedTask } from "ember-resources/util/ember-concurrency";
+import { cached } from "tracked-toolbox";
 
 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";
+import controlsQuery from "@projectcaluma/ember-distribution/gql/queries/controls.graphql";
+import inquiryDialogQuery from "@projectcaluma/ember-distribution/gql/queries/inquiry-dialog.graphql";
+import navigationQuery from "@projectcaluma/ember-distribution/gql/queries/navigation.graphql";
+import uniqueByGroups from "@projectcaluma/ember-distribution/utils/unique-by-groups";
 
 export default class DistributionService extends Service {
   @service("-scheduler") scheduler;
@@ -21,9 +24,7 @@ export default class DistributionService extends Service {
 
   @config config;
 
-  get caseId() {
-    return getOwner(this).lookup("route:application").currentModel;
-  }
+  @tracked caseId;
 
   get hasInquiries() {
     return (
@@ -52,7 +53,7 @@ export default class DistributionService extends Service {
   @dropTask
   *fetchControls(caseId) {
     return yield this.apollo.watchQuery({
-      query: controlWorkItemsQuery,
+      query: controlsQuery,
       variables: {
         caseId,
         currentGroup: String(this.calumaOptions.currentGroupId),
@@ -67,14 +68,13 @@ export default class DistributionService extends Service {
   @dropTask
   *fetchNavigation(caseId) {
     const response = yield this.apollo.watchQuery({
-      query: inquiryNavigationQuery,
+      query: navigationQuery,
       variables: {
         caseId,
         task: this.config.inquiry.task,
         currentGroup: String(this.calumaOptions.currentGroupId),
         statusQuestion: this.config.inquiry.answer.statusQuestion,
         deadlineQuestion: this.config.inquiry.deadlineQuestion,
-        includeNavigationData: true,
       },
     });
 
@@ -107,6 +107,22 @@ export default class DistributionService extends Service {
       // get create inquiry work item to complete
       const createId = decodeId(this.controls.value?.create.edges[0].node.id);
 
+      // refetch dialog queries of the groups that will have a new inquiry
+      const refetchQueries = groups.map((group) => ({
+        query: inquiryDialogQuery,
+        variables: {
+          from: String(this.calumaOptions.currentGroupId),
+          to: String(group),
+          caseId: this.caseId,
+          task: this.config.inquiry.task,
+          infoQuestion: this.config.inquiry.infoQuestion,
+          deadlineQuestion: this.config.inquiry.deadlineQuestion,
+          statusQuestion: this.config.inquiry.answer.statusQuestion,
+          answerInfoQuestions: this.config.inquiry.answer.infoQuestions,
+          buttonTasks: Object.keys(this.config.inquiry.answer.buttons),
+        },
+      }));
+
       // create new inquiries
       yield this.apollo.mutate({
         mutation: createInquiryMutation,
@@ -117,6 +133,7 @@ export default class DistributionService extends Service {
             addressed_groups: groups.map(String),
           }),
         },
+        refetchQueries,
       });
 
       // refetch navigation and controls data
@@ -127,4 +144,49 @@ export default class DistributionService extends Service {
       );
     }
   }
+
+  @cached
+  get inquiries() {
+    const findGroupName = (identifiers) => {
+      const group = this.scheduler.groupCache.find((group) =>
+        identifiers
+          .map(String)
+          .includes(String(group[this.calumaOptions.groupIdentifierProperty]))
+      );
+
+      return group?.[this.calumaOptions.groupNameProperty] ?? "";
+    };
+
+    return Object.entries(this.navigation.value ?? {}).reduce(
+      (inquiries, [key, objects]) => {
+        return {
+          ...inquiries,
+          // Don't return any data until the internal scheduler has cached
+          // groups since we don't want to render empty navigation items
+          [key]: this.scheduler.groupCache.length
+            ? uniqueByGroups(
+                objects.edges.map((edge) => ({
+                  ...edge.node,
+                  // Populate the work item with the names of the involved
+                  // groups so the <DistributionNavigation::Section /> component
+                  // can sort by them
+                  addressedGroupName: findGroupName(edge.node.addressedGroups),
+                  controllingGroupName: findGroupName(
+                    edge.node.controllingGroups
+                  ),
+                }))
+              ).sort((a, b) => {
+                const sortProperty =
+                  key === "addressed"
+                    ? "controllingGroupName"
+                    : "addressedGroupName";
+
+                return a[sortProperty].localeCompare(b[sortProperty]);
+              })
+            : [],
+        };
+      },
+      {}
+    );
+  }
 }

package/addon/templates/application.hbs

@@ -10,7 +10,7 @@
   <div uk-grid class={{if this.config.ui.stack "uk-grid-small"}}>
     {{#if this.distribution.hasInquiries}}
       <div class={{if this.config.ui.stack "uk-width-1-1" "uk-width-1-3"}}>
-        <CdNavigation @caseId={{@model}} />
+        <CdNavigation />
       </div>
       {{#if this.config.ui.stack}}<div class="uk-width-1-1"><hr /></div>{{/if}}
     {{/if}}

package/addon/templates/inquiry/index.hbs

@@ -1,5 +1 @@
-<CdInquiryDialog
-  @from={{@model.from}}
-  @to={{@model.to}}
-  @caseId={{@model.case}}
-/>
+<CdInquiryDialog @from={{@model.from}} @to={{@model.to}} />