Merge pull request #8313 from michaelchadwick/remove-wait-saving-rend…

…er-modifier Remove WaitSaving render modifier
ilios · Jan 16, 2025 · 016c3ba · 016c3ba
2 parents ff7bf32 + 4f9902e
commit 016c3ba
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/packages/ilios-common/.lint-todo b/packages/ilios-common/.lint-todo
@@ -18,7 +18,6 @@ add|ember-template-lint|no-at-ember-render-modifiers|3|2|3|2|23cd787c79c34a628da
 add|ember-template-lint|no-at-ember-render-modifiers|4|2|4|2|60333f2ba463ca3d2ba17a04d799c8d66d8b99e2|1731542400000|1762646400000|1793750400000|addon/components/session-offerings-list.hbs
 add|ember-template-lint|no-at-ember-render-modifiers|3|2|3|2|7ed3e86f759809c1d3f9de3aec39e22bf5f11d30|1731542400000|1762646400000|1793750400000|addon/components/session-overview.hbs
 add|ember-template-lint|no-at-ember-render-modifiers|4|2|4|2|60333f2ba463ca3d2ba17a04d799c8d66d8b99e2|1731542400000|1762646400000|1793750400000|addon/components/session-overview.hbs
-add|ember-template-lint|no-at-ember-render-modifiers|8|57|8|57|49de9e74a62c8d39ef6a37eaecf07bd389aa57c7|1731542400000|1762646400000|1793750400000|addon/components/wait-saving.hbs
 add|ember-template-lint|no-at-ember-render-modifiers|7|2|7|2|1a2522cd1202904fb09a6e811dec6b46d8189ab3|1731542400000|1762646400000|1793750400000|addon/components/weekly-calendar-event.hbs
 add|ember-template-lint|no-at-ember-render-modifiers|4|2|4|2|2bbf15957242a9a3c1e26e14e5d022c858199fde|1731542400000|1762646400000|1793750400000|addon/components/course/rollover-date-picker.hbs
 add|ember-template-lint|no-at-ember-render-modifiers|5|2|5|2|167e8d9ede488c7f199cb748e81bc09b97617e71|1731542400000|1762646400000|1793750400000|addon/components/course/rollover-date-picker.hbs

diff --git a/packages/ilios-common/addon/components/wait-saving.hbs b/packages/ilios-common/addon/components/wait-saving.hbs
@@ -5,7 +5,7 @@
     ...attributes
     {{focus-trap focusTrapOptions=(hash fallbackFocus=this.contentElement)}}
   >
-    <div tabindex="-1" class="content" data-test-content {{did-insert (set this "contentElement")}}>
+    <div tabindex="-1" class="content" id={{this.contentId}} data-test-content>
       <PulseLoader />
       <h2 class="page-title">
         {{#if (has-block)}}
@@ -19,4 +19,4 @@
       {{/if}}
     </div>
   </div>
-{{/in-element}}
+{{/in-element}}
diff --git a/packages/ilios-common/addon/components/wait-saving.js b/packages/ilios-common/addon/components/wait-saving.js
@@ -1,6 +1,15 @@
 import Component from '@glimmer/component';
+import { guidFor } from '@ember/object/internals';
 
 export default class WaitSaving extends Component {
+  get contentId() {
+    return `wait-saving-${guidFor(this)}`;
+  }
+
+  get contentElement() {
+    return document.getElementById(this.contentId);
+  }
+
   get progress() {
     const total = this.args.totalProgress || 1;
     const current = this.args.currentProgress || 0;