From 9af1284f3c16636a7b660dd20aff28b386c54e65 Mon Sep 17 00:00:00 2001
From: James Chua <jcchua1205@gmail.com>
Date: Thu, 13 Aug 2026 15:53:32 +0800
Subject: [PATCH 1/6] Align session search and actions with loaded state

---
 .../addon/components/course/loading.gjs         | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/packages/ilios-common/addon/components/course/loading.gjs b/packages/ilios-common/addon/components/course/loading.gjs
index 053cf9e346..7bba07f3b2 100644
--- a/packages/ilios-common/addon/components/course/loading.gjs
+++ b/packages/ilios-common/addon/components/course/loading.gjs
@@ -54,11 +54,18 @@ import { faSquarePlus } from '@fortawesome/free-solid-svg-icons';
           {{t "general.sessions"}}
           (xx)
         </div>
-        <div class="actions"></div>
-      </div>
-      <div class="filter">
-        {{! template-lint-disable require-input-label }}
-        <input disabled />
+        <div class="actions">
+          <div class="filter">
+            {{! template-lint-disable require-input-label }}
+            <input disabled />
+          </div>
+          <button type="button" disabled>
+            {{t "general.newSession"}}
+          </button>
+          <button type="button" disabled>
+            {{t "general.publicationReview"}}
+          </button>
+        </div>
       </div>
       <section>
         <div class="sessions-grid-row sessions-grid-header-row loading-text"></div>

From 4276a602ba3e7d950388f4a9e3576ebfbdaa6727 Mon Sep 17 00:00:00 2001
From: James Chua <jcchua1205@gmail.com>
Date: Fri, 14 Aug 2026 15:22:21 +0800
Subject: [PATCH 2/6] Replace New Session button with ExpandCollapseButton and
 mute session action buttons while loading

---
 .../addon/components/course/loading.gjs             | 13 +++++++++----
 .../ilios-common/components/course/loading.scss     |  8 ++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/packages/ilios-common/addon/components/course/loading.gjs b/packages/ilios-common/addon/components/course/loading.gjs
index 7bba07f3b2..44df51c17e 100644
--- a/packages/ilios-common/addon/components/course/loading.gjs
+++ b/packages/ilios-common/addon/components/course/loading.gjs
@@ -3,6 +3,8 @@ import animateLoading from 'ilios-common/modifiers/animate-loading';
 import t from 'ember-intl/helpers/t';
 import FaIcon from '@fortawesome/ember-fontawesome/components/fa-icon';
 import { faSquarePlus } from '@fortawesome/free-solid-svg-icons';
+import ExpandCollapseButton from 'ilios-common/components/expand-collapse-button';
+const noop = () => {};
 <template>
   <BackToCourses />
 
@@ -59,10 +61,13 @@ import { faSquarePlus } from '@fortawesome/free-solid-svg-icons';
             {{! template-lint-disable require-input-label }}
             <input disabled />
           </div>
-          <button type="button" disabled>
-            {{t "general.newSession"}}
-          </button>
-          <button type="button" disabled>
+          <ExpandCollapseButton
+            @value={{false}}
+            @action={{noop}}
+            @expandButtonLabel={{t "general.newSession"}}
+            @collapseButtonLabel={{t "general.close"}}
+          />
+          <button type="button" class="loading-text" disabled>
             {{t "general.publicationReview"}}
           </button>
         </div>
diff --git a/packages/ilios-common/app/styles/ilios-common/components/course/loading.scss b/packages/ilios-common/app/styles/ilios-common/components/course/loading.scss
index 415c8d704d..e23146f2ad 100644
--- a/packages/ilios-common/app/styles/ilios-common/components/course/loading.scss
+++ b/packages/ilios-common/app/styles/ilios-common/components/course/loading.scss
@@ -25,6 +25,14 @@
     }
   }
 
+  .actions {
+    cursor: default;
+  }
+  
+  .expand-collapse-button {
+    color: var(--lighter-grey);
+  }
+
   .sessions-grid-header-row {
     background-color: var(--lighter-grey);
     height: 2rem;

From 5938a2759a2407f18f753315bc4d39e6c0fe9749 Mon Sep 17 00:00:00 2001
From: James Chua <153830017+james-chua-1493@users.noreply.github.com>
Date: Tue, 18 Aug 2026 18:29:37 +0800
Subject: [PATCH 3/6] Apply suggestion from @jrjohnson

Co-authored-by: Jon Johnson <jon.johnson@ucsf.edu>
---
 packages/ilios-common/addon/components/course/loading.gjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ilios-common/addon/components/course/loading.gjs b/packages/ilios-common/addon/components/course/loading.gjs
index 44df51c17e..0900245c5e 100644
--- a/packages/ilios-common/addon/components/course/loading.gjs
+++ b/packages/ilios-common/addon/components/course/loading.gjs
@@ -4,7 +4,7 @@ import t from 'ember-intl/helpers/t';
 import FaIcon from '@fortawesome/ember-fontawesome/components/fa-icon';
 import { faSquarePlus } from '@fortawesome/free-solid-svg-icons';
 import ExpandCollapseButton from 'ilios-common/components/expand-collapse-button';
-const noop = () => {};
+import noop from 'ilios-common/helpers/noop';
 <template>
   <BackToCourses />
 

From a04d538f7c670ed2cfb33ccbe86acfc7d4d86374 Mon Sep 17 00:00:00 2001
From: James Chua <jcchua1205@gmail.com>
Date: Tue, 18 Aug 2026 19:15:16 +0800
Subject: [PATCH 4/6] Mute session action buttons with loading-text and fix
 header alignment

---
 .../addon/components/course/loading.gjs        |  1 +
 .../components/course/loading.scss             | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/packages/ilios-common/addon/components/course/loading.gjs b/packages/ilios-common/addon/components/course/loading.gjs
index 0900245c5e..7bf7f791cf 100644
--- a/packages/ilios-common/addon/components/course/loading.gjs
+++ b/packages/ilios-common/addon/components/course/loading.gjs
@@ -62,6 +62,7 @@ import noop from 'ilios-common/helpers/noop';
             <input disabled />
           </div>
           <ExpandCollapseButton
+            class="loading-text"
             @value={{false}}
             @action={{noop}}
             @expandButtonLabel={{t "general.newSession"}}
diff --git a/packages/ilios-common/app/styles/ilios-common/components/course/loading.scss b/packages/ilios-common/app/styles/ilios-common/components/course/loading.scss
index e23146f2ad..0436a5dd9e 100644
--- a/packages/ilios-common/app/styles/ilios-common/components/course/loading.scss
+++ b/packages/ilios-common/app/styles/ilios-common/components/course/loading.scss
@@ -20,17 +20,21 @@
 
   .course-sessions-header {
     height: 2rem;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
     @include m.for-phone-only {
       height: 3rem;
     }
-  }
 
-  .actions {
-    cursor: default;
-  }
-  
-  .expand-collapse-button {
-    color: var(--lighter-grey);
+    .actions {
+      display: flex;
+      cursor: default;
+
+      .loading-text {
+        background-color: var(--grey);
+      }
+    }
   }
 
   .sessions-grid-header-row {

From db28d313ebf0372ac3f34f34fe125162f28dd62a Mon Sep 17 00:00:00 2001
From: Chua Ming Zhe <jcchua1205@gmail.com>
Date: Thu, 20 Aug 2026 10:51:14 +0800
Subject: [PATCH 5/6] Use plain button with icon instead of
 ExpandCollapseButton to fix test failures

---
 .../addon/components/course/loading.gjs            | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/packages/ilios-common/addon/components/course/loading.gjs b/packages/ilios-common/addon/components/course/loading.gjs
index 7bf7f791cf..9a37715311 100644
--- a/packages/ilios-common/addon/components/course/loading.gjs
+++ b/packages/ilios-common/addon/components/course/loading.gjs
@@ -2,9 +2,7 @@ import BackToCourses from 'ilios-common/components/course/back-to-courses';
 import animateLoading from 'ilios-common/modifiers/animate-loading';
 import t from 'ember-intl/helpers/t';
 import FaIcon from '@fortawesome/ember-fontawesome/components/fa-icon';
-import { faSquarePlus } from '@fortawesome/free-solid-svg-icons';
-import ExpandCollapseButton from 'ilios-common/components/expand-collapse-button';
-import noop from 'ilios-common/helpers/noop';
+import { faSquarePlus, faPlus } from '@fortawesome/free-solid-svg-icons';
 <template>
   <BackToCourses />
 
@@ -61,13 +59,9 @@ import noop from 'ilios-common/helpers/noop';
             {{! template-lint-disable require-input-label }}
             <input disabled />
           </div>
-          <ExpandCollapseButton
-            class="loading-text"
-            @value={{false}}
-            @action={{noop}}
-            @expandButtonLabel={{t "general.newSession"}}
-            @collapseButtonLabel={{t "general.close"}}
-          />
+          <button type="button" class="loading-text" disabled>
+            <FaIcon @icon={{faPlus}} />
+          </button>
           <button type="button" class="loading-text" disabled>
             {{t "general.publicationReview"}}
           </button>

From 386cd9d0158d378a3dd8630ed1c36c852a66324b Mon Sep 17 00:00:00 2001
From: James Chua <153830017+james-chua-1493@users.noreply.github.com>
Date: Fri, 21 Aug 2026 11:43:15 +0800
Subject: [PATCH 6/6] Apply suggestion from @jrjohnson

Co-authored-by: Jon Johnson <jon.johnson@ucsf.edu>
---
 .../app/styles/ilios-common/components/course/loading.scss      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ilios-common/app/styles/ilios-common/components/course/loading.scss b/packages/ilios-common/app/styles/ilios-common/components/course/loading.scss
index 0436a5dd9e..27f42608c1 100644
--- a/packages/ilios-common/app/styles/ilios-common/components/course/loading.scss
+++ b/packages/ilios-common/app/styles/ilios-common/components/course/loading.scss
@@ -32,7 +32,7 @@
       cursor: default;
 
       .loading-text {
-        background-color: var(--grey);
+        background-color: var(--lighter-grey);
       }
     }
   }