cci(changelist): adjust layout, fix links

Author: ChlodAlejandro

src/ui/root/DeputyChangesListElements.tsx

@@ -16,29 +16,24 @@ export function ChangesListLinks(
 	{ revid: _revid, parentid: _parentid, missing }:
 		{ revid: number, parentid: number, missing?: boolean }
 ): JSX.Element {
-	let diff: number | 'prev' = _revid;
-	let oldid = _parentid;
-	if ( missing ) {
-		oldid = _revid;
-		diff = 'prev';
-	}
+	const cur = getRevisionDiffURL( _revid, 'cur' );
+	const prev = missing ?
+		getRevisionDiffURL( _revid, 'prev' ) :
+		getRevisionDiffURL( _parentid, _revid );
 
 	return <span class="mw-changeslist-links">
 		<span><a
 			rel="noopener"
-			href={ getRevisionDiffURL( diff, 'cur' ) }
+			href={ cur }
 			title={ mw.msg( 'deputy.session.revision.cur.tooltip' ) }
 			target="_blank"
 		>{ mw.msg( 'deputy.session.revision.cur' ) }</a></span>
 		<span>{
-			!oldid ?
+			( !_parentid && !missing ) ?
 				mw.msg( 'deputy.session.revision.prev' ) :
 				<a
 					rel="noopener"
-					href={ !oldid ?
-						null :
-						getRevisionDiffURL( oldid, diff )
-					}
+					href={ prev }
 					title={ mw.msg( 'deputy.session.revision.prev.tooltip' ) }
 					target="_blank"
 				>{ mw.msg( 'deputy.session.revision.prev' ) }</a>

src/ui/root/DeputyContributionSurveyRevision.tsx

@@ -189,11 +189,11 @@ export default class DeputyContributionSurveyRevision
 		return <span>
 			{
 				!this.revision.parentid && <NewPageIndicator />
-			}<ChangesListTime
+			} <ChangesListTime
 				timestamp={ this.revision.timestamp }
 			/><ChangesListDate
 				revision={ this.revision }
-			/>  <ChangesListUser
+			/> <ChangesListUser
 				user={ this.revision.user }
 			/> <span
 				class="mw-changeslist-separator"
@@ -216,7 +216,7 @@ export default class DeputyContributionSurveyRevision
 	 */
 	renderMissingRevisionInfo(): HTMLElement {
 		return <span>
-			<i dangerouslySetInnerHTML={mw.message(
+			{' '}<i dangerouslySetInnerHTML={mw.message(
 				'deputy.session.revision.missing',
 				this.revision.revid
 			).parse()}/>
@@ -241,7 +241,7 @@ export default class DeputyContributionSurveyRevision
 				revid={ this.revision.revid }
 				parentid={ this.revision.parentid }
 				missing={ ( this.revision as any ).missing }
-			/> {unwrapElement(
+			/>{unwrapElement(
 				( this.revision as any ).missing ?
 					this.renderMissingRevisionInfo() :
 					this.renderRevisionInfo()

src/util/unwrapElement.ts

@@ -5,6 +5,9 @@
  * @param el The element to unwrap.
  * @return The unwrapped element.
  */
-export default function ( el: HTMLElement ): HTMLElement[] {
-	return Array.from( el.children ) as HTMLElement[];
+export default function ( el: HTMLElement ): ( HTMLElement | string )[] {
+	return Array.from( el.childNodes ).map( v =>
+		v instanceof HTMLElement ? v :
+			( v instanceof Text ? v.textContent : undefined )
+	).filter( v => v !== undefined );
 }