File tree Expand file tree Collapse file tree 3 files changed +15
-9
lines changed
meteor/server/publications/pieceContentStatusUI
packages/corelib/src/dataModel Expand file tree Collapse file tree 3 files changed +15
-9
lines changed Original file line number Diff line number Diff line change @@ -311,7 +311,7 @@ export async function checkPieceContentStatusAndDependencies(
311311
312312interface MediaObjectMessage {
313313 status : PieceStatusCode
314- message : ITranslatableMessage
314+ message : ITranslatableMessage | null
315315}
316316
317317async function checkPieceContentMediaObjectStatus (
@@ -514,7 +514,7 @@ async function checkPieceContentMediaObjectStatus(
514514
515515 return {
516516 status : pieceStatus ,
517- messages : messages . map ( ( msg ) => msg . message ) ,
517+ messages : _ . compact ( messages . map ( ( msg ) => msg . message ) ) ,
518518 progress : 0 ,
519519
520520 freezes,
@@ -820,7 +820,7 @@ async function checkPieceContentExpectedPackageStatus(
820820
821821 return {
822822 status : pieceStatus ,
823- messages : translatedMessages ,
823+ messages : _ . compact ( translatedMessages ) ,
824824 progress,
825825
826826 freezes,
Original file line number Diff line number Diff line change @@ -92,13 +92,15 @@ export class PieceContentStatusMessageFactory {
9292 getTranslation (
9393 messageKey : PackageStatusMessage ,
9494 args : PieceContentStatusMessageRequiredArgs & { [ k : string ] : any }
95- ) : ITranslatableMessage {
95+ ) : ITranslatableMessage | null {
9696 if ( this . #blueprint) {
9797 const blueprintMessage = this . #blueprint. packageStatusMessages ?. [ messageKey ]
98- // TODO - allow blueprints to discard message
99- // if (blueprintMessage === '') {
100- // return null
101- // }
98+
99+ if ( blueprintMessage === '' ) {
100+ // If the blueprint gave an empty string, it means it wants to suppress the message
101+ return null
102+ }
103+
102104 if ( blueprintMessage ) {
103105 return wrapTranslatableMessageFromBlueprints (
104106 {
Original file line number Diff line number Diff line change @@ -54,7 +54,11 @@ export interface Blueprint {
5454 /** Whether the blueprint this wraps has a `fixUpConfig` function defined */
5555 hasFixUpFunction : boolean
5656
57- /** The blueprint provided alternate package status messages, if any were provided */
57+ /**
58+ * The blueprint provided alternate package status messages, if any were provided
59+ * Any undefined/unset values will use the system default messages.
60+ * Any empty strings will suppress the message from being shown.
61+ */
5862 packageStatusMessages ?: Partial < Record < PackageStatusMessage , string | undefined > >
5963}
6064
You can’t perform that action at this time.
0 commit comments