Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,6 @@ function resolveAppBuildId(): string {
return 'dev-local';
}

function appendBuildIdToDiagnosticMessage(message: string, buildId: string): string {
return `${message} [build:${buildId}]`;
}

export default function App() {
const [user, setUser] = useState<FirebaseUser | null>(null);
const [isAuthReady, setIsAuthReady] = useState(false);
Expand Down Expand Up @@ -321,7 +317,7 @@ export default function App() {
membershipProbeResult,
});

setUnknownQueueWarning(appendBuildIdToDiagnosticMessage(classification.userMessage, appBuildId));
setUnknownQueueWarning(classification.userMessage);
hasLoadedUnknownQueue = true;
markInitialViewReady();
};
Expand Down Expand Up @@ -363,7 +359,7 @@ export default function App() {
unknownQueueUnsub();
unknownQueueUnsub = null;
}
setUnknownQueueWarning(appendBuildIdToDiagnosticMessage('Review queue order is temporarily unavailable.', appBuildId));
setUnknownQueueWarning('Review queue order is temporarily unavailable.');
subscribeUnknownQueueFallback();
return;
}
Expand Down Expand Up @@ -674,9 +670,6 @@ export default function App() {
</div>
</div>
<div className="flex items-center justify-between gap-3 sm:justify-end">
<div className="hidden rounded-full border border-white/15 bg-white/10 px-3 py-1 text-[11px] font-semibold tracking-wide text-orange-50/90 sm:block">
Build {appBuildId}
</div>
<div className="inline-flex items-center gap-2 rounded-full border border-white/15 bg-white/10 px-3 py-1.5 text-sm font-semibold text-white shadow-inner">
{isOwner ? <User size={16} /> : <ChefHat size={16} />}
<span>{isOwner ? appCopy.ownerRole : appCopy.cookRole}</span>
Expand Down
37 changes: 37 additions & 0 deletions test/unit/run.ts
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,43 @@ function testUnknownQueueErrorParsingAndMessaging(): void {
userMessage: 'Review queue is temporarily unavailable.',
},
);

const userFacingMessages = [
getUnknownQueueLoadErrorMessage(permissionDenied, 'owner'),
getUnknownQueueLoadErrorMessage(permissionDenied, 'non-member'),
getUnknownQueueLoadErrorMessage(failedPrecondition, 'owner'),
getUnknownQueueLoadErrorMessage(unknownError, null),
classifyUnknownQueueLoadFailure({
error: permissionDenied,
membershipProbeResult: 'owner',
plainReadProbeResult: 'permission-denied',
}).userMessage,
classifyUnknownQueueLoadFailure({
error: permissionDenied,
membershipProbeResult: 'owner',
plainReadProbeResult: 'succeeded',
}).userMessage,
classifyUnknownQueueLoadFailure({
error: permissionDenied,
membershipProbeResult: 'non-member',
plainReadProbeResult: 'not-run',
}).userMessage,
classifyUnknownQueueLoadFailure({
error: failedPrecondition,
membershipProbeResult: 'owner',
plainReadProbeResult: 'not-run',
}).userMessage,
classifyUnknownQueueLoadFailure({
error: unknownError,
membershipProbeResult: null,
plainReadProbeResult: 'failed',
}).userMessage,
];

for (const message of userFacingMessages) {
assert.equal(message.includes('[build:'), false);
assert.equal(message.includes('Build '), false);
}
}

function testUnknownQueueFallbackSortOrder(): void {
Expand Down
Loading