Render notification progress update as html (#10588)

eclipse-theia · Jan 5, 2022 · 8083f76 · 8083f76
1 parent 17b419f
commit 8083f76
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/packages/messages/src/browser/notification-component.tsx b/packages/messages/src/browser/notification-component.tsx
@@ -78,7 +78,12 @@ export class NotificationComponent extends React.Component<NotificationComponent
                     <div className={`theia-notification-icon ${codicon(type)} ${type}`} />
                     <div className='theia-notification-message'>
                         <span
-                            dangerouslySetInnerHTML={{ __html: DOMPurify.sanitize(message) }} // eslint-disable-line react/no-danger
+                            // eslint-disable-next-line react/no-danger
+                            dangerouslySetInnerHTML={{
+                                __html: DOMPurify.sanitize(message, {
+                                    ALLOW_UNKNOWN_PROTOCOLS: true // DOMPurify usually strips non http(s) links from hrefs
+                                })
+                            }}
                             onClick={this.onMessageClick}
                         />
                     </div>

diff --git a/packages/messages/src/browser/notifications-manager.ts b/packages/messages/src/browser/notifications-manager.ts
@@ -276,8 +276,10 @@ export class NotificationManager extends MessageClient {
         if (cancellationToken.isCancellationRequested) {
             this.clear(messageId);
         } else {
-            notification.message = originalMessage.text && update.message ? `${originalMessage.text}: ${update.message}` :
-                originalMessage.text || update?.message || notification.message;
+            const textMessage = originalMessage.text && update.message ? `${originalMessage.text}: ${update.message}` : originalMessage.text || update?.message;
+            if (textMessage) {
+                notification.message = this.contentRenderer.renderMessage(textMessage);
+            }
             notification.progress = this.toPlainProgress(update) || notification.progress;
         }
         this.fireUpdatedEvent();