Skip to content

refactor(TeacherProjectService): Move doesAnyComponentHaveWork() to NodeAuthoringComponent #1904

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
hirokiterashima merged 1 commit into from
Aug 20, 2024
Merged

refactor(TeacherProjectService): Move doesAnyComponentHaveWork() to NodeAuthoringComponent #1904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ export class NodeAuthoringComponent implements OnInit {

private checkIfNeedToShowNodeSaveOrNodeSubmitButtons(): void {
if (!this.projectService.doesAnyComponentInNodeShowSubmitButton(this.nodeId)) {
if (this.projectService.doesAnyComponentHaveWork(this.nodeId)) {
if (this.hasComponentsWithWork()) {
this.nodeJson.showSaveButton = true;
this.nodeJson.showSubmitButton = false;
this.hideAllComponentSaveButtons();
Expand All @@ -223,6 +223,12 @@ export class NodeAuthoringComponent implements OnInit {
}
}

private hasComponentsWithWork(): boolean {
return this.node.components.some((component) =>
this.componentServiceLookupService.getService(component.type).componentHasWork(component)
);
}

/**
* Temporarily highlight the specified components and show the component
* authoring views. Used to bring user's attention to new changes.
Expand Down
16 changes: 0 additions & 16 deletions src/assets/wise5/services/teacherProjectService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1623,22 +1623,6 @@ export class TeacherProjectService extends ProjectService {
return component;
}

/**
* Returns true iff any component in the step generates work
* @param nodeId the node id
* @return whether any components in the step generates work
*/
doesAnyComponentHaveWork(nodeId) {
const node = this.getNodeById(nodeId);
for (const component of node.components) {
const service = this.componentServiceLookupService.getService(component.type);
if (service != null && service.componentHasWork(component)) {
return true;
}
}
return false;
}

/**
* Check if any of the components in the node are showing their submit button.
* @param nodeId {string} The node id to check.
Expand Down