@instructure/quiz-core 22.16.1 → 22.17.0

package/es/moderating/components/resources/ModerateTable/presenter.js

@@ -254,7 +254,7 @@ export var ModerateTable = /*#__PURE__*/ function(Component) {
                         sessionTimeLimitInSeconds: sessionTimeLimitInSeconds
                     });
                 }
-                if (prevProps.tableData != this.props.tableData) {
+                if (prevProps.tableData !== this.props.tableData) {
                     this.setState({
                         selectedStudent: null
                     });
@@ -297,7 +297,9 @@ export var ModerateTable = /*#__PURE__*/ function(Component) {
                         rowData: rowData,
                         shouldRenderModerateButton: shouldRenderModerateButton,
                         focusTarget: _this.state.selectedStudent,
-                        displayScoreAsPercentage: _this.state.displayScoreAsPercentage
+                        displayScoreAsPercentage: _this.state.displayScoreAsPercentage,
+                        isAnonymousParticipantsEnabled: _this.props.isAnonymousParticipantsEnabled,
+                        isGraded: _this.props.isGraded
                     });
                 });
             }
@@ -382,26 +384,27 @@ export var ModerateTable = /*#__PURE__*/ function(Component) {
             key: "renderTable",
             value: function renderTable() {
                 var outstandingAttemptsCount = this.countOutstandingAttempts();
+                var _this_props = this.props, anonymousGrading = _this_props.anonymousGrading, isAnonymousParticipantsEnabled = _this_props.isAnonymousParticipantsEnabled, isGraded = _this_props.isGraded, onAccommodationsClick = _this_props.onAccommodationsClick, shouldRenderModerateButton = _this_props.shouldRenderModerateButton;
                 return /*#__PURE__*/ jsx("div", {
                     className: "fs-mask"
                 }, outstandingAttemptsCount ? this.renderAlertContent(outstandingAttemptsCount) : null, /*#__PURE__*/ jsx(Table, {
                     caption: t('Moderation Table')
                 }, /*#__PURE__*/ jsx(Table.Head, null, /*#__PURE__*/ jsx(Table.Row, null, /*#__PURE__*/ jsx(Table.ColHeader, {
                     id: "moderation-table-student"
-                }, t('Student')), !this.props.anonymousGrading && /*#__PURE__*/ jsx(Table.ColHeader, {
+                }, t('Student')), !anonymousGrading && /*#__PURE__*/ jsx(Table.ColHeader, {
                     id: "moderation-table-attempts"
-                }, t('Attempts')), !this.props.anonymousGrading && /*#__PURE__*/ jsx(Table.ColHeader, {
+                }, t('Attempts')), !anonymousGrading && isGraded && /*#__PURE__*/ jsx(Table.ColHeader, {
                     id: "moderation-table-score"
-                }, t('Score'), this.renderScoreToggle()), !this.props.anonymousGrading && /*#__PURE__*/ jsx(Table.ColHeader, {
+                }, t('Score'), this.renderScoreToggle()), !anonymousGrading && /*#__PURE__*/ jsx(Table.ColHeader, {
                     id: "moderation-table-time"
-                }, t('Time')), !this.props.anonymousGrading && /*#__PURE__*/ jsx(Table.ColHeader, {
+                }, t('Time')), !anonymousGrading && !isAnonymousParticipantsEnabled && /*#__PURE__*/ jsx(Table.ColHeader, {
                     id: "moderation-table-log"
-                }, t('Log')), this.props.onAccommodationsClick && !this.props.anonymousGrading && /*#__PURE__*/ jsx(Table.ColHeader, {
+                }, t('Log')), onAccommodationsClick && !anonymousGrading && !isAnonymousParticipantsEnabled && /*#__PURE__*/ jsx(Table.ColHeader, {
                     id: "moderation-table-accommodations"
                 }, t({
                     default: 'Accommodations',
                     description: 'Support for students with who need extra time or attempts.'
-                })), this.props.shouldRenderModerateButton && /*#__PURE__*/ jsx(Table.ColHeader, {
+                })), shouldRenderModerateButton && !isAnonymousParticipantsEnabled && /*#__PURE__*/ jsx(Table.ColHeader, {
                     id: "moderation-table-moderate"
                 }, /*#__PURE__*/ jsx(ScreenReaderContent, null, t('Moderate'))))), /*#__PURE__*/ jsx(Table.Body, null, this.renderTableRows())));
             }
@@ -489,7 +492,9 @@ _define_property(ModerateTable, "propTypes", {
     addSuccess: PropTypes.func.isRequired,
     styles: PropTypes.object,
     makeStyles: PropTypes.func,
-    atteqApplyChangesToCurrentQuizAttemptsEnabled: PropTypes.bool.isRequired
+    atteqApplyChangesToCurrentQuizAttemptsEnabled: PropTypes.bool.isRequired,
+    isAnonymousParticipantsEnabled: PropTypes.bool.isRequired,
+    isGraded: PropTypes.bool.isRequired
 });
 _define_property(ModerateTable, "defaultProps", {
     anonymousGrading: false,

package/es/moderating/components/resources/ModerateTableRow/presenter.js

@@ -74,6 +74,30 @@ function _object_spread(target) {
     }
     return target;
 }
+function ownKeys(object, enumerableOnly) {
+    var keys = Object.keys(object);
+    if (Object.getOwnPropertySymbols) {
+        var symbols = Object.getOwnPropertySymbols(object);
+        if (enumerableOnly) {
+            symbols = symbols.filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+            });
+        }
+        keys.push.apply(keys, symbols);
+    }
+    return keys;
+}
+function _object_spread_props(target, source) {
+    source = source != null ? source : {};
+    if (Object.getOwnPropertyDescriptors) {
+        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+    } else {
+        ownKeys(Object(source)).forEach(function(key) {
+            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+        });
+    }
+    return target;
+}
 function _possible_constructor_return(self, call) {
     if (call && (_type_of(call) === "object" || typeof call === "function")) {
         return call;
@@ -105,7 +129,7 @@ function _ts_decorate(decorators, target, key, desc) {
     else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-import React, { Component } from 'react';
+import React, { Component, useCallback } from 'react';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { AccessibleContent, PresentationContent } from '@instructure/ui-a11y-content';
@@ -115,16 +139,37 @@ import { Link } from '@instructure/ui-link';
 import { Avatar } from '@instructure/ui-avatar';
 import { View } from '@instructure/ui-view';
 import { Table } from '@instructure/ui-table';
-import { IconEditLine, IconWarningLine, IconWarningSolid } from '@instructure/ui-icons';
+import { IconEditLine, IconWarningLine, IconWarningSolid, IconUserLine } from '@instructure/ui-icons';
 import { IconButton } from '@instructure/ui-buttons';
 import { jsx } from '@instructure/emotion';
 import t from '@instructure/quiz-i18n/format-message';
-import { withI18nSupport, withStyleOverrides } from '@instructure/quiz-common';
+import { Flex, withI18nSupport, withStyleOverrides } from '@instructure/quiz-common';
 import FormattedDuration from '../../../../common/components/shared/FormattedDuration';
 import generateStyle from './styles';
 import generateComponentTheme from './theme';
 import { Tooltip } from '@instructure/ui-tooltip';
 var DASHES = '---';
+function ParticipantAvatar(param) {
+    var avatarUrl = param.avatarUrl, name = param.name, isAnonymousParticipantsEnabled = param.isAnonymousParticipantsEnabled;
+    var avatarProps = useCallback(function() {
+        if (isAnonymousParticipantsEnabled) {
+            return {
+                renderIcon: /*#__PURE__*/ jsx(IconUserLine, null)
+            };
+        }
+        return {
+            name: name,
+            src: avatarUrl
+        };
+    }, [
+        isAnonymousParticipantsEnabled,
+        name,
+        avatarUrl
+    ]);
+    return /*#__PURE__*/ jsx(PresentationContent, null, /*#__PURE__*/ jsx(Avatar, _object_spread_props(_object_spread({}, avatarProps()), {
+        size: "small"
+    })));
+}
 var _withI18nSupport;
 export var ModerateTableRow = /*#__PURE__*/ function(_superClass) {
     "use strict";
@@ -191,7 +236,10 @@ export var ModerateTableRow = /*#__PURE__*/ function(_superClass) {
             value: function onResultsLinkClick(quizSessionId) {
                 var _this = this;
                 return function() {
-                    _this.props.onResultsLinkClick(quizSessionId);
+                    _this.props.onResultsLinkClick({
+                        quizSessionId: quizSessionId,
+                        participantId: _this.props.rowData.id
+                    });
                 };
             }
         },
@@ -408,30 +456,24 @@ export var ModerateTableRow = /*#__PURE__*/ function(_superClass) {
             }
         },
         {
-            key: "renderName",
-            value: function renderName(name, avatarName) {
-                return /*#__PURE__*/ jsx(Link, {
+            key: "render",
+            value: function render() {
+                var quizSessions = this.props.quizSessions.toArray();
+                var _this_props = this.props, _this_props_rowData = _this_props.rowData, name = _this_props_rowData.name, avatarUrl = _this_props_rowData.avatar, maxAttempts = _this_props_rowData.maxAttempts, accommodations = _this_props_rowData.accommodations, isAnonymousParticipantsEnabled = _this_props.isAnonymousParticipantsEnabled, isGraded = _this_props.isGraded;
+                var avatarName = this.props.styles.avatarName;
+                return /*#__PURE__*/ jsx(Table.Row, null, /*#__PURE__*/ jsx(Table.RowHeader, null, /*#__PURE__*/ jsx(Flex, {
+                    alignItems: "center"
+                }, /*#__PURE__*/ jsx(ParticipantAvatar, {
+                    name: name,
+                    avatarUrl: avatarUrl,
+                    isAnonymousParticipantsEnabled: isAnonymousParticipantsEnabled
+                }), /*#__PURE__*/ jsx(Link, {
                     onClick: this.onAccommodationsClick,
                     screenReaderLabel: t('Edit course accommodations'),
                     "data-automation": "sdk-moderate-accommodations-edit",
                     margin: "0 small",
                     css: avatarName
-                }, name);
-            }
-        },
-        {
-            key: "render",
-            value: function render() {
-                var quizSessions = this.props.quizSessions.toArray();
-                var _this_props = this.props, _this_props_rowData = _this_props.rowData, name = _this_props_rowData.name, avatarUrl = _this_props_rowData.avatar, maxAttempts = _this_props_rowData.maxAttempts, accommodations = _this_props_rowData.accommodations;
-                var _this_props_styles = this.props.styles, avatarRow = _this_props_styles.avatarRow, avatarName = _this_props_styles.avatarName;
-                return /*#__PURE__*/ jsx(Table.Row, null, /*#__PURE__*/ jsx(Table.RowHeader, null, /*#__PURE__*/ jsx("span", {
-                    css: avatarRow
-                }, /*#__PURE__*/ jsx(PresentationContent, null, /*#__PURE__*/ jsx(Avatar, {
-                    name: name,
-                    src: avatarUrl,
-                    size: "small"
-                })), this.renderName(name, avatarName))), !this.props.anonymousGrading && /*#__PURE__*/ jsx(Table.Cell, null, this.renderAttempts(quizSessions, maxAttempts)), !this.props.anonymousGrading && /*#__PURE__*/ jsx(Table.Cell, null, this.renderScores(quizSessions)), !this.props.anonymousGrading && /*#__PURE__*/ jsx(Table.Cell, null, this.renderTimes(quizSessions)), !this.props.anonymousGrading && /*#__PURE__*/ jsx(Table.Cell, null, this.renderLogLinks(quizSessions)), !this.props.anonymousGrading && this.renderAccommodations(accommodations), this.renderModerate());
+                }, name))), !this.props.anonymousGrading && /*#__PURE__*/ jsx(Table.Cell, null, this.renderAttempts(quizSessions, maxAttempts)), !this.props.anonymousGrading && isGraded && /*#__PURE__*/ jsx(Table.Cell, null, this.renderScores(quizSessions)), !this.props.anonymousGrading && /*#__PURE__*/ jsx(Table.Cell, null, this.renderTimes(quizSessions)), !this.props.anonymousGrading && !isAnonymousParticipantsEnabled && /*#__PURE__*/ jsx(Table.Cell, null, this.renderLogLinks(quizSessions)), !this.props.anonymousGrading && !isAnonymousParticipantsEnabled && this.renderAccommodations(accommodations), !isAnonymousParticipantsEnabled && this.renderModerate());
             }
         }
     ]);
@@ -464,7 +506,9 @@ _define_property(ModerateTableRow, "propTypes", {
     }).isRequired,
     shouldRenderModerateButton: PropTypes.bool,
     focusTarget: PropTypes.string,
-    styles: PropTypes.object
+    styles: PropTypes.object,
+    isAnonymousParticipantsEnabled: PropTypes.bool.isRequired,
+    isGraded: PropTypes.bool.isRequired
 });
 _define_property(ModerateTableRow, "defaultProps", {
     displayScoreAsPercentage: true,

package/es/moderating/components/resources/ModerateTableRow/styles.js

@@ -3,10 +3,6 @@ var generateStyle = function(componentTheme) {
         moderateButton: {
             float: 'right'
         },
-        avatarRow: {
-            display: 'flex',
-            alignItems: 'center'
-        },
         avatarName: {
             marginLeft: componentTheme.avatarNameMargin,
             overflow: 'hidden',

package/es/reduxStore.js

@@ -26,4 +26,8 @@ store.getAppState = function() {
     var opts = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
     return store.useFakeState || opts.useFakeState ? store.fakeState : store.getState();
 };
+export var appDispatch = null;
+export function setAppDispatch(dispatchToSet) {
+    appDispatch = dispatchToSet;
+}
 export default store;

package/es/taking/api/taking.js

@@ -142,6 +142,7 @@ import { getSessionItems, handleQuizSessionFetch } from '../../common/actions/qu
 import { handleSessionItemsResponse, handleResumeDataResponse, handleQuizSessionResponse } from '../../common/api/callHandlers';
 import * as modalActions from '../../common/actions/modal';
 import { backtrackingNextQuestion, sessionStartOrResumeEvent, setCurrentSessionItemPosition, submitQuizSessionEvent, updateQuizSubmitFlag, updateQuizSessionStatusOnPageLoad, updateTimerInfo } from '../../common/actions/taking';
+import { getActiveQuiz } from '../../common/selectors/quizzes';
 import { getClientIpAddress } from '../../common/util/getClientIpAddress';
 var getQuizSessionConfig = function(quizSession) {
     // these should be handled by existing functions
@@ -291,10 +292,16 @@ export function onQuizSessionReadyForTaking(quizSession) {
 // ====================================
 // show submit confirmation modal
 // ====================================
-export var messageForSubmitModal = function(positions) {
+export var messageForSubmitModal = function(positions, isSurvey) {
     if (!positions || positions.length === 0) {
         return t('Upon submission you will not be able to change your answers. Are you ready to submit?');
     }
+    if (isSurvey) {
+        return messageForSurveySubmitModal(positions);
+    }
+    return messageForQuizSubmitModal(positions);
+};
+var messageForQuizSubmitModal = function(positions) {
     if (positions.length >= 10) {
         return featureOn('invalid_input_warning') ? t('Multiple questions have either not been answered or have invalid answers. Upon submission you will not be able to change your answers. Are you ready to submit?') : t('Multiple questions have not been answered. Upon submission you will not be able to change your answers. Are you ready to submit?');
     }
@@ -307,6 +314,19 @@ export var messageForSubmitModal = function(positions) {
         }));
     })), /*#__PURE__*/ React.createElement("p", null, t('Upon submission you will not be able to change your answers. Are you ready to submit?')));
 };
+var messageForSurveySubmitModal = function(positions) {
+    if (positions.length >= 10) {
+        return t('Please complete all the required questions to submit.');
+    }
+    var message = t('You need to answer the following questions before you can submit this survey:');
+    return /*#__PURE__*/ React.createElement("div", null, /*#__PURE__*/ React.createElement("p", null, message), /*#__PURE__*/ React.createElement("ul", null, positions.map(function(position) {
+        return /*#__PURE__*/ React.createElement("li", {
+            key: position
+        }, t('Question { position, number }', {
+            position: position
+        }));
+    })), /*#__PURE__*/ React.createElement("p", null, t('Please complete all the required questions to submit.')));
+};
 var __getResponseForSessionItem = function(sessionItem, responses) {
     var resp = responses.find(function(r) {
         return r.get('position') === sessionItem.get('position');
@@ -316,13 +336,18 @@ var __getResponseForSessionItem = function(sessionItem, responses) {
     }
     return resp && resp.get('userResponse').toJS();
 };
-var __remainingQuestionPositions = function(sessionItems, responses) {
+var __remainingQuestionPositions = function(sessionItems, responses, isSurvey) {
     return sessionItems.toList().sortBy(function(si) {
         return si.get('position');
     }).filterNot(function(si) {
         var item = si.get('item');
         var interactionType = item.get('interactionType');
         return typeof interactionType === 'undefined' || interactionType === 'no-interaction';
+    }).filter(function(si) {
+        if (isSurvey) {
+            return si.get('required');
+        }
+        return true;
     }).filterNot(function(si) {
         var item = new Item(si.get('item'));
         var itemUserResponse = __getResponseForSessionItem(si, responses);
@@ -334,16 +359,20 @@ var __remainingQuestionPositions = function(sessionItems, responses) {
 export function showSubmitConfirmModal(quizSessionId) {
     var onSubmitQuizSession = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : noop;
     return function(dispatch, getState) {
-        var needResponse = getQuestionsNeedingAResponse(getState(), quizSessionId);
-        var title = titleForSubmitModal(needResponse);
-        var message = messageForSubmitModal(needResponse);
+        var state = getState();
+        var quiz = getActiveQuiz(state);
+        var isSurvey = quiz.isSurvey();
+        var needResponse = getQuestionsNeedingAResponse(state, quizSessionId, isSurvey);
+        var title = titleForSubmitModal(needResponse, isSurvey);
+        var message = messageForSubmitModal(needResponse, isSurvey);
         var modalAction = modalActions.withConfirm(function() {
             return dispatch(postQuizSession(quizSessionId, onSubmitQuizSession));
         }, {
             title: title,
             text: message,
             continueText: t('Submit'),
-            cancelText: t('Cancel')
+            cancelText: t('Cancel'),
+            submitButtonDisabled: isSurvey && needResponse.length > 0
         });
         return dispatch(modalAction);
     };
@@ -355,8 +384,14 @@ export function closeSubmitConfirmModal(quizSessionId) {
         return dispatch(modalActions.closeModal(title));
     };
 }
-function titleForSubmitModal(needResponse) {
-    return needResponse.length > 0 ? t('Unanswered Questions!') : t('Confirm Submission');
+function titleForSubmitModal(needResponse, isSurvey) {
+    if (needResponse.length === 0) {
+        return t('Confirm Submission');
+    }
+    if (isSurvey) {
+        return t('Required Questions!');
+    }
+    return t('Unanswered Questions!');
 }
 // ==============================================
 // check for unanswered questions or override
@@ -388,7 +423,7 @@ export function updateTime(timeInSeconds, timerRunning) {
         }));
     };
 }
-function getQuestionsNeedingAResponse(state, quizSessionId) {
+function getQuestionsNeedingAResponse(state, quizSessionId, isSurvey) {
     var responses = state.getIn([
         'taking',
         'responses'
@@ -396,7 +431,7 @@ function getQuestionsNeedingAResponse(state, quizSessionId) {
     var sessionItems = state.get('sessionItems', Map()).filter(function(record) {
         return record.get('quizSessionId') === quizSessionId;
     });
-    return __remainingQuestionPositions(sessionItems, responses);
+    return __remainingQuestionPositions(sessionItems, responses, isSurvey);
 }
 // ====================================
 // submit the data for the quiz

package/lib/building/api/quizEntries.js

@@ -305,14 +305,11 @@ export var createItemAndQuizEntry = queue.wrapActionCreator(function(quizId, ite
 export function createQuizEntry(quizId, entryId, entryType, entryProperties) {
     var requireFocus = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : true;
     var url = "/api/quizzes/".concat(quizId, "/quiz_entries");
-    var quizEntryParams = _object_spread({
+    var body = buildCreateQuizEntryBody(_object_spread({
         quizId: quizId,
         entryType: entryType,
         entryId: entryId
-    }, entryProperties);
-    var body = JSON.stringify({
-        quiz_entry: quizEntryParams
-    });
+    }, entryProperties));
     return function(dispatch, getState) {
         var fetcher = new Fetcher({
             callType: CREATE_QUIZ_ENTRY_CALL,
@@ -334,6 +331,29 @@ export function createQuizEntry(quizId, entryId, entryType, entryProperties) {
         });
     };
 }
+var propertiesKeys = [
+    'required'
+];
+function buildCreateQuizEntryBody(entryProps) {
+    var _Object_keys_reduce = Object.keys(entryProps).reduce(function(acc, key) {
+        if (propertiesKeys.includes(key)) {
+            // eslint-disable-next-line no-param-reassign
+            acc.properties[key] = entryProps[key];
+        } else {
+            // eslint-disable-next-line no-param-reassign
+            acc.params[key] = entryProps[key];
+        }
+        return acc;
+    }, {
+        properties: {},
+        params: {}
+    }), properties = _Object_keys_reduce.properties, params = _Object_keys_reduce.params;
+    return JSON.stringify({
+        quiz_entry: _object_spread({
+            properties: properties
+        }, params)
+    });
+}
 export function createBulkQuizEntries(items, param) {
     var quizId = param.quizId, startPosition = param.startPosition, _param_pointsPossible = param.pointsPossible, pointsPossible = _param_pointsPossible === void 0 ? [] : _param_pointsPossible, _param_requireFocus = param.requireFocus, requireFocus = _param_requireFocus === void 0 ? true : _param_requireFocus;
     var url = "/api/quizzes/".concat(quizId, "/quiz_entries/bulk");

package/lib/building/components/layout/header/BuildingButtons/index.js

@@ -23,6 +23,7 @@ export function mapStateToProps(state) {
         isEditing: state.get('editing') && state.get('editing').some(function(elem) {
             return elem;
         }),
+        isSurvey: quiz.isSurvey(),
         printingEnabled: featureOn('printing')
     };
 }

package/lib/building/components/layout/header/BuildingButtons/presenter.js

@@ -269,6 +269,7 @@ export var BuildingButtons = /*#__PURE__*/ function(Component) {
                     return /*#__PURE__*/ jsx(Drilldown.Option, {
                         id: key,
                         key: key,
+                        disabled: this.props.isSurvey,
                         onOptionClick: onClick,
                         "data-automation": menuItemDataAutomation
                     }, /*#__PURE__*/ jsx(IconBankLine, {
@@ -280,6 +281,7 @@ export var BuildingButtons = /*#__PURE__*/ function(Component) {
                 }
                 return /*#__PURE__*/ jsx(Menu.Item, {
                     key: key,
+                    disabled: this.props.isSurvey,
                     onSelect: onClick,
                     "data-automation": menuItemDataAutomation
                 }, /*#__PURE__*/ jsx(IconBankLine, {
@@ -435,6 +437,7 @@ _define_property(BuildingButtons, "propTypes", {
     enableItemBanking: PropTypes.bool,
     hasQuestions: PropTypes.bool.isRequired,
     isEditing: PropTypes.bool.isRequired,
+    isSurvey: PropTypes.bool,
     navigateToBanks: PropTypes.func.isRequired,
     navigateToPreviewPrint: PropTypes.func.isRequired,
     openBanksTray: PropTypes.func.isRequired,
@@ -458,6 +461,7 @@ _define_property(BuildingButtons, "defaultProps", {
     contentExportEnabled: false,
     contentExport: null,
     enableItemBanking: true,
+    isSurvey: false,
     quizSaving: false,
     speedgraderLink: null,
     contextUuid: null,

package/lib/building/components/resources/ItemFeedbackModal/index.js

@@ -8,6 +8,7 @@ import { set } from '../../../../common/actions/ui';
 import { getModalTrigger } from '../../../../common/util/modalHelpers';
 import { generateImportModalId } from '../../../../common/components/ImportModal';
 import { ITEM_FEEDBACK_MODAL, ITEM_FEEDBACK_MODAL_ITEM, ITEM_FEEDBACK_MODAL_FEEDBACK } from '@instructure/quiz-common';
+import { getActiveQuiz } from '../../../../common/selectors/quizzes';
 function mapStateToProps(state, props) {
     var nestedModals = [
         'correct',
@@ -19,6 +20,7 @@ function mapStateToProps(state, props) {
         'isOpen'
     ]);
     var importModalOpen = nestedModals.includes(openModal);
+    var quiz = getActiveQuiz(state);
     return {
         importModalOpen: importModalOpen,
         modalOpen: openModal === ITEM_FEEDBACK_MODAL,
@@ -30,7 +32,8 @@ function mapStateToProps(state, props) {
             'ui',
             ITEM_FEEDBACK_MODAL_FEEDBACK
         ]) || Map(),
-        modalTrigger: getModalTrigger(state)
+        modalTrigger: getModalTrigger(state),
+        isSurvey: quiz.isSurvey()
     };
 }
 var mapDispatchToProps = {

package/lib/building/components/resources/ItemFeedbackModal/presenter.js

@@ -84,23 +84,27 @@ function _is_native_reflect_construct() {
         return !!result;
     })();
 }
-function _ts_decorate(decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-}
-import { Component } from 'react';
+import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { Button, CloseButton } from '@instructure/ui-buttons';
+import { View } from '@instructure/ui-view';
 import { Heading } from '@instructure/ui-heading';
 import { jsx } from '@instructure/emotion';
 import { RichContentRenderer, RichContentInput, RCE_THREE_LINES_HEIGHT } from '@instructure/quiz-rce';
 import t from '@instructure/quiz-i18n/format-message';
-import { Modal, ModalHeader, ModalBody, ModalFooter, ITEM_FEEDBACK_MODAL_FEEDBACK, XSMALL_SIDE_MARGIN, withStyleOverrides } from '@instructure/quiz-common';
-import generateStyle from './styles';
-import generateComponentTheme from './theme';
+import { Modal, ModalHeader, ModalBody, ModalFooter, ITEM_FEEDBACK_MODAL_FEEDBACK, XSMALL_SIDE_MARGIN } from '@instructure/quiz-common';
+function FeedbackInput(param) {
+    var textAreaId = param.textAreaId, label = param.label, content = param.content, onChange = param.onChange;
+    return /*#__PURE__*/ jsx(RichContentInput, {
+        textareaId: textAreaId,
+        label: label,
+        plainTextLabel: label,
+        defaultContent: content,
+        onChange: onChange,
+        height: RCE_THREE_LINES_HEIGHT
+    });
+}
 export var ItemFeedbackModal = /*#__PURE__*/ function(Component) {
     "use strict";
     _inherits(ItemFeedbackModal, Component);
@@ -145,35 +149,12 @@ export var ItemFeedbackModal = /*#__PURE__*/ function(Component) {
                 }, t('Done'));
             }
         },
-        {
-            key: "renderRichContentInput",
-            value: function renderRichContentInput(key, label) {
-                return /*#__PURE__*/ jsx("div", null, /*#__PURE__*/ jsx("br", null), /*#__PURE__*/ jsx("label", {
-                    css: this.props.styles.feedbackLabel,
-                    htmlFor: key
-                }, label), /*#__PURE__*/ jsx(RichContentInput, {
-                    label: "",
-                    textareaId: key,
-                    defaultContent: this.props.feedback.get(key),
-                    onChange: this.onFeedbackWrapper(key),
-                    height: RCE_THREE_LINES_HEIGHT
-                }));
-            }
-        },
-        {
-            key: "renderContent",
-            value: function renderContent() {
-                return /*#__PURE__*/ jsx("div", null, /*#__PURE__*/ jsx(RichContentRenderer, {
-                    customStyles: this.props.styles.itemStem,
-                    content: this.props.item.itemBody
-                }), this.renderRichContentInput('correct', t('For a correct answer')), this.renderRichContentInput('incorrect', t('For an incorrect answer')), this.renderRichContentInput('neutral', t('Provide general feedback (regardless of answer)')));
-            }
-        },
         {
             key: "render",
             value: function render() {
-                return /*#__PURE__*/ jsx("div", null, /*#__PURE__*/ jsx(Modal, {
-                    open: this.props.modalOpen || this.props.importModalOpen,
+                var _this_props = this.props, modalOpen = _this_props.modalOpen, importModalOpen = _this_props.importModalOpen, feedback = _this_props.feedback, item = _this_props.item, isSurvey = _this_props.isSurvey;
+                return /*#__PURE__*/ jsx(Modal, {
+                    open: modalOpen || importModalOpen,
                     onClose: this.closeAction,
                     size: "large",
                     label: t('Student Feedback'),
@@ -187,7 +168,32 @@ export var ItemFeedbackModal = /*#__PURE__*/ function(Component) {
                     placement: "end",
                     offset: "medium",
                     screenReaderLabel: t('Close')
-                })), /*#__PURE__*/ jsx(ModalBody, null, this.renderContent()), /*#__PURE__*/ jsx(ModalFooter, null, this.cancelButton(), this.doneButton())));
+                })), /*#__PURE__*/ jsx(ModalBody, null, /*#__PURE__*/ jsx(View, {
+                    as: "div",
+                    margin: "0 0 medium 0"
+                }, /*#__PURE__*/ jsx(RichContentRenderer, {
+                    customStyles: {
+                        whiteSpace: 'nowrap',
+                        overflow: 'hidden',
+                        textOverflow: 'ellipsis'
+                    },
+                    content: item.itemBody
+                })), !isSurvey && /*#__PURE__*/ jsx(React.Fragment, null, /*#__PURE__*/ jsx(FeedbackInput, {
+                    textAreaId: "correct",
+                    label: t('For a correct answer'),
+                    content: feedback.get('correct'),
+                    onChange: this.onFeedbackWrapper('correct')
+                }), /*#__PURE__*/ jsx(FeedbackInput, {
+                    textAreaId: "incorrect",
+                    label: t('For an incorrect answer'),
+                    content: feedback.get('incorrect'),
+                    onChange: this.onFeedbackWrapper('incorrect')
+                })), /*#__PURE__*/ jsx(FeedbackInput, {
+                    textAreaId: "neutral",
+                    label: t('Provide general feedback (regardless of answer)'),
+                    content: feedback.get('neutral'),
+                    onChange: this.onFeedbackWrapper('neutral')
+                })), /*#__PURE__*/ jsx(ModalFooter, null, this.cancelButton(), this.doneButton()));
             }
         }
     ]);
@@ -204,12 +210,9 @@ _define_property(ItemFeedbackModal, "propTypes", {
     modalOpen: PropTypes.bool.isRequired,
     setUi: PropTypes.func.isRequired,
     modalTrigger: PropTypes.instanceOf(Component),
-    styles: PropTypes.object
+    isSurvey: PropTypes.bool.isRequired
 });
 _define_property(ItemFeedbackModal, "defaultProps", {
     modalTrigger: null
 });
-ItemFeedbackModal = _ts_decorate([
-    withStyleOverrides(generateStyle, generateComponentTheme)
-], ItemFeedbackModal);
 export default ItemFeedbackModal;

package/lib/building/components/resources/quizEntry/QuizEntry/index.js

@@ -58,7 +58,8 @@ export var mapStateToProps = function(state, props) {
         tagAssociations: tagAssociations,
         useBankTags: useBankTags,
         workingEntry: entry.getWorkingInstance(),
-        workingQuizEntry: props.quizEntry.getWorkingInstance()
+        workingQuizEntry: props.quizEntry.getWorkingInstance(),
+        isSurvey: activeQuiz.isSurvey()
     };
 };
 var dispatchToProps = {

package/lib/building/components/resources/quizEntry/QuizEntry/presenter.js

@@ -265,7 +265,8 @@ export var QuizEntry = /*#__PURE__*/ function(Component) {
             key: "additionalEditOptions",
             value: function additionalEditOptions(item) {
                 var options = [];
-                if (this.props.quizEntry.entryType === 'Item') {
+                // Don't show item banking options for surveys (both graded and ungraded)
+                if (this.props.quizEntry.entryType === 'Item' && !this.props.isSurvey) {
                     options.push({
                         key: 'banks',
                         title: t('Item Banking'),
@@ -293,7 +294,8 @@ export var QuizEntry = /*#__PURE__*/ function(Component) {
                     initialFocusId: this.props.initialFocusId,
                     validationErrorsFromApi: this.props.validationErrorsFromApi,
                     clearValidationErrorsFromApi: this.props.clearValidationErrorsFromApi,
-                    separatorConfig: this.props.separatorConfig
+                    separatorConfig: this.props.separatorConfig,
+                    isSurvey: this.props.isSurvey
                 };
             }
         },
@@ -538,6 +540,7 @@ _define_property(QuizEntry, "propTypes", {
         decimalSeparator: PropTypes.string,
         thousandSeparator: PropTypes.string
     }),
+    isSurvey: PropTypes.bool,
     styles: PropTypes.object
 });
 _define_property(QuizEntry, "defaultProps", {
@@ -548,6 +551,7 @@ _define_property(QuizEntry, "defaultProps", {
     initialFocusId: null,
     isContentLockedByBlueprint: false,
     isEditing: false,
+    isSurvey: false,
     partialDeepScoringEnabled: false,
     partialScoringEnabled: false,
     scrollKey: void 0,