Skip to content

Fix Program->ProgramYear missing collapse arrow icon #8941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dartajax merged 2 commits into from
Nov 7, 2025
Merged

Fix Program->ProgramYear missing collapse arrow icon #8941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbc58fa
fixed variable names so the boolean checks properly and shows the arrow
michaelchadwick Nov 7, 2025
33752b9
added tests to check for proper arrow icon
michaelchadwick Nov 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/frontend/app/components/program-year/collapsed-objectives.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export default class ProgramYearCollapsedObjectivesComponent extends Component {
>
{{t "general.objectives"}}
({{get this.objectives "length"}})
<FaIcon @icon="caret-right" />
<FaIcon @icon="caret-right" data-test-expand />
</button>
</div>
<div class="content">
Expand Down
6 changes: 3 additions & 3 deletions packages/frontend/app/components/program-year/objectives.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ export default class ProgramYearObjectivesComponent extends Component {
@tracked newObjectiveTitle;

get showCollapsible() {
return this.hasObjectives && !this.isManaging;
return this.hasObjectives;
}

get hasObjectives() {
return this.objectiveCount > 0;
return this.objectiveIdsCount > 0;
}

get objectiveIds() {
Expand Down Expand Up @@ -93,7 +93,7 @@ export default class ProgramYearObjectivesComponent extends Component {
>
{{t "general.objectives"}}
({{this.objectiveIdsCount}})
<FaIcon @icon="caret-down" />
<FaIcon @icon="caret-down" data-test-collapse />
</button>
</div>
{{else}}
Expand Down
1 change: 1 addition & 0 deletions packages/frontend/tests/integration/components/program-year/collapsed-objectives-test.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ module('Integration | Component | program-year/collapsed-objectives', function (
);

assert.strictEqual(component.title, 'Objectives (4)');
assert.ok(component.hasExpandIcon);
assert.strictEqual(component.objectiveCount, 'There are 4 objectives');
assert.strictEqual(component.parentCount, '1 has a linked competency');
assert.strictEqual(component.meshCount, '1 has MeSH');
Expand Down
1 change: 1 addition & 0 deletions packages/frontend/tests/integration/components/program-year/objectives-test.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ module('Integration | Component | program-year/objectives', function (hooks) {
</template>,
);

assert.ok(component.hasCollapseIcon);
assert.strictEqual(component.objectiveList.objectives.length, 2);
assert.strictEqual(
component.objectiveList.objectives[0].description.text,
Expand Down
3 changes: 3 additions & 0 deletions packages/frontend/tests/pages/components/program-year/collapsed-objectives.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ import { create, collection, clickable, hasClass, text } from 'ember-cli-page-ob
const definition = {
scope: '[data-test-program-year-collapsed-objectives]',
title: text('[data-test-title]'),
hasExpandIcon: {
scope: '[data-test-expand]',
},
expand: clickable('[data-test-title]'),
headers: collection('thead th'),
objectiveCount: text('[data-test-objective-count]'),
Expand Down
3 changes: 3 additions & 0 deletions packages/frontend/tests/pages/components/program-year/objectives.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ import objectiveList from './objective-list';
const definition = {
scope: '[data-test-program-year-objectives]',
title: text('[data-test-title]'),
hasCollapseIcon: {
scope: '[data-test-collapse]',
},
createNew: clickable('[data-test-actions] [data-test-expand-collapse-button] button'),
newObjective,
objectiveList,
Expand Down