djkato/saleor-dashboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use error codes in webhook section

Browse source
This commit is contained in:
dominik-zeglen 2020-03-18 12:03:20 +01:00
parent d92a8028cb
commit 6ab6cf4e68
21 changed files with 866 additions and 163 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/searches/useServiceAccountSearch.ts
View file

@ -13,7 +13,7 @@ export const searchServiceAccount = gql`
search: serviceAccounts(
after: $after
first: $first
filter: { search: $query }
filter: { search: $query, isActive: true }
) {
edges {
node {

710
src/storybook/__snapshots__/Stories.test.ts.snap
View file

@ -131353,16 +131353,16 @@ exports[`Storyshots Views / Webhooks / Create webhook default 1`] = `
class="MuiFormControl-root-id MuiTextField-root-id MuiFormControl-fullWidth-id"
>
<label
class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id"
class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id MuiFormLabel-error-id MuiInputLabel-error-id"
data-shrink="false"
>
Webhook Name
</label>
<div
class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-error-id MuiOutlinedInput-error-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
>
<input
aria-invalid="false"
aria-invalid="true"
class="MuiInputBase-input-id MuiOutlinedInput-input-id"
name="name"
type="text"
@ -131383,6 +131383,11 @@ exports[`Storyshots Views / Webhooks / Create webhook default 1`] = `
</legend>
</fieldset>
</div>
<p
class="MuiFormHelperText-root-id MuiFormHelperText-contained-id MuiFormHelperText-error-id"
>
Invalid value
</p>
</div>
<div
class="FormSpacer-spacer-id"
@ -131464,16 +131469,16 @@ exports[`Storyshots Views / Webhooks / Create webhook default 1`] = `
class="MuiFormControl-root-id MuiTextField-root-id MuiFormControl-fullWidth-id"
>
<label
class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id"
class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id MuiFormLabel-error-id MuiInputLabel-error-id"
data-shrink="false"
>
Target URL
</label>
<div
class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-error-id MuiOutlinedInput-error-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
>
<input
aria-invalid="false"
aria-invalid="true"
class="MuiInputBase-input-id MuiOutlinedInput-input-id"
name="targetUrl"
type="text"
@ -131495,9 +131500,9 @@ exports[`Storyshots Views / Webhooks / Create webhook default 1`] = `
</fieldset>
</div>
<p
class="MuiFormHelperText-root-id MuiFormHelperText-contained-id"
class="MuiFormHelperText-root-id MuiFormHelperText-contained-id MuiFormHelperText-error-id"
>
This URL will receive webhook POST requests
Invalid value
</p>
</div>
<div
@ -131507,16 +131512,16 @@ exports[`Storyshots Views / Webhooks / Create webhook default 1`] = `
class="MuiFormControl-root-id MuiTextField-root-id MuiFormControl-fullWidth-id"
>
<label
class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id"
class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id MuiFormLabel-error-id MuiInputLabel-error-id"
data-shrink="false"
>
Secrect Key
</label>
<div
class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-error-id MuiOutlinedInput-error-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
>
<input
aria-invalid="false"
aria-invalid="true"
class="MuiInputBase-input-id MuiOutlinedInput-input-id"
name="secretKey"
type="text"
@ -131538,9 +131543,9 @@ exports[`Storyshots Views / Webhooks / Create webhook default 1`] = `
</fieldset>
</div>
<p
class="MuiFormHelperText-root-id MuiFormHelperText-contained-id"
class="MuiFormHelperText-root-id MuiFormHelperText-contained-id MuiFormHelperText-error-id"
>
secret key is used to create a hash signature with each payload. *optional field
Invalid value
</p>
</div>
</div>
@ -132037,7 +132042,7 @@ exports[`Storyshots Views / Webhooks / Create webhook form errors 1`] = `
<p
class="MuiFormHelperText-root-id MuiFormHelperText-contained-id MuiFormHelperText-error-id"
>
This field is required
Invalid value
</p>
</div>
</div>
@ -132547,6 +132552,11 @@ exports[`Storyshots Views / Webhooks / Create webhook loading 1`] = `
</legend>
</fieldset>
</div>
<p
class="MuiFormHelperText-root-id MuiFormHelperText-contained-id MuiFormHelperText-error-id MuiFormHelperText-filled-id"
>
Invalid value
</p>
</div>
<div
class="FormSpacer-spacer-id"
@ -133066,6 +133076,12 @@ exports[`Storyshots Views / Webhooks / Delete webhook default 1`] = `
/>
`;
exports[`Storyshots Views / Webhooks / Delete webhook unnamed webhook 1`] = `
<div
style="padding:24px"
/>
`;
exports[`Storyshots Views / Webhooks / Webhook details default 1`] = `
<div
style="padding:24px"
@ -133127,16 +133143,16 @@ exports[`Storyshots Views / Webhooks / Webhook details default 1`] = `
class="MuiFormControl-root-id MuiTextField-root-id MuiFormControl-fullWidth-id"
>
<label
class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id MuiFormLabel-filled-id"
class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id MuiFormLabel-error-id MuiInputLabel-error-id MuiFormLabel-filled-id"
data-shrink="true"
>
Webhook Name
</label>
<div
class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-error-id MuiOutlinedInput-error-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
>
<input
aria-invalid="false"
aria-invalid="true"
class="MuiInputBase-input-id MuiOutlinedInput-input-id"
name="name"
type="text"
@ -133238,16 +133254,16 @@ exports[`Storyshots Views / Webhooks / Webhook details default 1`] = `
class="MuiFormControl-root-id MuiTextField-root-id MuiFormControl-fullWidth-id"
>
<label
class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id MuiFormLabel-filled-id"
class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id MuiFormLabel-error-id MuiInputLabel-error-id MuiFormLabel-filled-id"
data-shrink="true"
>
Target URL
</label>
<div
class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-error-id MuiOutlinedInput-error-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
>
<input
aria-invalid="false"
aria-invalid="true"
class="MuiInputBase-input-id MuiOutlinedInput-input-id"
name="targetUrl"
type="text"
@ -133269,9 +133285,9 @@ exports[`Storyshots Views / Webhooks / Webhook details default 1`] = `
</fieldset>
</div>
<p
class="MuiFormHelperText-root-id MuiFormHelperText-contained-id MuiFormHelperText-filled-id"
class="MuiFormHelperText-root-id MuiFormHelperText-contained-id MuiFormHelperText-error-id MuiFormHelperText-filled-id"
>
This URL will receive webhook POST requests
Invalid value
</p>
</div>
<div
@ -133281,16 +133297,16 @@ exports[`Storyshots Views / Webhooks / Webhook details default 1`] = `
class="MuiFormControl-root-id MuiTextField-root-id MuiFormControl-fullWidth-id"
>
<label
class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id MuiFormLabel-filled-id"
class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id MuiFormLabel-error-id MuiInputLabel-error-id MuiFormLabel-filled-id"
data-shrink="true"
>
Secrect Key
</label>
<div
class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-error-id MuiOutlinedInput-error-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
>
<input
aria-invalid="false"
aria-invalid="true"
class="MuiInputBase-input-id MuiOutlinedInput-input-id"
name="secretKey"
type="text"
@ -133312,9 +133328,9 @@ exports[`Storyshots Views / Webhooks / Webhook details default 1`] = `
</fieldset>
</div>
<p
class="MuiFormHelperText-root-id MuiFormHelperText-contained-id MuiFormHelperText-filled-id"
class="MuiFormHelperText-root-id MuiFormHelperText-contained-id MuiFormHelperText-error-id MuiFormHelperText-filled-id"
>
secret key is used to create a hash signature with each payload. *optional field
Invalid value
</p>
</div>
</div>
@ -133811,7 +133827,7 @@ exports[`Storyshots Views / Webhooks / Webhook details form errors 1`] = `
<p
class="MuiFormHelperText-root-id MuiFormHelperText-contained-id MuiFormHelperText-error-id MuiFormHelperText-filled-id"
>
This field is required
Invalid value
</p>
</div>
</div>
@ -134834,6 +134850,584 @@ exports[`Storyshots Views / Webhooks / Webhook details loading 1`] = `
</div>
`;
exports[`Storyshots Views / Webhooks / Webhook details unnamed 1`] = `
<div
style="padding:24px"
>
<form>
<div
class="Container-root-id"
>
<div
class="ExtendedPageHeader-root-id ExtendedPageHeader-block-id"
>
<div
class="MuiTypography-root-id PageHeader-title-id MuiTypography-h5-id"
>
Unnamed Webhook Details
</div>
<div
class="ExtendedPageHeader-action-id"
>
<div
class="PageHeader-root-id"
/>
</div>
</div>
<div
class="Grid-root-id Grid-default-id"
>
<div>
<div
class="MuiPaper-root-id MuiPaper-elevation0-id MuiCard-root-id MuiPaper-rounded-id"
>
<div
class="CardTitle-root-id"
>
<span
class="MuiTypography-root-id CardTitle-title-id MuiTypography-h5-id"
>
Webhook Information
</span>
<div
class="CardTitle-toolbar-id"
/>
</div>
<div
class="CardTitle-children-id"
/>
<hr
class="CardTitle-hr-id"
/>
<div
class="MuiCardContent-root-id"
>
<div
class="MuiTypography-root-id WebhookInfo-title-id MuiTypography-body1-id"
>
General Informations
</div>
<div
class="MuiFormControl-root-id MuiTextField-root-id MuiFormControl-fullWidth-id"
>
<label
class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id"
data-shrink="false"
>
Webhook Name
</label>
<div
class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
>
<input
aria-invalid="false"
class="MuiInputBase-input-id MuiOutlinedInput-input-id"
name="name"
type="text"
/>
<fieldset
aria-hidden="true"
class="PrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
style="padding-left:8px"
>
<legend
class="PrivateNotchedOutline-legend-id"
style="width:0.01px"
>
<span>
​
</span>
</legend>
</fieldset>
</div>
</div>
<div
class="FormSpacer-spacer-id"
/>
<hr
class="Hr-root-id"
/>
<div
class="FormSpacer-spacer-id"
/>
<div
class="MuiTypography-root-id WebhookInfo-title-id MuiTypography-body1-id"
>
Webhook specific information
</div>
<div
class="SingleAutocompleteSelectField-container-id"
>
<div
class="MuiFormControl-root-id MuiTextField-root-id MuiFormControl-fullWidth-id"
>
<label
class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id MuiFormLabel-filled-id"
data-shrink="true"
>
Assign to Service Account
</label>
<div
aria-autocomplete="list"
aria-expanded="false"
class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
role="combobox"
>
<input
aria-invalid="false"
autocomplete="off"
class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
type="text"
value="Test Account 2"
/>
<div>
<svg
aria-hidden="true"
class="MuiSvgIcon-root-id"
focusable="false"
role="presentation"
viewBox="0 0 24 24"
>
<g
style="fill-rule:evenodd"
>
<path
d="M7 10l5 5 5-5z"
/>
</g>
</svg>
</div>
<fieldset
aria-hidden="true"
class="PrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
style="padding-left:8px"
>
<legend
class="PrivateNotchedOutline-legend-id"
style="width:0"
>
<span>
​
</span>
</legend>
</fieldset>
</div>
</div>
</div>
<div
class="FormSpacer-spacer-id"
/>
<div
class="MuiFormControl-root-id MuiTextField-root-id MuiFormControl-fullWidth-id"
>
<label
class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id MuiFormLabel-filled-id"
data-shrink="true"
>
Target URL
</label>
<div
class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
>
<input
aria-invalid="false"
class="MuiInputBase-input-id MuiOutlinedInput-input-id"
name="targetUrl"
type="text"
value="http://www.getsaleor.com"
/>
<fieldset
aria-hidden="true"
class="PrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
style="padding-left:8px"
>
<legend
class="PrivateNotchedOutline-legend-id"
style="width:0"
>
<span>
​
</span>
</legend>
</fieldset>
</div>
<p
class="MuiFormHelperText-root-id MuiFormHelperText-contained-id MuiFormHelperText-filled-id"
>
This URL will receive webhook POST requests
</p>
</div>
<div
class="FormSpacer-spacer-id"
/>
<div
class="MuiFormControl-root-id MuiTextField-root-id MuiFormControl-fullWidth-id"
>
<label
class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id MuiFormLabel-filled-id"
data-shrink="true"
>
Secrect Key
</label>
<div
class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
>
<input
aria-invalid="false"
class="MuiInputBase-input-id MuiOutlinedInput-input-id"
name="secretKey"
type="text"
value="zxczx_asdas"
/>
<fieldset
aria-hidden="true"
class="PrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
style="padding-left:8px"
>
<legend
class="PrivateNotchedOutline-legend-id"
style="width:0"
>
<span>
​
</span>
</legend>
</fieldset>
</div>
<p
class="MuiFormHelperText-root-id MuiFormHelperText-contained-id MuiFormHelperText-filled-id"
>
secret key is used to create a hash signature with each payload. *optional field
</p>
</div>
</div>
</div>
</div>
<div>
<div
class="MuiPaper-root-id MuiPaper-elevation0-id MuiCard-root-id MuiPaper-rounded-id"
>
<div
class="CardTitle-root-id"
>
<span
class="MuiTypography-root-id CardTitle-title-id MuiTypography-h5-id"
>
Events
</span>
<div
class="CardTitle-toolbar-id"
/>
</div>
<div
class="CardTitle-children-id"
/>
<hr
class="CardTitle-hr-id"
/>
<div
class="MuiCardContent-root-id"
>
<div
class="MuiTypography-root-id MuiTypography-body1-id"
>
Expand or restrict webhooks permissions to register certain events in Saleor system.
</div>
<label
class="MuiFormControlLabel-root-id"
>
<button
class="MuiButtonBase-root-id Checkbox-root-id"
tabindex="0"
type="button"
>
<input
class="Checkbox-box-id"
name="allEvents"
type="checkbox"
value="false"
/>
</button>
<span
class="MuiTypography-root-id MuiFormControlLabel-label-id MuiTypography-body1-id"
>
All events
</span>
</label>
<hr
class="Hr-root-id"
/>
<div>
<label
class="MuiFormControlLabel-root-id"
>
<button
class="MuiButtonBase-root-id Checkbox-root-id"
tabindex="0"
type="button"
>
<input
class="Checkbox-box-id"
name="CHECKOUT_QUANTITY_CHANGED"
type="checkbox"
value="false"
/>
</button>
<span
class="MuiTypography-root-id MuiFormControlLabel-label-id MuiTypography-body1-id"
>
Changed quantity in checkout
</span>
</label>
</div>
<div>
<label
class="MuiFormControlLabel-root-id"
>
<button
class="MuiButtonBase-root-id Checkbox-root-id"
tabindex="0"
type="button"
>
<input
class="Checkbox-box-id"
name="CUSTOMER_CREATED"
type="checkbox"
value="false"
/>
</button>
<span
class="MuiTypography-root-id MuiFormControlLabel-label-id MuiTypography-body1-id"
>
Customer created
</span>
</label>
</div>
<div>
<label
class="MuiFormControlLabel-root-id"
>
<button
class="MuiButtonBase-root-id Checkbox-root-id"
tabindex="0"
type="button"
>
<input
class="Checkbox-box-id"
name="FULFILLMENT_CREATED"
type="checkbox"
value="false"
/>
</button>
<span
class="MuiTypography-root-id MuiFormControlLabel-label-id MuiTypography-body1-id"
>
Fulfillment created
</span>
</label>
</div>
<div>
<label
class="MuiFormControlLabel-root-id"
>
<button
class="MuiButtonBase-root-id Checkbox-root-id"
tabindex="0"
type="button"
>
<input
class="Checkbox-box-id"
name="ORDER_CANCELLED"
type="checkbox"
value="false"
/>
</button>
<span
class="MuiTypography-root-id MuiFormControlLabel-label-id MuiTypography-body1-id"
>
Order cancelled
</span>
</label>
</div>
<div>
<label
class="MuiFormControlLabel-root-id"
>
<button
class="MuiButtonBase-root-id Checkbox-root-id"
tabindex="0"
type="button"
>
<input
class="Checkbox-box-id"
name="ORDER_CREATED"
type="checkbox"
value="false"
/>
</button>
<span
class="MuiTypography-root-id MuiFormControlLabel-label-id MuiTypography-body1-id"
>
Order created
</span>
</label>
</div>
<div>
<label
class="MuiFormControlLabel-root-id"
>
<button
class="MuiButtonBase-root-id Checkbox-root-id"
tabindex="0"
type="button"
>
<input
class="Checkbox-box-id"
name="ORDER_FULFILLED"
type="checkbox"
value="false"
/>
</button>
<span
class="MuiTypography-root-id MuiFormControlLabel-label-id MuiTypography-body1-id"
>
Order fulfilled
</span>
</label>
</div>
<div>
<label
class="MuiFormControlLabel-root-id"
>
<button
class="MuiButtonBase-root-id Checkbox-root-id"
tabindex="0"
type="button"
>
<input
class="Checkbox-box-id"
name="ORDER_FULLY_PAID"
type="checkbox"
value="false"
/>
</button>
<span
class="MuiTypography-root-id MuiFormControlLabel-label-id MuiTypography-body1-id"
>
Order fully paid
</span>
</label>
</div>
<div>
<label
class="MuiFormControlLabel-root-id"
>
<button
class="MuiButtonBase-root-id Checkbox-root-id"
tabindex="0"
type="button"
>
<input
class="Checkbox-box-id"
name="ORDER_UPDATED"
type="checkbox"
value="false"
/>
</button>
<span
class="MuiTypography-root-id MuiFormControlLabel-label-id MuiTypography-body1-id"
>
Order updated
</span>
</label>
</div>
<div>
<label
class="MuiFormControlLabel-root-id"
>
<button
class="MuiButtonBase-root-id Checkbox-root-id"
tabindex="0"
type="button"
>
<input
class="Checkbox-box-id"
name="PRODUCT_CREATED"
type="checkbox"
value="false"
/>
</button>
<span
class="MuiTypography-root-id MuiFormControlLabel-label-id MuiTypography-body1-id"
>
Product created
</span>
</label>
</div>
</div>
</div>
<div
class="FormSpacer-spacer-id"
/>
<div
class="MuiPaper-root-id MuiPaper-elevation0-id MuiCard-root-id MuiPaper-rounded-id"
>
<div
class="CardTitle-root-id"
>
<span
class="MuiTypography-root-id CardTitle-title-id MuiTypography-h5-id"
>
Webhook Status
</span>
<div
class="CardTitle-toolbar-id"
/>
</div>
<div
class="CardTitle-children-id"
/>
<hr
class="CardTitle-hr-id"
/>
<div
class="MuiCardContent-root-id"
>
<div
class="MuiTypography-root-id MuiTypography-body1-id"
>
If you want to disable this webhook please uncheck the box below.
</div>
<label
class="MuiFormControlLabel-root-id"
>
<button
class="MuiButtonBase-root-id Checkbox-root-id"
tabindex="0"
type="button"
>
<input
class="Checkbox-box-id Checkbox-checked-id"
name="isActive"
type="checkbox"
value="true"
/>
</button>
<span
class="MuiTypography-root-id MuiFormControlLabel-label-id MuiTypography-body1-id"
>
Webhook is active
</span>
</label>
</div>
</div>
</div>
</div>
</div>
</form>
</div>
`;
exports[`Storyshots Views / Webhooks / Webhook list default 1`] = `
<div
style="padding:24px"
@ -135259,6 +135853,66 @@ exports[`Storyshots Views / Webhooks / Webhook list default 1`] = `
</button>
</td>
</tr>
<tr
class="MuiTableRow-root-id WebhooksList-tableRow-id MuiTableRow-hover-id"
>
<td
class="MuiTableCell-root-id MuiTableCell-body-id WebhooksList-colName-id WebhooksList-colNameUnnamed-id"
>
Unnamed webhook
</td>
<td
class="MuiTableCell-root-id MuiTableCell-body-id WebhooksList-colActive-id"
>
Test Account 2
</td>
<td
class="MuiTableCell-root-id MuiTableCell-body-id WebhooksList-colAction-id"
>
<button
class="MuiButtonBase-root-id MuiIconButton-root-id MuiIconButton-colorPrimary-id"
tabindex="0"
type="button"
>
<span
class="MuiIconButton-label-id"
>
<svg
aria-hidden="true"
class="MuiSvgIcon-root-id"
focusable="false"
role="presentation"
viewBox="0 0 24 24"
>
<path
d="M3 17.25V21h3.75L17.81 9.94l-3.75-3.75L3 17.25zM20.71 7.04c.39-.39.39-1.02 0-1.41l-2.34-2.34a.9959.9959 0 00-1.41 0l-1.83 1.83 3.75 3.75 1.83-1.83z"
/>
</svg>
</span>
</button>
<button
class="MuiButtonBase-root-id MuiIconButton-root-id MuiIconButton-colorPrimary-id"
tabindex="0"
type="button"
>
<span
class="MuiIconButton-label-id"
>
<svg
aria-hidden="true"
class="MuiSvgIcon-root-id"
focusable="false"
role="presentation"
viewBox="0 0 24 24"
>
<path
d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z"
/>
</svg>
</span>
</button>
</td>
</tr>
</tbody>
</table>
</div>

28
src/utils/errors/webhooks.ts Normal file
View file

@ -0,0 +1,28 @@
import { IntlShape } from "react-intl";
import { WebhookErrorCode } from "@saleor/types/globalTypes";
import { commonMessages } from "@saleor/intl";
import { WebhookErrorFragment } from "@saleor/webhooks/types/WebhookErrorFragment";
import commonErrorMessages from "./common";
function getWebhookErrorMessage(
err: Omit<WebhookErrorFragment, "__typename"> | undefined,
intl: IntlShape
): string {
if (err) {
switch (err.code) {
case WebhookErrorCode.GRAPHQL_ERROR:
return intl.formatMessage(commonErrorMessages.graphqlError);
case WebhookErrorCode.REQUIRED:
return intl.formatMessage(commonMessages.requiredField);
case WebhookErrorCode.INVALID:
return intl.formatMessage(commonErrorMessages.invalid);
default:
return intl.formatMessage(commonErrorMessages.unknownError);
}
}
return undefined;
}
export default getWebhookErrorMessage;

18
src/webhooks/components/WebhookCreatePage/WebhookCreatePage.tsx
View file

@ -7,16 +7,15 @@ import Grid from "@saleor/components/Grid";
import PageHeader from "@saleor/components/PageHeader";
import SaveButtonBar from "@saleor/components/SaveButtonBar";
import { sectionNames } from "@saleor/intl";
import { maybe } from "@saleor/misc";
import { SearchServiceAccount_search_edges_node } from "@saleor/searches/types/SearchServiceAccount";
import { WebhookEventTypeEnum } from "@saleor/types/globalTypes";
import createSingleAutocompleteSelectHandler from "@saleor/utils/handlers/singleAutocompleteSelectChangeHandler";
import WebhookEvents from "@saleor/webhooks/components/WebhookEvents";
import WebhookInfo from "@saleor/webhooks/components/WebhookInfo";
import WebhookStatus from "@saleor/webhooks/components/WebhookStatus";
import { WebhookCreate_webhookCreate_webhookErrors } from "@saleor/webhooks/types/WebhookCreate";
import React from "react";
import { useIntl } from "react-intl";
import { WebhookErrorFragment } from "@saleor/webhooks/types/WebhookErrorFragment";
export interface FormData {
events: WebhookEventTypeEnum[];
@ -30,7 +29,7 @@ export interface FormData {
export interface WebhookCreatePageProps {
disabled: boolean;
errors: WebhookCreate_webhookCreate_webhookErrors[];
errors: WebhookErrorFragment[];
services?: SearchServiceAccount_search_edges_node[];
saveButtonBarState: ConfirmButtonTransitionState;
fetchServiceAccounts: (data: string) => void;
@ -60,14 +59,11 @@ const WebhookCreatePage: React.FC<WebhookCreatePageProps> = ({
const [selectedServiceAcccount, setSelectedServiceAcccount] = React.useState(
""
);
const servicesChoiceList = maybe(
() =>
services.map(node => ({
label: node.name,
value: node.id
})),
[]
);
const servicesChoiceList =
services?.map(node => ({
label: node.name,
value: node.id
})) || [];
return (
<Form initial={initialForm} onSubmit={onSubmit}>

11
src/webhooks/components/WebhookCreatePage/WebhooksCreatePage.stories.tsx
View file

@ -21,15 +21,10 @@ storiesOf("Views / Webhooks / Create webhook", module)
.add("form errors", () => (
<WebhookCreatePage
{...props}
errors={[
{
code: WebhookErrorCode.INVALID,
field: null
}
].map(error => ({
errors={["name", "targetUrl", "secretKey", null].map(field => ({
__typename: "WebhookError",
message: "Generic form error",
...error
code: WebhookErrorCode.INVALID,
field
}))}
/>
));

3
src/webhooks/components/WebhookDeleteDialog/WebhookDeleteDialog.stories.tsx
View file

@ -16,4 +16,5 @@ const props: WebhookDeleteDialogProps = {
storiesOf("Views / Webhooks / Delete webhook", module)
.addDecorator(Decorator)
.add("default", () => <WebhookDeleteDialog {...props} />);
.add("default", () => <WebhookDeleteDialog {...props} />)
.add("unnamed webhook", () => <WebhookDeleteDialog {...props} name={null} />);

22
src/webhooks/components/WebhookDeleteDialog/WebhookDeleteDialog.tsx
View file

@ -4,6 +4,7 @@ import { FormattedMessage, useIntl } from "react-intl";
import ActionDialog from "@saleor/components/ActionDialog";
import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton";
import { getStringOrPlaceholder } from "@saleor/misc";
export interface WebhookDeleteDialogProps {
confirmButtonState: ConfirmButtonTransitionState;
@ -35,13 +36,20 @@ const WebhookDeleteDialog: React.FC<WebhookDeleteDialogProps> = ({
variant="delete"
>
<DialogContentText>
<FormattedMessage
defaultMessage="Are you sure you want to delete {name}?"
description="delete webhook"
values={{
name: <strong>{name}</strong>
}}
/>
{["", null].includes(name) ? (
<FormattedMessage
defaultMessage="Are you sure you want to delete this webhook?"
description="delete webhook"
/>
) : (
<FormattedMessage
defaultMessage="Are you sure you want to delete {name}?"
description="delete webhook"
values={{
name: <strong>{getStringOrPlaceholder(name)}</strong>
}}
/>
)}
</DialogContentText>
</ActionDialog>
);

31
src/webhooks/components/WebhookInfo/WebhookInfo.tsx
View file

@ -14,14 +14,15 @@ import SingleAutocompleteSelectField, {
} from "@saleor/components/SingleAutocompleteSelectField";
import { ChangeEvent } from "@saleor/hooks/useForm";
import { commonMessages } from "@saleor/intl";
import { WebhookCreate_webhookCreate_webhookErrors } from "@saleor/webhooks/types/WebhookCreate";
import { getFieldError } from "@saleor/utils/errors";
import { getFormErrors } from "@saleor/utils/errors";
import getWebhookErrorMessage from "@saleor/utils/errors/webhooks";
import { WebhookErrorFragment } from "@saleor/webhooks/types/WebhookErrorFragment";
import { FormData } from "../WebhooksDetailsPage";
interface WebhookInfoProps {
data: FormData;
disabled: boolean;
errors: WebhookCreate_webhookCreate_webhookErrors[];
errors: WebhookErrorFragment[];
serviceDisplayValue: string;
services: SingleAutocompleteChoiceType[];
onChange: (event: React.ChangeEvent<any>) => void;
@ -55,8 +56,9 @@ const WebhookInfo: React.FC<WebhookInfoProps> = ({
}) => {
const classes = useStyles({});
const intl = useIntl();
const serviceAccountsError =
errors.filter(error => error.field === null).length > 0;
const serviceAccountError = errors.find(error => error.field === null);
const formErrors = getFormErrors(["name", "targetUrl", "secretKey"], errors);
return (
<Card>
@ -72,8 +74,8 @@ const WebhookInfo: React.FC<WebhookInfoProps> = ({
</Typography>
<TextField
disabled={disabled}
error={!!getFieldError(errors, "name")}
helperText={getFieldError(errors, "name")?.message}
error={!!formErrors.name}
helperText={getWebhookErrorMessage(formErrors.name, intl)}
label={intl.formatMessage({
defaultMessage: "Webhook Name",
description: "webhook"
@ -98,11 +100,8 @@ const WebhookInfo: React.FC<WebhookInfoProps> = ({
label={intl.formatMessage({
defaultMessage: "Assign to Service Account"
})}
error={serviceAccountsError}
helperText={
serviceAccountsError &&
intl.formatMessage(commonMessages.requiredField)
}
error={!!serviceAccountError}
helperText={getWebhookErrorMessage(serviceAccountError, intl)}
name="serviceAccount"
onChange={serviceOnChange}
value={data.serviceAccount}
@ -115,9 +114,9 @@ const WebhookInfo: React.FC<WebhookInfoProps> = ({
<FormSpacer />
<TextField
disabled={disabled}
error={!!getFieldError(errors, "targetUrl")}
error={!!formErrors.targetUrl}
helperText={
getFieldError(errors, "targetUrl")?.message ||
getWebhookErrorMessage(formErrors.targetUrl, intl) ||
intl.formatMessage({
defaultMessage: "This URL will receive webhook POST requests",
description: "webhook target url help text"
@ -135,9 +134,9 @@ const WebhookInfo: React.FC<WebhookInfoProps> = ({
<FormSpacer />
<TextField
disabled={disabled}
error={!!getFieldError(errors, "secretKey")}
error={!!formErrors.secretKey}
helperText={
getFieldError(errors, "secretKey")?.message ||
getWebhookErrorMessage(formErrors.secretKey, intl) ||
intl.formatMessage({
defaultMessage:
"secret key is used to create a hash signature with each payload. *optional field",

14
src/webhooks/components/WebhooksDetailsPage/WebhooksDetailsPage.stories.tsx
View file

@ -22,6 +22,9 @@ const props: WebhooksDetailsPageProps = {
storiesOf("Views / Webhooks / Webhook details", module)
.addDecorator(Decorator)
.add("default", () => <WebhooksDetailsPage {...props} />)
.add("unnamed", () => (
<WebhooksDetailsPage {...props} webhook={{ ...webhook, name: null }} />
))
.add("loading", () => (
<WebhooksDetailsPage
{...props}
@ -33,15 +36,10 @@ storiesOf("Views / Webhooks / Webhook details", module)
.add("form errors", () => (
<WebhooksDetailsPage
{...props}
errors={[
{
code: WebhookErrorCode.INVALID,
field: null
}
].map(error => ({
errors={["name", "targetUrl", "secretKey", null].map(field => ({
__typename: "WebhookError",
message: "Generic form error",
...error
code: WebhookErrorCode.INVALID,
field
}))}
/>
));

32
src/webhooks/components/WebhooksDetailsPage/WebhooksDetailsPage.tsx
View file

@ -11,15 +11,16 @@ import PageHeader from "@saleor/components/PageHeader";
import SaveButtonBar from "@saleor/components/SaveButtonBar";
import useStateFromProps from "@saleor/hooks/useStateFromProps";
import { sectionNames } from "@saleor/intl";
import { maybe } from "@saleor/misc";
import { maybe, getStringOrPlaceholder } from "@saleor/misc";
import { SearchServiceAccount_search_edges_node } from "@saleor/searches/types/SearchServiceAccount";
import { WebhookEventTypeEnum } from "@saleor/types/globalTypes";
import createSingleAutocompleteSelectHandler from "@saleor/utils/handlers/singleAutocompleteSelectChangeHandler";
import WebhookEvents from "@saleor/webhooks/components/WebhookEvents";
import WebhookInfo from "@saleor/webhooks/components/WebhookInfo";
import WebhookStatus from "@saleor/webhooks/components/WebhookStatus";
import { WebhookCreate_webhookCreate_webhookErrors } from "@saleor/webhooks/types/WebhookCreate";
import { WebhookDetails_webhook } from "@saleor/webhooks/types/WebhookDetails";
import { WebhookErrorFragment } from "@saleor/webhooks/types/WebhookErrorFragment";
import { isUnnamed } from "@saleor/webhooks/utils";
export interface FormData {
events: WebhookEventTypeEnum[];
@ -33,7 +34,7 @@ export interface FormData {
export interface WebhooksDetailsPageProps {
disabled: boolean;
errors: WebhookCreate_webhookCreate_webhookErrors[];
errors: WebhookErrorFragment[];
webhook: WebhookDetails_webhook;
services?: SearchServiceAccount_search_edges_node[];
saveButtonBarState: ConfirmButtonTransitionState;
@ -94,15 +95,22 @@ const WebhooksDetailsPage: React.FC<WebhooksDetailsPageProps> = ({
{intl.formatMessage(sectionNames.webhooks)}
</AppHeader>
<PageHeader
title={intl.formatMessage(
{
defaultMessage: "{webhookName} Details",
description: "header"
},
{
webhookName: maybe(() => webhook.name, "...")
}
)}
title={
isUnnamed(webhook)
? intl.formatMessage({
defaultMessage: "Unnamed Webhook Details",
description: "header"
})
: intl.formatMessage(
{
defaultMessage: "{webhookName} Details",
description: "header"
},
{
webhookName: getStringOrPlaceholder(webhook?.name)
}
)
}
/>
<Grid>
<div>

26
src/webhooks/components/WebhooksList/WebhooksList.tsx
View file

@ -8,16 +8,18 @@ import TableRow from "@material-ui/core/TableRow";
import DeleteIcon from "@material-ui/icons/Delete";
import EditIcon from "@material-ui/icons/Edit";
import React from "react";
import { useIntl } from "react-intl";
import { useIntl, FormattedMessage } from "react-intl";
import classNames from "classnames";
import ResponsiveTable from "@saleor/components/ResponsiveTable";
import Skeleton from "@saleor/components/Skeleton";
import TablePagination from "@saleor/components/TablePagination";
import { maybe, renderCollection, stopPropagation } from "@saleor/misc";
import { renderCollection, stopPropagation } from "@saleor/misc";
import { ListProps, SortPage } from "@saleor/types";
import { WebhookListUrlSortField } from "@saleor/webhooks/urls";
import TableCellHeader from "@saleor/components/TableCellHeader";
import { getArrowDirection } from "@saleor/utils/sort";
import { isUnnamed } from "@saleor/webhooks/utils";
import { Webhooks_webhooks_edges_node } from "../../types/Webhooks";
export interface WebhooksListProps
@ -49,6 +51,9 @@ const useStyles = makeStyles(
paddingLeft: 0,
width: 250
},
colNameUnnamed: {
color: theme.palette.text.secondary
},
table: {
tableLayout: "fixed"
},
@ -143,14 +148,19 @@ const WebhooksList: React.FC<WebhooksListProps> = ({
onClick={webhook ? onRowClick(webhook.id) : undefined}
key={webhook ? webhook.id : "skeleton"}
>
<TableCell className={classes.colName}>
{maybe<React.ReactNode>(() => webhook.name, <Skeleton />)}
<TableCell
className={classNames(classes.colName, {
[classes.colNameUnnamed]: isUnnamed(webhook)
})}
>
{isUnnamed(webhook) ? (
<FormattedMessage defaultMessage="Unnamed webhook" />
) : (
webhook?.name || <Skeleton />
)}
</TableCell>
<TableCell className={classes.colActive}>
{maybe<React.ReactNode>(
() => webhook.serviceAccount.name,
<Skeleton />
)}
{webhook?.serviceAccount?.name || <Skeleton />}
</TableCell>
<TableCell className={classes.colAction}>
<IconButton

11
src/webhooks/fixtures.ts
View file

@ -23,6 +23,17 @@ export const webhookList: Webhooks_webhooks_edges_node[] = [
id: "Jzx1ss23sEt==",
name: "Test Account 2"
}
},
{
__typename: "Webhook",
id: "Jzx12123sEt==",
isActive: false,
name: null,
serviceAccount: {
__typename: "ServiceAccount",
id: "Jzx1ss23sEt==",
name: "Test Account 2"
}
}
];
export const webhook: WebhookDetails_webhook = {

35
src/webhooks/mutations.ts
View file

@ -6,18 +6,20 @@ import { WebhookCreate, WebhookCreateVariables } from "./types/WebhookCreate";
import { WebhookDelete, WebhookDeleteVariables } from "./types/WebhookDelete";
import { WebhookUpdate, WebhookUpdateVariables } from "./types/WebhookUpdate";
const webhookErrorFragment = gql`
fragment WebhookErrorFragment on WebhookError {
code
field
}
`;
const webhookCreate = gql`
${webhooksDetailsFragment}
${webhookErrorFragment}
mutation WebhookCreate($input: WebhookCreateInput!) {
webhookCreate(input: $input) {
errors {
field
message
}
webhookErrors {
code
message
field
errors: webhookErrors {
...WebhookErrorFragment
}
webhook {
...WebhooksDetailsFragment
@ -32,16 +34,11 @@ export const TypedWebhookCreate = TypedMutation<
const webhookUpdate = gql`
${webhooksDetailsFragment}
${webhookErrorFragment}
mutation WebhookUpdate($id: ID!, $input: WebhookUpdateInput!) {
webhookUpdate(id: $id, input: $input) {
errors {
field
message
}
webhookErrors {
code
message
field
errors: webhookErrors {
...WebhookErrorFragment
}
webhook {
...WebhooksDetailsFragment
@ -55,11 +52,11 @@ export const TypedWebhookUpdate = TypedMutation<
>(webhookUpdate);
const webhookDelete = gql`
${webhookErrorFragment}
mutation WebhookDelete($id: ID!) {
webhookDelete(id: $id) {
errors {
field
message
errors: webhookErrors {
...WebhookErrorFragment
}
}
}

8
src/webhooks/types/WebhookCreate.ts
View file

@ -9,15 +9,8 @@ import { WebhookCreateInput, WebhookErrorCode } from "./../../types/globalTypes"
// ====================================================
export interface WebhookCreate_webhookCreate_errors {
__typename: "Error";
field: string | null;
message: string | null;
}
export interface WebhookCreate_webhookCreate_webhookErrors {
__typename: "WebhookError";
code: WebhookErrorCode;
message: string | null;
field: string | null;
}
@ -38,7 +31,6 @@ export interface WebhookCreate_webhookCreate_webhook {
export interface WebhookCreate_webhookCreate {
__typename: "WebhookCreate";
errors: WebhookCreate_webhookCreate_errors[];
webhookErrors: WebhookCreate_webhookCreate_webhookErrors[];
webhook: WebhookCreate_webhookCreate_webhook | null;
}

6
src/webhooks/types/WebhookDelete.ts
View file

@ -2,14 +2,16 @@
/* eslint-disable */
// This file was automatically generated and should not be edited.
import { WebhookErrorCode } from "./../../types/globalTypes";
// ====================================================
// GraphQL mutation operation: WebhookDelete
// ====================================================
export interface WebhookDelete_webhookDelete_errors {
__typename: "Error";
__typename: "WebhookError";
code: WebhookErrorCode;
field: string | null;
message: string | null;
}
export interface WebhookDelete_webhookDelete {

15
src/webhooks/types/WebhookErrorFragment.ts Normal file
View file

@ -0,0 +1,15 @@
/* tslint:disable */
/* eslint-disable */
// This file was automatically generated and should not be edited.
import { WebhookErrorCode } from "./../../types/globalTypes";
// ====================================================
// GraphQL fragment: WebhookErrorFragment
// ====================================================
export interface WebhookErrorFragment {
__typename: "WebhookError";
code: WebhookErrorCode;
field: string | null;
}

8
src/webhooks/types/WebhookUpdate.ts
View file

@ -9,15 +9,8 @@ import { WebhookUpdateInput, WebhookErrorCode } from "./../../types/globalTypes"
// ====================================================
export interface WebhookUpdate_webhookUpdate_errors {
__typename: "Error";
field: string | null;
message: string | null;
}
export interface WebhookUpdate_webhookUpdate_webhookErrors {
__typename: "WebhookError";
code: WebhookErrorCode;
message: string | null;
field: string | null;
}
@ -38,7 +31,6 @@ export interface WebhookUpdate_webhookUpdate_webhook {
export interface WebhookUpdate_webhookUpdate {
__typename: "WebhookUpdate";
errors: WebhookUpdate_webhookUpdate_errors[];
webhookErrors: WebhookUpdate_webhookUpdate_webhookErrors[];
webhook: WebhookUpdate_webhookUpdate_webhook | null;
}

5
src/webhooks/utils.ts Normal file
View file

@ -0,0 +1,5 @@
import { WebhookFragment } from "./types/WebhookFragment";
export function isUnnamed(webhook: WebhookFragment): boolean {
return ["", null].includes(webhook?.name);
}

16
src/webhooks/views/WebhookList/WebhookList.tsx
View file

@ -10,7 +10,7 @@ import usePaginator, {
createPaginationState
} from "@saleor/hooks/usePaginator";
import { commonMessages } from "@saleor/intl";
import { maybe } from "@saleor/misc";
import { maybe, getStringOrPlaceholder } from "@saleor/misc";
import { ListViews } from "@saleor/types";
import WebhookDeleteDialog from "@saleor/webhooks/components/WebhookDeleteDialog";
import { WebhookDelete } from "@saleor/webhooks/types/WebhookDelete";
@ -171,7 +171,7 @@ export const WebhooksList: React.FC<WebhooksListProps> = ({ params }) => {
disabled={loading}
settings={settings}
sort={getSortParams(params)}
webhooks={maybe(() => data.webhooks.edges.map(edge => edge.node))}
webhooks={data?.webhooks.edges.map(edge => edge.node)}
pageInfo={pageInfo}
onAdd={() => navigate(webhookAddUrl)}
onBack={() => navigate(configurationMenuUrl)}
@ -184,12 +184,10 @@ export const WebhooksList: React.FC<WebhooksListProps> = ({ params }) => {
/>
<WebhookDeleteDialog
confirmButtonState={webhookDeleteOpts.status}
name={maybe(
() =>
data.webhooks.edges.find(edge => edge.node.id === params.id)
.node.name,
"..."
)}
name={
data?.webhooks.edges.find(edge => edge.node.id === params.id)
?.node?.name
}
onClose={closeModal}
onConfirm={handleRemoveConfirm}
open={params.action === "remove"}
@ -205,7 +203,7 @@ export const WebhooksList: React.FC<WebhooksListProps> = ({ params }) => {
confirmButtonState="default"
onClose={closeModal}
onSubmit={handleTabDelete}
tabName={maybe(() => tabs[currentTab - 1].name, "...")}
tabName={getStringOrPlaceholder(tabs[currentTab - 1]?.name)}
/>
</>
);

12
src/webhooks/views/WebhooksCreate.tsx
View file

@ -8,7 +8,6 @@ import { WebhookEventTypeEnum } from "@saleor/types/globalTypes";
import { WebhookCreate as WebhookCreateData } from "@saleor/webhooks/types/WebhookCreate";
import React from "react";
import { useIntl } from "react-intl";
import { maybe } from "../../misc";
import WebhookCreatePage, { FormData } from "../components/WebhookCreatePage";
import { TypedWebhookCreate } from "../mutations";
import { webhookListUrl, WebhookListUrlQueryParams, webhookUrl } from "../urls";
@ -30,7 +29,7 @@ export const WebhooksCreate: React.FC<WebhooksCreateProps> = () => {
});
const onSubmit = (data: WebhookCreateData) => {
if (data.webhookCreate.webhookErrors.length === 0) {
if (data.webhookCreate.errors.length === 0) {
notify({
text: intl.formatMessage(commonMessages.savedChanges)
});
@ -69,13 +68,10 @@ export const WebhooksCreate: React.FC<WebhooksCreateProps> = () => {
/>
<WebhookCreatePage
disabled={false}
errors={maybe(
() => webhookCreateOpts.data.webhookCreate.webhookErrors,
[]
)}
errors={webhookCreateOpts.data?.webhookCreate.errors || []}
fetchServiceAccounts={searchServiceAccount}
services={maybe(() =>
searchServiceAccountOpt.data.search.edges.map(edge => edge.node)
services={searchServiceAccountOpt.data?.search.edges.map(
edge => edge.node
)}
onBack={handleBack}
onSubmit={handleSubmit}

16
src/webhooks/views/WebhooksDetails.tsx
View file

@ -13,7 +13,7 @@ import { WebhookDelete } from "@saleor/webhooks/types/WebhookDelete";
import { WebhookUpdate } from "@saleor/webhooks/types/WebhookUpdate";
import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers";
import NotFoundPage from "@saleor/components/NotFoundPage";
import { maybe, getStringOrPlaceholder } from "../../misc";
import { getStringOrPlaceholder } from "../../misc";
import WebhooksDetailsPage from "../components/WebhooksDetailsPage";
import { TypedWebhookDelete, TypedWebhookUpdate } from "../mutations";
import { TypedWebhooksDetailsQuery } from "../queries";
@ -58,14 +58,14 @@ export const WebhooksDetails: React.FC<WebhooksDetailsProps> = ({
};
const onWebhookUpdate = (data: WebhookUpdate) => {
const errors = data.webhookUpdate?.webhookErrors;
const errors = data.webhookUpdate?.errors;
const webhook = data.webhookUpdate?.webhook;
if (errors.length === 0 && webhook) {
notify({
text: intl.formatMessage(commonMessages.savedChanges)
});
navigate(webhookUrl(webhook.id));
closeModal();
}
};
@ -87,7 +87,7 @@ export const WebhooksDetails: React.FC<WebhooksDetailsProps> = ({
const webhook = webhookDetails?.data?.webhook;
const formErrors =
webhookUpdateOpts.data?.webhookUpdate.webhookErrors || [];
webhookUpdateOpts.data?.webhookUpdate.errors || [];
if (webhook === null) {
return <NotFoundPage onBack={handleOnBack} />;
@ -106,10 +106,8 @@ export const WebhooksDetails: React.FC<WebhooksDetailsProps> = ({
saveButtonBarState={webhookUpdateOpts.status}
webhook={webhook}
fetchServiceAccounts={searchServiceAccount}
services={maybe(() =>
searchServiceAccountOpt.data.search.edges.map(
edge => edge.node
)
services={searchServiceAccountOpt.data?.search.edges.map(
edge => edge.node
)}
onBack={handleOnBack}
onDelete={() => openModal("remove")}
@ -133,7 +131,7 @@ export const WebhooksDetails: React.FC<WebhooksDetailsProps> = ({
/>
<WebhookDeleteDialog
confirmButtonState={webhookDeleteOpts.status}
name={getStringOrPlaceholder(webhook?.name)}
name={webhook?.name}
onClose={closeModal}
onConfirm={handleRemoveConfirm}
open={params.action === "remove"}