fix: this.props.location undefined (#513)

Signed-off-by: Yixiang Zhao <seriouszyx@foxmail.com>

idp/facebook.go

@@ -122,9 +122,9 @@ func (idp *FacebookIdProvider) GetToken(code string) (*oauth2.Token, error) {
 //}
 
 type FacebookUserInfo struct {
-	Id         string `json:"id"`          // The app user's App-Scoped User ID. This ID is unique to the app and cannot be used by other apps.
-	Name       string `json:"name"`        // The person's full name.
-	NameFormat string `json:"name_format"` // The person's name formatted to correctly handle Chinese, Japanese, or Korean ordering.
+	Id         string   `json:"id"`          // The app user's App-Scoped User ID. This ID is unique to the app and cannot be used by other apps.
+	Name       string   `json:"name"`        // The person's full name.
+	NameFormat string   `json:"name_format"` // The person's name formatted to correctly handle Chinese, Japanese, or Korean ordering.
 	Picture    struct { // The person's profile picture.
 		Data struct { // This struct is different as https://developers.facebook.com/docs/graph-api/reference/user/picture/
 			Height       int    `json:"height"`
@@ -164,6 +164,7 @@ func (idp *FacebookIdProvider) GetUserInfo(token *oauth2.Token) (*UserInfo, erro
 
 	userInfo := UserInfo{
 		Id:          facebookUserInfo.Id,
+		Username:    facebookUserInfo.Name,
 		DisplayName: facebookUserInfo.Name,
 		Email:       facebookUserInfo.Email,
 		AvatarUrl:   facebookUserInfo.Picture.Data.Url,

web/src/App.js

@@ -412,13 +412,13 @@ class App extends Component {
           </Link>
         </Menu.Item>
       );
-      res.push(
-        <Menu.Item key="/payments">
-          <Link to="/payments">
-            {i18next.t("general:Payments")}
-          </Link>
-        </Menu.Item>
-      );
+      // res.push(
+      //   <Menu.Item key="/payments">
+      //     <Link to="/payments">
+      //       {i18next.t("general:Payments")}
+      //     </Link>
+      //   </Menu.Item>
+      // );
       res.push(
         <Menu.Item key="/swagger">
           <a target="_blank" rel="noreferrer" href={Setting.isLocalhost() ? `${Setting.ServerUrl}/swagger` : "/swagger"}>

web/src/ApplicationEditPage.js

@@ -47,6 +47,7 @@ class ApplicationEditPage extends React.Component {
       certs: [],
       providers: [],
       uploading: false,
+      mode: props.location.mode !== undefined ? props.location.mode : "edit",
     };
   }
 
@@ -134,9 +135,10 @@ class ApplicationEditPage extends React.Component {
     return (
       <Card size="small" title={
         <div>
-          {i18next.t("application:Edit Application")}&nbsp;&nbsp;&nbsp;&nbsp;
+          {this.state.mode === "add" ? i18next.t("application:New Application") : i18next.t("application:Edit Application")}&nbsp;&nbsp;&nbsp;&nbsp;
           <Button onClick={() => this.submitApplicationEdit(false)}>{i18next.t("general:Save")}</Button>
           <Button style={{marginLeft: '20px'}} type="primary" onClick={() => this.submitApplicationEdit(true)}>{i18next.t("general:Save & Exit")}</Button>
+          {this.state.mode === "add" ? <Button style={{marginLeft: '20px'}} onClick={() => this.deleteApplication()}>{i18next.t("general:Cancel")}</Button> : null}
         </div>
       } style={(Setting.isMobile())? {margin: '5px'}:{}} type="inner">
         <Row style={{marginTop: '10px'}} >
@@ -592,6 +594,16 @@ class ApplicationEditPage extends React.Component {
       });
   }
 
+  deleteApplication() {
+    ApplicationBackend.deleteApplication(this.state.application)
+      .then(() => {
+        this.props.history.push(`/applications`);
+      })
+      .catch(error => {
+        Setting.showMessage("error", `Application failed to delete: ${error}`);
+      });
+  }
+
   render() {
     return (
       <div>
@@ -601,6 +613,7 @@ class ApplicationEditPage extends React.Component {
       <div style={{marginTop: '20px', marginLeft: '40px'}}>
         <Button size="large" onClick={() => this.submitApplicationEdit(false)}>{i18next.t("general:Save")}</Button>
         <Button style={{marginLeft: '20px'}} type="primary" size="large" onClick={() => this.submitApplicationEdit(true)}>{i18next.t("general:Save & Exit")}</Button>
+        {this.state.mode === "add" ? <Button style={{marginLeft: '20px'}} size="large" onClick={() => this.deleteApplication()}>{i18next.t("general:Cancel")}</Button> : null}
       </div>
     </div>
     );

web/src/ApplicationListPage.js

@@ -34,7 +34,7 @@ class ApplicationListPage extends BaseListPage {
       logo: "https://cdn.casdoor.com/logo/casdoor-logo_1185x256.png",
       enablePassword: true,
       enableSignUp: true,
-      enableSigninSession: true,
+      enableSigninSession: false,
       enableCodeSignin: false,
       providers: [],
       signupItems: [
@@ -58,8 +58,7 @@ class ApplicationListPage extends BaseListPage {
     const newApplication = this.newApplication();
     ApplicationBackend.addApplication(newApplication)
       .then((res) => {
-          Setting.showMessage("success", `Application added successfully`);
-          this.props.history.push(`/applications/${newApplication.name}`);
+          this.props.history.push({pathname: `/applications/${newApplication.name}`, mode: "add"});
         }
       )
       .catch(error => {

web/src/CertEditPage.js

@@ -30,6 +30,7 @@ class CertEditPage extends React.Component {
       classes: props,
       certName: props.match.params.certName,
       cert: null,
+      mode: props.location.mode !== undefined ? props.location.mode : "edit",
     };
   }
 
@@ -67,9 +68,10 @@ class CertEditPage extends React.Component {
     return (
       <Card size="small" title={
         <div>
-          {i18next.t("cert:Edit Cert")}&nbsp;&nbsp;&nbsp;&nbsp;
+          {this.state.mode === "add" ? i18next.t("cert:New Cert") : i18next.t("cert:Edit Cert")}&nbsp;&nbsp;&nbsp;&nbsp;
           <Button onClick={() => this.submitCertEdit(false)}>{i18next.t("general:Save")}</Button>
           <Button style={{marginLeft: '20px'}} type="primary" onClick={() => this.submitCertEdit(true)}>{i18next.t("general:Save & Exit")}</Button>
+          {this.state.mode === "add" ? <Button style={{marginLeft: '20px'}} onClick={() => this.deleteCert()}>{i18next.t("general:Cancel")}</Button> : null}
         </div>
       } style={(Setting.isMobile())? {margin: '5px'}:{}} type="inner">
         <Row style={{marginTop: '10px'}} >
@@ -236,6 +238,16 @@ class CertEditPage extends React.Component {
       });
   }
 
+  deleteCert() {
+    CertBackend.deleteCert(this.state.cert)
+      .then(() => {
+        this.props.history.push(`/certs`);
+      })
+      .catch(error => {
+        Setting.showMessage("error", `Cert failed to delete: ${error}`);
+      });
+  }
+
   render() {
     return (
       <div>
@@ -245,6 +257,7 @@ class CertEditPage extends React.Component {
         <div style={{marginTop: '20px', marginLeft: '40px'}}>
           <Button size="large" onClick={() => this.submitCertEdit(false)}>{i18next.t("general:Save")}</Button>
           <Button style={{marginLeft: '20px'}} type="primary" size="large" onClick={() => this.submitCertEdit(true)}>{i18next.t("general:Save & Exit")}</Button>
+          {this.state.mode === "add" ? <Button style={{marginLeft: '20px'}} size="large" onClick={() => this.deleteCert()}>{i18next.t("general:Cancel")}</Button> : null}
         </div>
       </div>
     );

web/src/CertListPage.js

@@ -44,8 +44,7 @@ class CertListPage extends BaseListPage {
     const newCert = this.newCert();
     CertBackend.addCert(newCert)
       .then((res) => {
-          Setting.showMessage("success", `Cert added successfully`);
-          this.props.history.push(`/certs/${newCert.name}`);
+          this.props.history.push({pathname: `/certs/${newCert.name}`, mode: "add"});
         }
       )
       .catch(error => {

web/src/OrganizationEditPage.js

@@ -31,6 +31,7 @@ class OrganizationEditPage extends React.Component {
       organizationName: props.match.params.organizationName,
       organization: null,
       ldaps: null,
+      mode: props.location.mode !== undefined ? props.location.mode : "edit",
     };
   }
 
@@ -84,9 +85,10 @@ class OrganizationEditPage extends React.Component {
     return (
       <Card size="small" title={
         <div>
-          {i18next.t("organization:Edit Organization")}&nbsp;&nbsp;&nbsp;&nbsp;
+          {this.state.mode === "add" ? i18next.t("organization:New Organization") : i18next.t("organization:Edit Organization")}&nbsp;&nbsp;&nbsp;&nbsp;
           <Button onClick={() => this.submitOrganizationEdit(false)}>{i18next.t("general:Save")}</Button>
           <Button style={{marginLeft: '20px'}} type="primary" onClick={() => this.submitOrganizationEdit(true)}>{i18next.t("general:Save & Exit")}</Button>
+          {this.state.mode === "add" ? <Button style={{marginLeft: '20px'}} onClick={() => this.deleteOrganization()}>{i18next.t("general:Cancel")}</Button> : null}
         </div>
       } style={(Setting.isMobile())? {margin: '5px'}:{}} type="inner">
         <Row style={{marginTop: '10px'}} >
@@ -269,6 +271,16 @@ class OrganizationEditPage extends React.Component {
       });
   }
 
+  deleteOrganization() {
+    OrganizationBackend.deleteOrganization(this.state.organization)
+      .then(() => {
+        this.props.history.push(`/organizations`);
+      })
+      .catch(error => {
+        Setting.showMessage("error", `Failed to connect to server: ${error}`);
+      });
+  }
+
   render() {
     return (
       <div>
@@ -278,6 +290,7 @@ class OrganizationEditPage extends React.Component {
         <div style={{marginTop: '20px', marginLeft: '40px'}}>
           <Button size="large" onClick={() => this.submitOrganizationEdit(false)}>{i18next.t("general:Save")}</Button>
           <Button style={{marginLeft: '20px'}} type="primary" size="large" onClick={() => this.submitOrganizationEdit(true)}>{i18next.t("general:Save & Exit")}</Button>
+          {this.state.mode === "add" ? <Button style={{marginLeft: '20px'}} size="large" onClick={() => this.deleteOrganization()}>{i18next.t("general:Cancel")}</Button> : null}
         </div>
       </div>
     );

web/src/OrganizationListPage.js

@@ -45,8 +45,7 @@ class OrganizationListPage extends BaseListPage {
     const newOrganization = this.newOrganization();
     OrganizationBackend.addOrganization(newOrganization)
       .then((res) => {
-          Setting.showMessage("success", `Organization added successfully`);
-          this.props.history.push(`/organizations/${newOrganization.name}`);
+          this.props.history.push({pathname: `/organizations/${newOrganization.name}`, mode: "add"});
         }
       )
       .catch(error => {

web/src/PaymentEditPage.js

@@ -31,6 +31,7 @@ class PaymentEditPage extends React.Component {
       organizationName: props.organizationName !== undefined ? props.organizationName : props.match.params.organizationName,
       paymentName: props.match.params.paymentName,
       payment: null,
+      mode: props.location.mode !== undefined ? props.location.mode : "edit",
     };
   }
 
@@ -68,9 +69,10 @@ class PaymentEditPage extends React.Component {
     return (
       <Card size="small" title={
         <div>
-          {i18next.t("payment:Edit Payment")}&nbsp;&nbsp;&nbsp;&nbsp;
+          {this.state.mode === "add" ? i18next.t("payment:New Payment") : i18next.t("payment:Edit Payment")}&nbsp;&nbsp;&nbsp;&nbsp;
           <Button onClick={() => this.submitPaymentEdit(false)}>{i18next.t("general:Save")}</Button>
           <Button style={{marginLeft: '20px'}} type="primary" onClick={() => this.submitPaymentEdit(true)}>{i18next.t("general:Save & Exit")}</Button>
+          {this.state.mode === "add" ? <Button style={{marginLeft: '20px'}} onClick={() => this.deletePayment()}>{i18next.t("general:Cancel")}</Button> : null}
         </div>
       } style={(Setting.isMobile())? {margin: '5px'}:{}} type="inner">
         <Row style={{marginTop: '10px'}} >
@@ -192,6 +194,16 @@ class PaymentEditPage extends React.Component {
       });
   }
 
+  deletePayment() {
+    PaymentBackend.deletePayment(this.state.payment)
+      .then(() => {
+        this.props.history.push(`/payments`);
+      })
+      .catch(error => {
+        Setting.showMessage("error", `Payment failed to delete: ${error}`);
+      });
+  }
+
   render() {
     return (
       <div>
@@ -201,6 +213,7 @@ class PaymentEditPage extends React.Component {
         <div style={{marginTop: '20px', marginLeft: '40px'}}>
           <Button size="large" onClick={() => this.submitPaymentEdit(false)}>{i18next.t("general:Save")}</Button>
           <Button style={{marginLeft: '20px'}} type="primary" size="large" onClick={() => this.submitPaymentEdit(true)}>{i18next.t("general:Save & Exit")}</Button>
+          {this.state.mode === "add" ? <Button style={{marginLeft: '20px'}} size="large" onClick={() => this.deletePayment()}>{i18next.t("general:Cancel")}</Button> : null}
         </div>
       </div>
     );

web/src/PaymentListPage.js

@@ -45,8 +45,7 @@ class PaymentListPage extends BaseListPage {
     const newPayment = this.newPayment();
     PaymentBackend.addPayment(newPayment)
       .then((res) => {
-          Setting.showMessage("success", `Payment added successfully`);
-          this.props.history.push(`/payments/${newPayment.name}`);
+          this.props.history.push({pathname: `/payments/${newPayment.name}`, mode: "add"});
         }
       )
       .catch(error => {

web/src/PermissionEditPage.js

@@ -34,6 +34,7 @@ class PermissionEditPage extends React.Component {
       organizations: [],
       users: [],
       roles: [],
+      mode: props.location.mode !== undefined ? props.location.mode : "edit",
     };
   }
 
@@ -102,9 +103,10 @@ class PermissionEditPage extends React.Component {
     return (
       <Card size="small" title={
         <div>
-          {i18next.t("permission:Edit Permission")}&nbsp;&nbsp;&nbsp;&nbsp;
+          {this.state.mode === "add" ? i18next.t("permission:New Permission") : i18next.t("permission:Edit Permission")}&nbsp;&nbsp;&nbsp;&nbsp;
           <Button onClick={() => this.submitPermissionEdit(false)}>{i18next.t("general:Save")}</Button>
           <Button style={{marginLeft: '20px'}} type="primary" onClick={() => this.submitPermissionEdit(true)}>{i18next.t("general:Save & Exit")}</Button>
+          {this.state.mode === "add" ? <Button style={{marginLeft: '20px'}} onClick={() => this.deletePermission()}>{i18next.t("general:Cancel")}</Button> : null}
         </div>
       } style={(Setting.isMobile())? {margin: '5px'}:{}} type="inner">
         <Row style={{marginTop: '10px'}} >
@@ -258,6 +260,16 @@ class PermissionEditPage extends React.Component {
       });
   }
 
+  deletePermission() {
+    PermissionBackend.deletePermission(this.state.permission)
+      .then(() => {
+        this.props.history.push(`/permissions`);
+      })
+      .catch(error => {
+        Setting.showMessage("error", `Permission failed to delete: ${error}`);
+      });
+  }
+
   render() {
     return (
       <div>
@@ -267,6 +279,7 @@ class PermissionEditPage extends React.Component {
         <div style={{marginTop: '20px', marginLeft: '40px'}}>
           <Button size="large" onClick={() => this.submitPermissionEdit(false)}>{i18next.t("general:Save")}</Button>
           <Button style={{marginLeft: '20px'}} type="primary" size="large" onClick={() => this.submitPermissionEdit(true)}>{i18next.t("general:Save & Exit")}</Button>
+          {this.state.mode === "add" ? <Button style={{marginLeft: '20px'}} size="large" onClick={() => this.deletePermission()}>{i18next.t("general:Cancel")}</Button> : null}
         </div>
       </div>
     );

web/src/PermissionListPage.js

@@ -43,8 +43,7 @@ class PermissionListPage extends BaseListPage {
     const newPermission = this.newPermission();
     PermissionBackend.addPermission(newPermission)
       .then((res) => {
-          Setting.showMessage("success", `Permission added successfully`);
-          this.props.history.push(`/permissions/${newPermission.owner}/${newPermission.name}`);
+          this.props.history.push({pathname: `/permissions/${newPermission.owner}/${newPermission.name}`, mode: "add"});
         }
       )
       .catch(error => {

web/src/ProviderEditPage.js

@@ -31,6 +31,7 @@ class ProviderEditPage extends React.Component {
       classes: props,
       providerName: props.match.params.providerName,
       provider: null,
+      mode: props.location.mode !== undefined ? props.location.mode : "edit",
     };
   }
 
@@ -133,9 +134,10 @@ class ProviderEditPage extends React.Component {
     return (
       <Card size="small" title={
         <div>
-          {i18next.t("provider:Edit Provider")}&nbsp;&nbsp;&nbsp;&nbsp;
+          {this.state.mode === "add" ? i18next.t("provider:New Provider") : i18next.t("provider:Edit Provider")}&nbsp;&nbsp;&nbsp;&nbsp;
           <Button onClick={() => this.submitProviderEdit(false)}>{i18next.t("general:Save")}</Button>
           <Button style={{marginLeft: '20px'}} type="primary" onClick={() => this.submitProviderEdit(true)}>{i18next.t("general:Save & Exit")}</Button>
+          {this.state.mode === "add" ? <Button style={{marginLeft: '20px'}} onClick={() => this.deleteProvider()}>{i18next.t("general:Cancel")}</Button> : null}
         </div>
       } style={(Setting.isMobile())? {margin: '5px'}:{}} type="inner">
         <Row style={{marginTop: '10px'}} >
@@ -572,6 +574,16 @@ class ProviderEditPage extends React.Component {
       });
   }
 
+  deleteProvider() {
+    ProviderBackend.deleteProvider(this.state.provider)
+      .then(() => {
+        this.props.history.push(`/providers`);
+      })
+      .catch(error => {
+        Setting.showMessage("error", `Provider failed to delete: ${error}`);
+      });
+  }
+
   render() {
     return (
       <div>
@@ -581,6 +593,7 @@ class ProviderEditPage extends React.Component {
         <div style={{marginTop: '20px', marginLeft: '40px'}}>
           <Button size="large" onClick={() => this.submitProviderEdit(false)}>{i18next.t("general:Save")}</Button>
           <Button style={{marginLeft: '20px'}} type="primary" size="large" onClick={() => this.submitProviderEdit(true)}>{i18next.t("general:Save & Exit")}</Button>
+          {this.state.mode === "add" ? <Button style={{marginLeft: '20px'}} size="large" onClick={() => this.deleteProvider()}>{i18next.t("general:Cancel")}</Button> : null}
         </div>
       </div>
     );

web/src/ProviderListPage.js

@@ -47,8 +47,7 @@ class ProviderListPage extends BaseListPage {
     const newProvider = this.newProvider();
     ProviderBackend.addProvider(newProvider)
       .then((res) => {
-          Setting.showMessage("success", `Provider added successfully`);
-          this.props.history.push(`/providers/${newProvider.name}`);
+          this.props.history.push({pathname: `/providers/${newProvider.name}`, mode: "add"});
         }
       )
       .catch(error => {

web/src/RoleEditPage.js

@@ -33,6 +33,7 @@ class RoleEditPage extends React.Component {
       organizations: [],
       users: [],
       roles: [],
+      mode: props.location.mode !== undefined ? props.location.mode : "edit",
     };
   }
 
@@ -101,9 +102,10 @@ class RoleEditPage extends React.Component {
     return (
       <Card size="small" title={
         <div>
-          {i18next.t("role:Edit Role")}&nbsp;&nbsp;&nbsp;&nbsp;
+          {this.state.mode === "add" ? i18next.t("role:New Role") : i18next.t("role:Edit Role")}&nbsp;&nbsp;&nbsp;&nbsp;
           <Button onClick={() => this.submitRoleEdit(false)}>{i18next.t("general:Save")}</Button>
           <Button style={{marginLeft: '20px'}} type="primary" onClick={() => this.submitRoleEdit(true)}>{i18next.t("general:Save & Exit")}</Button>
+          {this.state.mode === "add" ? <Button style={{marginLeft: '20px'}} onClick={() => this.deleteRole()}>{i18next.t("general:Cancel")}</Button> : null}
         </div>
       } style={(Setting.isMobile())? {margin: '5px'}:{}} type="inner">
         <Row style={{marginTop: '10px'}} >
@@ -201,6 +203,16 @@ class RoleEditPage extends React.Component {
       });
   }
 
+  deleteRole() {
+    RoleBackend.deleteRole(this.state.role)
+      .then(() => {
+        this.props.history.push(`/roles`);
+      })
+      .catch(error => {
+        Setting.showMessage("error", `Role failed to delete: ${error}`);
+      });
+  }
+
   render() {
     return (
       <div>
@@ -210,6 +222,7 @@ class RoleEditPage extends React.Component {
         <div style={{marginTop: '20px', marginLeft: '40px'}}>
           <Button size="large" onClick={() => this.submitRoleEdit(false)}>{i18next.t("general:Save")}</Button>
           <Button style={{marginLeft: '20px'}} type="primary" size="large" onClick={() => this.submitRoleEdit(true)}>{i18next.t("general:Save & Exit")}</Button>
+          {this.state.mode === "add" ? <Button style={{marginLeft: '20px'}} size="large" onClick={() => this.deleteRole()}>{i18next.t("general:Cancel")}</Button> : null}
         </div>
       </div>
     );

web/src/RoleListPage.js

@@ -39,8 +39,7 @@ class RoleListPage extends BaseListPage {
     const newRole = this.newRole();
     RoleBackend.addRole(newRole)
       .then((res) => {
-          Setting.showMessage("success", `Role added successfully`);
-          this.props.history.push(`/roles/${newRole.owner}/${newRole.name}`);
+          this.props.history.push({pathname: `/roles/${newRole.owner}/${newRole.name}`, mode: "add"});
         }
       )
       .catch(error => {

web/src/SyncerEditPage.js

@@ -36,6 +36,7 @@ class SyncerEditPage extends React.Component {
       syncerName: props.match.params.syncerName,
       syncer: null,
       organizations: [],
+      mode: props.location.mode !== undefined ? props.location.mode : "edit",
     };
   }
 
@@ -83,9 +84,10 @@ class SyncerEditPage extends React.Component {
     return (
       <Card size="small" title={
         <div>
-          {i18next.t("syncer:Edit Syncer")}&nbsp;&nbsp;&nbsp;&nbsp;
+          {this.state.mode === "add" ? i18next.t("syncer:New Syncer") : i18next.t("syncer:Edit Syncer")}&nbsp;&nbsp;&nbsp;&nbsp;
           <Button onClick={() => this.submitSyncerEdit(false)}>{i18next.t("general:Save")}</Button>
           <Button style={{marginLeft: '20px'}} type="primary" onClick={() => this.submitSyncerEdit(true)}>{i18next.t("general:Save & Exit")}</Button>
+          {this.state.mode === "add" ? <Button style={{marginLeft: '20px'}} onClick={() => this.deleteSyncer()}>{i18next.t("general:Cancel")}</Button> : null}
         </div>
       } style={(Setting.isMobile())? {margin: '5px'}:{}} type="inner">
         <Row style={{marginTop: '10px'}} >
@@ -308,6 +310,16 @@ class SyncerEditPage extends React.Component {
       });
   }
 
+  deleteSyncer() {
+    SyncerBackend.deleteSyncer(this.state.syncer)
+      .then(() => {
+        this.props.history.push(`/syncers`);
+      })
+      .catch(error => {
+        Setting.showMessage("error", `Syncer failed to delete: ${error}`);
+      });
+  }
+
   render() {
     return (
       <div>
@@ -317,6 +329,7 @@ class SyncerEditPage extends React.Component {
         <div style={{marginTop: '20px', marginLeft: '40px'}}>
           <Button size="large" onClick={() => this.submitSyncerEdit(false)}>{i18next.t("general:Save")}</Button>
           <Button style={{marginLeft: '20px'}} type="primary" size="large" onClick={() => this.submitSyncerEdit(true)}>{i18next.t("general:Save & Exit")}</Button>
+          {this.state.mode === "add" ? <Button style={{marginLeft: '20px'}} size="large" onClick={() => this.deleteSyncer()}>{i18next.t("general:Cancel")}</Button> : null}
         </div>
       </div>
     );

web/src/SyncerListPage.js

@@ -50,8 +50,7 @@ class SyncerListPage extends BaseListPage {
     const newSyncer = this.newSyncer();
     SyncerBackend.addSyncer(newSyncer)
       .then((res) => {
-          Setting.showMessage("success", `Syncer added successfully`);
-          this.props.history.push(`/syncers/${newSyncer.name}`);
+          this.props.history.push({pathname: `/syncers/${newSyncer.name}`, mode: "add"});
         }
       )
       .catch(error => {

web/src/TokenEditPage.js

@@ -25,6 +25,7 @@ class TokenEditPage extends React.Component {
       classes: props,
       tokenName: props.match.params.tokenName,
       token: null,
+      mode: props.location.mode !== undefined ? props.location.mode : "edit",
     };
   }
 
@@ -62,9 +63,10 @@ class TokenEditPage extends React.Component {
     return (
       <Card size="small" title={
         <div>
-          {i18next.t("token:Edit Token")}&nbsp;&nbsp;&nbsp;&nbsp;
+          {this.state.mode === "add" ? i18next.t("token:New Token") : i18next.t("token:Edit Token")}&nbsp;&nbsp;&nbsp;&nbsp;
           <Button onClick={() => this.submitTokenEdit(false)}>{i18next.t("general:Save")}</Button>
           <Button style={{marginLeft: '20px'}} type="primary" onClick={() => this.submitTokenEdit(true)}>{i18next.t("general:Save & Exit")}</Button>
+          {this.state.mode === "add" ? <Button style={{marginLeft: '20px'}} onClick={() => this.deleteToken()}>{i18next.t("general:Cancel")}</Button> : null}
         </div>
       } style={(Setting.isMobile())? {margin: '5px'}:{}} type="inner">
         <Row style={{marginTop: '10px'}} >
@@ -186,6 +188,16 @@ class TokenEditPage extends React.Component {
       });
   }
 
+  deleteToken() {
+    TokenBackend.deleteToken(this.state.token)
+      .then(() => {
+        this.props.history.push(`/tokens`);
+      })
+      .catch(error => {
+        Setting.showMessage("error", `Token failed to delete: ${error}`);
+      });
+  }
+
   render() {
     return (
       <div>
@@ -195,6 +207,7 @@ class TokenEditPage extends React.Component {
       <div style={{marginTop: '20px', marginLeft: '40px'}}>
         <Button size="large" onClick={() => this.submitTokenEdit(false)}>{i18next.t("general:Save")}</Button>
         <Button style={{marginLeft: '20px'}} type="primary" size="large" onClick={() => this.submitTokenEdit(true)}>{i18next.t("general:Save & Exit")}</Button>
+        {this.state.mode === "add" ? <Button style={{marginLeft: '20px'}} size="large" onClick={() => this.deleteToken()}>{i18next.t("general:Cancel")}</Button> : null}
       </div>
     </div>
     );

web/src/TokenListPage.js

@@ -44,8 +44,7 @@ class TokenListPage extends BaseListPage {
     const newToken = this.newToken();
     TokenBackend.addToken(newToken)
       .then((res) => {
-          Setting.showMessage("success", `Token added successfully`);
-          this.props.history.push(`/tokens/${newToken.name}`);
+          this.props.history.push({pathname: `/tokens/${newToken.name}`, mode: "add"});
         }
       )
       .catch(error => {

web/src/UserEditPage.js

@@ -46,6 +46,7 @@ class UserEditPage extends React.Component {
       application: null,
       organizations: [],
       applications: [],
+      mode: props.location.mode !== undefined ? props.location.mode : "edit",
     };
   }
 
@@ -121,9 +122,10 @@ class UserEditPage extends React.Component {
     return (
       <Card size="small" title={
         <div>
-          {i18next.t("user:Edit User")}&nbsp;&nbsp;&nbsp;&nbsp;
+          {this.state.mode === "add" ? i18next.t("user:New User") : i18next.t("user:Edit User")}&nbsp;&nbsp;&nbsp;&nbsp;
           <Button onClick={() => this.submitUserEdit(false)}>{i18next.t("general:Save")}</Button>
           <Button style={{marginLeft: '20px'}} type="primary" onClick={() => this.submitUserEdit(true)}>{i18next.t("general:Save & Exit")}</Button>
+          {this.state.mode === "add" ? <Button style={{marginLeft: '20px'}} onClick={() => this.deleteUser()}>{i18next.t("general:Cancel")}</Button> : null}
         </div>
       } style={(Setting.isMobile())? {margin: '5px'}:{}} type="inner">
         <Row style={{marginTop: '10px'}} >
@@ -430,6 +432,16 @@ class UserEditPage extends React.Component {
       });
   }
 
+  deleteUser() {
+    UserBackend.deleteUser(this.state.user)
+      .then(() => {
+        this.props.history.push(`/users`);
+      })
+      .catch(error => {
+        Setting.showMessage("error", `User failed to delete: ${error}`);
+      });
+  }
+
   render() {
     return (
       <div>
@@ -439,6 +451,7 @@ class UserEditPage extends React.Component {
       <div style={{marginTop: '20px', marginLeft: '40px'}}>
         <Button size="large" onClick={() => this.submitUserEdit(false)}>{i18next.t("general:Save")}</Button>
         <Button style={{marginLeft: '20px'}} type="primary" size="large" onClick={() => this.submitUserEdit(true)}>{i18next.t("general:Save & Exit")}</Button>
+        {this.state.mode === "add" ? <Button style={{marginLeft: '20px'}} size="large" onClick={() => this.deleteUser()}>{i18next.t("general:Cancel")}</Button> : null}
       </div>
     </div>
     );

web/src/UserListPage.js

@@ -21,6 +21,7 @@ import * as Setting from "./Setting";
 import * as UserBackend from "./backend/UserBackend";
 import i18next from "i18next";
 import BaseListPage from "./BaseListPage";
+import * as path from "path";
 
 class UserListPage extends BaseListPage {
   constructor(props) {
@@ -69,8 +70,7 @@ class UserListPage extends BaseListPage {
     const newUser = this.newUser();
     UserBackend.addUser(newUser)
       .then((res) => {
-          Setting.showMessage("success", `User added successfully`);
-          this.props.history.push(`/users/${newUser.owner}/${newUser.name}`);
+          this.props.history.push({pathname: `/users/${newUser.owner}/${newUser.name}`, mode: "add"});
         }
       )
       .catch(error => {

web/src/WebhookEditPage.js

@@ -96,6 +96,7 @@ class WebhookEditPage extends React.Component {
       webhookName: props.match.params.webhookName,
       webhook: null,
       organizations: [],
+      mode: props.location.mode !== undefined ? props.location.mode : "edit",
     };
   }
 
@@ -149,9 +150,10 @@ class WebhookEditPage extends React.Component {
     return (
       <Card size="small" title={
         <div>
-          {i18next.t("webhook:Edit Webhook")}&nbsp;&nbsp;&nbsp;&nbsp;
+          {this.state.mode === "add" ? i18next.t("webhook:New Webhook") : i18next.t("webhook:Edit Webhook")}&nbsp;&nbsp;&nbsp;&nbsp;
           <Button onClick={() => this.submitWebhookEdit(false)}>{i18next.t("general:Save")}</Button>
           <Button style={{marginLeft: '20px'}} type="primary" onClick={() => this.submitWebhookEdit(true)}>{i18next.t("general:Save & Exit")}</Button>
+          {this.state.mode === "add" ? <Button style={{marginLeft: '20px'}} onClick={() => this.deleteWebhook()}>{i18next.t("general:Cancel")}</Button> : null}
         </div>
       } style={(Setting.isMobile())? {margin: '5px'}:{}} type="inner">
         <Row style={{marginTop: '10px'}} >
@@ -315,6 +317,16 @@ class WebhookEditPage extends React.Component {
       });
   }
 
+  deleteWebhook() {
+    WebhookBackend.deleteWebhook(this.state.webhook)
+      .then(() => {
+        this.props.history.push(`/webhooks`);
+      })
+      .catch(error => {
+        Setting.showMessage("error", `Webhook failed to delete: ${error}`);
+      });
+  }
+
   render() {
     return (
       <div>
@@ -324,6 +336,7 @@ class WebhookEditPage extends React.Component {
         <div style={{marginTop: '20px', marginLeft: '40px'}}>
           <Button size="large" onClick={() => this.submitWebhookEdit(false)}>{i18next.t("general:Save")}</Button>
           <Button style={{marginLeft: '20px'}} type="primary" size="large" onClick={() => this.submitWebhookEdit(true)}>{i18next.t("general:Save & Exit")}</Button>
+          {this.state.mode === "add" ? <Button style={{marginLeft: '20px'}} size="large" onClick={() => this.deleteWebhook()}>{i18next.t("general:Cancel")}</Button> : null}
         </div>
       </div>
     );

web/src/WebhookListPage.js

@@ -42,8 +42,7 @@ class WebhookListPage extends BaseListPage {
     const newWebhook = this.newWebhook();
     WebhookBackend.addWebhook(newWebhook)
       .then((res) => {
-          Setting.showMessage("success", `Webhook added successfully`);
-          this.props.history.push(`/webhooks/${newWebhook.name}`);
+          this.props.history.push({pathname: `/webhooks/${newWebhook.name}`, mode: "add"});
         }
       )
       .catch(error => {

web/src/account/AccountPage.js

@@ -18,7 +18,7 @@ import UserEditPage from "../UserEditPage";
 class AccountPage extends React.Component {
   render() {
     return (
-      <UserEditPage organizationName={this.props.account.owner} userName={this.props.account.name} account={this.props.account} />
+      <UserEditPage organizationName={this.props.account.owner} userName={this.props.account.name} account={this.props.account} location={this.props.location} />
     )
   }
 }

web/src/locales/de/data.json

@@ -14,6 +14,7 @@
     "Enable signup": "Anmeldung aktivieren",
     "Enable signup - Tooltip": "Whether to allow users to sign up",
     "File uploaded successfully": "Datei erfolgreich hochgeladen",
+    "New Application": "New Application",
     "Password ON": "Passwort AN",
     "Password ON - Tooltip": "Whether to allow password login",
     "Please select a HTML file": "Bitte wählen Sie eine HTML-Datei",
@@ -45,6 +46,7 @@
     "Edit Cert": "Zitat bearbeiten",
     "Expire in years": "Gültig in Jahren",
     "Expire in years - Tooltip": "Verfällt in Jahren - Tooltip",
+    "New Cert": "New Cert",
     "Private key": "Privater Schlüssel",
     "Private key - Tooltip": "Privater Schlüssel - Tooltip",
     "Private key copied to clipboard successfully": "Privater Schlüssel erfolgreich in die Zwischenablage kopiert",
@@ -91,6 +93,7 @@
     "Avatar": "Avatar",
     "Avatar - Tooltip": "Avatar to show to others",
     "Back Home": "Zurück zu Hause",
+    "Cancel": "Cancel",
     "Captcha": "Captcha",
     "Cert": "Cert",
     "Cert - Tooltip": "Cert - Tooltip",
@@ -137,7 +140,6 @@
     "Password type - Tooltip": "The form in which the password is stored in the database",
     "Payments": "Payments",
     "Permissions": "Berechtigungen",
-    "Real name": "Persönlicher Name",
     "Phone": "Telefon",
     "Phone - Tooltip": "Phone",
     "Phone prefix": "Telefonpräfix",
@@ -148,6 +150,7 @@
     "Provider - Tooltip": "Provider - Tooltip",
     "Providers": "Anbieter",
     "Providers - Tooltip": "List of third-party applications that can be used to log in",
+    "Real name": "Persönlicher Name",
     "Records": "Datensätze",
     "Request URI": "Request URI",
     "Resources": "Ressourcen",
@@ -233,6 +236,7 @@
     "Default avatar": "Standard Avatar",
     "Edit Organization": "Organisation bearbeiten",
     "Favicon": "Févicon",
+    "New Organization": "New Organization",
     "Soft deletion": "Weiche Löschung",
     "Soft deletion - Tooltip": "Weiche Löschung - Tooltip",
     "Website URL": "Website-URL",
@@ -245,7 +249,8 @@
     "Currency - Tooltip": "Currency - Tooltip",
     "Edit Payment": "Edit Payment",
     "Good": "Good",
-    "Good - Tooltip": "Good - Tooltip"
+    "Good - Tooltip": "Good - Tooltip",
+    "New Payment": "New Payment"
   },
   "permission": {
     "Actions": "Aktionen",
@@ -253,6 +258,7 @@
     "Edit Permission": "Berechtigung bearbeiten",
     "Effect": "Effekt",
     "Effect - Tooltip": "Effekt - Tooltip",
+    "New Permission": "New Permission",
     "Resource type": "Ressourcentyp",
     "Resource type - Tooltip": "Ressourcentyp - Tooltip",
     "Resources": "Ressourcen"
@@ -299,6 +305,7 @@
     "Method": "Methode",
     "Method - Tooltip": "Login behaviors, QR code or silent authorization",
     "Name": "Name",
+    "New Provider": "New Provider",
     "Parse": "Parse",
     "Parse Metadata successfully": "Metadaten erfolgreich analysieren",
     "Port": "Port",
@@ -362,6 +369,7 @@
   },
   "role": {
     "Edit Role": "Rolle bearbeiten",
+    "New Role": "New Role",
     "Sub roles": "Unterrollen",
     "Sub roles - Tooltip": "Unterrollen - Tooltip",
     "Sub users": "Unternutzer",
@@ -381,8 +389,8 @@
     "Please input your address!": "Bitte geben Sie Ihre Adresse ein!",
     "Please input your affiliation!": "Bitte geben Sie Ihre Zugehörigkeit ein!",
     "Please input your display name!": "Bitte geben Sie Ihren Anzeigenamen ein!",
-    "Please input your real name!": "Bitte geben Sie Ihren persönlichen Namen ein!",
     "Please input your phone number!": "Bitte geben Sie Ihre Telefonnummer ein!",
+    "Please input your real name!": "Bitte geben Sie Ihren persönlichen Namen ein!",
     "Please select your country/region!": "Bitte wählen Sie Ihr Land/Ihre Region!",
     "Terms of Use": "Nutzungsbedingungen",
     "The input is not valid Email!": "Die Eingabe ist ungültig!",
@@ -410,6 +418,7 @@
     "Error text": "Error text",
     "Error text - Tooltip": "Error text - Tooltip",
     "Is hashed": "Ist gehasht",
+    "New Syncer": "New Syncer",
     "Sync interval": "Sync-Intervall",
     "Sync interval - Tooltip": "Sync-Intervall - Tooltip",
     "Table": "Tisch",
@@ -424,6 +433,7 @@
     "Authorization code": "Autorisierungscode",
     "Edit Token": "Token bearbeiten",
     "Expires in": "Läuft ab",
+    "New Token": "New Token",
     "Scope": "Bereich",
     "Token type": "Token-Typ"
   },
@@ -462,6 +472,7 @@
     "Modify password...": "Passwort ändern...",
     "New Email": "Neue E-Mail",
     "New Password": "Neues Passwort",
+    "New User": "New User",
     "New phone": "Neues Telefon",
     "OK": "Ok",
     "Old Password": "Altes Passwort",
@@ -498,6 +509,7 @@
     "Method": "Methode",
     "Method - Tooltip": "Methode - Tooltip",
     "Name": "Name",
+    "New Webhook": "New Webhook",
     "URL": "URL",
     "URL - Tooltip": "URL - Tooltip",
     "Value": "Wert"

web/src/locales/en/data.json

@@ -10,10 +10,11 @@
     "Edit Application": "Edit Application",
     "Enable code signin": "Enable code signin",
     "Enable code signin - Tooltip": "Enable code signin - Tooltip",
-    "Enable signin session - Tooltip": "Enable signin session - Tooltip",
+    "Enable signin session - Tooltip": "Whether to preserve the session in Casdoor after login",
     "Enable signup": "Enable signup",
     "Enable signup - Tooltip": "Enable signup - Tooltip",
     "File uploaded successfully": "File uploaded successfully",
+    "New Application": "New Application",
     "Password ON": "Password ON",
     "Password ON - Tooltip": "Password ON - Tooltip",
     "Please select a HTML file": "Please select a HTML file",
@@ -45,6 +46,7 @@
     "Edit Cert": "Edit Cert",
     "Expire in years": "Expire in years",
     "Expire in years - Tooltip": "Expire in years - Tooltip",
+    "New Cert": "New Cert",
     "Private key": "Private key",
     "Private key - Tooltip": "Private key - Tooltip",
     "Private key copied to clipboard successfully": "Private key copied to clipboard successfully",
@@ -91,6 +93,7 @@
     "Avatar": "Avatar",
     "Avatar - Tooltip": "Avatar - Tooltip",
     "Back Home": "Back Home",
+    "Cancel": "Cancel",
     "Captcha": "Captcha",
     "Cert": "Cert",
     "Cert - Tooltip": "Cert - Tooltip",
@@ -137,7 +140,6 @@
     "Password type - Tooltip": "Password type - Tooltip",
     "Payments": "Payments",
     "Permissions": "Permissions",
-    "Real name": "Real name",
     "Phone": "Phone",
     "Phone - Tooltip": "Phone - Tooltip",
     "Phone prefix": "Phone prefix",
@@ -148,6 +150,7 @@
     "Provider - Tooltip": "Provider - Tooltip",
     "Providers": "Providers",
     "Providers - Tooltip": "Providers - Tooltip",
+    "Real name": "Real name",
     "Records": "Records",
     "Request URI": "Request URI",
     "Resources": "Resources",
@@ -233,6 +236,7 @@
     "Default avatar": "Default avatar",
     "Edit Organization": "Edit Organization",
     "Favicon": "Favicon",
+    "New Organization": "New Organization",
     "Soft deletion": "Soft deletion",
     "Soft deletion - Tooltip": "Soft deletion - Tooltip",
     "Website URL": "Website URL",
@@ -245,7 +249,8 @@
     "Currency - Tooltip": "Currency - Tooltip",
     "Edit Payment": "Edit Payment",
     "Good": "Good",
-    "Good - Tooltip": "Good - Tooltip"
+    "Good - Tooltip": "Good - Tooltip",
+    "New Payment": "New Payment"
   },
   "permission": {
     "Actions": "Actions",
@@ -253,6 +258,7 @@
     "Edit Permission": "Edit Permission",
     "Effect": "Effect",
     "Effect - Tooltip": "Effect - Tooltip",
+    "New Permission": "New Permission",
     "Resource type": "Resource type",
     "Resource type - Tooltip": "Resource type - Tooltip",
     "Resources": "Resources"
@@ -299,6 +305,7 @@
     "Method": "Method",
     "Method - Tooltip": "Method - Tooltip",
     "Name": "Name",
+    "New Provider": "New Provider",
     "Parse": "Parse",
     "Parse Metadata successfully": "Parse Metadata successfully",
     "Port": "Port",
@@ -362,6 +369,7 @@
   },
   "role": {
     "Edit Role": "Edit Role",
+    "New Role": "New Role",
     "Sub roles": "Sub roles",
     "Sub roles - Tooltip": "Sub roles - Tooltip",
     "Sub users": "Sub users",
@@ -381,8 +389,8 @@
     "Please input your address!": "Please input your address!",
     "Please input your affiliation!": "Please input your affiliation!",
     "Please input your display name!": "Please input your display name!",
-    "Please input your real name!": "Please input your real name!",
     "Please input your phone number!": "Please input your phone number!",
+    "Please input your real name!": "Please input your real name!",
     "Please select your country/region!": "Please select your country/region!",
     "Terms of Use": "Terms of Use",
     "The input is not valid Email!": "The input is not valid Email!",
@@ -410,6 +418,7 @@
     "Error text": "Error text",
     "Error text - Tooltip": "Error text - Tooltip",
     "Is hashed": "Is hashed",
+    "New Syncer": "New Syncer",
     "Sync interval": "Sync interval",
     "Sync interval - Tooltip": "Sync interval - Tooltip",
     "Table": "Table",
@@ -424,6 +433,7 @@
     "Authorization code": "Authorization code",
     "Edit Token": "Edit Token",
     "Expires in": "Expires in",
+    "New Token": "New Token",
     "Scope": "Scope",
     "Token type": "Token type"
   },
@@ -462,6 +472,7 @@
     "Modify password...": "Modify password...",
     "New Email": "New Email",
     "New Password": "New Password",
+    "New User": "New User",
     "New phone": "New phone",
     "OK": "OK",
     "Old Password": "Old Password",
@@ -498,6 +509,7 @@
     "Method": "Method",
     "Method - Tooltip": "Method - Tooltip",
     "Name": "Name",
+    "New Webhook": "New Webhook",
     "URL": "URL",
     "URL - Tooltip": "URL - Tooltip",
     "Value": "Value"

web/src/locales/fr/data.json

@@ -14,6 +14,7 @@
     "Enable signup": "Activer l'inscription",
     "Enable signup - Tooltip": "Whether to allow users to sign up",
     "File uploaded successfully": "Fichier téléchargé avec succès",
+    "New Application": "New Application",
     "Password ON": "Mot de passe activé",
     "Password ON - Tooltip": "Whether to allow password login",
     "Please select a HTML file": "Veuillez sélectionner un fichier HTML",
@@ -45,6 +46,7 @@
     "Edit Cert": "Modifier le certificat",
     "Expire in years": "Expire dans les années",
     "Expire in years - Tooltip": "Expire dans les années - infobulle",
+    "New Cert": "New Cert",
     "Private key": "Clé privée",
     "Private key - Tooltip": "Clé privée - Infobulle",
     "Private key copied to clipboard successfully": "Clé privée copiée dans le presse-papiers avec succès",
@@ -91,6 +93,7 @@
     "Avatar": "Avatars",
     "Avatar - Tooltip": "Avatar to show to others",
     "Back Home": "Retour à la page d'accueil",
+    "Cancel": "Cancel",
     "Captcha": "Captcha",
     "Cert": "Cert",
     "Cert - Tooltip": "Cert - Tooltip",
@@ -137,7 +140,6 @@
     "Password type - Tooltip": "The form in which the password is stored in the database",
     "Payments": "Payments",
     "Permissions": "Permissions",
-    "Real name": "Nom personnel",
     "Phone": "Téléphone",
     "Phone - Tooltip": "Phone",
     "Phone prefix": "Préfixe du téléphone",
@@ -148,6 +150,7 @@
     "Provider - Tooltip": "Provider - Tooltip",
     "Providers": "Fournisseurs",
     "Providers - Tooltip": "List of third-party applications that can be used to log in",
+    "Real name": "Nom personnel",
     "Records": "Enregistrements",
     "Request URI": "Request URI",
     "Resources": "Ressource",
@@ -233,6 +236,7 @@
     "Default avatar": "Avatar par défaut",
     "Edit Organization": "Modifier l'organisation",
     "Favicon": "Favicon",
+    "New Organization": "New Organization",
     "Soft deletion": "Suppression du logiciel",
     "Soft deletion - Tooltip": "Suppression de soft - infobulle",
     "Website URL": "URL du site web",
@@ -245,7 +249,8 @@
     "Currency - Tooltip": "Currency - Tooltip",
     "Edit Payment": "Edit Payment",
     "Good": "Good",
-    "Good - Tooltip": "Good - Tooltip"
+    "Good - Tooltip": "Good - Tooltip",
+    "New Payment": "New Payment"
   },
   "permission": {
     "Actions": "Actions",
@@ -253,6 +258,7 @@
     "Edit Permission": "Autorisation d'édition",
     "Effect": "Effet",
     "Effect - Tooltip": "Effet - Infobulle",
+    "New Permission": "New Permission",
     "Resource type": "Type de ressource",
     "Resource type - Tooltip": "Type de ressource - infobulle",
     "Resources": "Ressource"
@@ -299,6 +305,7 @@
     "Method": "Méthode",
     "Method - Tooltip": "Login behaviors, QR code or silent authorization",
     "Name": "Nom",
+    "New Provider": "New Provider",
     "Parse": "Parse",
     "Parse Metadata successfully": "Analyse des métadonnées réussie",
     "Port": "Port",
@@ -362,6 +369,7 @@
   },
   "role": {
     "Edit Role": "Modifier le rôle",
+    "New Role": "New Role",
     "Sub roles": "Sous-rôles",
     "Sub roles - Tooltip": "Sous-rôles - infobulle",
     "Sub users": "Sous-utilisateurs",
@@ -381,8 +389,8 @@
     "Please input your address!": "Veuillez saisir votre adresse !",
     "Please input your affiliation!": "Veuillez entrer votre affiliation !",
     "Please input your display name!": "Veuillez entrer votre nom d'affichage !",
-    "Please input your real name!": "Veuillez entrer votre nom personnel !",
     "Please input your phone number!": "Veuillez entrer votre numéro de téléphone!",
+    "Please input your real name!": "Veuillez entrer votre nom personnel !",
     "Please select your country/region!": "Veuillez sélectionner votre pays/région!",
     "Terms of Use": "Conditions d'utilisation",
     "The input is not valid Email!": "L'entrée n'est pas un email valide !",
@@ -410,6 +418,7 @@
     "Error text": "Error text",
     "Error text - Tooltip": "Error text - Tooltip",
     "Is hashed": "Est haché",
+    "New Syncer": "New Syncer",
     "Sync interval": "Intervalle de synchronisation",
     "Sync interval - Tooltip": "Intervalle de synchronisation - infobulle",
     "Table": "Tableau",
@@ -424,6 +433,7 @@
     "Authorization code": "Code d'autorisation",
     "Edit Token": "Modifier le jeton",
     "Expires in": "Expire dans",
+    "New Token": "New Token",
     "Scope": "Périmètre d'application",
     "Token type": "Type de jeton"
   },
@@ -462,6 +472,7 @@
     "Modify password...": "Modifier le mot de passe...",
     "New Email": "Nouvel e-mail",
     "New Password": "Nouveau mot de passe",
+    "New User": "New User",
     "New phone": "Nouveau téléphone",
     "OK": "Ok",
     "Old Password": "Ancien mot de passe",
@@ -498,6 +509,7 @@
     "Method": "Méthode",
     "Method - Tooltip": "Méthode - Infobulle",
     "Name": "Nom",
+    "New Webhook": "New Webhook",
     "URL": "URL",
     "URL - Tooltip": "URL - Info-bulle",
     "Value": "Valeur"

web/src/locales/ja/data.json

@@ -14,6 +14,7 @@
     "Enable signup": "サインアップを有効にする",
     "Enable signup - Tooltip": "Whether to allow users to sign up",
     "File uploaded successfully": "ファイルが正常にアップロードされました",
+    "New Application": "New Application",
     "Password ON": "パスワードON",
     "Password ON - Tooltip": "Whether to allow password login",
     "Please select a HTML file": "HTMLファイルを選択してください",
@@ -45,6 +46,7 @@
     "Edit Cert": "Certを編集",
     "Expire in years": "有効期限",
     "Expire in years - Tooltip": "年間有効期限 - ツールチップ",
+    "New Cert": "New Cert",
     "Private key": "Private key",
     "Private key - Tooltip": "Private key - Tooltip",
     "Private key copied to clipboard successfully": "秘密鍵を正常にクリップボードにコピーしました",
@@ -91,6 +93,7 @@
     "Avatar": "アバター",
     "Avatar - Tooltip": "Avatar to show to others",
     "Back Home": "ホーム",
+    "Cancel": "Cancel",
     "Captcha": "Captcha",
     "Cert": "Cert",
     "Cert - Tooltip": "Cert - Tooltip",
@@ -137,7 +140,6 @@
     "Password type - Tooltip": "The form in which the password is stored in the database",
     "Payments": "Payments",
     "Permissions": "アクセス許可",
-    "Real name": "個人名",
     "Phone": "電話番号",
     "Phone - Tooltip": "Phone",
     "Phone prefix": "電話プレフィクス",
@@ -148,6 +150,7 @@
     "Provider - Tooltip": "Provider - Tooltip",
     "Providers": "プロバイダー",
     "Providers - Tooltip": "List of third-party applications that can be used to log in",
+    "Real name": "個人名",
     "Records": "レコード",
     "Request URI": "Request URI",
     "Resources": "リソース",
@@ -233,6 +236,7 @@
     "Default avatar": "デフォルトのアバター",
     "Edit Organization": "組織を編集",
     "Favicon": "ファビコン",
+    "New Organization": "New Organization",
     "Soft deletion": "ソフト削除",
     "Soft deletion - Tooltip": "ソフト削除 - ツールチップ",
     "Website URL": "Website URL",
@@ -245,7 +249,8 @@
     "Currency - Tooltip": "Currency - Tooltip",
     "Edit Payment": "Edit Payment",
     "Good": "Good",
-    "Good - Tooltip": "Good - Tooltip"
+    "Good - Tooltip": "Good - Tooltip",
+    "New Payment": "New Payment"
   },
   "permission": {
     "Actions": "アクション",
@@ -253,6 +258,7 @@
     "Edit Permission": "権限を編集",
     "Effect": "効果",
     "Effect - Tooltip": "エフェクト - ツールチップ",
+    "New Permission": "New Permission",
     "Resource type": "リソースタイプ",
     "Resource type - Tooltip": "リソースタイプ - ツールチップ",
     "Resources": "リソース"
@@ -299,6 +305,7 @@
     "Method": "方法",
     "Method - Tooltip": "Login behaviors, QR code or silent authorization",
     "Name": "名前",
+    "New Provider": "New Provider",
     "Parse": "Parse",
     "Parse Metadata successfully": "メタデータの解析に成功",
     "Port": "ポート",
@@ -362,6 +369,7 @@
   },
   "role": {
     "Edit Role": "役割を編集",
+    "New Role": "New Role",
     "Sub roles": "サブロール",
     "Sub roles - Tooltip": "Sub roles - Tooltip",
     "Sub users": "サブユーザー",
@@ -381,8 +389,8 @@
     "Please input your address!": "住所を入力してください！",
     "Please input your affiliation!": "所属を入力してください！",
     "Please input your display name!": "表示名を入力してください。",
-    "Please input your real name!": "個人名を入力してください！",
     "Please input your phone number!": "電話番号を入力してください！",
+    "Please input your real name!": "個人名を入力してください！",
     "Please select your country/region!": "あなたの国/地域を選択してください！",
     "Terms of Use": "利用規約",
     "The input is not valid Email!": "入力されたメールアドレスが無効です！",
@@ -410,6 +418,7 @@
     "Error text": "Error text",
     "Error text - Tooltip": "Error text - Tooltip",
     "Is hashed": "ハッシュされました",
+    "New Syncer": "New Syncer",
     "Sync interval": "同期間隔",
     "Sync interval - Tooltip": "同期間隔 - ツールチップ",
     "Table": "表",
@@ -424,6 +433,7 @@
     "Authorization code": "認証コード",
     "Edit Token": "トークンを編集",
     "Expires in": "有効期限:",
+    "New Token": "New Token",
     "Scope": "スコープ",
     "Token type": "トークンの種類"
   },
@@ -462,6 +472,7 @@
     "Modify password...": "パスワードを変更...",
     "New Email": "新しいメール",
     "New Password": "新しいパスワード",
+    "New User": "New User",
     "New phone": "新しい電話番号",
     "OK": "OK",
     "Old Password": "古いパスワード",
@@ -498,6 +509,7 @@
     "Method": "方法",
     "Method - Tooltip": "方法 - ツールチップ",
     "Name": "名前",
+    "New Webhook": "New Webhook",
     "URL": "URL",
     "URL - Tooltip": "URL → ツールチップ",
     "Value": "値"

web/src/locales/ko/data.json

@@ -14,6 +14,7 @@
     "Enable signup": "Enable signup",
     "Enable signup - Tooltip": "Whether to allow users to sign up",
     "File uploaded successfully": "File uploaded successfully",
+    "New Application": "New Application",
     "Password ON": "Password ON",
     "Password ON - Tooltip": "Whether to allow password login",
     "Please select a HTML file": "Please select a HTML file",
@@ -45,6 +46,7 @@
     "Edit Cert": "Edit Cert",
     "Expire in years": "Expire in years",
     "Expire in years - Tooltip": "Expire in years - Tooltip",
+    "New Cert": "New Cert",
     "Private key": "Private key",
     "Private key - Tooltip": "Private key - Tooltip",
     "Private key copied to clipboard successfully": "Private key copied to clipboard successfully",
@@ -91,6 +93,7 @@
     "Avatar": "Avatar",
     "Avatar - Tooltip": "Avatar to show to others",
     "Back Home": "Back Home",
+    "Cancel": "Cancel",
     "Captcha": "Captcha",
     "Cert": "Cert",
     "Cert - Tooltip": "Cert - Tooltip",
@@ -137,7 +140,6 @@
     "Password type - Tooltip": "The form in which the password is stored in the database",
     "Payments": "Payments",
     "Permissions": "Permissions",
-    "Real name": "Real name",
     "Phone": "Phone",
     "Phone - Tooltip": "Phone",
     "Phone prefix": "Phone prefix",
@@ -148,6 +150,7 @@
     "Provider - Tooltip": "Provider - Tooltip",
     "Providers": "Providers",
     "Providers - Tooltip": "List of third-party applications that can be used to log in",
+    "Real name": "Real name",
     "Records": "Records",
     "Request URI": "Request URI",
     "Resources": "Resources",
@@ -233,6 +236,7 @@
     "Default avatar": "Default avatar",
     "Edit Organization": "Edit Organization",
     "Favicon": "Favicon",
+    "New Organization": "New Organization",
     "Soft deletion": "Soft deletion",
     "Soft deletion - Tooltip": "Soft deletion - Tooltip",
     "Website URL": "Website URL",
@@ -245,7 +249,8 @@
     "Currency - Tooltip": "Currency - Tooltip",
     "Edit Payment": "Edit Payment",
     "Good": "Good",
-    "Good - Tooltip": "Good - Tooltip"
+    "Good - Tooltip": "Good - Tooltip",
+    "New Payment": "New Payment"
   },
   "permission": {
     "Actions": "Actions",
@@ -253,6 +258,7 @@
     "Edit Permission": "Edit Permission",
     "Effect": "Effect",
     "Effect - Tooltip": "Effect - Tooltip",
+    "New Permission": "New Permission",
     "Resource type": "Resource type",
     "Resource type - Tooltip": "Resource type - Tooltip",
     "Resources": "Resources"
@@ -299,6 +305,7 @@
     "Method": "Method",
     "Method - Tooltip": "Login behaviors, QR code or silent authorization",
     "Name": "Name",
+    "New Provider": "New Provider",
     "Parse": "Parse",
     "Parse Metadata successfully": "Parse Metadata successfully",
     "Port": "Port",
@@ -362,6 +369,7 @@
   },
   "role": {
     "Edit Role": "Edit Role",
+    "New Role": "New Role",
     "Sub roles": "Sub roles",
     "Sub roles - Tooltip": "Sub roles - Tooltip",
     "Sub users": "Sub users",
@@ -381,8 +389,8 @@
     "Please input your address!": "Please input your address!",
     "Please input your affiliation!": "Please input your affiliation!",
     "Please input your display name!": "Please input your display name!",
-    "Please input your real name!": "Please input your real name!",
     "Please input your phone number!": "Please input your phone number!",
+    "Please input your real name!": "Please input your real name!",
     "Please select your country/region!": "Please select your country/region!",
     "Terms of Use": "Terms of Use",
     "The input is not valid Email!": "The input is not valid Email!",
@@ -410,6 +418,7 @@
     "Error text": "Error text",
     "Error text - Tooltip": "Error text - Tooltip",
     "Is hashed": "Is hashed",
+    "New Syncer": "New Syncer",
     "Sync interval": "Sync interval",
     "Sync interval - Tooltip": "Sync interval - Tooltip",
     "Table": "Table",
@@ -424,6 +433,7 @@
     "Authorization code": "Authorization code",
     "Edit Token": "Edit Token",
     "Expires in": "Expires in",
+    "New Token": "New Token",
     "Scope": "Scope",
     "Token type": "Token type"
   },
@@ -462,6 +472,7 @@
     "Modify password...": "Modify password...",
     "New Email": "New Email",
     "New Password": "New Password",
+    "New User": "New User",
     "New phone": "New phone",
     "OK": "OK",
     "Old Password": "Old Password",
@@ -498,6 +509,7 @@
     "Method": "Method",
     "Method - Tooltip": "Method - Tooltip",
     "Name": "Name",
+    "New Webhook": "New Webhook",
     "URL": "URL",
     "URL - Tooltip": "URL - Tooltip",
     "Value": "Value"

web/src/locales/ru/data.json

@@ -14,6 +14,7 @@
     "Enable signup": "Включить регистрацию",
     "Enable signup - Tooltip": "Whether to allow users to sign up",
     "File uploaded successfully": "Файл успешно загружен",
+    "New Application": "New Application",
     "Password ON": "Пароль ВКЛ",
     "Password ON - Tooltip": "Whether to allow password login",
     "Please select a HTML file": "Пожалуйста, выберите HTML-файл",
@@ -45,6 +46,7 @@
     "Edit Cert": "Изменить сертификат",
     "Expire in years": "Истекает через годы",
     "Expire in years - Tooltip": "Истекает через годы - Подсказка",
+    "New Cert": "New Cert",
     "Private key": "Приватный ключ",
     "Private key - Tooltip": "Приватный ключ - Подсказка",
     "Private key copied to clipboard successfully": "Приватный ключ скопирован в буфер обмена",
@@ -91,6 +93,7 @@
     "Avatar": "Аватар",
     "Avatar - Tooltip": "Avatar to show to others",
     "Back Home": "Назад",
+    "Cancel": "Cancel",
     "Captcha": "Капча",
     "Cert": "Cert",
     "Cert - Tooltip": "Cert - Tooltip",
@@ -137,7 +140,6 @@
     "Password type - Tooltip": "The form in which the password is stored in the database",
     "Payments": "Payments",
     "Permissions": "Права доступа",
-    "Real name": "Личное имя",
     "Phone": "Телефон",
     "Phone - Tooltip": "Phone",
     "Phone prefix": "Префикс телефона",
@@ -148,6 +150,7 @@
     "Provider - Tooltip": "Provider - Tooltip",
     "Providers": "Поставщики",
     "Providers - Tooltip": "List of third-party applications that can be used to log in",
+    "Real name": "Личное имя",
     "Records": "Отчеты",
     "Request URI": "Request URI",
     "Resources": "Ресурсы",
@@ -233,6 +236,7 @@
     "Default avatar": "Аватар по умолчанию",
     "Edit Organization": "Изменить организацию",
     "Favicon": "Иконка",
+    "New Organization": "New Organization",
     "Soft deletion": "Мягкое удаление",
     "Soft deletion - Tooltip": "Мягкое удаление - Подсказка",
     "Website URL": "URL сайта",
@@ -245,7 +249,8 @@
     "Currency - Tooltip": "Currency - Tooltip",
     "Edit Payment": "Edit Payment",
     "Good": "Good",
-    "Good - Tooltip": "Good - Tooltip"
+    "Good - Tooltip": "Good - Tooltip",
+    "New Payment": "New Payment"
   },
   "permission": {
     "Actions": "Действия",
@@ -253,6 +258,7 @@
     "Edit Permission": "Изменить права доступа",
     "Effect": "Эффект",
     "Effect - Tooltip": "Эффект - Подсказка",
+    "New Permission": "New Permission",
     "Resource type": "Тип ресурса",
     "Resource type - Tooltip": "Тип ресурса - Подсказка",
     "Resources": "Ресурсы"
@@ -299,6 +305,7 @@
     "Method": "Метод",
     "Method - Tooltip": "Login behaviors, QR code or silent authorization",
     "Name": "Наименование",
+    "New Provider": "New Provider",
     "Parse": "Parse",
     "Parse Metadata successfully": "Анализ метаданных успешно завершен",
     "Port": "Порт",
@@ -362,6 +369,7 @@
   },
   "role": {
     "Edit Role": "Изменить роль",
+    "New Role": "New Role",
     "Sub roles": "Суб роли",
     "Sub roles - Tooltip": "Суб роли - Tooltip",
     "Sub users": "Субпользователи",
@@ -381,8 +389,8 @@
     "Please input your address!": "Пожалуйста, введите ваш адрес!",
     "Please input your affiliation!": "Пожалуйста, введите вашу партнерство!",
     "Please input your display name!": "Пожалуйста, введите ваше отображаемое имя!",
-    "Please input your real name!": "Пожалуйста, введите ваше личное имя!",
     "Please input your phone number!": "Пожалуйста, введите ваш номер телефона!",
+    "Please input your real name!": "Пожалуйста, введите ваше личное имя!",
     "Please select your country/region!": "Пожалуйста, выберите вашу страну/регион!",
     "Terms of Use": "Условия использования",
     "The input is not valid Email!": "Ввод не является допустимым Email!",
@@ -410,6 +418,7 @@
     "Error text": "Error text",
     "Error text - Tooltip": "Error text - Tooltip",
     "Is hashed": "Хэшировано",
+    "New Syncer": "New Syncer",
     "Sync interval": "Интервал синхронизации",
     "Sync interval - Tooltip": "Интервал синхронизации - Tooltip",
     "Table": "Таблица",
@@ -424,6 +433,7 @@
     "Authorization code": "Код авторизации",
     "Edit Token": "Изменить токен",
     "Expires in": "Истекает через",
+    "New Token": "New Token",
     "Scope": "Сфера охвата",
     "Token type": "Тип токена"
   },
@@ -462,6 +472,7 @@
     "Modify password...": "Изменить пароль...",
     "New Email": "Новое письмо",
     "New Password": "Новый пароль",
+    "New User": "New User",
     "New phone": "Новый телефон",
     "OK": "ОК",
     "Old Password": "Старый пароль",
@@ -498,6 +509,7 @@
     "Method": "Метод",
     "Method - Tooltip": "Метод - Подсказка",
     "Name": "Наименование",
+    "New Webhook": "New Webhook",
     "URL": "URL",
     "URL - Tooltip": "URL - Подсказка",
     "Value": "Значение"

web/src/locales/zh/data.json

@@ -14,6 +14,7 @@
     "Enable signup": "启用注册",
     "Enable signup - Tooltip": "是否允许用户注册",
     "File uploaded successfully": "文件上传成功",
+    "New Application": "添加应用",
     "Password ON": "开启密码",
     "Password ON - Tooltip": "是否允许密码登录",
     "Please select a HTML file": "请选择一个HTML文件",
@@ -45,6 +46,7 @@
     "Edit Cert": "编辑证书",
     "Expire in years": "有效期（年）",
     "Expire in years - Tooltip": "到期年份-工具提示",
+    "New Cert": "添加证书",
     "Private key": "私钥",
     "Private key - Tooltip": "私钥 - 工具提示",
     "Private key copied to clipboard successfully": "私钥已成功复制到剪贴板",
@@ -91,6 +93,7 @@
     "Avatar": "头像",
     "Avatar - Tooltip": "向其他人展示的头像",
     "Back Home": "返回到首页",
+    "Cancel": "取消",
     "Captcha": "人机验证码",
     "Cert": "证书",
     "Cert - Tooltip": "该应用所对应的客户端SDK需要验证的公钥证书",
@@ -137,7 +140,6 @@
     "Password type - Tooltip": "密码在数据库中存储的形式",
     "Payments": "付款",
     "Permissions": "权限",
-    "Real name": "姓名",
     "Phone": "手机号",
     "Phone - Tooltip": "手机号",
     "Phone prefix": "手机号前缀",
@@ -148,6 +150,7 @@
     "Provider - Tooltip": "第三方登录需要配置的提供方",
     "Providers": "提供商",
     "Providers - Tooltip": "第三方登录需要配置的提供方",
+    "Real name": "姓名",
     "Records": "日志",
     "Request URI": "请求URI",
     "Resources": "资源",
@@ -233,6 +236,7 @@
     "Default avatar": "默认头像",
     "Edit Organization": "编辑组织",
     "Favicon": "图标",
+    "New Organization": "添加组织",
     "Soft deletion": "软删除",
     "Soft deletion - Tooltip": "启用后，删除用户信息时不会在数据库彻底清除，只会标记为已删除状态",
     "Website URL": "网页地址",
@@ -245,7 +249,8 @@
     "Currency - Tooltip": "如USD（美元），CNY（人民币）等",
     "Edit Payment": "编辑付款",
     "Good": "商品",
-    "Good - Tooltip": "购买的商品名称"
+    "Good - Tooltip": "购买的商品名称",
+    "New Payment": "添加付款"
   },
   "permission": {
     "Actions": "动作",
@@ -253,6 +258,7 @@
     "Edit Permission": "编辑权限",
     "Effect": "效果",
     "Effect - Tooltip": "允许还是拒绝",
+    "New Permission": "添加权限",
     "Resource type": "资源类型",
     "Resource type - Tooltip": "授权资源的类型",
     "Resources": "资源"
@@ -299,6 +305,7 @@
     "Method": "方法",
     "Method - Tooltip": "登录行为，二维码或者静默授权登录",
     "Name": "名称",
+    "New Provider": "添加提供商",
     "Parse": "Parse",
     "Parse Metadata successfully": "解析元数据成功",
     "Port": "端口",
@@ -362,6 +369,7 @@
   },
   "role": {
     "Edit Role": "编辑角色",
+    "New Role": "添加角色",
     "Sub roles": "包含角色",
     "Sub roles - Tooltip": "当前角色所包含的子角色",
     "Sub users": "包含用户",
@@ -381,8 +389,8 @@
     "Please input your address!": "请输入您的地址！",
     "Please input your affiliation!": "请输入您所在的工作单位！",
     "Please input your display name!": "请输入您的显示名称！",
-    "Please input your real name!": "请输入您的姓名！",
     "Please input your phone number!": "请输入您的手机号码！",
+    "Please input your real name!": "请输入您的姓名！",
     "Please select your country/region!": "请选择您的国家/地区",
     "Terms of Use": "《用户协议》",
     "The input is not valid Email!": "您输入的电子邮箱格式有误！",
@@ -410,6 +418,7 @@
     "Error text": "错误信息",
     "Error text - Tooltip": "同步器连接数据库时发生的错误",
     "Is hashed": "是否参与哈希计算",
+    "New Syncer": "添加同步器",
     "Sync interval": "同步间隔",
     "Sync interval - Tooltip": "单位为秒",
     "Table": "表名",
@@ -424,6 +433,7 @@
     "Authorization code": "授权码",
     "Edit Token": "编辑令牌",
     "Expires in": "有效期",
+    "New Token": "添加令牌",
     "Scope": "范围",
     "Token type": "令牌类型"
   },
@@ -462,6 +472,7 @@
     "Modify password...": "编辑密码...",
     "New Email": "新邮箱",
     "New Password": "新密码",
+    "New User": "添加用户",
     "New phone": "新手机号",
     "OK": "确定",
     "Old Password": "旧密码",
@@ -498,6 +509,7 @@
     "Method": "方法",
     "Method - Tooltip": "HTTP方法",
     "Name": "名称",
+    "New Webhook": "添加Webhook",
     "URL": "网址",
     "URL - Tooltip": "URL",
     "Value": "值"