Skip to content

Commit

Permalink
Merge branch 'main' into 3825-apply-new-column-picker-in-order-draft-…
Browse files Browse the repository at this point in the history
…list
  • Loading branch information
poulch committed Jul 7, 2023
2 parents 2397a2e + b09f2d5 commit f3b089e
Show file tree
Hide file tree
Showing 42 changed files with 5,006 additions and 2,125 deletions.
5 changes: 5 additions & 0 deletions .changeset/fast-apes-draw.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"saleor-dashboard": minor
---

Drop deprecated fields in transactionsAPI
5 changes: 5 additions & 0 deletions .changeset/grumpy-eagles-live.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"saleor-dashboard": patch
---

Set custom version within the workflow of deployments from main
5 changes: 5 additions & 0 deletions .changeset/plenty-deers-mate.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"saleor-dashboard": patch
---

Refactoring FilterContainer in filter feature
5 changes: 5 additions & 0 deletions .changeset/real-buckets-explode.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"saleor-dashboard": patch
---

Fix customer is not present in order list view
5 changes: 5 additions & 0 deletions .changeset/red-dogs-occur.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"saleor-dashboard": patch
---

Enable no-console ESLint rule
5 changes: 5 additions & 0 deletions .changeset/sour-onions-appear.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"saleor-dashboard": patch
---

Fix null-cheks for filters
6 changes: 6 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,12 @@
"paths": ["lodash", "@material-ui/icons/Delete", "classnames"]
}
],
"no-console": [
"error",
{
"allow": ["warn", "error"]
}
],
// These rules should be reviewed - tracked in
// Tracked in https://github.com/saleor/saleor-dashboard/issues/3813
"@typescript-eslint/consistent-type-imports": "off",
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/deploy-master-staging.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ jobs:
IS_CLOUD_INSTANCE: true
steps:
- uses: actions/checkout@v2
- name: Set custom version
run: |
HASH=$(git rev-parse --short HEAD)
CURRENT_VERSION=$(jq -r .version package.json)
echo "CUSTOM_VERSION=${CURRENT_VERSION}-${HASH}" >> $GITHUB_ENV
- name: Setup Node
uses: actions/setup-node@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ jobs:
env:
CI: true
SALEOR_CLI_ENV: staging
run: npx saleor backup restore XXDODfk2 --skip-webhooks-update
run: npx saleor backup restore 3R5IPRr6 --skip-webhooks-update

- name: Notify Slack
if: ${{ failure() }}
Expand Down
Loading

0 comments on commit f3b089e

Please sign in to comment.