Repository navigation
feat(VLE): Add progress and status info to step select #2345
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.
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
breity
merged 11 commits into
replace-unit-plan-with-enhanced-step-select-menu
from
add-progress-to-step-select
Oct 5, 2026
Merged
Changes from 7 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
6450e67
feat(VLE): Add progress and status info to step select dropdown
breity 34a5de5
feat(Style): Increase border-radius for certain UI elements
breity 4ac648a
Merge branch 'develop' into add-progress-to-step-select
breity 85c4325
Fix tests
breity aad4742
Updated messages
github-actions[bot] 19162af
Set fixed widths for step select trigger button
breity 533fc23
Updated messages
github-actions[bot] f9079a3
Align node status icon to end of step select trigger
breity 4dcd710
Remove unused dependencies, clean up code, fix typo
breity c0620a8
Updated messages
github-actions[bot] c883fc3
Clean up tests
breity File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...authoringTool/choose-node-location/node-icon-and-title/node-icon-and-title.component.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 5 additions & 8 deletions
13
src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 0 additions & 4 deletions
4
src/assets/wise5/common/node-icon-chooser-dialog/node-icon-chooser-dialog.component.scss
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,3 @@ | ||
| .preview-icon { | ||
| color: #ffffff; | ||
| } | ||
|
|
||
| .custom-icon { | ||
| vertical-align: middle; | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -39,3 +39,10 @@ | |
| display: none; | ||
| } | ||
| } | ||
|
|
||
| .node-select-option.mat-mdc-option { | ||
| .mat-icon { | ||
| margin-right: 0; | ||
| margin-left: 0; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...ssets/wise5/themes/default/themeComponents/nodeStatusIcon/node-status-icon.component.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
145 changes: 145 additions & 0 deletions
145
src/assets/wise5/themes/default/themeComponents/stepSelect/step-select.component.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,145 @@ | ||
| <button | ||
| class="!px-2 step-select w-48 sm:w-96" | ||
| mat-button | ||
| [matMenuTriggerFor]="stepSelect" | ||
| (menuOpened)="onMenuOpened()" | ||
| > | ||
| <div class="flex gap-2 items-center"> | ||
| <mat-icon>menu</mat-icon> | ||
| <node-icon [nodeId]="nodeId" size="18" /> | ||
| <span class="normal-case truncate">{{ currentNodeTitle }}</span> | ||
| <node-status-icon [nodeId]="nodeId" size="18" /> | ||
| </div> | ||
| </button> | ||
| <mat-menu #stepSelect="matMenu" [overlapTrigger]="true" class="step-select-menu"> | ||
| <div class="mat-app-background" (keydown.tab)="$event.stopPropagation()"> | ||
| <div class="sticky top-0 z-10" (click)="$event.stopPropagation()"> | ||
| <div class="px-3 py-2 app-bg-bg" i18n>Unit Progress</div> | ||
| <div class="px-3 py-2 flex flex-row items-center gap-2 mat-caption mat-app-background"> | ||
| <span i18n>Completion:</span> | ||
| <ng-container | ||
| *ngTemplateOutlet=" | ||
| progressIndicator; | ||
| context: { | ||
| progress: nodeStatuses[rootNodeId]?.progress, | ||
| isVisitable: true | ||
| } | ||
| " | ||
| /> | ||
| <span>{{ nodeStatuses[rootNodeId]?.progress?.completionPct }}%</span> | ||
| </div> | ||
| <mat-divider /> | ||
| </div> | ||
| <div class="px-2"> | ||
| <mat-nav-list> | ||
| <mat-accordion multi> | ||
| <div class="flex flex-col gap-2"> | ||
| @for (group of groups; track group.id) { | ||
| @if (nodeStatuses[group.id]?.isVisible) { | ||
| <mat-expansion-panel | ||
| hideToggle | ||
| [expanded]="expandedGroups[group.id]" | ||
| (opened)="expandedGroups[group.id] = true" | ||
| (closed)="expandedGroups[group.id] = false" | ||
| > | ||
| <mat-expansion-panel-header | ||
| mat-list-item | ||
| (click)="$event.stopPropagation()" | ||
| (keydown.enter)="$event.stopPropagation()" | ||
| (keydown.space)="$event.stopPropagation()" | ||
| > | ||
| <mat-panel-title> | ||
| <div class="flex flex-row flex-grow items-center gap-2"> | ||
| <node-icon | ||
| class="flex!" | ||
| [nodeId]="group.id" | ||
| [icon]="nodeStatuses[group.id]?.icon" | ||
| size="24" | ||
| /> | ||
| <span class="mat-caption list-item-title">{{ group.title }}</span> | ||
| <span class="flex-1"></span> | ||
| <ng-container | ||
| *ngTemplateOutlet=" | ||
| progressIndicator; | ||
| context: { | ||
| progress: nodeStatuses[group.id]?.progress, | ||
| isVisitable: nodeStatuses[group.id]?.isVisitable, | ||
| tooltip: getProgressTooltip(group.id) | ||
| } | ||
| " | ||
| /> | ||
| </div> | ||
| </mat-panel-title> | ||
| </mat-expansion-panel-header> | ||
| @for (child of group.children; track child.id) { | ||
| @if (nodeStatuses[child.id]?.isVisible) { | ||
| <button | ||
| mat-list-item | ||
| [activated]="child.id === nodeId" | ||
| (click)="chooseNode(child.id)" | ||
| > | ||
| <div class="flex flex-row items-center gap-2 w-full"> | ||
| <node-icon | ||
| [nodeId]="child.id" | ||
| [icon]="nodeStatuses[child.id]?.icon" | ||
| size="24" | ||
| class="flex!" | ||
| /> | ||
| <span class="mat-caption list-item-title">{{ child.title }}</span> | ||
| <span class="flex-1"></span> | ||
| <node-status-icon | ||
| [nodeId]="child.id" | ||
| size="18" | ||
| class="shrink-0" | ||
| [customClass]="child.id === nodeId ? 'primary' : ''" | ||
| /> | ||
| @if ( | ||
| !nodeStatuses[child.id]?.isVisitable || | ||
| !nodeStatuses[group.id]?.isVisitable | ||
| ) { | ||
| <mat-icon | ||
| class="shrink-0 mat-18" | ||
| aria-label="Item is locked" | ||
| i18n-aria-label | ||
| > | ||
| lock | ||
| </mat-icon> | ||
| } | ||
| </div> | ||
| </button> | ||
| } | ||
| } | ||
| </mat-expansion-panel> | ||
| } | ||
| } | ||
| </div> | ||
| </mat-accordion> | ||
| </mat-nav-list> | ||
| </div> | ||
| </div> | ||
| </mat-menu> | ||
|
|
||
| <ng-template | ||
| #progressIndicator | ||
| let-progress="progress" | ||
| let-isVisitable="isVisitable" | ||
| let-tooltip="tooltip" | ||
| > | ||
| <span class="relative shrink-0"> | ||
| @if (isVisitable === false) { | ||
| <mat-icon class="icon-inside-progress" aria-label="Item is locked" i18n-aria-label> | ||
| lock | ||
| </mat-icon> | ||
| } @else if (progress?.completionPct === 100) { | ||
| <mat-icon class="icon-inside-progress">check</mat-icon> | ||
| } | ||
| <mat-progress-spinner | ||
| [value]="progress?.completionPct" | ||
| [diameter]="24" | ||
| [matTooltip]="tooltip" | ||
| [matTooltipDisabled]="!tooltip" | ||
| i18n-matTooltip | ||
| matTooltipPosition="above" | ||
| /> | ||
| </span> | ||
| </ng-template> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove typo?