llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-05-24 08:20:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: fix GetDashboard() page

Browse Source
This commit is contained in:
Yang Luo 2024-03-15 19:52:19 +08:00
parent 2cb6ff69ae
commit 88a4736520
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
object/get-dashboard.go
View File

@ -28,6 +28,10 @@ type Dashboard struct {
} }
func GetDashboard(owner string) (*Dashboard, error) { func GetDashboard(owner string) (*Dashboard, error) {
if owner == "All" {
owner = ""
}
dashboard := &Dashboard{ dashboard := &Dashboard{
OrganizationCounts: make([]int, 31), OrganizationCounts: make([]int, 31),
UserCounts: make([]int, 31), UserCounts: make([]int, 31),
@ -36,14 +40,13 @@ func GetDashboard(owner string) (*Dashboard, error) {
SubscriptionCounts: make([]int, 31), SubscriptionCounts: make([]int, 31),
} }
var wg sync.WaitGroup
organizations := []Organization{} organizations := []Organization{}
users := []User{} users := []User{}
providers := []Provider{} providers := []Provider{}
applications := []Application{} applications := []Application{}
subscriptions := []Subscription{} subscriptions := []Subscription{}
var wg sync.WaitGroup
wg.Add(5) wg.Add(5)
go func() { go func() {
defer wg.Done() defer wg.Done()

17
web/src/basic/Dashboard.js
View File

@ -42,11 +42,21 @@ const Dashboard = (props) => {
} }
}, [props.account]); }, [props.account]);
const getOrganizationName = () => {
let organization = localStorage.getItem("organization") === "All" ? "" : localStorage.getItem("organization");
if (!Setting.isAdminUser(props.account) && Setting.isLocalAdminUser(props.account)) {
organization = props.account.owner;
}
return organization;
};
React.useEffect(() => { React.useEffect(() => {
if (!Setting.isLocalAdminUser(props.account)) { if (!Setting.isLocalAdminUser(props.account)) {
return; return;
} }
DashboardBackend.getDashboard(props.account.owner).then((res) => {
const organization = getOrganizationName();
DashboardBackend.getDashboard(organization).then((res) => {
if (res.status === "ok") { if (res.status === "ok") {
setDashboardData(res.data); setDashboardData(res.data);
} else { } else {
@ -64,9 +74,8 @@ const Dashboard = (props) => {
return; return;
} }
const newOrganization = localStorage.getItem("organization") === "All" ? "" : localStorage.getItem("organization"); const organization = getOrganizationName();
DashboardBackend.getDashboard(organization).then((res) => {
DashboardBackend.getDashboard(newOrganization).then((res) => {
if (res.status === "ok") { if (res.status === "ok") {
setDashboardData(res.data); setDashboardData(res.data);
} else { } else {