Skip to content
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

BC-5119-Prevent-creating-new-neXboards (Server) #4522

Closed
wants to merge 16 commits into from
Closed

BC-5119-Prevent-creating-new-neXboards (Server) #4522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
0446d19
Created functionality to ignore copy nextboard.
Michaellinaresxk Nov 5, 2023
62b0698
removing console.logs
Michaellinaresxk Nov 5, 2023
8117254
test
Michaellinaresxk Nov 6, 2023
0d2022f
test
Michaellinaresxk Nov 6, 2023
897036c
testing spaces.
Michaellinaresxk Nov 6, 2023
99428b9
Added private filterOutNeXboardFromCopyStatus to copy course function…
Michaellinaresxk Nov 14, 2023
c7886f0
test
Michaellinaresxk Nov 14, 2023
98a4993
BC-5119-Prevent-creating-new-neXboards
Michaellinaresxk Nov 16, 2023
23027d4
remove the commented code.
Michaellinaresxk Nov 16, 2023
8a4c7ed
Changed the lesson copy service behaviour.
Michaellinaresxk Nov 17, 2023
8c51e64
Identation fixed.
Michaellinaresxk Nov 19, 2023
1faba72
Added FEATURE_COPY_NEXBOARD_ENABLED to cenabled nexboard on copy course.
Michaellinaresxk Nov 20, 2023
e99e428
Added FEATURE_COPY_NEXBOARD_ENABLED to cenabled nexboard on copy course.
Michaellinaresxk Nov 20, 2023
5db47fd
DS_Store file restored.
Michaellinaresxk Nov 21, 2023
2a4ffd7
File fileStorage-DS_storage restored.
Michaellinaresxk Nov 21, 2023
b19394d
add NOT_DOIN enum.
Michaellinaresxk Nov 21, 2023
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
93 changes: 0 additions & 93 deletions .vscode/launch.default.json
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions .vscode/settings.default.json
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion apps/server/src/modules/learnroom/service/board-copy.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ export class BoardCopyService {
const references: BoardElement[] = this.extractReferences(elements);

let boardCopy: Board = new Board({ references, course: destinationCourse });

let status: CopyStatus = {
title: 'board',
type: CopyElementType.BOARD,
Expand Down Expand Up @@ -84,7 +85,6 @@ export class BoardCopyService {
if (element.target === undefined) {
return Promise.reject(new Error('Broken boardelement - not pointing to any target entity'));
}

if (element.boardElementType === BoardElementType.Task && isTask(element.target)) {
return this.copyTask(element.target, user, destinationCourse).then((status) => [pos, status]);
}
Expand Down
15 changes: 12 additions & 3 deletions apps/server/src/modules/learnroom/service/course-copy.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,23 @@ export class CourseCopyService {
// copy course and board
const courseCopy = await this.copyCourseEntity({ user, originalCourse, copyName });
const boardStatus = await this.boardCopyService.copyBoard({ originalBoard, destinationCourse: courseCopy, user });
const filteredBoardStatus = this.filterOutNeXboardFromCopyStatus(boardStatus);
Michaellinaresxk marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here too should use the new feature flag condition...

const finishedCourseCopy = await this.finishCourseCopying(courseCopy);

const courseStatus = this.deriveCourseStatus(originalCourse, finishedCourseCopy, boardStatus);
const courseStatus = this.deriveCourseStatus(originalCourse, finishedCourseCopy, filteredBoardStatus);

return courseStatus;
}

// Exclude LESSON_CONTENT_NEXBOARD from boardStatus
private filterOutNeXboardFromCopyStatus(boardStatus: CopyStatus): CopyStatus {
if (boardStatus.elements) {
boardStatus.elements = boardStatus.elements.filter(
(elementStatus) => elementStatus.type !== CopyElementType.LESSON_CONTENT_NEXBOARD
);
}
return boardStatus;
}

private async copyCourseEntity(params: CourseCopyParams): Promise<Course> {
const { originalCourse, user, copyName } = params;
const courseCopy = new Course({
Expand Down Expand Up @@ -100,7 +110,6 @@ export class CourseCopyService {
if (courseGroupsExist) {
elements.push({ type: CopyElementType.COURSEGROUP_GROUP, status: CopyStatusEnum.NOT_IMPLEMENTED });
}

const status = {
title: courseCopy.name,
type: CopyElementType.COURSE,
Expand Down
Loading
Loading