wiki-config: better handling

Author: ChlodAlejandro

i18n/settings/en.json

@@ -124,7 +124,7 @@
     "deputy.setting.wiki.ia.subpageFormat.description": "The format to use for subpages of the root page. This is a moment.js format string.",
     "deputy.setting.wiki.ia.preload.name": "Preload",
     "deputy.setting.wiki.ia.preload.description": "Defines the page content to preload the page with if a given subpage does not exist yet. This should be an existing page on-wiki. Leave blank to avoid using a preload entirely.",
-    "deputy.setting.wiki.ia.listingWikitext": "Listing wikitext",
+    "deputy.setting.wiki.ia.listingWikitext.name": "Listing wikitext",
     "deputy.setting.wiki.ia.listingWikitext.description": "Defines the wikitext that will be used when adding listings to a noticeboard page. You may use \"$1\" to denote the page being reported, and \"$2\" for user comments (which shouldn't contain the signature).",
     "deputy.setting.wiki.ia.listingWikitextMatch.name": "Regular expression for listings",
     "deputy.setting.wiki.ia.listingWikitextMatch.description": "A regular expression that will be used to parse and detect listings on a given noticeboard page. Since its usage is rather technical, this value should be edited by someone with technical knowledge of regular expressions. This regular expression must provide three captured groups: group \"$1\" will catch any bullet point, space, or prefix, \"$2\" will catch the page title ONLY if the given page matches \"{{int:deputy.setting.wiki.ia.listingWikitext.name}}\" or \"{{int:deputy.setting.wiki.ia.batchListingWikitext.name}}\", and \"$3\" will catch the page title ONLY IF the page wasn't caught in \"$2\" (such as in cases where there is only a bare link to the page).",

src/config/WikiConfiguration.ts

@@ -71,7 +71,7 @@ export default class WikiConfiguration extends ConfigurationBase {
 
 		if ( configPage ) {
 			return new WikiConfiguration(
-				configPage.title,
+				new mw.Title( configPage.title.title, configPage.title.namespace ),
 				JSON.parse( configPage.wt ),
 				configPage.editable
 			);
@@ -91,7 +91,8 @@ export default class WikiConfiguration extends ConfigurationBase {
 			...await ( async () => {
 				const content = await getPageContent( sourcePage, {
 					prop: 'revisions|info',
-					intestactions: 'edit'
+					intestactions: 'edit',
+					fallbacktext: '{}'
 				} );
 
 				return {
@@ -203,7 +204,7 @@ export default class WikiConfiguration extends ConfigurationBase {
 			displayOptions: { type: 'checkbox' }
 		} ),
 		rootPage: new Setting<string, mw.Title>( {
-			serialize: ( v ) => v.getPrefixedText(),
+			serialize: ( v ) => v?.getPrefixedText(),
 			deserialize: ( v ) => new mw.Title( v ),
 			defaultValue: null,
 			displayOptions: { type: 'page' }
@@ -231,7 +232,7 @@ export default class WikiConfiguration extends ConfigurationBase {
 			displayOptions: { type: 'checkbox' }
 		} ),
 		rootPage: new Setting<string, mw.Title>( {
-			serialize: ( v ) => v.getPrefixedText(),
+			serialize: ( v ) => v?.getPrefixedText(),
 			deserialize: ( v ) => new mw.Title( v ),
 			defaultValue: null,
 			displayOptions: { type: 'page' }
@@ -241,7 +242,7 @@ export default class WikiConfiguration extends ConfigurationBase {
 			displayOptions: { type: 'text' }
 		} ),
 		preload: new Setting<string, string>( {
-			serialize: ( v ) => v.trim().length === 0 ? null : v.trim(),
+			serialize: ( v ) => ( v?.trim()?.length ?? 0 ) === 0 ? null : v.trim(),
 			defaultValue: null,
 			displayOptions: { type: 'page' }
 		} ),

src/ui/config/WikiConfigurationEditIntro.tsx

@@ -1,40 +1,17 @@
 import unwrapWidget from '../../util/unwrapWidget';
 import { h } from 'tsx-dom';
 import WikiConfiguration from '../../config/WikiConfiguration';
-import swapElements from '../../util/swapElements';
 import { spawnConfigurationDialog } from './ConfigurationDialog';
 import normalizeTitle from '../../wiki/util/normalizeTitle';
+import DeputyMessageWidget from '../shared/DeputyMessageWidget';
 
 /**
- * @param config The current configuration
+ * @param config The current configuration (actively loaded, not the one being viewed)
  * @return An HTML element consisting of an OOUI MessageWidget
  */
 export default function WikiConfigurationEditIntro( config: WikiConfiguration ): JSX.Element {
-	const r = 'deputy-' + Math.random().toString().slice( 2 );
 	const current = config.onConfigurationPage();
 
-	const messageBox = new OO.ui.MessageWidget( {
-		classes: [
-			'deputy', 'dp-mb'
-		],
-		type: 'info',
-		label: new OO.ui.HtmlSnippet( ( <span>
-			<b>{
-				mw.msg( 'deputy.settings.wikiEditIntro.title' )
-			}</b><br/>{
-				current ?
-					mw.msg( 'deputy.settings.wikiEditIntro.current' ) :
-					<span dangerouslySetInnerHTML={
-						mw.message(
-							'deputy.settings.wikiEditIntro.other',
-							config.sourcePage.getPrefixedText()
-						).parse()
-					} />
-			}<br/>
-			<span id={r}></span>
-		</span> ).innerHTML )
-	} );
-
 	let buttons: any[];
 	if ( current ) {
 		const editCurrent = new OO.ui.ButtonWidget( {
@@ -52,7 +29,7 @@ export default function WikiConfigurationEditIntro( config: WikiConfiguration ):
 		const editCurrent = new OO.ui.ButtonWidget( {
 			flags: [ 'progressive', 'primary' ],
 			label: mw.msg( 'deputy.settings.wikiEditIntro.edit.otherCurrent' ),
-			disabled: config.editable,
+			disabled: !config.editable,
 			title: config.editable ?
 				undefined : mw.msg( 'deputy.settings.wikiEditIntro.edit.protected' )
 		} );
@@ -72,10 +49,24 @@ export default function WikiConfigurationEditIntro( config: WikiConfiguration ):
 		buttons = [ editCurrent, editOther ];
 	}
 
+	const messageBox = DeputyMessageWidget( {
+		classes: [
+			'deputy', 'dp-mb'
+		],
+		type: 'info',
+		title: mw.msg( 'deputy.settings.wikiEditIntro.title' ),
+		message: current ?
+			mw.msg( 'deputy.settings.wikiEditIntro.current' ) :
+			<span dangerouslySetInnerHTML={
+				mw.message(
+					'deputy.settings.wikiEditIntro.other',
+					config.sourcePage.getPrefixedText()
+				).parse()
+			} />,
+		actions: buttons
+	} );
+
 	const box = unwrapWidget( messageBox );
-	swapElements( box.querySelector( `#${r}` ), <span>
-		{ buttons.map( b => unwrapWidget( b ) ) }
-	</span> );
 
 	box.classList.add( 'deputy', 'deputy-wikiConfig-intro' );
 

src/wiki/util/getPageContent.ts

@@ -27,9 +27,18 @@ export default function (
 		rvlimit: '1',
 		...extraOptions
 	} ).then( ( data ) => {
+		const fallbackText = extraOptions.fallbacktext;
+
 		if ( data.query.pages[ 0 ].revisions == null ) {
-			return null;
+			if ( fallbackText ) {
+				return Object.assign( fallbackText, {
+					page: data.query.pages[ 0 ]
+				} );
+			} else {
+				return null;
+			}
 		}
+
 		return Object.assign(
 			data.query.pages[ 0 ].revisions[ 0 ].slots.main.content,
 			{