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
Allow user to change admin username.
Mike Caofaf6438852bc
diff --git a/components/settings/AccountSettings.js b/components/settings/AccountSettings.jsindex 4929b2448..967492db2 100644--- a/components/settings/AccountSettings.js+++ b/components/settings/AccountSettings.js@@ -37,17 +37,18 @@ export default function AccountSettings() {</Link>);- const Buttons = row =>- row.username !== 'admin' ? (- <ButtonLayout align="right">- <Button icon={<Pen />} size="small" onClick={() => setEditAccount(row)}>- <FormattedMessage id="label.edit" defaultMessage="Edit" />- </Button>+ const Buttons = row => (+ <ButtonLayout align="right">+ <Button icon={<Pen />} size="small" onClick={() => setEditAccount(row)}>+ <FormattedMessage id="label.edit" defaultMessage="Edit" />+ </Button>+ {!row.is_admin && (<Button icon={<Trash />} size="small" onClick={() => setDeleteAccount(row)}><FormattedMessage id="label.delete" defaultMessage="Delete" /></Button>- </ButtonLayout>- ) : null;+ )}+ </ButtonLayout>+ );const columns = [{diff --git a/lib/queries.js b/lib/queries.jsindex ed6448741..7d3dd7a2d 100644--- a/lib/queries.js+++ b/lib/queries.js@@ -230,7 +230,16 @@ export async function saveEvent(website_id, session_id, url, event_type, event_v}export async function getAccounts() {- return runQuery(prisma.account.findMany());+ return runQuery(+ prisma.account.findMany({+ orderBy: [+ { is_admin: 'desc' },+ {+ username: 'asc',+ },+ ],+ }),+ );}export async function getAccountById(user_id) {diff --git a/pages/api/account/index.js b/pages/api/account/index.jsindex 2ec5f0811..101d3e7fa 100644--- a/pages/api/account/index.js+++ b/pages/api/account/index.js@@ -23,10 +23,7 @@ export default async (req, res) => {// Only admin can change these fieldsif (current_user_is_admin) {- // Cannot change username of admin- if (username !== 'admin') {- data.username = username;- }+ data.username = username;data.is_admin = is_admin;}@@ -37,7 +34,7 @@ export default async (req, res) => {return badRequest(res, 'Account already exists');}}-+ console.log('------------------\n', data);const updated = await updateAccount(user_id, data);return ok(res, updated);diff --git a/pages/api/accounts.js b/pages/api/accounts/index.jssimilarity index 100%rename from pages/api/accounts.jsrename to pages/api/accounts/index.jsdiff --git a/pages/api/websites.js b/pages/api/websites/index.jssimilarity index 100%rename from pages/api/websites.jsrename to pages/api/websites/index.js