forked from casdoor/casdoor
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: support dashboard in homepage (casdoor#2207)
* feat: support dashboard * feat: support dashboard
- Loading branch information
Showing
7 changed files
with
283 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| // Copyright 2021 The Casdoor Authors. All Rights Reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package controllers | ||
|
|
||
| import "github.com/casdoor/casdoor/object" | ||
|
|
||
| // GetDashboard | ||
| // @Title GetDashboard | ||
| // @Tag GetDashboard API | ||
| // @Description get information of dashboard | ||
| // @Success 200 {object} controllers.Response The Response object | ||
| // @router /get-dashboard [get] | ||
| func (c *ApiController) GetDashboard() { | ||
| data, err := object.GetDashboard() | ||
| if err != nil { | ||
| c.ResponseError(err.Error()) | ||
| return | ||
| } | ||
|
|
||
| c.ResponseOk(data) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,111 @@ | ||
| // Copyright 2021 The Casdoor Authors. All Rights Reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package object | ||
|
|
||
| import "time" | ||
|
|
||
| type Dashboard struct { | ||
| OrganizationCounts []int `json:"organizationCounts"` | ||
| UserCounts []int `json:"userCounts"` | ||
| ProviderCounts []int `json:"providerCounts"` | ||
| ApplicationCounts []int `json:"applicationCounts"` | ||
| SubscriptionCounts []int `json:"subscriptionCounts"` | ||
| } | ||
|
|
||
| func GetDashboard() (*Dashboard, error) { | ||
| dashboard := &Dashboard{ | ||
| OrganizationCounts: make([]int, 31), | ||
| UserCounts: make([]int, 31), | ||
| ProviderCounts: make([]int, 31), | ||
| ApplicationCounts: make([]int, 31), | ||
| SubscriptionCounts: make([]int, 31), | ||
| } | ||
|
|
||
| nowTime := time.Now() | ||
|
|
||
| organizations := make([]Organization, 0) | ||
| if err := ormer.Engine.Find(&organizations); err != nil { | ||
| return dashboard, err | ||
| } | ||
| users := make([]User, 0) | ||
| if err := ormer.Engine.Find(&users); err != nil { | ||
| return dashboard, err | ||
| } | ||
| providers := make([]Provider, 0) | ||
| if err := ormer.Engine.Find(&providers); err != nil { | ||
| return dashboard, err | ||
| } | ||
| applications := make([]Application, 0) | ||
| if err := ormer.Engine.Find(&applications); err != nil { | ||
| return dashboard, err | ||
| } | ||
| subscriptions := make([]Subscription, 0) | ||
| if err := ormer.Engine.Find(&subscriptions); err != nil { | ||
| return dashboard, err | ||
| } | ||
|
|
||
| for i := 30; i >= 0; i-- { | ||
| cutTime := nowTime.AddDate(0, 0, -i) | ||
| dashboard.OrganizationCounts[30-i] = countCreatedBefore(organizations, cutTime) | ||
| dashboard.UserCounts[30-i] = countCreatedBefore(users, cutTime) | ||
| dashboard.ProviderCounts[30-i] = countCreatedBefore(providers, cutTime) | ||
| dashboard.ApplicationCounts[30-i] = countCreatedBefore(applications, cutTime) | ||
| dashboard.SubscriptionCounts[30-i] = countCreatedBefore(subscriptions, cutTime) | ||
| } | ||
|
|
||
| return dashboard, nil | ||
| } | ||
|
|
||
| func countCreatedBefore(objects interface{}, before time.Time) int { | ||
| count := 0 | ||
| switch obj := objects.(type) { | ||
| case []Organization: | ||
| for _, o := range obj { | ||
| createdTime, _ := time.Parse("2006-01-02T15:04:05-07:00", o.CreatedTime) | ||
| if createdTime.Before(before) { | ||
| count++ | ||
| } | ||
| } | ||
| case []User: | ||
| for _, u := range obj { | ||
| createdTime, _ := time.Parse("2006-01-02T15:04:05-07:00", u.CreatedTime) | ||
| if createdTime.Before(before) { | ||
| count++ | ||
| } | ||
| } | ||
| case []Provider: | ||
| for _, p := range obj { | ||
| createdTime, _ := time.Parse("2006-01-02T15:04:05-07:00", p.CreatedTime) | ||
| if createdTime.Before(before) { | ||
| count++ | ||
| } | ||
| } | ||
| case []Application: | ||
| for _, a := range obj { | ||
| createdTime, _ := time.Parse("2006-01-02T15:04:05-07:00", a.CreatedTime) | ||
| if createdTime.Before(before) { | ||
| count++ | ||
| } | ||
| } | ||
| case []Subscription: | ||
| for _, s := range obj { | ||
| createdTime, _ := time.Parse("2006-01-02T15:04:05-07:00", s.CreatedTime) | ||
| if createdTime.Before(before) { | ||
| count++ | ||
| } | ||
| } | ||
| } | ||
| return count | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| // Copyright 2023 The Casdoor Authors. All Rights Reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| import * as Setting from "../Setting"; | ||
|
|
||
| export function getDashboard(owner, name) { | ||
| return fetch(`${Setting.ServerUrl}/api/get-dashboard`, { | ||
| method: "GET", | ||
| credentials: "include", | ||
| headers: { | ||
| "Accept-Language": Setting.getAcceptLanguage(), | ||
| }, | ||
| }).then(res => res.json()); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6682,6 +6682,14 @@ ecc-jsbn@~0.1.1: | |
| jsbn "~0.1.0" | ||
| safer-buffer "^2.1.0" | ||
|
|
||
| echarts@^5.4.3: | ||
| version "5.4.3" | ||
| resolved "https://registry.yarnpkg.com/echarts/-/echarts-5.4.3.tgz#f5522ef24419164903eedcfd2b506c6fc91fb20c" | ||
| integrity sha512-mYKxLxhzy6zyTi/FaEbJMOZU1ULGEQHaeIeuMR5L+JnJTpz+YR03mnnpBhbR4+UYJAgiXgpyTVLffPAjOTLkZA== | ||
| dependencies: | ||
| tslib "2.3.0" | ||
| zrender "5.4.4" | ||
|
|
||
| [email protected]: | ||
| version "1.1.1" | ||
| resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" | ||
|
|
@@ -14147,6 +14155,11 @@ tsconfig-paths@^3.14.1: | |
| minimist "^1.2.6" | ||
| strip-bom "^3.0.0" | ||
|
|
||
| [email protected]: | ||
| version "2.3.0" | ||
| resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e" | ||
| integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg== | ||
|
|
||
| tslib@^1.8.1, tslib@^1.9.0: | ||
| version "1.14.1" | ||
| resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" | ||
|
|
@@ -15090,3 +15103,10 @@ yocto-queue@^0.1.0: | |
| version "0.1.0" | ||
| resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" | ||
| integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== | ||
|
|
||
| [email protected]: | ||
| version "5.4.4" | ||
| resolved "https://registry.yarnpkg.com/zrender/-/zrender-5.4.4.tgz#8854f1d95ecc82cf8912f5a11f86657cb8c9e261" | ||
| integrity sha512-0VxCNJ7AGOMCWeHVyTrGzUgrK4asT4ml9PEkeGirAkKNYXYzoPJCLvmyfdoOXcjTHPs10OZVMfD1Rwg16AZyYw== | ||
| dependencies: | ||
| tslib "2.3.0" | ||