watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-04 04:37:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'master' of https://github.com/umami-software/umami into francis/uc-24-kafka-test

Browse source
This commit is contained in:
Francis Cao 2022-08-18 16:54:57 -07:00
commit 295ce2487d
20 changed files with 206 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

18
pages/api/scripts/telemetry.js
View file

@ -1,18 +1,18 @@
import { TELEMETRY_PIXEL } from 'lib/constants';
import { CURRENT_VERSION, TELEMETRY_PIXEL } from 'lib/constants';
export default function handler(req, res) {
const { v } = req.query;
res.setHeader('content-type', 'text/javascript');
if (process.env.DISABLE_TELEMETRY) {
return res.send('/* telemetry disabled */');
}
const script = `
(()=>{const i=document.createElement('img');
i.setAttribute('src','${TELEMETRY_PIXEL}?v=${v}');
i.setAttribute('src','${TELEMETRY_PIXEL}?v=${CURRENT_VERSION}');
i.setAttribute('style','width:0;height:0;position:absolute;pointer-events:none;');
document.body.appendChild(i);})();
`;
res.setHeader('content-type', 'text/javascript');
if (process.env.DISABLE_TELEMETRY) {
res.send('/* telemetry disabled */');
} else {
res.send(script.replace(/\s\s+/g, ''));
}
return res.send(script.replace(/\s\s+/g, ''));
}

12
pages/test.js → pages/console/[[...id]].js
View file

@ -2,11 +2,13 @@ import React from 'react';
import Layout from 'components/layout/Layout';
import TestConsole from 'components/pages/TestConsole';
import useRequireLogin from 'hooks/useRequireLogin';
import useUser from 'hooks/useUser';
export default function TestPage() {
export default function ConsolePage({ enabled }) {
const { loading } = useRequireLogin();
const { user } = useUser();
if (loading) {
if (loading || !enabled || !user?.is_admin) {
return null;
}
@ -16,3 +18,9 @@ export default function TestPage() {
</Layout>
);
}
export async function getServerSideProps() {
return {
props: { enabled: !!process.env.ENABLE_TEST_CONSOLE },
};
}