Skip to content

Commit 42ed24d

Browse files
committed
fix(Menu): Add fallback to service menu when service name is empty
Closes #250
1 parent 8736c15 commit 42ed24d

File tree

1 file changed

+17
-1
lines changed

1 file changed

+17
-1
lines changed

src/lib/Menu.js

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ export default class FranzMenu {
277277

278278
if (this.stores.user.isLoggedIn) {
279279
return services.map((service, i) => ({
280-
label: service.name,
280+
label: this._getServiceName(service),
281281
accelerator: i <= 9 ? `CmdOrCtrl+${i + 1}` : null,
282282
type: 'radio',
283283
checked: service.isActive,
@@ -289,4 +289,20 @@ export default class FranzMenu {
289289

290290
return [];
291291
}
292+
293+
_getServiceName(service) {
294+
if (service.name) {
295+
return service.name;
296+
}
297+
298+
let name = service.recipe.name;
299+
300+
if (service.team) {
301+
name = `${name} (${service.team})`;
302+
} else if (service.customUrl) {
303+
name = `${name} (${service.customUrl})`;
304+
}
305+
306+
return name;
307+
}
292308
}

0 commit comments

Comments
 (0)