switch from html::(notice/warning/error)Box to OOUI messageWidget(typ…

…e: (notice/warning/error)) (#128) …e: (notice/warning/error))  ## Summary by CodeRabbit - **New Features** - Enhanced message display using modern UI components, improving the consistency and clarity of informational, error, and warning messages. - **Style** - Updated the styling of message boxes by switching to new CSS class names for a more modern and cohesive user interface.
miraheze · Feb 4, 2025 · 2df8a9f · 2df8a9f
1 parent e9d4e87
commit 2df8a9f
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 38 deletions.
diff --git a/includes/ImportDumpRequestViewer.php b/includes/ImportDumpRequestViewer.php
@@ -12,6 +12,8 @@
 use MediaWiki\Permissions\PermissionManager;
 use MediaWiki\User\User;
 use MediaWiki\WikiMap\WikiMap;
+use OOUI\HtmlSnippet;
+use OOUI\MessageWidget;
 use UserNotLoggedIn;
 
 class ImportDumpRequestViewer implements ImportDumpStatus {
@@ -70,6 +72,8 @@ public function getFormDescriptor(): array {
 			);
 		}
 
+		$this->context->getOutput()->enableOOUI();
+
 		$formDescriptor = [
 			'source' => [
 				'label-message' => 'importdump-label-source',
@@ -207,7 +211,8 @@ public function getFormDescriptor(): array {
 
 				$fileInfo .= Html::element( 'button', [
 						'type' => 'button',
-						'onclick' => 'navigator.clipboard.writeText( $( \'.mw-message-box-notice code\' ).text() );',
+						'onclick' => 'navigator.clipboard.writeText(
+      								$( \'.oo-ui-flaggedElement-notice\' ).text() );',
 					],
 					$this->context->msg( 'importdump-button-copy' )->text()
 				);
@@ -226,52 +231,67 @@ public function getFormDescriptor(): array {
 					)->parse();
 				}
 
-				$info = Html::noticeBox( $fileInfo, '' );
+				$info = new MessageWidget( [
+					'label' => new HtmlSnippet( $fileInfo ),
+					'type' => 'notice',
+				] );
 			} else {
-				$info = Html::errorBox(
-					$this->context->msg( 'importdump-info-no-file-found',
-						$this->importDumpRequestManager->getFilePath()
-					)->escaped()
-				);
+				$info = new MessageWidget( [
+					'label' => new HtmlSnippet(
+								$this->context->msg( 'importdump-info-no-file-found',
+								$this->importDumpRequestManager->getFilePath()
+							)->escaped()
+						),
+					'type' => 'error',
+				] );
 
 				$validRequest = false;
 				if ( $status === self::STATUS_PENDING || $status === self::STATUS_INPROGRESS ) {
 					$status = self::STATUS_DECLINED;
 				}
 			}
 
-			$info .= Html::noticeBox(
-				$this->context->msg( 'importdump-info-groups',
-					$this->importDumpRequestManager->getRequester()->getName(),
-					$this->importDumpRequestManager->getTarget(),
-					$this->context->getLanguage()->commaList(
-						$this->importDumpRequestManager->getUserGroupsFromTarget()
-					)
-				)->escaped(),
-				''
-			);
+			$info .= new MessageWidget( [
+				'label' => new HtmlSnippet(
+						$this->context->msg( 'importdump-info-groups',
+							$this->importDumpRequestManager->getRequester()->getName(),
+							$this->importDumpRequestManager->getTarget(),
+							$this->context->getLanguage()->commaList(
+								$this->importDumpRequestManager->getUserGroupsFromTarget()
+							)
+						)->escaped(),
+					),
+				'type' => 'notice',
+			] );
 
 			if ( $this->importDumpRequestManager->isPrivate() ) {
-				$info .= Html::warningBox(
-					$this->context->msg( 'importdump-info-request-private' )->escaped()
-				);
+				$info .= new MessageWidget( [
+					'label' => new HtmlSnippet( $this->context->msg( 'importdump-info-request-private' )->escaped() ),
+					'type' => 'warning',
+				] );
 			}
 
 			if ( $this->importDumpRequestManager->getRequester()->getBlock() ) {
-				$info .= Html::warningBox(
-					$this->context->msg( 'importdump-info-requester-blocked',
-						$this->importDumpRequestManager->getRequester()->getName(),
-						WikiMap::getCurrentWikiId()
-					)->escaped()
-				);
+				$info .= new MessageWidget( [
+					'label' => new HtmlSnippet(
+							$this->context->msg( 'importdump-info-requester-blocked',
+								$this->importDumpRequestManager->getRequester()->getName(),
+								WikiMap::getCurrentWikiId()
+							)->escaped()
+						),
+					'type' => 'warning',
+				] );
 			}
 
 			if ( $this->importDumpRequestManager->getRequester()->isLocked() ) {
-				$info .= Html::errorBox(
-					$this->context->msg( 'importdump-info-requester-locked',
-						$this->importDumpRequestManager->getRequester()->getName()
-					)->escaped()
-				);
+				$info .= new MessageWidget( [
+					'label' => new HtmlSnippet(
+							$this->context->msg( 'importdump-info-requester-locked',
+								$this->importDumpRequestManager->getRequester()->getName()
+							)->escaped()
+						),
+					'type' => 'error',
+				] );
 
 				$validRequest = false;
 				if ( $status === self::STATUS_PENDING || $status === self::STATUS_INPROGRESS ) {
@@ -280,12 +300,15 @@ public function getFormDescriptor(): array {
 			}
 
 			if ( !$this->importDumpRequestManager->getInterwikiPrefix() ) {
-				$info .= Html::errorBox(
-					$this->context->msg( 'importdump-info-no-interwiki-prefix',
-						$this->importDumpRequestManager->getTarget(),
-						parse_url( $this->importDumpRequestManager->getSource(), PHP_URL_HOST )
-					)->escaped()
-				);
+				$info .= new MessageWidget( [
+					'label' => new HtmlSnippet(
+							$this->context->msg( 'importdump-info-no-interwiki-prefix',
+								$this->importDumpRequestManager->getTarget(),
+								parse_url( $this->importDumpRequestManager->getSource(), PHP_URL_HOST )
+							)->escaped()
+						),
+					'type' => 'error',
+				] );
 			}
 
 			$formDescriptor += [

diff --git a/modules/ext.importdump.oouiform.ooui.less b/modules/ext.importdump.oouiform.ooui.less
@@ -1,7 +1,7 @@
 #importdump {
 	filter: brightness( 1 );
 
-	.mw-message-box-notice {
+	.oo-ui-flaggedElement-notice {
 		border-color: #33a6f1;
 		background: #bce5fd;