From 1b33336bbeaaf8f70830ce642763ef1296b6dc5a Mon Sep 17 00:00:00 2001 From: Michael Chadwick Date: Fri, 29 May 2026 11:15:15 -0700 Subject: [PATCH 1/7] replaced bulk change buttons with radio inputs --- .../addon/components/publish-all-sessions.gjs | 62 ++++++++++++++----- 1 file changed, 46 insertions(+), 16 deletions(-) diff --git a/packages/ilios-common/addon/components/publish-all-sessions.gjs b/packages/ilios-common/addon/components/publish-all-sessions.gjs index 527b2ba344..f865337ce0 100644 --- a/packages/ilios-common/addon/components/publish-all-sessions.gjs +++ b/packages/ilios-common/addon/components/publish-all-sessions.gjs @@ -27,6 +27,7 @@ export default class PublishAllSessionsComponent extends Component { @tracked totalSessionsToSave; @tracked currentSessionsSaved; + @tracked userSelectedAction = 'scheduleAll'; @tracked userSelectedSessionsToPublish = []; @tracked userSelectedSessionsToSchedule = []; @@ -245,12 +246,14 @@ export default class PublishAllSessionsComponent extends Component { publishAllAsIs() { this.userSelectedSessionsToSchedule = []; this.userSelectedSessionsToPublish = [...this.overridableSessions]; + this.userSelectedAction = 'publishAllAsIs'; } @action scheduleAll() { this.userSelectedSessionsToPublish = []; this.userSelectedSessionsToSchedule = [...this.overridableSessions]; + this.userSelectedAction = 'scheduleAll'; } @action @@ -561,22 +564,49 @@ export default class PublishAllSessionsComponent extends Component {
{{#if this.overridableSessions.length}} - - + + {{#if (eq this.userSelectedAction "publishAllAsIs")}} + + {{else}} + + {{/if}} + + {{#if (eq this.userSelectedAction "scheduleAll")}} + + {{else}} + + {{/if}} + From 28e230190149cccde6c79a7088856bdce60c87b8 Mon Sep 17 00:00:00 2001 From: Michael Chadwick Date: Fri, 29 May 2026 11:39:37 -0700 Subject: [PATCH 2/7] individual session row actions now use radio buttons instead of checkboxes; bulk radio selection also gets unchecked if non-default action is selected --- .../addon/components/publish-all-sessions.gjs | 79 +++++++------------ .../components/publish-all-sessions.scss | 19 +++-- 2 files changed, 44 insertions(+), 54 deletions(-) diff --git a/packages/ilios-common/addon/components/publish-all-sessions.gjs b/packages/ilios-common/addon/components/publish-all-sessions.gjs index f865337ce0..c8be32a813 100644 --- a/packages/ilios-common/addon/components/publish-all-sessions.gjs +++ b/packages/ilios-common/addon/components/publish-all-sessions.gjs @@ -240,6 +240,8 @@ export default class PublishAllSessionsComponent extends Component { ); this.userSelectedSessionsToPublish = [...this.userSelectedSessionsToPublish, session]; } + + this.userSelectedAction = ''; } @action @@ -565,47 +567,28 @@ export default class PublishAllSessionsComponent extends Component {
{{#if this.overridableSessions.length}} - {{#if (eq this.userSelectedAction "publishAllAsIs")}} - - {{else}} +
- {{/if}} - - {{#if (eq this.userSelectedAction "scheduleAll")}} - - {{else}} - {{/if}} +
@@ -663,30 +646,28 @@ export default class PublishAllSessionsComponent extends Component { {{#each this.orderedOverridableSessions as |session|}}
-
    -
  • - -
    • -
  • - -
    • -
+
+ + +
diff --git a/packages/ilios-common/app/styles/ilios-common/components/publish-all-sessions.scss b/packages/ilios-common/app/styles/ilios-common/components/publish-all-sessions.scss index 54981e1a83..b2955c5974 100644 --- a/packages/ilios-common/app/styles/ilios-common/components/publish-all-sessions.scss +++ b/packages/ilios-common/app/styles/ilios-common/components/publish-all-sessions.scss @@ -46,8 +46,14 @@ td { vertical-align: top; - @include m.for-tablet-and-up { - padding-right: 0.5em; + fieldset { + border: none; + padding: 0; + + label { + display: block; + padding-bottom: 0.5em; + } } } } @@ -65,10 +71,13 @@ border-bottom: none; padding-bottom: 0; - ul { - list-style-type: none; - margin: 0; + fieldset { + border: none; padding: 0; + + label { + padding-right: 0.5em; + } } } From a3b89f3ee815259d60cc3bd1529dcc9d4f9c5119 Mon Sep 17 00:00:00 2001 From: Michael Chadwick Date: Fri, 29 May 2026 15:37:54 -0700 Subject: [PATCH 3/7] fixed and updated tests; made default bulk action radion button group unchecked --- .../components/publish-all-sessions.js | 4 +- .../addon/components/publish-all-sessions.gjs | 5 +- .../components/publish-all-sessions-test.gjs | 56 +++++++++++++++++++ 3 files changed, 60 insertions(+), 5 deletions(-) diff --git a/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/publish-all-sessions.js b/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/publish-all-sessions.js index 213e42e198..6c811e78cb 100644 --- a/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/publish-all-sessions.js +++ b/packages/ilios-common/addon-test-support/ilios-common/page-objects/components/publish-all-sessions.js @@ -137,11 +137,11 @@ const definition = { title: text('> [data-test-title]'), publishAllAsIs: { scope: '[data-test-publish-all-as-is]', - isDisabled: property('disabled'), + isChecked: property('checked'), }, markAllAsScheduled: { scope: '[data-test-mark-all-as-scheduled]', - isDisabled: property('disabled'), + isChecked: property('checked'), }, table: { scope: 'table', diff --git a/packages/ilios-common/addon/components/publish-all-sessions.gjs b/packages/ilios-common/addon/components/publish-all-sessions.gjs index c8be32a813..8cebcb93de 100644 --- a/packages/ilios-common/addon/components/publish-all-sessions.gjs +++ b/packages/ilios-common/addon/components/publish-all-sessions.gjs @@ -27,7 +27,7 @@ export default class PublishAllSessionsComponent extends Component { @tracked totalSessionsToSave; @tracked currentSessionsSaved; - @tracked userSelectedAction = 'scheduleAll'; + @tracked userSelectedAction = ''; @tracked userSelectedSessionsToPublish = []; @tracked userSelectedSessionsToSchedule = []; @@ -566,8 +566,7 @@ export default class PublishAllSessionsComponent extends Component {
{{#if this.overridableSessions.length}} - -
+
diff --git a/packages/ilios-common/translations/en-us.yaml b/packages/ilios-common/translations/en-us.yaml index 88041e3d07..c5eba356d7 100644 --- a/packages/ilios-common/translations/en-us.yaml +++ b/packages/ilios-common/translations/en-us.yaml @@ -218,6 +218,7 @@ general: makeRecurring: Make Recurring manageLeadership: Manage Leadership manageLearners: Manage Learners + markAllAsScheduled: Mark All as Scheduled markAsScheduled: Mark as Scheduled markedAccessible: Accessible materials: Materials @@ -286,6 +287,7 @@ general: publicationReview: Publication Review publicationStatus: Publication Status publishAllConfirmation: "Publish {publishCount}, schedule {scheduleCount}, and ignore {ignoreCount} sessions" + publishAllAsIs: Publish All As-is publishAsIs: Publish As-is publishCourse: Publish Course published: Published diff --git a/packages/ilios-common/translations/es.yaml b/packages/ilios-common/translations/es.yaml index 09f6490b6a..8f81b09f8a 100644 --- a/packages/ilios-common/translations/es.yaml +++ b/packages/ilios-common/translations/es.yaml @@ -218,6 +218,7 @@ general: makeRecurring: Hacer Recurrente manageLeadership: Maneje el Liderazgo manageLearners: Administrar Aprendedores + markAllAsScheduled: Marque Todo Como Programado markAsScheduled: Marque Como Programado markedAccessible: Accesible materials: Materiales @@ -286,6 +287,7 @@ general: publicationReview: Revisión de Publicación publicationStatus: Estado de Publicación publishAllConfirmation: "Publique {publishCount}, Programe {scheduleCount}, y ignore {ignoreCount} sesiónes" + publishAllAsIs: Publique Todo Como Es publishAsIs: Publique Como Es publishCourse: Publique Curso published: Publicado diff --git a/packages/ilios-common/translations/fr.yaml b/packages/ilios-common/translations/fr.yaml index b5706829ca..ddd1baab1b 100644 --- a/packages/ilios-common/translations/fr.yaml +++ b/packages/ilios-common/translations/fr.yaml @@ -218,6 +218,7 @@ general: makeRecurring: Activité Récurrente manageLeadership: Gérer Dirigeants manageLearners: Manager Étudiants + markAllAsScheduled: Faire tout à prévu markAsScheduled: Faire à prévu markedAccessible: Accessible materials: Matériels @@ -286,6 +287,7 @@ general: publicationReview: Revue de Publication publicationStatus: Statut de Publication publishAllConfirmation: "Publier {publishCount}, réserver {scheduleCount}, et ignorer des {ignoreCount} séances" + publishAllAsIs: 'Publier tout "as-is"' publishAsIs: 'Publier "as-is"' publishCourse: Publier Cours published: Publié From f94edc5b06257721a7833939aaa9292fc3f6bed6 Mon Sep 17 00:00:00 2001 From: Michael Chadwick Date: Thu, 4 Jun 2026 11:42:25 -0700 Subject: [PATCH 6/7] simplified logic to check if all sessions are to be scheduled/published-as-is --- .../addon/components/publish-all-sessions.gjs | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/packages/ilios-common/addon/components/publish-all-sessions.gjs b/packages/ilios-common/addon/components/publish-all-sessions.gjs index 127f65cd20..44bfe0627d 100644 --- a/packages/ilios-common/addon/components/publish-all-sessions.gjs +++ b/packages/ilios-common/addon/components/publish-all-sessions.gjs @@ -77,19 +77,11 @@ export default class PublishAllSessionsComponent extends Component { } get sessionsToAllBePublished() { - if (this.sessionsToPublish?.length) { - return !this.sessionsToSchedule?.length ? true : false; - } - - return false; + return !this.sessionsToSchedule?.length; } get sessionsToAllBeScheduled() { - if (this.sessionsToSchedule?.length) { - return !this.sessionsToPublish?.length ? true : false; - } - - return false; + return !this.sessionsToPublish?.length; } get allSessionsScheduled() { From bc6f617c3280b42fa662314b4fe6fa8701e40ef6 Mon Sep 17 00:00:00 2001 From: Michael Chadwick Date: Fri, 5 Jun 2026 15:05:17 -0700 Subject: [PATCH 7/7] fixed test --- .../integration/components/publish-all-sessions-test.gjs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/test-app/tests/integration/components/publish-all-sessions-test.gjs b/packages/test-app/tests/integration/components/publish-all-sessions-test.gjs index a430a51b6d..01c8e7a910 100644 --- a/packages/test-app/tests/integration/components/publish-all-sessions-test.gjs +++ b/packages/test-app/tests/integration/components/publish-all-sessions-test.gjs @@ -372,6 +372,12 @@ module('Integration | Component | publish all sessions', function (hooks) { @course={{this.course}} @setExpandCompleteSessions={{(noop)}} @setExpandIncompleteSessions={{(noop)}} + @sortIncompleteBy={{this.sortColumn}} + @setSortIncompleteBy={{(noop)}} + @sortCompleteBy={{this.sortColumn}} + @setSortCompleteBy={{(noop)}} + @sortUnpublishedBy={{this.sortColumn}} + @setSortUnpublishedBy={{(noop)}} /> , ); @@ -379,7 +385,7 @@ module('Integration | Component | publish all sessions', function (hooks) { component.review.confirmation, 'Publish 2, schedule 1, and ignore 1 sessions', ); - assert.strictEqual(component.overridableSessions.title, 'Sessions Requiring Review (2)'); + assert.strictEqual(component.overridableSessions.title, 'Unpublished Sessions: for review (2)'); assert.ok(component.overridableSessions.markAllAsScheduled.isVisible); assert.ok(component.overridableSessions.publishAllAsIs.isVisible); const { sessions: list } = component.overridableSessions;