Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Refactored update notice. Fixes #2124.
Mike Caof35d0f65dc64
diff --git a/components/common/UpdateNotice.js b/components/common/UpdateNotice.jsindex 161a5a676..2cdbcb43f 100644--- a/components/common/UpdateNotice.js+++ b/components/common/UpdateNotice.js@@ -1,15 +1,19 @@-import { useState, useEffect, useCallback } from 'react';+import { useEffect, useCallback, useState } from 'react';import { Button, Row, Column } from 'react-basics';import { setItem } from 'next-basics';import useStore, { checkVersion } from 'store/version';import { REPO_URL, VERSION_CHECK } from 'lib/constants';import styles from './UpdateNotice.module.css';import useMessages from 'hooks/useMessages';+import { useRouter } from 'next/router';-export function UpdateNotice() {+export function UpdateNotice({ user, config }) {const { formatMessage, labels, messages } = useMessages();const { latest, checked, hasUpdate, releaseUrl } = useStore();- const [dismissed, setDismissed] = useState(false);+ const { pathname } = useRouter();+ const [dismissed, setDismissed] = useState(checked);+ const allowUpdate =+ user?.isAdmin && !config?.updatesDisabled && !pathname.includes('/share/') && !dismissed;const updateCheck = useCallback(() => {setItem(VERSION_CHECK, { version: latest, time: Date.now() });@@ -27,12 +31,12 @@ export function UpdateNotice() {}useEffect(() => {- if (!checked) {+ if (allowUpdate) {checkVersion();}- }, [checked]);+ }, [allowUpdate]);- if (!hasUpdate || dismissed) {+ if (!allowUpdate || !hasUpdate) {return null;}diff --git a/components/common/UpdateNotice.module.css b/components/common/UpdateNotice.module.cssindex f5e29445b..db7a0abdc 100644--- a/components/common/UpdateNotice.module.css+++ b/components/common/UpdateNotice.module.css@@ -4,7 +4,7 @@gap: 20px;margin: 20px auto;justify-self: center;- background: #fff;+ background: var(--base50);padding: 20px;border: 1px solid var(--base300);border-radius: var(--border-radius);@@ -15,7 +15,8 @@display: flex;justify-content: center;align-items: center;- font-weight: 600;+ color: var(--font-color100);+ font-weight: 700;}.buttons {diff --git a/components/layout/AppLayout.js b/components/layout/AppLayout.jsindex 45ba7e23f..c30b10189 100644--- a/components/layout/AppLayout.js+++ b/components/layout/AppLayout.js@@ -11,17 +11,14 @@ import styles from './AppLayout.module.css';export function AppLayout({ title, children }) {const { user } = useRequireLogin();const config = useConfig();- const { pathname } = useRouter();if (!user || !config) {return null;}- const allowUpdate = user?.isAdmin && !config?.updatesDisabled && !pathname.includes('/share/');-return (<div className={styles.layout} data-app-version={CURRENT_VERSION}>- {allowUpdate && <UpdateNotice />}+ <UpdateNotice user={user} config={config} /><Head><title>{title ? `${title} | umami` : 'umami'}</title></Head>diff --git a/hooks/useConfig.js b/hooks/useConfig.jsindex 6dda7b740..2dead15a8 100644--- a/hooks/useConfig.js+++ b/hooks/useConfig.js@@ -21,7 +21,7 @@ export function useConfig() {}}, []);- return config || {};+ return config;}export default useConfig;