ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Sync to SIS in embedded Assign To for discussions 

closes LX-1952

flag=selective_release_ui_api
flag=selective_release_edit_page

test plan:
- Enable required sync to SIS and make due
dates required in account settings.
- Navigate to a graded discussion create/edit page.
> Verify that if the Sync to SIS checkbox is enabled
the cards of the panel should require due dates
(showing errors). If not you can leave these fields
blank.
> Verify that you are not able to save if there
are empty due dates if Sync to SIS is enabled.
> Verify that if you try to Save, the focus will
go to the first issue you have on the cards.

Change-Id: Ic844d45aa477e41cd6d406cb3ed5f0c83817f551
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/354840
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Sarah Gerard <sarah.gerard@instructure.com>
QA-Review: Sarah Gerard <sarah.gerard@instructure.com>
Product-Review: Juan Chavez <juan.chavez@instructure.com>
This commit is contained in:
juan.chavez 2024-08-12 18:42:51 -04:00 committed by Juan Chavez
parent b37258f970
commit e34441901e
1 changed files with 56 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
ui/features/discussion_topic_edit_v2/react/components/DiscussionTopicForm/DiscussionTopicForm.jsx
View File

@ -131,6 +131,8 @@ function DiscussionTopicForm({
const dateInputRef = useRef()
const groupOptionsRef = useRef()
const gradedDiscussionRef = useRef()
const shouldForceFocusAfterRenderRef = useRef(false)
const postToSisForCards = useRef(!!currentDiscussionTopic?.assignment?.postToSis || false)
const {setOnFailure} = useContext(AlertManagerContext)
const isAnnouncement = ENV?.DISCUSSION_TOPIC?.ATTRIBUTES?.is_announcement ?? false
@ -190,7 +192,10 @@ function DiscussionTopicForm({
currentDiscussionTopic?.isAnonymousAuthor || true
)
const [isThreaded, setIsThreaded] = useState(
currentDiscussionTopic?.discussionType === "threaded" || (currentDiscussionTopic?.discussionType === "side_comment" && ENV?.DISCUSSION_TOPIC?.ATTRIBUTES?.has_threaded_replies) || Object.keys(currentDiscussionTopic).length === 0
currentDiscussionTopic?.discussionType === 'threaded' ||
(currentDiscussionTopic?.discussionType === 'side_comment' &&
ENV?.DISCUSSION_TOPIC?.ATTRIBUTES?.has_threaded_replies) ||
Object.keys(currentDiscussionTopic).length === 0
)
const [requireInitialPost, setRequireInitialPost] = useState(
currentDiscussionTopic?.requireInitialPost || false
@ -340,9 +345,25 @@ function DiscussionTopicForm({
pointsPossible,
isGraded,
isCheckpoints,
postToSis,
postToSis: ENV.FEATURES.selective_release_edit_page ? postToSisForCards.current : postToSis,
}
useEffect(() => {
// Expects to force the focus the errors on re-render once
if (
shouldForceFocusAfterRenderRef.current &&
ENV.FEATURES.selective_release_ui_api &&
ENV.FEATURES.selective_release_edit_page
) {
const sectionViewRef = document.getElementById(
'manage-assign-to-container'
)?.reactComponentInstance
if (sectionViewRef?.focusErrors()) {
shouldForceFocusAfterRenderRef.current = false
}
}
})
useEffect(() => {
if (isAnnouncement && availableFrom) {
const rightNow = new Date()
@ -476,11 +497,7 @@ function DiscussionTopicForm({
...(shouldShowUsageRightsOption && {usageRightsData}),
}
if (
!isGraded &&
ENV.FEATURES?.selective_release_ui_api &&
!isAnnouncement
) {
if (!isGraded && ENV.FEATURES?.selective_release_ui_api && !isAnnouncement) {
delete payload.specificSections
Object.assign(
payload,
@ -532,6 +549,7 @@ function DiscussionTopicForm({
const continueSubmitForm = (shouldPublish, shouldNotifyUsers = false) => {
setTimeout(() => {
postToSisForCards.current = postToSis
setIsSubmitting(true)
}, 0)
@ -560,7 +578,7 @@ function DiscussionTopicForm({
sectionIdsToPostTo,
assignedInfoList,
postToSis,
showPostToSisFlashAlert('manage-assign-to', true)
showPostToSisFlashAlert('manage-assign-to', !ENV.FEATURES.selective_release_edit_page)
)
) {
const payload = createSubmitPayload(shouldPublish)
@ -569,6 +587,23 @@ function DiscussionTopicForm({
}
setTimeout(() => {
if (
isGraded &&
ENV.DUE_DATE_REQUIRED_FOR_ACCOUNT &&
ENV.FEATURES.selective_release_ui_api &&
ENV.FEATURES.selective_release_edit_page &&
assignedInfoList.length > 0 &&
postToSis
) {
const sectionViewRef = document.getElementById(
'manage-assign-to-container'
)?.reactComponentInstance
const aDueDateMissing = assignedInfoList.some(assignee => !assignee.dueDate)
// If there are errors visible already don't force the focus
if (sectionViewRef?.allCardsValid() && aDueDateMissing) {
shouldForceFocusAfterRenderRef.current = true
}
}
setIsSubmitting(false)
}, 0)
@ -1097,13 +1132,18 @@ function DiscussionTopicForm({
)}
</View>
)}
{!canGroupDiscussion && isEditing && !isAnnouncement && currentDiscussionTopic?.entryCounts?.repliesCount > 0 && (
<View display="block" data-testid="group-category-not-editable">
<Alert variant="warning" margin="small none small none">
{I18n.t('Students have already submitted to this discussion, so group settings cannot be changed.')}
</Alert>
</View>
)}
{!canGroupDiscussion &&
isEditing &&
!isAnnouncement &&
currentDiscussionTopic?.entryCounts?.repliesCount > 0 && (
<View display="block" data-testid="group-category-not-editable">
<Alert variant="warning" margin="small none small none">
{I18n.t(
'Students have already submitted to this discussion, so group settings cannot be changed.'
)}
</Alert>
</View>
)}
</FormFieldGroup>
{discussionAnonymousState.includes('anonymity') && !isEditing && (
<View width="580px" display="block" data-testid="groups_grading_not_allowed">
@ -1121,10 +1161,7 @@ function DiscussionTopicForm({
</div>
<div style={{display: selectedView === Views.MasteryPaths ? 'block' : 'none'}}>
{ENV.CONDITIONAL_RELEASE_ENV && (
<MasteryPathsReactWrapper
type="discussion topic"
env={ENV.CONDITIONAL_RELEASE_ENV}
/>
<MasteryPathsReactWrapper type="discussion topic" env={ENV.CONDITIONAL_RELEASE_ENV} />
)}
</div>
<FormFieldGroup description="" rowSpacing="small">