fix(unit-user-usage): update activity columns to use new api

Author: OliverDudgeon

components/usage/UserUsageTable.tsx

@@ -62,22 +62,43 @@ export const UserUsageTable = ({ users, toolbarContent, onChange }: UserUsageTab
         header: "Unit Editor",
         cell: ({ row }) => (row.original.isEditor ? <Done /> : <Close />),
       }),
-      columnHelper.accessor("first_seen", {
-        header: "First Seen",
-        cell: ({ getValue }) => dayjs.utc(getValue()).format(`${DATE_FORMAT} ${TIME_FORMAT}`),
-        sortingFn: (a, b) =>
-          dayjs.utc(a.original.first_seen).diff(dayjs.utc(b.original.first_seen)),
-      }),
-      columnHelper.accessor((user) => user.activity.active_days, {
-        id: "activity",
+      columnHelper.group({
         header: "Activity",
+        columns: [
+          columnHelper.accessor("first_seen", {
+            header: "First Seen",
+            cell: ({ getValue }) => dayjs.utc(getValue()).format(`${DATE_FORMAT} ${TIME_FORMAT}`),
+            sortingFn: (a, b) =>
+              dayjs.utc(a.original.first_seen).diff(dayjs.utc(b.original.first_seen)),
+          }),
+          columnHelper.accessor((user) => user.activity.period_b?.active_days, {
+            id: "activity_b",
+            header: "API Used",
+            cell: ({
+              row: {
+                original: { activity },
+              },
+            }) =>
+              `${activity.period_b?.active_days} of last ${activity.period_b?.monitoring_period}`,
+          }),
+          columnHelper.accessor((user) => user.activity.period_a.active_days, {
+            id: "activity_a",
+            header: "",
+            cell: ({
+              row: {
+                original: { activity },
+              },
+            }) => `${activity.period_a.active_days} of last ${activity.period_a.monitoring_period}`,
+          }),
+          columnHelper.accessor("last_seen_date", {
+            header: "Last Seen",
+            cell: ({ getValue }) => dayjs.utc(getValue()).format(DATE_FORMAT),
+            sortingFn: (a, b) =>
+              dayjs.utc(a.original.last_seen_date).diff(dayjs.utc(b.original.last_seen_date)),
+          }),
+        ],
       }),
-      columnHelper.accessor("last_seen_date", {
-        header: "Last Seen",
-        cell: ({ getValue }) => dayjs.utc(getValue()).format(DATE_FORMAT),
-        sortingFn: (a, b) =>
-          dayjs.utc(a.original.last_seen_date).diff(dayjs.utc(b.original.last_seen_date)),
-      }),
+
       columnHelper.group({
         header: "Datasets",
         columns: [

package.json

@@ -52,8 +52,8 @@
     "@rjsf/utils": "5.18.1",
     "@rjsf/validator-ajv8": "5.18.1",
     "@sentry/nextjs": "7.109.0",
-    "@squonk/account-server-client": "2.1.0",
-    "@squonk/data-manager-client": "2.0.5",
+    "@squonk/account-server-client": "2.1.1-rc.1",
+    "@squonk/data-manager-client": "2.0.7-rc.1",
     "@squonk/mui-theme": "3.0.2",
     "@squonk/sdf-parser": "1.3.0",
     "@tanstack/match-sorter-utils": "8.15.1",