Home: fix "no tables" flash because user roles haven't loaded yet

This commit is contained in:
Sidney Alcantara
2022-04-07 14:06:46 +10:00
parent a5560b1731
commit c28f93682d
2 changed files with 2 additions and 4 deletions

View File

@@ -81,9 +81,9 @@ export const AppProvider: React.FC = ({ children }) => {
};
useEffect(() => {
auth.onAuthStateChanged((auth) => {
setCurrentUser(auth);
if (auth)
auth.getIdTokenResult(true).then((results) => {
setCurrentUser(auth);
setAuthToken(results.token);
setUserRoles(
Array.isArray(results.claims.roles) ? results.claims.roles : []

View File

@@ -6,9 +6,6 @@ import _find from "lodash/find";
import firebase from "firebase/app";
import { compare } from "compare-versions";
import { Button } from "@mui/material";
import InlineOpenInNewIcon from "@src/components/InlineOpenInNewIcon";
import useTable, { TableActions, TableState } from "@src/hooks/useTable";
import useSettings from "@src/hooks/useSettings";
import { useAppContext } from "./AppContext";
@@ -123,6 +120,7 @@ export const ProjectContextProvider: React.FC = ({ children }) => {
const { enqueueSnackbar } = useSnackbar();
const { tableState, tableActions } = useTable();
const [tables, setTables] = useState<IProjectContext["tables"]>();
console.log("tables", tables);
const [settings, settingsActions] = useSettings();
const table = _find(tables, (table) => table.id === tableState.config.id);