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

Add isUserExtended to webhook.

Browse Source
This commit is contained in:
Yang Luo
2022-01-01 11:15:04 +08:00
parent 4611b59b08
commit 2d4103d751
11 changed files with 104 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
web/src/WebhookEditPage.js
View File

@ -28,7 +28,7 @@ require("codemirror/mode/javascript/javascript");
const { Option } = Select;
const preview = {
const previewTemplate = {
"id": 9078,
"owner": "built-in",
"name": "68f55b28-7380-46b1-9bde-64fe1576e3b3",
@ -42,6 +42,52 @@ const preview = {
"isTriggered": false,
};
const userTemplate = {
"owner": "built-in",
"name": "admin",
"createdTime": "2020-07-16T21:46:52+08:00",
"updatedTime": "",
"id": "9eb20f79-3bb5-4e74-99ac-39e3b9a171e8",
"type": "normal-user",
"password": "123",
"passwordSalt": "",
"displayName": "Admin",
"avatar": "https://cdn.casbin.com/usercontent/admin/avatar/1596241359.png",
"permanentAvatar": "https://cdn.casbin.com/casdoor/avatar/casbin/admin.png",
"email": "admin@example.com",
"phone": "",
"location": "",
"address": null,
"affiliation": "",
"title": "",
"score": 10000,
"ranking": 10,
"isOnline": false,
"isAdmin": true,
"isGlobalAdmin": false,
"isForbidden": false,
"isDeleted": false,
"signupApplication": "app-casnode",
"properties": {
"bio": "",
"checkinDate": "20200801",
"editorType": "",
"emailVerifiedTime": "2020-07-16T21:46:52+08:00",
"fileQuota": "50",
"location": "",
"no": "22",
"oauth_QQ_displayName": "",
"oauth_QQ_verifiedTime": "",
"oauth_WeChat_displayName": "",
"oauth_WeChat_verifiedTime": "",
"onlineStatus": "false",
"phoneVerifiedTime": "",
"renameQuota": "3",
"tagline": "",
"website": ""
}
};
class WebhookEditPage extends React.Component {
constructor(props) {
super(props);
@ -94,6 +140,12 @@ class WebhookEditPage extends React.Component {
}
renderWebhook() {
let preview = Setting.deepCopy(previewTemplate);
if (this.state.webhook.isUserExtended) {
preview["extendedUser"] = userTemplate;
}
const previewText = JSON.stringify(preview, null, 2);
return (
<Card size="small" title={
<div>
@ -200,6 +252,16 @@ class WebhookEditPage extends React.Component {
</Select>
</Col>
</Row>
<Row style={{marginTop: '20px'}} >
<Col style={{marginTop: '5px'}} span={(Setting.isMobile()) ? 19 : 2}>
{Setting.getLabel(i18next.t("webhook:Is user extended"), i18next.t("webhook:Is user extended - Tooltip"))} :
</Col>
<Col span={1} >
<Switch checked={this.state.webhook.isUserExtended} onChange={checked => {
this.updateWebhookField('isUserExtended', checked);
}} />
</Col>
</Row>
<Row style={{marginTop: '20px'}} >
<Col style={{marginTop: '5px'}} span={(Setting.isMobile()) ? 22 : 2}>
{Setting.getLabel(i18next.t("general:Preview"), i18next.t("general:Preview - Tooltip"))} :
@ -207,7 +269,7 @@ class WebhookEditPage extends React.Component {
<Col span={22} >
<div style={{width: "900px", height: "300px"}} >
<CodeMirror
value={JSON.stringify(preview, null, 2)}
value={previewText}
options={{mode: 'javascript', theme: "material-darker"}}
onBeforeChange={(editor, data, value) => {}}
/>

12
web/src/WebhookListPage.js
View File

@ -157,6 +157,18 @@ class WebhookListPage extends BaseListPage {
return Setting.getTags(text);
}
},
{
title: i18next.t("webhook:Is user extended"),
dataIndex: 'isUserExtended',
key: 'isUserExtended',
width: '160px',
sorter: true,
render: (text, record, index) => {
return (
<Switch disabled checkedChildren="ON" unCheckedChildren="OFF" checked={text} />
)
}
},
{
title: i18next.t("general:Is enabled"),
dataIndex: 'isEnabled',

2
web/src/locales/de/data.json
View File

@ -449,6 +449,8 @@
"Events - Tooltip": "Events - Tooltip",
"Headers": "Headers",
"Headers - Tooltip": "Headers - Tooltip",
"Is user extended": "Is user extended",
"Is user extended - Tooltip": "Is user extended - Tooltip",
"Method": "Method",
"Method - Tooltip": "Method - Tooltip",
"Name": "Name",

2
web/src/locales/en/data.json
View File

@ -449,6 +449,8 @@
"Events - Tooltip": "Events - Tooltip",
"Headers": "Headers",
"Headers - Tooltip": "Headers - Tooltip",
"Is user extended": "Is user extended",
"Is user extended - Tooltip": "Is user extended - Tooltip",
"Method": "Method",
"Method - Tooltip": "Method - Tooltip",
"Name": "Name",

2
web/src/locales/fr/data.json
View File

@ -449,6 +449,8 @@
"Events - Tooltip": "Events - Tooltip",
"Headers": "Headers",
"Headers - Tooltip": "Headers - Tooltip",
"Is user extended": "Is user extended",
"Is user extended - Tooltip": "Is user extended - Tooltip",
"Method": "Method",
"Method - Tooltip": "Method - Tooltip",
"Name": "Name",

2
web/src/locales/ja/data.json
View File

@ -449,6 +449,8 @@
"Events - Tooltip": "Events - Tooltip",
"Headers": "Headers",
"Headers - Tooltip": "Headers - Tooltip",
"Is user extended": "Is user extended",
"Is user extended - Tooltip": "Is user extended - Tooltip",
"Method": "Method",
"Method - Tooltip": "Method - Tooltip",
"Name": "Name",

2
web/src/locales/ko/data.json
View File

@ -449,6 +449,8 @@
"Events - Tooltip": "Events - Tooltip",
"Headers": "Headers",
"Headers - Tooltip": "Headers - Tooltip",
"Is user extended": "Is user extended",
"Is user extended - Tooltip": "Is user extended - Tooltip",
"Method": "Method",
"Method - Tooltip": "Method - Tooltip",
"Name": "Name",

2
web/src/locales/ru/data.json
View File

@ -449,6 +449,8 @@
"Events - Tooltip": "Events - Tooltip",
"Headers": "Headers",
"Headers - Tooltip": "Headers - Tooltip",
"Is user extended": "Is user extended",
"Is user extended - Tooltip": "Is user extended - Tooltip",
"Method": "Method",
"Method - Tooltip": "Method - Tooltip",
"Name": "Name",

2
web/src/locales/zh/data.json
View File

@ -449,6 +449,8 @@
"Events - Tooltip": "事件",
"Headers": "协议头",
"Headers - Tooltip": "HTTP协议头（键值对）",
"Is user extended": "扩展用户字段",
"Is user extended - Tooltip": "JSON里加入extendedUser来扩展用户字段",
"Method": "方法",
"Method - Tooltip": "HTTP方法",
"Name": "名称",