Merge pull request TFNS#27 from JJ-8/0-last-active-downstream

Add last active admin functionality
woutvanderploeg · May 5, 2023 · 1d99e5a · 1d99e5a
2 parents b6e3ec5 + 9b1f009
commit 1d99e5a
Show file tree

Hide file tree

Showing 6 changed files with 168 additions and 66 deletions.
diff --git a/api/migrations/42-add-last-active.sql b/api/migrations/42-add-last-active.sql
@@ -0,0 +1,33 @@
+ALTER TABLE ctfnote.profile
+ADD COLUMN "lastactive" timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP;
+
+
+/* UpdateLastActive */
+CREATE FUNCTION ctfnote.update_last_active ()
+  RETURNS void
+  AS $$
+  BEGIN
+    UPDATE ctfnote.profile
+      SET lastactive = now()
+      WHERE id = ctfnote_private.user_id ();
+  END;
+$$
+LANGUAGE plpgsql VOLATILE
+SECURITY DEFINER;
+GRANT EXECUTE ON FUNCTION ctfnote.update_last_active () TO user_guest;
+
+CREATE OR REPLACE FUNCTION ctfnote.me ()
+  RETURNS ctfnote.profile
+  AS $$
+  SELECT ctfnote.update_last_active();
+  SELECT
+    *
+  FROM
+    ctfnote.profile
+  WHERE
+    id = ctfnote_private.user_id ()
+  LIMIT 1;
+
+$$
+LANGUAGE SQL
+STRICT STABLE;
diff --git a/front/graphql.schema.json b/front/graphql.schema.json
@@ -4689,6 +4689,22 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "lastactive",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Datetime",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "nodeId",
             "description": "A globally unique identifier. Can be used in various places throughout the system to identify this single value.",

diff --git a/front/src/components/Admin/Users.vue b/front/src/components/Admin/Users.vue
@@ -36,6 +36,11 @@
             {{ value }}
           </q-td>
         </template>
+        <template #body-cell-lastactive="{ value }">
+          <q-td class="text-right">
+            {{ value }}
+          </q-td>
+        </template>
         <template #body-cell-username="{ value }">
           <q-td class="text-right">
             {{ value }}
@@ -81,6 +86,7 @@
 </template>
 
 <script lang="ts">
+import { date } from 'quasar';
 import { Role, User } from 'src/ctfnote/models';
 import ctfnote from 'src/ctfnote';
 
@@ -101,6 +107,14 @@ const columns = [
     sortable: true,
   },
   { name: 'login', label: 'Login', field: 'login', sortable: true },
+  {
+    name: 'lastactive',
+    label: 'Last active',
+    field: (u: User) => {
+      return date.formatDate(u.profile.lastactive, 'YYYY-MM-DD HH:mm:ss');
+    },
+    sortable: true,
+  },
   {
     name: 'username',
     label: 'Username',

diff --git a/front/src/ctfnote/models.ts b/front/src/ctfnote/models.ts
@@ -17,6 +17,7 @@ export type Maybe<T> = T | null;
 export type Profile = {
   id: Id<Profile>;
   username: string;
+  lastactive: string;
   role: Role;
   description: string;
   color: string;
@@ -90,7 +91,7 @@ export const defaultColorsNames = [
   'warning',
 ] as const;
 
-export type SettingsColor = typeof defaultColorsNames[number];
+export type SettingsColor = (typeof defaultColorsNames)[number];
 export type SettingsColorMap = Record<SettingsColor, string>;
 export type Settings = {
   registrationAllowed: boolean;