Skip to content
Open
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
2 changes: 1 addition & 1 deletion web/src/shared/api/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@ export interface LdapInfo {
}

export interface ApplicationInfo {
version: string;
version: string | null;
network_present: boolean;
smtp_enabled: boolean;
external_openid_enabled: boolean;
Expand Down
4 changes: 4 additions & 0 deletions web/src/shared/components/Navigation/Navigation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -223,11 +223,15 @@ export const Navigation = () => {
}));
}, [aliasesCount, destinationsCount, rulesCount]);

const rawVersion = useApp((s) => s.appInfo.version);
const semverVersion = rawVersion ? rawVersion.split('+')[0] : null;

if (!isAdmin || !isOpen) return null;
return (
<div className="navigation">
<div className="top">
<NavLogo />
{semverVersion && <span className="version-badge">{semverVersion}</span>}
<div className="control">
<IconButton
icon="hamburger"
Expand Down
13 changes: 13 additions & 0 deletions web/src/shared/components/Navigation/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,19 @@
padding: var(--spacing-md) var(--spacing-md) var(--spacing-md) var(--spacing-lg);
width: 100%;

& > .version-badge {
display: flex;
justify-content: center;
align-items: center;
margin-left: var(--spacing-md);
font: var(--t-body-xxs-500);
font-family: var(--font-family-jetbrains);
color: var(--fg-neutral);
background-color: var(--bg-emphasis);
border-radius: var(--radius-sm);
padding: 2px var(--spacing-xs);
}

& > .control {
margin-left: auto;

Expand Down
2 changes: 1 addition & 1 deletion web/src/shared/hooks/useApp.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const defaults: StoreValues = {
},
network_present: false,
smtp_enabled: false,
version: '',
version: null,
},
settingsEssentials: undefined,
wizardState: undefined,
Expand Down
Loading