@instructure/quiz-core 22.16.0 → 22.17.0

package/lib/configureStore.js

@@ -35,6 +35,7 @@ import crossDomainMessagingMiddleware from './common/middleware/crossDomainMessa
 import eventLoggerMiddlewareCreator from './common/middleware/eventLoggerMiddleware';
 import { createQuizTimerWebSocketMiddleware } from './common/middleware/quizTimerWebSocketMiddleware';
 import { createSharedBanksMiddleware } from './common/middleware/sharedBanksMiddleware';
+import { createAppSyncMiddleware } from './common/middleware/appSyncMiddleware';
 // reducers
 import alerts from './common/reducers/alerts';
 import banks from './common/reducers/banks';
@@ -99,7 +100,8 @@ export function configureStore(param) {
         getMiddleware(eventLoggerMiddlewareCreator(), middlewareOverrides.kinesisMiddleware),
         getMiddleware(thunkMiddleware, middlewareOverrides.thunkMiddleware),
         getMiddleware(createQuizTimerWebSocketMiddleware(), middlewareOverrides.websocketMiddleware),
-        getMiddleware(createSharedBanksMiddleware(), middlewareOverrides.sharedBanksMiddleware)
+        getMiddleware(createSharedBanksMiddleware(), middlewareOverrides.sharedBanksMiddleware),
+        getMiddleware(createAppSyncMiddleware(), middlewareOverrides.appSyncMiddleware)
     ];
     var devMiddleware = [
         getMiddleware(loggerMiddleware, middlewareOverrides.logger)

package/lib/index.js

@@ -5,7 +5,7 @@
  * These exports are for other packages to use.
  * We should look into configuring an import/no-restricted-paths eslint rule to prevent this.
  */ // Components
-export { DragDroppableSDKApp as SDKApp } from './common/components/SDKApp';
+export { SDKApp } from './common/components/SDKApp';
 export { TimingAlerts } from './common/components/TimingAlerts';
 export { ModerateTable } from './moderating/components/resources/ModerateTable';
 export { Calculator } from './common/components/layout/header/Calculator/index';
@@ -27,7 +27,7 @@ export { ExtraTimeSettings } from './moderating/components/resources/Accommodati
 export { ReduceAnswerChoicesSettings } from './moderating/components/resources/AccommodationsModal/ReduceAnswerChoicesSettings';
 export { PreviewFrame } from './common/components/PreviewFrame';
 export { SDKHeaderCalculator } from './common/components/SDKHeaderCalculator';
-export { QuizzesSpinner } from './common/components/shared/spinner/Spinner';
+export { Spinner } from './common/components/shared/spinner/Spinner';
 export { PrintTrigger } from './common/components/shared/PrintTrigger';
 export { IfFeature } from './common/components/shared/IfFeature';
 export { UndecoratedQuizEntryEdit } from './building/components/resources/quizEntry/QuizEntryEdit/presenter';
@@ -69,8 +69,8 @@ export { QuizInstructions } from './building/components/resources/quiz/instructi
 export { QuizTitle } from './building/components/resources/quiz/title/Title';
 export { QuizEntryShow } from './building/components/resources/quizEntry/QuizEntryShow';
 export { StimulusShow } from './common/components/resources/stimulus/StimulusShow';
-export { QuizSessionResultHeader } from './common/components/resources/quizSessionResult/Header';
-export { Info as QuizSessionResultInfo } from './common/components/resources/quizSessionResult/Info';
+export { QuizSessionResultHeader } from './common/components/resources/QuizSessionResult/QuizSessionResultHeader';
+export { QuizSessionResultInfo } from './common/components/resources/QuizSessionResult/QuizSessionResultInfo';
 export { SessionItemResultsList } from './common/components/resources/sessionItemResult/SessionItemResultsList';
 export { TimeUnitsInput } from './common/components/shared/TimeUnitsInput';
 export { QuizEntry as QuizEntryView } from './building/components/resources/quizEntry/QuizEntry';
@@ -83,6 +83,8 @@ export { MaskedTextInput } from './common/components/MaskedTextInput';
 export { AccessCodeTextInput } from './common/components/AccessCodeTextInput';
 export { LocalStoreService } from './common/util/localStoreService';
 export { default as Alerts } from './common/components/alerts/index';
+export { InteractionTypeName, PointsPossible, RequiredIndicator } from './building/components/resources/quizEntry/QuizEntryShow/components/LeftHeader';
+export { default as ConfirmationModal } from './common/components/ConfirmationModal';
 // Utilities
 export { environment as config } from './config';
 export { Fetcher } from './common/util/Fetcher';

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

@@ -130,7 +130,7 @@ import ModerateTableRow from '../ModerateTableRow';
 import IfFeature from '../../../../common/components/shared/IfFeature';
 import OutstandingQuizzesModal from '../OutstandingQuizzesModal';
 import ModerateTray from '../../sidebar/ModerateTray';
-import Spinner from '../../../../common/components/shared/spinner/Spinner';
+import { Spinner } from '../../../../common/components/shared/spinner/Spinner';
 import generateStyle from './styles';
 import generateComponentTheme from './theme';
 import ResetQuiz from '../../sidebar/ResetQuiz';
@@ -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/lib/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/lib/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/lib/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/lib/reporting/components/itemAnalysis/ItemAnalysisRow/presenter.js

@@ -101,7 +101,7 @@ import { jsx } from '@instructure/emotion';
 import { RichContentRenderer } from '@instructure/quiz-rce';
 import Card from '../../../../common/components/shared/Card';
 import ExpandButton from '../../../../common/components/shared/ExpandButton';
-import Spinner from '../../../../common/components/shared/spinner/Spinner';
+import { Spinner } from '../../../../common/components/shared/spinner/Spinner';
 import AnswerFrequencySummary from '../AnswerFrequencySummary';
 import QuintileDistribution from '../../charts/QuintileDistribution';
 import Legend from '../../charts/Legend';

package/lib/reporting/components/quizAnalysis/QuizAnalysisOverview.js

@@ -100,7 +100,7 @@ import { jsx } from '@instructure/emotion';
 import FormattedDuration from '../../../common/components/shared/FormattedDuration';
 import t from '@instructure/quiz-i18n/format-message';
 import Card from '../../../common/components/shared/Card';
-import Spinner from '../../../common/components/shared/spinner/Spinner';
+import { Spinner } from '../../../common/components/shared/spinner/Spinner';
 import CentileDistribution from '../charts/CentileDistribution';
 import MetricsListItem from '../MetricsListItem';
 import generateStyle from './styles';

package/lib/reporting/components/resources/NewQuizAndItemAnalysis/ReportCard/presenter.js

@@ -101,7 +101,7 @@ import Card from '../../../../../common/components/shared/Card';
 import generateStyle from './styles';
 import generateComponentTheme from './theme';
 import AnalysisMetric from '../AnalysisMetric';
-import Spinner from '../../../../../common/components/shared/spinner/Spinner';
+import { Spinner } from '../../../../../common/components/shared/spinner/Spinner';
 import { AnalysisUpdateDate } from '../../common/AnalysisUpdateDate';
 import { itemAnalysisPropType, quizAnalysisPropType } from '../../common/propTypes';
 import { csvFormat } from '../exportFormats';

package/lib/reporting/components/resources/NewQuizAndItemAnalysis/presenter.js

@@ -98,8 +98,8 @@ import t from '@instructure/quiz-i18n/format-message';
 import { AnalysisUpdateDate } from '../common/AnalysisUpdateDate';
 import { itemAnalysisPropType, quizAnalysisPropType } from '../common/propTypes';
 import PropTypes from 'prop-types';
-import { QuizzesSpinner } from '../../../../common/components/shared/spinner/Spinner';
-import { Spinner } from '@instructure/ui-spinner';
+import { Spinner } from '../../../../common/components/shared/spinner/Spinner';
+import { Spinner as InstUISpinner } from '@instructure/ui-spinner';
 import { Button } from '@instructure/ui-buttons';
 import { Text } from '@instructure/ui-text';
 import { getFailedToFetchReports } from '../common/errorMessages';
@@ -137,7 +137,7 @@ export var NewQuizAndItemAnalysisPresenter = /*#__PURE__*/ function(Component) {
                 padding: "medium",
                 justifyItems: "center",
                 alignItems: "center"
-            }, /*#__PURE__*/ jsx(Spinner, {
+            }, /*#__PURE__*/ jsx(InstUISpinner, {
                 renderTitle: t('Loading item analyses data')
             }));
         }), _define_property(_this, "renderBodyOnFailedFetch", function() {
@@ -255,7 +255,7 @@ export var NewQuizAndItemAnalysisPresenter = /*#__PURE__*/ function(Component) {
                 color: "primary-inverse",
                 interaction: "disabled",
                 margin: "auto"
-            }, /*#__PURE__*/ jsx(QuizzesSpinner, {
+            }, /*#__PURE__*/ jsx(Spinner, {
                 size: "x-small",
                 color: "brand",
                 minHeight: "0",

package/lib/reporting/components/resources/QuizAndItemAnalysis/presenter.js

@@ -97,7 +97,7 @@ import { Heading } from '@instructure/ui-heading';
 import { jsx } from '@instructure/emotion';
 import t from '@instructure/quiz-i18n/format-message';
 import { withI18nSupport, withStyleOverrides } from '@instructure/quiz-common';
-import Spinner from '../../../../common/components/shared/spinner/Spinner';
+import { Spinner } from '../../../../common/components/shared/spinner/Spinner';
 import Card from '../../../../common/components/shared/Card';
 import FormattedDuration from '../../../../common/components/shared/FormattedDuration';
 import ItemAnalysisRow from '../../../../reporting/components/itemAnalysis/ItemAnalysisRow';

package/lib/reporting/components/resources/StudentAnalysis/ReportCard/presenter.js

@@ -99,7 +99,7 @@ import Card from '../../../../../common/components/shared/Card';
 import { generateStyle } from './styles';
 import { generateComponentTheme } from './theme';
 import { ExportButton } from '../../common/ExportButton';
-import Spinner from '../../../../../common/components/shared/spinner/Spinner';
+import { Spinner } from '../../../../../common/components/shared/spinner/Spinner';
 import { Flex, STUDENT_ANALYSES, withStyleOverrides } from '@instructure/quiz-common';
 import { AnalysisUpdateDate } from '../../common/AnalysisUpdateDate';
 export var StudentAnalysisReportCardPresenter = /*#__PURE__*/ function(Component) {

package/lib/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/quiz-core",
-  "version": "22.16.0",
+  "version": "22.17.0",
   "license": "MIT",
   "description": "The Quiz React SDK by Instructure Inc.",
   "author": "Instructure, Inc. Engineering and Product Design",
@@ -12,8 +12,8 @@
       "require": "./lib/index.js"
     },
     "./*": {
-      "import": "./es/*.js",
-      "require": "./lib/*.js"
+      "import": "./es/*",
+      "require": "./lib/*"
     }
   },
   "repository": {
@@ -121,12 +121,12 @@
     "store": "^1.3.20",
     "striptags": "^2.0.0",
     "uuid": "^3.2.1",
-    "@instructure/quiz-common": "22.16.0",
-    "@instructure/quiz-i18n": "22.16.0",
-    "@instructure/quiz-interactions": "22.16.0",
-    "@instructure/quiz-number-input": "22.16.0",
-    "@instructure/quiz-rce": "22.16.0",
-    "instructure-validations": "22.16.0"
+    "@instructure/quiz-common": "22.17.0",
+    "@instructure/quiz-i18n": "22.17.0",
+    "@instructure/quiz-interactions": "22.17.0",
+    "@instructure/quiz-number-input": "22.17.0",
+    "@instructure/quiz-rce": "22.17.0",
+    "instructure-validations": "22.17.0"
   },
   "devDependencies": {
     "@instructure/ui-axe-check": "10.17.0",
@@ -155,7 +155,7 @@
     "sinon": "^6.1.3",
     "sinon-chai": "^3.3.0",
     "@instructure/quiz-scripts": "21.0.0",
-    "quiz-presets": "22.16.0"
+    "quiz-presets": "22.17.0"
   },
   "peerDependencies": {
     "react": "^15 || ^16"

package/es/building/components/resources/ItemFeedbackModal/styles.js

@@ -1,13 +0,0 @@
-var generateStyle = function(componentTheme) {
-    return {
-        itemStem: {
-            whiteSpace: 'nowrap',
-            overflow: 'hidden',
-            textOverflow: 'ellipsis'
-        },
-        feedbackLabel: {
-            fontSize: componentTheme.feedbackLabelFontSize
-        }
-    };
-};
-export default generateStyle;

package/es/building/components/resources/ItemFeedbackModal/theme.js

@@ -1,7 +0,0 @@
-var generateComponentTheme = function(param) {
-    var typography = param.typography;
-    return {
-        feedbackLabelFontSize: typography.fontSizeSmall
-    };
-};
-export default generateComponentTheme;