Add fallback value to dd.LinkTo component (#658)

hashicorp-forge · Mar 22, 2024 · fad671b · fad671b
1 parent f8db8c0
commit fad671b
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 20 deletions.
diff --git a/web/app/components/header/facet-dropdown.hbs b/web/app/components/header/facet-dropdown.hbs
@@ -19,7 +19,6 @@
   <:item as |dd|>
     <dd.LinkTo
       data-test-facet-dropdown-link
-      @route={{this.currentRouteName}}
       @query={{get-facet-query-hash @name dd.value dd.attrs.isSelected}}
     >
       <X::DropdownList::CheckableItem

diff --git a/web/app/components/header/facet-dropdown.ts b/web/app/components/header/facet-dropdown.ts
@@ -1,7 +1,5 @@
 import Component from "@glimmer/component";
 import { FacetDropdownObjects } from "hermes/types/facets";
-import { inject as service } from "@ember/service";
-import RouterService from "@ember/routing/router-service";
 import { FacetName } from "./toolbar";
 
 interface HeaderFacetDropdownComponentSignature {
@@ -13,12 +11,6 @@ interface HeaderFacetDropdownComponentSignature {
 }
 
 export default class HeaderFacetDropdownComponent extends Component<HeaderFacetDropdownComponentSignature> {
-  @service declare router: RouterService;
-
-  protected get currentRouteName() {
-    return this.router.currentRouteName;
-  }
-
   protected get isDisabled() {
     return !this.args.facets || Object.keys(this.args.facets).length === 0;
   }

diff --git a/web/app/components/header/sort-dropdown.hbs b/web/app/components/header/sort-dropdown.hbs
@@ -13,7 +13,6 @@
   </:anchor>
   <:item as |dd|>
     <dd.LinkTo
-      @route={{this.currentRouteName}}
       @query={{hash
         sortBy=(if (eq dd.value "Newest") this.dateDesc this.dateAsc)
       }}

diff --git a/web/app/components/header/sort-dropdown.ts b/web/app/components/header/sort-dropdown.ts
@@ -1,7 +1,5 @@
 import Component from "@glimmer/component";
 import { SortByFacets, SortByValue } from "./toolbar";
-import { inject as service } from "@ember/service";
-import RouterService from "@ember/routing/router-service";
 import { Placement } from "@floating-ui/dom";
 
 interface HeaderSortDropdownComponentSignature {
@@ -15,12 +13,6 @@ interface HeaderSortDropdownComponentSignature {
 }
 
 export default class HeaderSortDropdownComponent extends Component<HeaderSortDropdownComponentSignature> {
-  @service declare router: RouterService;
-
-  get currentRouteName() {
-    return this.router.currentRouteName;
-  }
-
   get dateDesc() {
     return SortByValue.DateDesc;
   }

diff --git a/web/app/components/x/dropdown-list/link-to.hbs b/web/app/components/x/dropdown-list/link-to.hbs
@@ -7,7 +7,7 @@
   aria-selected={{@isAriaSelected}}
   tabindex="-1"
   aria-checked={{@isAriaChecked}}
-  @route={{@route}}
+  @route={{this.route}}
   @query={{maybe-query @query}}
   @models={{model-or-models @model @models}}
   class="x-dropdown-list-item-link {{if @isAriaSelected 'is-aria-selected'}}"

diff --git a/web/app/components/x/dropdown-list/link-to.ts b/web/app/components/x/dropdown-list/link-to.ts
@@ -3,11 +3,13 @@ import { XDropdownListInteractiveComponentArgs } from "./_shared";
 import { action } from "@ember/object";
 import Ember from "ember";
 import { next, schedule } from "@ember/runloop";
+import { inject as service } from "@ember/service";
+import RouterService from "@ember/routing/router-service";
 
 interface XDropdownListLinkToComponentSignature {
   Element: HTMLAnchorElement;
   Args: XDropdownListInteractiveComponentArgs & {
-    route: string;
+    route?: string;
     query?: Record<string, unknown>;
     model?: unknown;
     models?: unknown[];
@@ -18,6 +20,15 @@ interface XDropdownListLinkToComponentSignature {
 }
 
 export default class XDropdownListLinkToComponent extends Component<XDropdownListLinkToComponentSignature> {
+  @service declare router: RouterService;
+
+  /**
+   * The route passed to Ember's <LinkTo> component.
+   * Uses the passed-in value or the current route name.
+   */
+  protected get route() {
+    return this.args.route ?? this.router.currentRouteName;
+  }
   /**
    * The action to run when the item is clicked.
    * We wait until the next run loop so that we don't interfere with