Property Visibilities

This commit is contained in:
2023-01-07 15:34:05 +01:00
parent 99bfd7e505
commit d115d8b970
30 changed files with 241 additions and 215 deletions

View File

@@ -92,9 +92,9 @@ export default function Sidebar(props) {
<div className={"os-content"} style={{padding: "0px 0px", height: "100%", width: "100%"}}>
<div className="user-panel mt-3 pb-3 mb-3 d-flex">
<div className="info">
<a href="#" className="d-block">{L("account.logged_in_as")}:&nbsp;
<span className={"d-block"}>{L("account.logged_in_as")}:&nbsp;
<Link to={"/admin/user/" + api.user.id}>{api.user.name}</Link>
</a>
</span>
</div>
</div>
<nav className={"mt-2"}>

View File

@@ -1,16 +1,17 @@
export default class API {
constructor() {
this.loggedIn = false;
this.user = { };
this.user = null;
this.session = null;
}
csrfToken() {
return this.loggedIn ? this.user.session.csrf_token : null;
return this.loggedIn ? this.session.csrfToken : null;
}
async apiCall(method, params) {
params = params || { };
params.csrf_token = this.csrfToken();
params.csrfToken = this.csrfToken();
let response = await fetch("/api/" + method, {
method: 'post',
headers: {'Content-Type': 'application/json'},
@@ -39,8 +40,14 @@ export default class API {
let response = await fetch("/api/user/info");
let data = await response.json();
if (data) {
this.user = data["user"];
this.loggedIn = data["loggedIn"];
if (this.loggedIn) {
this.session = data["session"];
this.user = data["user"];
} else {
this.session = null;
this.user = null;
}
}
return data;
}

View File

@@ -19,7 +19,7 @@ export function DataTable(props) {
const {currentLocale, requestModules, translate: L} = useContext(LocaleContext);
const [doFetchData, setFetchData] = useState(true);
const [doFetchData, setFetchData] = useState(false);
const [data, setData] = useState(null);
const [sortAscending, setSortAscending] = useState(["asc","ascending"].includes(defaultSortOrder?.toLowerCase));
const [sortColumn, setSortColumn] = useState(defaultSortColumn || null);