Merge "bridge: Simplify talk page link"

wikimedia · Feb 21, 2025 · 037aa51 · 037aa51
2 parents 96cf552 + 5f5fef2
commit 037aa51
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 19 deletions.
diff --git a/client/data-bridge/dist/data-bridge.app.js b/client/data-bridge/dist/data-bridge.app.js
diff --git a/client/data-bridge/src/presentation/components/ErrorPermission.vue b/client/data-bridge/src/presentation/components/ErrorPermission.vue
@@ -97,17 +97,6 @@ export default defineComponent( {
 				...this.messageBodyParameters( permissionError ),
 			);
 		},
-		/** A poor (wo)man's implementation of constructing a correct
-		talk page title due to lack of a redirect functionality.
-		This can be removed once T242346 is resolved.
-		 */
-		buildTalkPageNamespace(): string {
-			if ( this.entityTitle.includes( ':' ) ) {
-				const entityTitleParts: string[] = this.entityTitle.split( ':', 2 );
-				return `${entityTitleParts[ 0 ]}_talk:${entityTitleParts[ 1 ]}`;
-			}
-			return `Talk:${this.entityTitle}`;
-		},
 		messageHeaderKey( permissionError: MissingPermissionsError ): ( keyof typeof MessageKeys ) {
 			return permissionTypeRenderers[ permissionError.type ].header;
 		},
@@ -207,13 +196,13 @@ export default defineComponent( {
 						this.$repoRouter.getPageUrl( 'Project:Page_protection_policy' ),
 						this.$repoRouter.getPageUrl( 'Project:Project:Edit_warring' ),
 						this.$repoRouter.getPageUrl( 'Special:Log/protect', { page: this.entityTitle } ),
-						this.$repoRouter.getPageUrl( this.buildTalkPageNamespace() ),
+						this.$repoRouter.getPageUrl( `Special:TalkPage/${this.entityTitle}` ),
 					);
 					break;
 				case PageNotEditable.ITEM_SEMI_PROTECTED:
 					params.push(
 						this.$repoRouter.getPageUrl( 'Special:Log/protect', { page: this.entityTitle } ),
-						this.$repoRouter.getPageUrl( this.buildTalkPageNamespace() ),
+						this.$repoRouter.getPageUrl( `Special:TalkPage/${this.entityTitle}` ),
 					);
 					break;
 				case PageNotEditable.ITEM_CASCADE_PROTECTED:

diff --git a/client/data-bridge/tests/unit/presentation/components/ErrorPermission.spec.ts b/client/data-bridge/tests/unit/presentation/components/ErrorPermission.spec.ts
@@ -192,7 +192,7 @@ describe( 'ErrorPermission', () => {
 			'http://localhost/wiki/Project:Page_protection_policy',
 			'http://localhost/wiki/Project:Edit_warring',
 			`http://localhost/wiki/Special:Log/protect?page=${entityTitle}`,
-			`http://localhost/wiki/Talk:${entityTitle}`,
+			`http://localhost/wiki/Special:TalkPage/${entityTitle}`,
 		];
 		const messageGet = jest.fn( ( key ) => key );
 		const repoRouterGetPageUrl = jest.fn();
@@ -202,7 +202,7 @@ describe( 'ErrorPermission', () => {
 			.mockReturnValueOnce( 'http://localhost/wiki/Project:Page_protection_policy' )
 			.mockReturnValueOnce( 'http://localhost/wiki/Project:Edit_warring' )
 			.mockReturnValueOnce( `http://localhost/wiki/Special:Log/protect?page=${entityTitle}` )
-			.mockReturnValueOnce( `http://localhost/wiki/Talk:${entityTitle}` );
+			.mockReturnValueOnce( `http://localhost/wiki/Special:TalkPage/${entityTitle}` );
 		const $repoRouter: MediaWikiRouter = {
 			getPageUrl: repoRouterGetPageUrl,
 		};
@@ -246,15 +246,15 @@ describe( 'ErrorPermission', () => {
 		const body = MessageKeys.PERMISSIONS_SEMI_PROTECTED_BODY;
 		const bodyParams = [
 			`http://localhost/wiki/Special:Log/protect?page=${entityTitle}`,
-			`http://localhost/wiki/Talk:${entityTitle}`,
+			`http://localhost/wiki/Special:TalkPage/${entityTitle}`,
 		];
 		const messageGet = jest.fn( ( key ) => key );
 		const repoRouterGetPageUrl = jest.fn();
 		repoRouterGetPageUrl
 			.mockReturnValueOnce( 'http://localhost/wiki/Project:Page_protection_policy' )
 			.mockReturnValueOnce( 'http://localhost/wiki/Project:Autoconfirmed_users' )
 			.mockReturnValueOnce( `http://localhost/wiki/Special:Log/protect?page=${entityTitle}` )
-			.mockReturnValueOnce( `http://localhost/wiki/Talk:${entityTitle}` );
+			.mockReturnValueOnce( `http://localhost/wiki/Special:TalkPage/${entityTitle}` );
 		const $repoRouter: MediaWikiRouter = {
 			getPageUrl: repoRouterGetPageUrl,
 		};
@@ -534,7 +534,7 @@ describe( 'ErrorPermission', () => {
 			protectionPolicyUrl = 'Project:Page_protection_policy',
 			autoconfirmedUsers = 'Autoconfirmed_users',
 			entityTitle = 'Property:P18',
-			propertyTalkUrl = 'http://localhost/wiki/Property_talk:P18',
+			propertyTalkUrl = 'http://localhost/wiki/Special:TalkPage/Property:P18',
 			logUrl = `http://localhost/wiki/Special:Log/protect?page=${entityTitle}`;
 		const $repoRouter: MediaWikiRouter = {
 			getPageUrl: jest.fn()