Merge branch 'develop'

Author: santiagolizardo

packages/app/src/components/system/ImportForm.jsx

@@ -1,3 +1,4 @@
+import { useQueryClient } from "@tanstack/react-query";
 import NativeInput from "components/form/NativeInput";
 import ExternalLink from "components/ui/ExternalLink";
 import { useRef, useState } from "react";
@@ -8,6 +9,7 @@ const ImportForm = () => {
     const importFileRef = useRef(null);
     const [importResponse, setImportResponse] = useState(null);
     const [importButtonDisabled, setImportButtonDisabled] = useState(true);
+    const queryClient = useQueryClient();
 
     const handleUploadClick = (ev) => {
         ev.preventDefault();
@@ -19,6 +21,7 @@ const ImportForm = () => {
             .then((resp) => resp.json())
             .then((resp) => {
                 setImportResponse(resp);
+                queryClient.invalidateQueries();
             })
             .catch((err) => console.error(err));
     };

packages/app/src/components/users/LastLogin.jsx

@@ -3,8 +3,8 @@ import RelativeDateFormatter from "components/ui/RelativeDateFormatter";
 export const LastLogin = ({ user }) => {
     return (
         <>
-            {user.last_login_ts ? (
-                <RelativeDateFormatter date={user.last_login_ts} />
+            {user.lastLoginAt ? (
+                <RelativeDateFormatter date={user.lastLoginAt} />
             ) : (
                 "Never"
             )}

packages/app/src/models/User.ts

@@ -2,7 +2,7 @@ interface UserInterface {
     id?: number;
     createdAt?: string;
     updatedAt?: string;
-    last_login_ts?: string;
+    lastLoginAt?: string;
     subject_id?: string;
     active?: boolean;
     mfaEnabled: boolean | undefined;