From 5324e60e84b6724ae1156b15c3d4d4f14fe2f130 Mon Sep 17 00:00:00 2001
From: Ed Sanders <esanders@wikimedia.org>
Date: Mon, 8 Mar 2021 13:23:00 +0000
Subject: [PATCH] Tracking changes from VE source mode

Change-Id: I5cafa7a21a0ab90fab9d09e44b7525ee07f56709
---
 modules/dt.ui.ReplyWidget.js | 11 ++++++++---
 modules/logger.js            |  9 ++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/modules/dt.ui.ReplyWidget.js b/modules/dt.ui.ReplyWidget.js
index 802263d38..cb9d77e76 100644
--- a/modules/dt.ui.ReplyWidget.js
+++ b/modules/dt.ui.ReplyWidget.js
@@ -1,7 +1,9 @@
 var controller = require( 'ext.discussionTools.init' ).controller,
 	modifier = require( 'ext.discussionTools.init' ).modifier,
 	utils = require( 'ext.discussionTools.init' ).utils,
-	logger = require( 'ext.discussionTools.init' ).logger;
+	logger = require( 'ext.discussionTools.init' ).logger,
+	dtConf = require( 'ext.discussionTools.init' ).config,
+	enable2017Wikitext = dtConf.enable2017Wikitext;
 
 require( './AbandonCommentDialog.js' );
 require( './AbandonTopicDialog.js' );
@@ -395,8 +397,11 @@ ReplyWidget.prototype.onModeTabSelectChoose = function ( option ) {
 		// Switch succeeded
 		mw.track( 'dt.schemaVisualEditorFeatureUse', {
 			feature: 'editor-switch',
-			// TODO: Log as `source-nwe-desktop` when enable2017Wikitext is set
-			action: ( mode === 'visual' ? 'visual' : 'source' ) + '-desktop'
+			action: (
+				mode === 'visual' ?
+					'visual' :
+					( enable2017Wikitext ? 'source-nwe' : 'source' )
+			) + '-desktop'
 		} );
 	}, function () {
 		// Switch failed, restore previous tab selection
diff --git a/modules/logger.js b/modules/logger.js
index fd1cfa3f6..7b361b500 100644
--- a/modules/logger.js
+++ b/modules/logger.js
@@ -1,6 +1,8 @@
 'use strict';
 
-var trackdebug = !!mw.util.getParamValue( 'trackdebug' );
+var trackdebug = !!mw.util.getParamValue( 'trackdebug' ),
+	dtConf = require( './config.json' ),
+	enable2017Wikitext = dtConf.enable2017Wikitext;
 
 /**
  * Logs an event to http://meta.wikimedia.org/wiki/Schema:EditAttemptStep
@@ -240,9 +242,10 @@ mw.loader.using( 'ext.eventLogging' ).done( function () {
 		}
 
 		if ( data.feature === 'editor-switch' && data.action.indexOf( 'dialog-' ) === -1 ) {
-			// TODO: Account for `source-nwe-desktop` when enable2017Wikitext is set
 			// eslint-disable-next-line camelcase
-			session.editor_interface = session.editor_interface === 'visualeditor' ? 'wikitext' : 'visualeditor';
+			session.editor_interface = session.editor_interface === 'visualeditor' ?
+				( enable2017Wikitext ? 'wikitext-2017' : 'wikitext' ) :
+				'visualeditor';
 		}
 	} );
 } );