Commit025eae7

committed

conditionally hide push notification button

1 parent801f22d commit025eae7Copy full SHA for 025eae7

File tree

+20

-7

lines changed

site/src
- contexts
  - usePushNotifications.ts
- modules/dashboard/Navbar
  - NavbarView.tsx

+20

-7

lines changed

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import { useQuery } from "react-query";`
`7`	`7`	`interfacePushNotifications{`
`8`	`8`	`readonlysubscribed:boolean;`
`9`	`9`	`readonlyloading:boolean;`
	`10`	`+readonlyenabled:boolean;`
`10`	`11`
`11`	`12`	`subscribe():Promise<void>;`
`12`	`13`	`unsubscribe():Promise<void>;`
`@@ -19,6 +20,17 @@ export const usePushNotifications = (): PushNotifications => {`
`19`	`20`	`const[subscribed,setSubscribed]=useState<boolean>(false);`
`20`	`21`	`const[loading,setLoading]=useState<boolean>(true);`
`21`	`22`
	`23`	`+// Disable push notifications if the server is not configured to send them.`
	`24`	`+constenabled=!!buildInfoQuery.data?.push_notifications_public_key;`
	`25`	`+if(!enabled){`
	`26`	`+return{`
	`27`	`+enabled:false,`
	`28`	`+subscribed:false,`
	`29`	`+loading:false,`
	`30`	`+subscribe:async()=>{},`
	`31`	`+unsubscribe:async()=>{},`
	`32`	`+};`
	`33`	`+}`
`22`	`34`	`useEffect(()=>{`
`23`	`35`	`// Check if browser supports push notifications`
`24`	`36`	`if(!("Notification"inwindow)\|\|!("serviceWorker"innavigator)){`
`@@ -95,6 +107,7 @@ export const usePushNotifications = (): PushNotifications => {`
`95`	`107`	`};`
`96`	`108`
`97`	`109`	`return{`
	`110`	`+enabled,`
`98`	`111`	`subscribed,`
`99`	`112`	`loading:loading\|\|buildInfoQuery.isLoading,`
`100`	`113`	`subscribe,`

Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ export const NavbarView: FC<NavbarViewProps> = ({`
`44`	`44`	`canViewAuditLog,`
`45`	`45`	`proxyContextValue,`
`46`	`46`	`})=>{`
`47`		`-const{ subscribed, loading, subscribe, unsubscribe}=`
	`47`	`+const{enabled,subscribed, loading, subscribe, unsubscribe}=`
`48`	`48`	`usePushNotifications();`
`49`	`49`
`50`	`50`	`return(`
`@@ -59,13 +59,13 @@ export const NavbarView: FC<NavbarViewProps> = ({`
`59`	`59`
`60`	`60`	`<NavItemsclassName="ml-4"/>`
`61`	`61`
`62`		`-{/* // TODO: styling required here.`
`63`		`-{subscribed ? (`
`64`		`-<button onClick={unsubscribe}>Unsubscribe</button>`
`65`		`-) : (`
`66`		`-<button onClick={subscribe}>Subscribe</button>`
	`62`	`+{enabled&&(`
	`63`	`+subscribed ?(`
	`64`	`+<buttononClick={unsubscribe}>Unsubscribe</button>`
	`65`	`+) :(`
	`66`	`+<buttononClick={subscribe}>Subscribe</button>`
	`67`	`+)`
`67`	`68`	`)}`
`68`		`-*/}`
`69`	`69`
`70`	`70`	`<divclassName=" hidden md:flex items-center gap-3 ml-auto">`
`71`	`71`	`{proxyContextValue&&(`

Comments

(0)