Merge branch 'main' into delete-multiple-product-test

.changeset/curvy-houses-nail.md

@@ -0,0 +1,5 @@
+---
+"saleor-dashboard": patch
+---
+
+Fix sentry upload and custom version scripts

.changeset/modern-spiders-talk.md

@@ -0,0 +1,5 @@
+---
+"saleor-dashboard": patch
+---
+
+Emit release for sentry from workflow

.changeset/pink-hornets-shout.md

@@ -0,0 +1,5 @@
+---
+"saleor-dashboard": minor
+---
+
+Add Category and Collections columns to the product list datagrid.

.changeset/six-eggs-march.md

@@ -0,0 +1,5 @@
+---
+"saleor-dashboard": patch
+---
+
+Bump @adobe/css-tools from 4.3.1 to 4.3.2

.changeset/stupid-experts-attack.md

@@ -0,0 +1,5 @@
+---
+"saleor-dashboard": patch
+---
+
+Stop deploying dashboard to demos

.github/workflows/deploy-cloud.yaml

@@ -31,6 +31,12 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version-file: ".nvmrc"
+      - name: Set sentry release
+        run: |
+          HASH=$(git rev-parse --short HEAD)
+          CURRENT_VERSION=$(jq -r .version package.json)
+          RELEASE="${CURRENT_VERSION}-${HASH}"
+          echo "SENTRY_RELEASE=${RELEASE}" >> $GITHUB_ENV
       - name: Package
         timeout-minutes: 15
         run: |

.github/workflows/deploy-master-staging.yaml

@@ -25,8 +25,9 @@ jobs:
         run: |
           HASH=$(git rev-parse --short HEAD)
           CURRENT_VERSION=$(jq -r .version package.json)
-          echo "CUSTOM_VERSION=${CURRENT_VERSION}-${HASH}" >> $GITHUB_ENV
-
+          RELEASE="${CURRENT_VERSION}-${HASH}"
+          echo "CUSTOM_VERSION=${RELEASE}" >> $GITHUB_ENV
+          echo "SENTRY_RELEASE=${RELEASE}" >> $GITHUB_ENV
       - name: Setup Node
         uses: actions/setup-node@v3
         with:

.github/workflows/deploy-staging.yaml

@@ -50,8 +50,11 @@ jobs:
         # Add commit hash to basic version number
         run: |
           set -x
-          hash=$(git rev-parse --short HEAD)
-          echo "CUSTOM_VERSION=${VERSION}-${hash}" >> $GITHUB_ENV
+          HASH=$(git rev-parse --short HEAD)
+          CURRENT_VERSION=$(jq -r .version package.json)
+          RELEASE="${CURRENT_VERSION}-${HASH}"
+          echo "CUSTOM_VERSION=${RELEASE}" >> $GITHUB_ENV
+          echo "SENTRY_RELEASE=${RELEASE}" >> $GITHUB_ENV
 
       - name: Setup Node
         uses: actions/setup-node@v3

.github/workflows/prepare-release.yml

@@ -64,6 +64,12 @@ jobs:
           environment=$(echo $VERSION | sed -n 's#\([0-9]\+\).\([0-9]\+\).*#saleor-staging-v\1\2#p')
           echo "ENVIRONMENT=${environment}" >> $GITHUB_ENV
 
+      - name: Set sentry release
+        run: |
+          HASH=$(git rev-parse --short HEAD)
+          VERSION=$(jq -r .version package.json)
+          echo "SENTRY_RELEASE=${VERSION}-${HASH}" >> $GITHUB_ENV
+
       - name: Setup Node
         uses: actions/setup-node@v3
         with:

locale/defaultMessages.json

@@ -1654,6 +1654,10 @@
     "context": "apps section name",
     "string": "Apps"
   },
+  "9qKFTA": {
+    "context": "Product category",
+    "string": "Category"
+  },
   "9scTQ0": {
     "context": "section header",
     "string": "Product Attributes"
@@ -6670,6 +6674,10 @@
     "context": "channel name",
     "string": "Channel Name"
   },
+  "j08fR9": {
+    "context": "Product collections",
+    "string": "Collections"
+  },
   "j0ugM4": {
     "context": "Manage and Update your warehouse information",
     "string": "Exchange Rates"

package.json

@@ -342,7 +342,7 @@
     "test:watch": "jest --watch src/",
     "lint": "eslint \"src/**/*.@(tsx|ts|jsx|js)\" --fix",
     "lint:check-progress": "eslint-nibble \"src/**/*.@(tsx|ts|jsx|js)\"",
-    "prebuild": "./scripts/sentry-init.sh && npm run build-types",
+    "prebuild": "npm run build-types",
     "postbuild": "./scripts/sentry-upload.sh",
     "predev": "npm run build-types",
     "release": "echo $npm_package_version | xargs git tag && git push --follow-tags",

scripts/sentry-upload.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 if [[ -z "${SENTRY_ORG}" ]]; then
   echo "Sentry not definied. Skipping uploading..."
 else 

src/config.ts

@@ -37,7 +37,9 @@ export type ProductListColumns =
   | "description"
   | "availability"
   | "price"
-  | "date";
+  | "date"
+  | "productCategory"
+  | "productCollections";
 
 export interface AppListViewSettings {
   [ListViews.APPS_LIST]: ListSettings;

src/fragments/products.ts

@@ -110,6 +110,14 @@ export const productFragment = gql`
       name
       hasVariants
     }
+    category @include(if: $includeCategories) {
+      id
+      name
+    }
+    collections @include(if: $includeCollections) {
+      id
+      name
+    }
     channelListings {
       ...ChannelListingProductWithoutPricing
       pricing @include(if: $hasChannel) {

src/graphql/hooks.generated.ts

@@ -2371,6 +2371,14 @@ export const ProductWithChannelListingsFragmentDoc = gql`
     name
     hasVariants
   }
+  category @include(if: $includeCategories) {
+    id
+    name
+  }
+  collections @include(if: $includeCollections) {
+    id
+    name
+  }
   channelListings {
     ...ChannelListingProductWithoutPricing
     pricing @include(if: $hasChannel) {
@@ -14213,7 +14221,7 @@ export type InitialProductFilterProductTypesQueryHookResult = ReturnType<typeof
 export type InitialProductFilterProductTypesLazyQueryHookResult = ReturnType<typeof useInitialProductFilterProductTypesLazyQuery>;
 export type InitialProductFilterProductTypesQueryResult = Apollo.QueryResult<Types.InitialProductFilterProductTypesQuery, Types.InitialProductFilterProductTypesQueryVariables>;
 export const ProductListDocument = gql`
-    query ProductList($first: Int, $after: String, $last: Int, $before: String, $filter: ProductFilterInput, $search: String, $where: ProductWhereInput, $channel: String, $sort: ProductOrder, $hasChannel: Boolean!) {
+    query ProductList($first: Int, $after: String, $last: Int, $before: String, $filter: ProductFilterInput, $search: String, $where: ProductWhereInput, $channel: String, $sort: ProductOrder, $hasChannel: Boolean!, $includeCategories: Boolean!, $includeCollections: Boolean!) {
   products(
     before: $before
     after: $after
@@ -14269,6 +14277,8 @@ ${ProductListAttributeFragmentDoc}`;
  *      channel: // value for 'channel'
  *      sort: // value for 'sort'
  *      hasChannel: // value for 'hasChannel'
+ *      includeCategories: // value for 'includeCategories'
+ *      includeCollections: // value for 'includeCollections'
  *   },
  * });
  */