Merge pull request #8306 from michaelchadwick/remove-selectable-terms…

…-list-item-render-modifiers Remove SelectableTermsListItem render modifiers
ilios · Jan 11, 2025 · 19d195b · 19d195b
2 parents 7e5bb02 + 4083b4e
commit 19d195b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/packages/ilios-common/.lint-todo b/packages/ilios-common/.lint-todo
@@ -15,7 +15,6 @@ add|ember-template-lint|no-at-ember-render-modifiers|12|6|12|6|9264ba2eca1f85881
 add|ember-template-lint|no-at-ember-render-modifiers|3|2|3|2|23cd787c79c34a628dadb6e96dd4004d42eebb79|1731542400000|1762646400000|1793750400000|addon/components/print-course.hbs
 add|ember-template-lint|no-at-ember-render-modifiers|4|2|4|2|aa5aedc5b45db1644928b5b95c2fefc1ef4a7bdf|1731542400000|1762646400000|1793750400000|addon/components/print-course.hbs
 add|ember-template-lint|no-at-ember-render-modifiers|12|4|12|4|5ba6894d30ea3a3eae704867d5bc5d61c5ee4e1f|1731542400000|1762646400000|1793750400000|addon/components/search-box.hbs
-add|ember-template-lint|no-at-ember-render-modifiers|8|2|8|2|1a2522cd1202904fb09a6e811dec6b46d8189ab3|1731542400000|1762646400000|1793750400000|addon/components/selectable-terms-list-item.hbs
 add|ember-template-lint|no-at-ember-render-modifiers|3|2|3|2|1fb6f249958ee245e6abc413681c9fe096120cef|1731542400000|1762646400000|1793750400000|addon/components/session-copy.hbs
 add|ember-template-lint|no-at-ember-render-modifiers|4|2|4|2|856162ce473b112534763bb641aae7a4422d8e2e|1731542400000|1762646400000|1793750400000|addon/components/session-copy.hbs
 add|ember-template-lint|no-at-ember-render-modifiers|3|2|3|2|23cd787c79c34a628dadb6e96dd4004d42eebb79|1731542400000|1762646400000|1793750400000|addon/components/session-offerings-list.hbs

diff --git a/packages/ilios-common/addon/components/selectable-terms-list-item.hbs b/packages/ilios-common/addon/components/selectable-terms-list-item.hbs
@@ -1,14 +1,14 @@
 <button
-  class="selectable-terms-list-item {{if this.isSelected "selected"}}"
+  class="selectable-terms-list-item {{if this.isSelected 'selected'}}"
   type="button"
   data-test-selectable-terms-list-item
   data-test-selectable-terms-list-item-level={{this.level}}
   {{on "click" this.click}}
   {{mouse-hover-toggle (set this "isHovering")}}
-  {{did-insert (set this "theElement")}}
+  id={{this.selectableTermsListItemButtonId}}
 >
-  {{#if (and this.theElement this.showTooltip)}}
-    <IliosTooltip @target={{this.theElement}}>
+  {{#if this.showTooltip}}
+    <IliosTooltip @target={{this.selectableTermsListItemButtonElement}}>
       {{@term.description}}
     </IliosTooltip>
   {{/if}}
@@ -20,4 +20,4 @@
       <FaIcon @icon="plus" class="add" />
     {{/if}}
   </span>
-</button>
+</button>
diff --git a/packages/ilios-common/addon/components/selectable-terms-list-item.js b/packages/ilios-common/addon/components/selectable-terms-list-item.js
@@ -1,10 +1,18 @@
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
+import { guidFor } from '@ember/object/internals';
 
 export default class SelectableTermsListItem extends Component {
   @tracked isHovering;
-  @tracked theElement;
+
+  get selectableTermsListItemButtonId() {
+    return `selectable-terms-list-item-button-${guidFor(this)}`;
+  }
+
+  get selectableTermsListItemButtonElement() {
+    return document.getElementById(this.selectableTermsListItemButtonId);
+  }
 
   get isSelected() {
     const term = this.args.term;
@@ -17,7 +25,7 @@ export default class SelectableTermsListItem extends Component {
   }
 
   get showTooltip() {
-    return this.args?.term.description?.length && this.theElement && this.isHovering;
+    return this.args?.term.description?.length && this.isHovering;
   }
 
   @action