m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2025-02-01 20:39:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Pass analyticsUrl prop.

Browse Source
This commit is contained in:
Mike Cao 2023-09-21 17:30:40 -07:00
parent 7f1f3b685a
commit a3a24e76c9
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/pages/settings/websites/ShareUrl.js
View File

@ -16,7 +16,7 @@ import useMessages from 'components/hooks/useMessages';
const generateId = () => getRandomChars(16); const generateId = () => getRandomChars(16);
export function ShareUrl({ websiteId, data, onSave }) { export function ShareUrl({ websiteId, data, analyticsUrl, onSave }) {
const { formatMessage, labels, messages } = useMessages(); const { formatMessage, labels, messages } = useMessages();
const { name, shareId } = data; const { name, shareId } = data;
const [id, setId] = useState(shareId); const [id, setId] = useState(shareId);
@ -27,10 +27,7 @@ export function ShareUrl({ websiteId, data, onSave }) {
); );
const ref = useRef(null); const ref = useRef(null);
const url = useMemo( const url = useMemo(
() => () => `${analyticsUrl || location.origin}${basePath}/share/${id}/${encodeURIComponent(name)}`,
`${process.env.analyticsUrl || location.origin}${basePath}/share/${id}/${encodeURIComponent(
name,
)}`,
[id, name, basePath], [id, name, basePath],
); );

4
src/components/pages/settings/websites/TrackingCode.js
View File

@ -3,7 +3,7 @@ import useMessages from 'components/hooks/useMessages';
import useConfig from 'components/hooks/useConfig'; import useConfig from 'components/hooks/useConfig';
import { useRouter } from 'next/router'; import { useRouter } from 'next/router';
export function TrackingCode({ websiteId, baseUrl }) { export function TrackingCode({ websiteId, analyticsUrl }) {
const { formatMessage, messages } = useMessages(); const { formatMessage, messages } = useMessages();
const { basePath } = useRouter(); const { basePath } = useRouter();
const config = useConfig(); const config = useConfig();
@ -13,7 +13,7 @@ export function TrackingCode({ websiteId, baseUrl }) {
const url = trackerScriptName?.startsWith('http') const url = trackerScriptName?.startsWith('http')
? trackerScriptName ? trackerScriptName
: `${baseUrl || location.origin}${basePath}/${trackerScriptName}`; : `${analyticsUrl || location.origin}${basePath}/${trackerScriptName}`;
const code = `<script async src="${url}" data-website-id="${websiteId}"></script>`; const code = `<script async src="${url}" data-website-id="${websiteId}"></script>`;

9
src/components/pages/settings/websites/WebsiteSettings.js
View File

@ -69,7 +69,14 @@ export function WebsiteSettings({ websiteId, openExternal = false, analyticsUrl
<WebsiteEditForm websiteId={websiteId} data={values} onSave={handleSave} /> <WebsiteEditForm websiteId={websiteId} data={values} onSave={handleSave} />
)} )}
{tab === 'tracking' && <TrackingCode websiteId={websiteId} analyticsUrl={analyticsUrl} />} {tab === 'tracking' && <TrackingCode websiteId={websiteId} analyticsUrl={analyticsUrl} />}
{tab === 'share' && <ShareUrl websiteId={websiteId} data={values} onSave={handleSave} />} {tab === 'share' && (
<ShareUrl
websiteId={websiteId}
data={values}
analyticsUrl={analyticsUrl}
onSave={handleSave}
/>
)}
{tab === 'data' && <WebsiteData websiteId={websiteId} onSave={handleReset} />} {tab === 'data' && <WebsiteData websiteId={websiteId} onSave={handleReset} />}
</Page> </Page>
); );