cci: force completion before archiving

Author: ChlodAlejandro

i18n/core/en.json

@@ -25,13 +25,14 @@
     "deputy.session.section.close": "Archive section",
     "deputy.session.section.closeComments": "Archiving comments",
     "deputy.session.section.closeHelp": "Your signature will automatically be included.",
-    "deputy.session.section.closeWarning": "Some revisions remain unassessed. You may want to mark these revisions as assessed before archiving this section.",
+    "deputy.session.section.closeError": "Some revisions remain unassessed. You must mark these revisions as assessed before archiving this section.",
     "deputy.session.section.closeWarn": "You have unsaved changes. Close the section without saving?",
 
     "deputy.session.section.stop": "Stop session",
     "deputy.session.section.saved": "Section saved",
     "deputy.session.section.failed": "Failed to save section",
     "deputy.session.section.missingSection": "The target section is missing from the case page.",
+    "deputy.session.section.sectionIncomplete": "The target section still has unreviewed rows.",
     "deputy.session.section.conflict.title": "Edit conflict",
     "deputy.session.section.conflict.help": "Someone else edited the page before you. Deputy will restart to load the new case content. Your changes will be preserved.",
 
@@ -64,6 +65,7 @@
     "deputy.session.row.checked.talk": "talk",
     "deputy.session.row.checked.contribs": "contribs",
 
+    "deputy.session.revision.assessed": "Mark as assessed",
     "deputy.session.revision.cur": "cur",
     "deputy.session.revision.prev": "prev",
     "deputy.session.revision.cur.tooltip": "Difference with latest revision",

src/ui/root/DeputyContributionSurveySection.tsx

@@ -416,14 +416,10 @@ export default class DeputyContributionSurveySection implements DeputyUIElement
 	 */
 	async save( sectionId: number ): Promise<any | false> {
 		if ( sectionId == null ) {
-			mw.notify(
-				mw.msg( 'deputy.session.section.missingSection' ),
-				{
-					autoHide: false,
-					title: mw.msg( 'deputy.session.section.failed' ),
-					type: 'error'
-				}
-			);
+			throw new Error( mw.msg( 'deputy.session.section.missingSection' ) );
+		}
+		if ( this.closed && this.rows.some( r => !r.completed ) ) {
+			throw new Error( mw.msg( 'deputy.session.section.sectionIncomplete' ) );
 		}
 
 		return MwApi.action.postWithEditToken( {
@@ -586,6 +582,12 @@ export default class DeputyContributionSurveySection implements DeputyUIElement
 					}
 				}
 			}, ( error ) => {
+				OO.ui.alert(
+					error.message,
+					{
+						title: mw.msg( 'deputy.session.section.failed' )
+					}
+				);
 				console.error( error );
 				saveContainer.classList.remove( 'active' );
 				this.setDisabled( false );
@@ -597,12 +599,14 @@ export default class DeputyContributionSurveySection implements DeputyUIElement
 
 		const closingWarning = DeputyMessageWidget( {
 			classes: [ 'dp-cs-section-unfinishedWarning' ],
-			type: 'warning',
-			label: mw.msg( 'deputy.session.section.closeWarning' )
+			type: 'error',
+			label: mw.msg( 'deputy.session.section.closeError' )
 		} );
 		closingWarning.toggle( false );
 		const updateClosingWarning = ( () => {
-			closingWarning.toggle( this.rows.some( ( row ) => !row.completed ) );
+			const incomplete = this.rows.some( ( row ) => !row.completed );
+			this.saveButton.setDisabled( incomplete );
+			closingWarning.toggle( incomplete );
 		} );
 
 		const closingCommentsField = new OO.ui.FieldLayout( this.closingComments, {
@@ -632,6 +636,7 @@ export default class DeputyContributionSurveySection implements DeputyUIElement
 				} );
 			} else {
 				closingWarning.toggle( false );
+				this.saveButton.setDisabled( false );
 				this.rows.forEach( ( row ) => {
 					row.removeEventListener( 'update', updateClosingWarning );
 				} );