Commitd4ca160

committed

Revert "conditionally hide push notification button"

This reverts commitaf7b58f.

1 parentd27f4dd commitd4ca160Copy full SHA for d4ca160

File tree

-20

lines changed

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

-20

lines changed

Lines changed: 0 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@ import { useQuery } from "react-query";`
`7`	`7`	`interfacePushNotifications{`
`8`	`8`	`readonlysubscribed:boolean;`
`9`	`9`	`readonlyloading:boolean;`
`10`		`-readonlyenabled:boolean;`
`11`	`10`
`12`	`11`	`subscribe():Promise<void>;`
`13`	`12`	`unsubscribe():Promise<void>;`
`@@ -20,17 +19,6 @@ export const usePushNotifications = (): PushNotifications => {`
`20`	`19`	`const[subscribed,setSubscribed]=useState<boolean>(false);`
`21`	`20`	`const[loading,setLoading]=useState<boolean>(true);`
`22`	`21`
`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`		`-}`
`34`	`22`	`useEffect(()=>{`
`35`	`23`	`// Check if browser supports push notifications`
`36`	`24`	`if(!("Notification"inwindow)\|\|!("serviceWorker"innavigator)){`
`@@ -107,7 +95,6 @@ export const usePushNotifications = (): PushNotifications => {`
`107`	`95`	`};`
`108`	`96`
`109`	`97`	`return{`
`110`		`-enabled,`
`111`	`98`	`subscribed,`
`112`	`99`	`loading:loading\|\|buildInfoQuery.isLoading,`
`113`	`100`	`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{enabled,subscribed, loading, subscribe, unsubscribe}=`
	`47`	`+const{ 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`		`-{enabled&&(`
`63`		`-subscribed ?(`
`64`		`-<buttononClick={unsubscribe}>Unsubscribe</button>`
`65`		`-) :(`
`66`		`-<buttononClick={subscribe}>Subscribe</button>`
`67`		`-)`
	`62`	`+{/* // TODO: styling required here.`
	`63`	`+{subscribed ? (`
	`64`	`+<button onClick={unsubscribe}>Unsubscribe</button>`
	`65`	`+) : (`
	`66`	`+<button onClick={subscribe}>Subscribe</button>`
`68`	`67`	`)}`
	`68`	`+*/}`
`69`	`69`
`70`	`70`	`<divclassName=" hidden md:flex items-center gap-3 ml-auto">`
`71`	`71`	`{proxyContextValue&&(`

Comments

(0)