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

Jump to bottom

[#10917] Fix unexpected behaviour when reverting to template feedback path #10975

Merged
merged 14 commits into from
Apr 12, 2021
Merged

[#10917] Fix unexpected behaviour when reverting to template feedback path #10975

Changes from 13 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
268bf9f
Fix unexpected behaviour when reverting to template feedback path
Feb 21, 2021
d0db372
Fix minor linting errors
Feb 21, 2021
09388fb
Merge branch 'master' of https://github.com/TEAMMATES/teammates into …
Mar 7, 2021
c99edac
Check if settings are same when reverting from custom to default
Mar 7, 2021
0889d76
Merge branch 'master' of https://github.com/TEAMMATES/teammates into …
Mar 23, 2021
8f4788d
Remove redundancies from if checks
Mar 23, 2021
c31b816
Revert to default display after choosing common feedback settings aft…
Mar 31, 2021
0df9eb9
Merge branch 'master' into 10917-visibility-no-change-with-feedback-p…
stapletonce Mar 31, 2021
3626115
Update src/web/app/components/question-edit-form/question-edit-form.c…
stapletonce Apr 5, 2021
e324ce8
Merge branch 'master' of https://github.com/TEAMMATES/teammates into …
Apr 5, 2021
82b54aa
Merge branch '10917-visibility-no-change-with-feedback-path-change' o…
Apr 5, 2021
90786d8
Revert "Update src/web/app/components/question-edit-form/question-edi…
Apr 5, 2021
9c62d84
Merge branch 'master' into 10917-visibility-no-change-with-feedback-p…
Derek-Hardy Apr 8, 2021
1268f00
Merge branch 'master' into 10917-visibility-no-change-with-feedback-p…
madanalogy Apr 12, 2021
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
29 changes: 20 additions & 9 deletions src/web/app/components/question-edit-form/question-edit-form.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,15 +246,26 @@ export class QuestionEditFormComponent implements OnInit {
if (allowedRecipientTypes.indexOf(recipientType) === -1) {
newRecipientType = allowedRecipientTypes[0];
}
this.triggerModelChangeBatch({
giverType,
recipientType: newRecipientType,
commonVisibilitySettingName: 'Please select a visibility option',
isUsingOtherVisibilitySetting: false,
showResponsesTo: [],
showGiverNameTo: [],
showRecipientNameTo: [],
});
if (this.model.giverType === giverType && this.model.recipientType === newRecipientType) {
// do not reset the visibility settings if reverting feedback path to preset template provided
if (this.model.isUsingOtherFeedbackPath) {
Comment on lines +249 to +251
Copy link
Contributor

Choose a reason for hiding this comment

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

It is perhaps not a good practice to have two such if's as they create an arrow-antipattern. You might want to just do

Suggested change
if (this.model.giverType === giverType && this.model.recipientType === newRecipientType) {
// do not reset the visibility settings if reverting feedback path to preset template provided
if (this.model.isUsingOtherFeedbackPath) {
if (this.model.giverType === giverType && this.model.recipientType === newRecipientType
&& this.model.isUsingOtherFeedbackPath) {

in which the precedence of the booleans achieves the exact same effect.

Copy link
Contributor

@moziliar moziliar Apr 5, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

Wrong logic above^. Shouldn't omit the path where the function does nothing

// remove the custom feedback if selecting a common feedback path
this.triggerModelChangeBatch({
isUsingOtherFeedbackPath: false,
});
}
} else {
this.triggerModelChangeBatch({
giverType,
recipientType: newRecipientType,
commonVisibilitySettingName: 'Please select a visibility option',
isUsingOtherFeedbackPath: false,
isUsingOtherVisibilitySetting: false,
showResponsesTo: [],
showGiverNameTo: [],
showRecipientNameTo: [],
});
}
}

/**
Expand Down