Allow user to change admin username.

components/settings/AccountSettings.js

@@ -37,17 +37,18 @@ export default function AccountSettings() {
     </Link>
   );
 
-  const Buttons = row =>
+  const Buttons = row => (
-    row.username !== 'admin' ? (
+    <ButtonLayout align="right">
-      <ButtonLayout align="right">
+      <Button icon={<Pen />} size="small" onClick={() => setEditAccount(row)}>
-        <Button icon={<Pen />} size="small" onClick={() => setEditAccount(row)}>
+        <FormattedMessage id="label.edit" defaultMessage="Edit" />
-          <FormattedMessage id="label.edit" defaultMessage="Edit" />
+      </Button>
-        </Button>
+      {!row.is_admin && (
         <Button icon={<Trash />} size="small" onClick={() => setDeleteAccount(row)}>
           <FormattedMessage id="label.delete" defaultMessage="Delete" />
         </Button>
-      </ButtonLayout>
+      )}
-    ) : null;
+    </ButtonLayout>
+  );
 
   const columns = [
     {

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) {

pages/api/account/index.js

@@ -23,10 +23,7 @@ export default async (req, res) => {
 
         // Only admin can change these fields
         if (current_user_is_admin) {
-          // Cannot change username of admin
+          data.username = username;
-          if (username !== 'admin') {
-            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);