fix(navigation): fix navigation to show base form questions (#565)

Fixes #460
projectcaluma · Oct 11, 2019 · 5f38df0 · 5f38df0
1 parent e5cd5ef
commit 5f38df0
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 17 deletions.
diff --git a/addon/lib/navigation.js b/addon/lib/navigation.js
@@ -59,15 +59,28 @@ export const NavigationItem = Base.extend({
    * @property {String} label
    * @accessor
    */
-  label: reads("fieldset.field.question.label"),
+  label: computed("fieldset.{field.question.label,form.name}", function() {
+    return this.getWithDefault(
+      "fieldset.field.question.label",
+      this.get("fieldset.form.name")
+    );
+  }),
 
   /**
    * The slug of the items form
    *
    * @property {String} slug
    * @accessor
    */
-  slug: reads("fieldset.field.question.subForm.slug"),
+  slug: computed(
+    "fieldset.{field.question.subForm.slug,form.slug}",
+    function() {
+      return this.getWithDefault(
+        "fieldset.field.question.subForm.slug",
+        this.get("fieldset.form.slug")
+      );
+    }
+  ),
 
   /**
    * The slug of the parent items form
@@ -101,7 +114,7 @@ export const NavigationItem = Base.extend({
     "fieldset.fields.@each.{hidden,questionType}",
     function() {
       return (
-        !this.fieldset.field.hidden &&
+        (this.fieldset.field === undefined || !this.fieldset.field.hidden) &&
         this.fieldset.fields.some(
           field => field.questionType !== "FormQuestion" && !field.hidden
         )
@@ -227,19 +240,17 @@ export const Navigation = Base.extend({
   },
 
   _createItems() {
-    const items = this.document.fieldsets
-      .filter(fieldset => fieldset.field)
-      .map(fieldset => {
-        const pk = `NavigationItem:${fieldset.pk}`;
-
-        return (
-          this.calumaStore.find(pk) ||
-          NavigationItem.create(getOwner(this).ownerInjection(), {
-            fieldset,
-            navigation: this
-          })
-        );
-      });
+    const items = this.document.fieldsets.map(fieldset => {
+      const pk = `NavigationItem:${fieldset.pk}`;
+
+      return (
+        this.calumaStore.find(pk) ||
+        NavigationItem.create(getOwner(this).ownerInjection(), {
+          fieldset,
+          navigation: this
+        })
+      );
+    });
 
     this.set("items", items);
   },

diff --git a/addon/templates/components/cf-navigation.hbs b/addon/templates/components/cf-navigation.hbs
@@ -2,6 +2,9 @@
   {{#each (reject-by "parent" navigation.items) as |item|}}
     {{#if item.visible}}
       {{cf-navigation-item item=item}}
+      {{#unless item.fieldset.field}}
+        <hr class="uk-divider-small uk-margin-small">
+      {{/unless}}
     {{/if}}
   {{/each}}
-</ul>
+</ul>