Skip to content

Commit

Permalink
Merge pull request #1181 from saleor/align-stable-with-canary
Browse files Browse the repository at this point in the history
Align stable with canary
  • Loading branch information
aniav committed Jun 14, 2024
2 parents 312f3f1 + aaf7aae commit fda6419
Show file tree
Hide file tree
Showing 8 changed files with 44 additions and 10 deletions.
2 changes: 1 addition & 1 deletion docs/developer/running-saleor/sentry.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Saleor provides integration with [Sentry](https://sentry.io/) - a comprehensive
## Environment variables

| Variable Name | Description |
|---------------|--------------------------|
| ------------- | ------------------------ |
| `SENTRY_DSN` | Sentry Data Source Name. |

If you need to customize the service, see the [official Sentry documentation for Django](https://docs.sentry.io/platforms/python/django/) for more details.
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ type Manifest {
#### [<code style={{ fontWeight: 'normal' }}>Manifest.<b>tokenTargetUrl</b></code>](#)<Bullet />[`String`](../../../api-reference/miscellaneous/scalars/string) <Badge class="badge badge--secondary" text="scalar"/>

> Endpoint used during process of app installation, [see installing an app.](https://docs.saleor.io/docs/3.x/developer/extending/apps/installing-apps#installing-an-app)
> Endpoint used during process of app installation, [see installing an app.](../../../developer/extending/apps/installing-apps#installing-an-app)
#### [<code style={{ fontWeight: 'normal' }}>Manifest.<b>dataPrivacy</b></code>](#)<Bullet />[`String`](../../../api-reference/miscellaneous/scalars/string) <Badge class="badge badge--deprecated badge--secondary" text="deprecated"/> <Badge class="badge badge--secondary" text="scalar"/>

Expand All @@ -157,7 +157,7 @@ type Manifest {
#### [<code style={{ fontWeight: 'normal' }}>Manifest.<b>extensions</b></code>](#)<Bullet />[`[AppManifestExtension!]!`](../../../api-reference/apps/objects/app-manifest-extension) <Badge class="badge badge--secondary" text="non-null"/> <Badge class="badge badge--secondary" text="object"/>

> List of extensions that will be mounted in Saleor's dashboard. For details, please [see the extension section.](https://docs.saleor.io/docs/3.x/developer/extending/apps/extending-dashboard-with-apps#key-concepts)
> List of extensions that will be mounted in Saleor's dashboard. For details, please [see the extension section.](../../../developer/extending/apps/extending-dashboard-with-apps#key-concepts)
#### [<code style={{ fontWeight: 'normal' }}>Manifest.<b>webhooks</b></code>](#)<Bullet />[`[AppManifestWebhook!]!`](../../../api-reference/apps/objects/app-manifest-webhook) <Badge class="badge badge--secondary" text="non-null"/> <Badge class="badge badge--secondary" text="object"/>

Expand Down
2 changes: 1 addition & 1 deletion versioned_docs/version-3.x/api-usage/developer-tools.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Saleor includes a GraphQL Playground, an interactive GraphQL editor, allowing ac

#### Admin authenticated playgrounds

In the admin dashboard use `CMD+'` this would open playground that would have admin rights of your respective user.
In the admin dashboard use `CMD+'`. This will open playground that has admin rights of your respective user.

#### Front-end playgrounds

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ feedback. However, it is still undergoing development and is subject to modifica
This guide describes a mutation allowing users to create and update multiple attributes in Saleor. The purpose of these mutations could be to import attributes from other systems.

:::caution
Mutations use the same data inputs as [`attributeCreate`](/docs/3.x/api-reference/attributes/mutations/attribute-create) and [`attributeUpdate`](/docs/3.x/api-reference/attributes/mutations/attribute-update) to keep it consistent between single and bulk mutations, but deprecated
fields from [`AttributeCreateInput`](/docs/3.x/api-reference/attributes/inputs/attribute-create-input), [`AttributeUpdateInput`](/docs/3.x/api-reference/attributes/inputs/attribute-update-input), [`AttributeValueCreateInput`](/docs/3.x/api-reference/attributes/inputs/attribute-value-create-input) and [`AttributeValueUpdateInput`](/docs/3.x/api-reference/attributes/inputs/attribute-value-update-input) are not supported in bulk mutations and using them will result in an error.
Mutations use the same data inputs as [`attributeCreate`](../../api-reference/attributes/mutations/attribute-create) and [`attributeUpdate`](../../api-reference/attributes/mutations/attribute-update) to keep it consistent between single and bulk mutations, but deprecated
fields from [`AttributeCreateInput`](../../api-reference/attributes/inputs/attribute-create-input), [`AttributeUpdateInput`](../../api-reference/attributes/inputs/attribute-update-input), [`AttributeValueCreateInput`](../../api-reference/attributes/inputs/attribute-value-create-input) and [`AttributeValueUpdateInput`](../../api-reference/attributes/inputs/attribute-value-update-input) are not supported in bulk mutations and using them will result in an error.

Those fields are:

Expand Down
6 changes: 6 additions & 0 deletions versioned_docs/version-3.x/developer/community/faq.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -153,3 +153,9 @@ query {
```

Please, note that you need `MANAGE_ORDERS` permission to perform this action.

## How do I test Transactions without a real payment gateway?

Please refer to the [Payments guide](developer/payments.mdx) on how to use the API.

You can also check the [community resouces](developer/payments.mdx#community-resources) for dummy payment app that can mimick payment gateway responses.
Original file line number Diff line number Diff line change
Expand Up @@ -350,3 +350,33 @@ export const productUpdatedWebhook =
query: ExampleProductUpdatedSubscription, // Or use plain string
});
```

### Saleor schema version inside context

From version 0.50.0 of `@saleor-sdk` have new field: `schemaVersion` inside context for `createHandler`:

```ts
export default orderCreatedWebhook.createHandler((req, res, context) => {
const { schemaVersion } = context;

console.log(schemaVersion);

// End with status 200
return res.status(200).end();
});
```

This field can be used to enable some feature based on the Saleor version. Before you use it make sure that your subscription have `version` field defined. If not `schemaVersion` will be `null`:

```diff
subscription {
event {
+ version
... on CalculateTaxes {
taxBase {
currency
}
}
}
}
```
Original file line number Diff line number Diff line change
Expand Up @@ -258,8 +258,6 @@ The application should return the status of the initialization and optionally `d
}
```

http://localhost:3000/docs/3.x/api-reference/payments/objects/payment-gateway-initialize-tokenization-error

The `result` field is an enum value of [PaymentGatewayInitializeTokenizationResultEnum](api-reference/payments/enums/payment-gateway-initialize-tokenization-result.mdx). In the event of returning a failure `result`, the `errors` message will be attached to the [error](api-reference/payments/objects/payment-gateway-initialize-tokenization.mdx) returned by the [paymentGatewayInitializeTokenization](api-reference/payments/mutations/payment-gateway-initialize-tokenization.mdx) mutation.

## Initialize payment method tokenization
Expand Down
4 changes: 2 additions & 2 deletions versioned_docs/version-3.x/developer/order-status.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ stateDiagram-v2
UNCONFIRMED --> UNFULFILLED: Order confirmed
UNCONFIRMED --> EXPIRED: Expire time has passed
UNCONFIRMED --> CANCELED: Cancel the order
UNCONFIRMED --> CANCELED: Order canceled
```

Expand Down Expand Up @@ -105,7 +105,7 @@ stateDiagram-v2
if_state_fulfillments --> FULFILLED: All products fulfilled
if_state_fulfillments --> PARTIALLY_FULFILLED: Products waiting for fulfillment
UNFULFILLED --> CANCELED: Cancel the order
UNFULFILLED --> CANCELED: Order canceled
UNFULFILLED --> if_state_returns: Return items
if_state_returns --> RETURNED: All products returned
Expand Down

0 comments on commit fda6419

Please sign in to comment.