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

fix: handle error of list in frontend (#1930)

Browse Source
This commit is contained in:
Yaodong Yu 2023-06-04 00:42:57 +08:00 committed by Yang Luo
parent 5ec7a54bf8
commit 5d776a3ce6
23 changed files with 114 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
web/src/AdapterListPage.js
View File

@ -249,9 +249,11 @@ class AdapterListPage extends BaseListPage {
this.setState({loading: true});
AdapterBackend.getAdapters("admin", Setting.isAdminUser(this.props.account) ? "" : this.props.account.owner, params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder)
.then((res) => {
this.setState({
loading: false,
});
if (res.status === "ok") {
this.setState({
loading: false,
data: res.data,
pagination: {
...params.pagination,
@ -263,9 +265,10 @@ class AdapterListPage extends BaseListPage {
} else {
if (Setting.isResponseDenied(res)) {
this.setState({
loading: false,
isAuthorized: false,
});
} else {
Setting.showMessage("error", res.msg);
}
}
});

7
web/src/ApplicationListPage.js
View File

@ -276,9 +276,11 @@ class ApplicationListPage extends BaseListPage {
(Setting.isAdminUser(this.props.account) ? ApplicationBackend.getApplications("admin", params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder) :
ApplicationBackend.getApplicationsByOrganization("admin", this.props.account.organization.name, params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder))
.then((res) => {
this.setState({
loading: false,
});
if (res.status === "ok") {
this.setState({
loading: false,
data: res.data,
pagination: {
...params.pagination,
@ -290,9 +292,10 @@ class ApplicationListPage extends BaseListPage {
} else {
if (Setting.isResponseDenied(res)) {
this.setState({
loading: false,
isAuthorized: false,
});
} else {
Setting.showMessage("error", res.msg);
}
}
});

7
web/src/CertListPage.js
View File

@ -239,9 +239,11 @@ class CertListPage extends BaseListPage {
(Setting.isAdminUser(this.props.account) ? CertBackend.getGlobleCerts(params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder)
: CertBackend.getCerts(this.props.account.owner, params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder))
.then((res) => {
this.setState({
loading: false,
});
if (res.status === "ok") {
this.setState({
loading: false,
data: res.data,
pagination: {
...params.pagination,
@ -253,9 +255,10 @@ class CertListPage extends BaseListPage {
} else {
if (Setting.isResponseDenied(res)) {
this.setState({
loading: false,
isAuthorized: false,
});
} else {
Setting.showMessage("error", res.msg);
}
}
});

7
web/src/ChatListPage.js
View File

@ -267,9 +267,11 @@ class ChatListPage extends BaseListPage {
this.setState({loading: true});
ChatBackend.getChats("admin", params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder)
.then((res) => {
this.setState({
loading: false,
});
if (res.status === "ok") {
this.setState({
loading: false,
data: res.data,
pagination: {
...params.pagination,
@ -281,9 +283,10 @@ class ChatListPage extends BaseListPage {
} else {
if (Setting.isResponseDenied(res)) {
this.setState({
loading: false,
isAuthorized: false,
});
} else {
Setting.showMessage("error", res.msg);
}
}
});

3
web/src/ChatPage.js
View File

@ -278,9 +278,10 @@ class ChatPage extends BaseListPage {
} else {
if (Setting.isResponseDenied(res)) {
this.setState({
loading: false,
isAuthorized: false,
});
} else {
Setting.showMessage("error", res.msg);
}
}
});

7
web/src/MessageListPage.js
View File

@ -210,9 +210,11 @@ class MessageListPage extends BaseListPage {
this.setState({loading: true});
MessageBackend.getMessages("admin", Setting.isAdminUser(this.props.account) ? "" : this.props.account.owner, params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder)
.then((res) => {
this.setState({
loading: false,
});
if (res.status === "ok") {
this.setState({
loading: false,
data: res.data,
pagination: {
...params.pagination,
@ -224,9 +226,10 @@ class MessageListPage extends BaseListPage {
} else {
if (Setting.isResponseDenied(res)) {
this.setState({
loading: false,
isAuthorized: false,
});
} else {
Setting.showMessage("error", res.msg);
}
}
});

7
web/src/ModelListPage.js
View File

@ -204,9 +204,11 @@ class ModelListPage extends BaseListPage {
this.setState({loading: true});
ModelBackend.getModels(Setting.isAdminUser(this.props.account) ? "" : this.props.account.owner, params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder)
.then((res) => {
this.setState({
loading: false,
});
if (res.status === "ok") {
this.setState({
loading: false,
data: res.data,
pagination: {
...params.pagination,
@ -218,9 +220,10 @@ class ModelListPage extends BaseListPage {
} else {
if (Setting.isResponseDenied(res)) {
this.setState({
loading: false,
isAuthorized: false,
});
} else {
Setting.showMessage("error", res.msg);
}
}
});

7
web/src/OrganizationListPage.js
View File

@ -273,9 +273,11 @@ class OrganizationListPage extends BaseListPage {
this.setState({loading: true});
OrganizationBackend.getOrganizations("admin", params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder)
.then((res) => {
this.setState({
loading: false,
});
if (res.status === "ok") {
this.setState({
loading: false,
data: res.data,
pagination: {
...params.pagination,
@ -287,9 +289,10 @@ class OrganizationListPage extends BaseListPage {
} else {
if (Setting.isResponseDenied(res)) {
this.setState({
loading: false,
isAuthorized: false,
});
} else {
Setting.showMessage("error", res.msg);
}
}
});

7
web/src/PaymentListPage.js
View File

@ -267,9 +267,11 @@ class PaymentListPage extends BaseListPage {
this.setState({loading: true});
PaymentBackend.getPayments(Setting.isAdminUser(this.props.account) ? "" : this.props.account.owner, params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder)
.then((res) => {
this.setState({
loading: false,
});
if (res.status === "ok") {
this.setState({
loading: false,
data: res.data,
pagination: {
...params.pagination,
@ -281,9 +283,10 @@ class PaymentListPage extends BaseListPage {
} else {
if (Setting.isResponseDenied(res)) {
this.setState({
loading: false,
isAuthorized: false,
});
} else {
Setting.showMessage("error", res.msg);
}
}
});

7
web/src/PermissionListPage.js
View File

@ -385,9 +385,11 @@ class PermissionListPage extends BaseListPage {
const getPermissions = Setting.isLocalAdminUser(this.props.account) ? PermissionBackend.getPermissions : PermissionBackend.getPermissionsBySubmitter;
getPermissions(Setting.isAdminUser(this.props.account) ? "" : this.props.account.owner, params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder)
.then((res) => {
this.setState({
loading: false,
});
if (res.status === "ok") {
this.setState({
loading: false,
data: res.data,
pagination: {
...params.pagination,
@ -399,9 +401,10 @@ class PermissionListPage extends BaseListPage {
} else {
if (Setting.isResponseDenied(res)) {
this.setState({
loading: false,
isAuthorized: false,
});
} else {
Setting.showMessage("error", res.msg);
}
}
});

7
web/src/PlanListPage.js
View File

@ -221,9 +221,11 @@ class PlanListPage extends BaseListPage {
this.setState({loading: true});
PlanBackend.getPlans(Setting.isAdminUser(this.props.account) ? "" : this.props.account.owner, params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder)
.then((res) => {
this.setState({
loading: false,
});
if (res.status === "ok") {
this.setState({
loading: false,
data: res.data,
pagination: {
...params.pagination,
@ -235,9 +237,10 @@ class PlanListPage extends BaseListPage {
} else {
if (Setting.isResponseDenied(res)) {
this.setState({
loading: false,
isAuthorized: false,
});
} else {
Setting.showMessage("error", res.msg);
}
}
});

7
web/src/PricingListPage.js
View File

@ -190,9 +190,11 @@ class PricingListPage extends BaseListPage {
this.setState({loading: true});
PricingBackend.getPricings(Setting.isAdminUser(this.props.account) ? "" : this.props.account.owner, params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder)
.then((res) => {
this.setState({
loading: false,
});
if (res.status === "ok") {
this.setState({
loading: false,
data: res.data,
pagination: {
...params.pagination,
@ -204,9 +206,10 @@ class PricingListPage extends BaseListPage {
} else {
if (Setting.isResponseDenied(res)) {
this.setState({
loading: false,
isAuthorized: false,
});
} else {
Setting.showMessage("error", res.msg);
}
}
});

7
web/src/ProductListPage.js
View File

@ -292,9 +292,11 @@ class ProductListPage extends BaseListPage {
this.setState({loading: true});
ProductBackend.getProducts(Setting.isAdminUser(this.props.account) ? "" : this.props.account.owner, params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder)
.then((res) => {
this.setState({
loading: false,
});
if (res.status === "ok") {
this.setState({
loading: false,
data: res.data,
pagination: {
...params.pagination,
@ -306,9 +308,10 @@ class ProductListPage extends BaseListPage {
} else {
if (Setting.isResponseDenied(res)) {
this.setState({
loading: false,
isAuthorized: false,
});
} else {
Setting.showMessage("error", res.msg);
}
}
});

7
web/src/ProviderListPage.js
View File

@ -259,9 +259,11 @@ class ProviderListPage extends BaseListPage {
(Setting.isAdminUser(this.props.account) ? ProviderBackend.getGlobalProviders(params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder)
: ProviderBackend.getProviders(this.props.account.owner, params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder))
.then((res) => {
this.setState({
loading: false,
});
if (res.status === "ok") {
this.setState({
loading: false,
data: res.data,
pagination: {
...params.pagination,
@ -273,9 +275,10 @@ class ProviderListPage extends BaseListPage {
} else {
if (Setting.isResponseDenied(res)) {
this.setState({
loading: false,
isAuthorized: false,
});
} else {
Setting.showMessage("error", res.msg);
}
}
});

4
web/src/RecordListPage.js
View File

@ -211,9 +211,11 @@ class RecordListPage extends BaseListPage {
this.setState({loading: true});
RecordBackend.getRecords(params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder)
.then((res) => {
this.setState({
loading: false,
});
if (res.status === "ok") {
this.setState({
loading: false,
data: res.data,
pagination: {
...params.pagination,

4
web/src/ResourceListPage.js
View File

@ -311,9 +311,11 @@ class ResourceListPage extends BaseListPage {
this.setState({loading: true});
ResourceBackend.getResources(Setting.isAdminUser(this.props.account) ? "" : this.props.account.owner, this.props.account.name, params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder)
.then((res) => {
this.setState({
loading: false,
});
if (res.status === "ok") {
this.setState({
loading: false,
data: res.data,
pagination: {
...params.pagination,

7
web/src/RoleListPage.js
View File

@ -260,9 +260,11 @@ class RoleListPage extends BaseListPage {
this.setState({loading: true});
RoleBackend.getRoles(Setting.isAdminUser(this.props.account) ? "" : this.props.account.owner, params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder)
.then((res) => {
this.setState({
loading: false,
});
if (res.status === "ok") {
this.setState({
loading: false,
data: res.data,
pagination: {
...params.pagination,
@ -274,9 +276,10 @@ class RoleListPage extends BaseListPage {
} else {
if (Setting.isResponseDenied(res)) {
this.setState({
loading: false,
isAuthorized: false,
});
} else {
Setting.showMessage("error", res.msg);
}
}
});

7
web/src/SessionListPage.js
View File

@ -136,9 +136,11 @@ class SessionListPage extends BaseListPage {
this.setState({loading: true});
SessionBackend.getSessions(Setting.isAdminUser(this.props.account) ? "" : this.props.account.owner, params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder)
.then((res) => {
this.setState({
loading: false,
});
if (res.status === "ok") {
this.setState({
loading: false,
data: res.data,
pagination: {
...params.pagination,
@ -150,9 +152,10 @@ class SessionListPage extends BaseListPage {
} else {
if (Setting.isResponseDenied(res)) {
this.setState({
loading: false,
isAuthorized: false,
});
} else {
Setting.showMessage("error", res.msg);
}
}
});

7
web/src/SubscriptionListPage.js
View File

@ -239,9 +239,11 @@ class SubscriptionListPage extends BaseListPage {
this.setState({loading: true});
SubscriptionBackend.getSubscriptions(Setting.isAdminUser(this.props.account) ? "" : this.props.account.owner, params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder)
.then((res) => {
this.setState({
loading: false,
});
if (res.status === "ok") {
this.setState({
loading: false,
data: res.data,
pagination: {
...params.pagination,
@ -253,9 +255,10 @@ class SubscriptionListPage extends BaseListPage {
} else {
if (Setting.isResponseDenied(res)) {
this.setState({
loading: false,
isAuthorized: false,
});
} else {
Setting.showMessage("error", res.msg);
}
}
});

7
web/src/SyncerListPage.js
View File

@ -277,9 +277,11 @@ class SyncerListPage extends BaseListPage {
this.setState({loading: true});
SyncerBackend.getSyncers("admin", Setting.isAdminUser(this.props.account) ? "" : this.props.account.owner, params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder)
.then((res) => {
this.setState({
loading: false,
});
if (res.status === "ok") {
this.setState({
loading: false,
data: res.data,
pagination: {
...params.pagination,
@ -291,9 +293,10 @@ class SyncerListPage extends BaseListPage {
} else {
if (Setting.isResponseDenied(res)) {
this.setState({
loading: false,
isAuthorized: false,
});
} else {
Setting.showMessage("error", res.msg);
}
}
});

7
web/src/TokenListPage.js
View File

@ -242,9 +242,11 @@ class TokenListPage extends BaseListPage {
this.setState({loading: true});
TokenBackend.getTokens("admin", Setting.isAdminUser(this.props.account) ? "" : this.props.account.owner, params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder)
.then((res) => {
this.setState({
loading: false,
});
if (res.status === "ok") {
this.setState({
loading: false,
data: res.data,
pagination: {
...params.pagination,
@ -256,9 +258,10 @@ class TokenListPage extends BaseListPage {
} else {
if (Setting.isResponseDenied(res)) {
this.setState({
loading: false,
isAuthorized: false,
});
} else {
Setting.showMessage("error", res.msg);
}
}
});

15
web/src/UserListPage.js
View File

@ -391,9 +391,11 @@ class UserListPage extends BaseListPage {
if (this.props.match.params.organizationName === undefined) {
(Setting.isAdminUser(this.props.account) ? UserBackend.getGlobalUsers(params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder) : UserBackend.getUsers(this.props.account.owner, params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder))
.then((res) => {
this.setState({
loading: false,
});
if (res.status === "ok") {
this.setState({
loading: false,
data: res.data,
pagination: {
...params.pagination,
@ -410,20 +412,24 @@ class UserListPage extends BaseListPage {
this.getOrganization(this.state.organizationName);
}
} else {
if (Setting.isResponseDenied(res)) {
this.setState({
loading: false,
isAuthorized: false,
});
} else {
Setting.showMessage("error", res.msg);
}
}
});
} else {
UserBackend.getUsers(this.props.match.params.organizationName, params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder)
.then((res) => {
this.setState({
loading: false,
});
if (res.status === "ok") {
this.setState({
loading: false,
data: res.data,
pagination: {
...params.pagination,
@ -442,9 +448,10 @@ class UserListPage extends BaseListPage {
} else {
if (Setting.isResponseDenied(res)) {
this.setState({
loading: false,
isAuthorized: false,
});
} else {
Setting.showMessage("error", res.msg);
}
}
});

7
web/src/WebhookListPage.js
View File

@ -242,9 +242,11 @@ class WebhookListPage extends BaseListPage {
this.setState({loading: true});
WebhookBackend.getWebhooks("admin", Setting.isAdminUser(this.props.account) ? "" : this.props.account.owner, params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder)
.then((res) => {
this.setState({
loading: false,
});
if (res.status === "ok") {
this.setState({
loading: false,
data: res.data,
pagination: {
...params.pagination,
@ -256,9 +258,10 @@ class WebhookListPage extends BaseListPage {
} else {
if (Setting.isResponseDenied(res)) {
this.setState({
loading: false,
isAuthorized: false,
});
} else {
Setting.showMessage("error", res.msg);
}
}
});