Skip to content

Commit ca16b6a

Browse files
authored
Merge branch 'main' into fix-e2e-notifiactions-check
2 parents 6a88f22 + 5b88aac commit ca16b6a

174 files changed

Lines changed: 4005 additions & 3041 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.changeset/frank-vans-drum.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.github/workflows/publish-containers.yml

Lines changed: 55 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -5,69 +5,77 @@ on:
55
types: [published]
66

77
jobs:
8-
docker:
8+
prepare-variables:
9+
name: Prepare variables
910
runs-on: ubuntu-22.04
10-
1111
permissions:
1212
contents: read
13-
packages: write
14-
13+
outputs:
14+
image_name: ${{ steps.get-image-name.outputs.image_name }}
15+
labels: ${{ steps.metadata.outputs.labels }}
16+
tags: ${{ steps.metadata.outputs.tags }}
17+
version: ${{ steps.metadata.outputs.version }}
1518
steps:
16-
- name: Checkout
17-
uses: actions/checkout@v4
18-
19-
# Outputs the name of the repository (owner/repo)
20-
- name: Build Image Name
21-
id: image
19+
- name: Get GHCR image name (owner/repo)
20+
id: get-image-name
21+
env:
22+
GH_REPO: ${{ github.repository }}
2223
run: |
23-
IMAGE_NAME=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]')
24-
echo "image_name=$IMAGE_NAME" >> $GITHUB_OUTPUT
24+
# github.repository is already in owner/repo format required
25+
# by GHCR; normalize it to lowercase.
26+
GHCR_IMAGE_NAME="${GH_REPO,,}"
27+
echo "image_name=$GHCR_IMAGE_NAME" >> $GITHUB_OUTPUT
2528
26-
- name: Docker meta
27-
id: meta
29+
# Required by docker/metadata-action
30+
- name: Checkout
31+
uses: actions/checkout@v6
32+
33+
- name: Docker metadata
34+
id: metadata
2835
uses: docker/metadata-action@v5
2936
with:
3037
images: |
31-
ghcr.io/${{ steps.image.outputs.image_name }}
38+
ghcr.io/${{ steps.get-image-name.outputs.image_name }}
3239
tags: |
3340
type=ref,event=branch
3441
type=pep440,pattern={{version}}
3542
type=pep440,pattern={{major}}.{{minor}}
43+
context: git
3644

37-
- name: Set up QEMU
38-
uses: docker/setup-qemu-action@v3
39-
with:
40-
platforms: arm64
4145

42-
- name: Set up Docker Buildx
43-
id: buildx
44-
uses: docker/setup-buildx-action@v3
46+
build-push:
47+
needs: prepare-variables
48+
uses: saleor/saleor-internal-actions/.github/workflows/build-push-image-multi-platform.yaml@92c29aa0e4545de579b892b2ef9f2d6366c29c11 # v1.5.2
49+
permissions:
50+
contents: read
51+
id-token: write # needed for AWS/ECR login (not used, but required permission)
52+
packages: write # needed for GHCR
53+
with:
54+
checkout-ref: ${{ github.ref }}
4555

46-
- name: Login to GitHub Container Registry
47-
uses: docker/login-action@v3
48-
with:
49-
registry: ghcr.io
50-
username: ${{ github.actor }}
51-
password: ${{ secrets.GITHUB_TOKEN }}
56+
enable-ghcr: true
57+
oci-full-repository: ghcr.io/${{ needs.prepare-variables.outputs.image_name }}
58+
tags: ${{ needs.prepare-variables.outputs.tags }}
59+
labels: ${{ needs.prepare-variables.outputs.labels }}
60+
61+
amd64-runner-image: ubuntu-24.04
62+
arm64-runner-image: ubuntu-24.04-arm
63+
64+
build-args: |
65+
COMMIT_ID=${{ github.sha }}
66+
PROJECT_VERSION=${{ needs.prepare-variables.outputs.version }}
5267
53-
- name: Build and Push
54-
id: docker_build
55-
uses: docker/build-push-action@v5
56-
with:
57-
builder: ${{ steps.buildx.outputs.name }}
58-
cache-from: type=gha
59-
cache-to: type=gha,mode=max
60-
context: .
61-
labels: ${{ steps.meta.outputs.labels }}
62-
platforms: linux/amd64,linux/arm64
63-
push: true
64-
tags: ${{ steps.meta.outputs.tags }}
65-
build-args: |
66-
COMMIT_ID=${{ github.sha }}
67-
PROJECT_VERSION=${{ steps.meta.outputs.version }}
6868
69-
- name: Image digest
69+
summary:
70+
needs: [prepare-variables, build-push]
71+
runs-on: ubuntu-22.04
72+
permissions:
73+
contents: read
74+
steps:
75+
- name: Display image digest and pushed tags
76+
env:
77+
tags: ${{ needs.prepare-variables.outputs.tags }}
78+
digest: ${{ needs.build-push.outputs.digest }}
7079
run: |
71-
echo $"\
72-
Digest: ${{ steps.docker_build.outputs.digest }}
73-
Tags: ${{ steps.meta.outputs.tags }}"
80+
echo "Tags: $tags"
81+
echo "Digest: $digest"

AGENTS.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,21 @@ The codebase follows a feature-based architecture with shared components:
127127
- Implement proper form validation with React Hook Form
128128
- Add internationalization support for user-facing text
129129

130+
### UI Design Guidelines
131+
132+
**Before redesigning any component that displays a list, ask: "What happens with 50+ items?"**
133+
134+
If the list could be long:
135+
136+
- Add scrollable container with `max-height`
137+
- Keep headers outside the scroll area
138+
- Auto-scroll to active item on load
139+
140+
Other considerations:
141+
142+
- Loading states: Show skeletons
143+
- Empty states: Handle zero items gracefully
144+
130145
### Testing Requirements
131146

132147
- Write unit tests for utility functions and complex components

CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
# Changelog
22

3+
## 3.22.29
4+
5+
### Patch Changes
6+
7+
- [#6284](https://github.com/saleor/saleor-dashboard/pull/6284) [`1a8279b`](https://github.com/saleor/saleor-dashboard/commit/1a8279b4f104220a6e0e79bcbccd8364cfa97831) Thanks [@xseignard](https://github.com/xseignard)! - Added metadata editing dialog for warehouses, allowing users to manage both public and private metadata through a dedicated modal accessible from the warehouse details page.
8+
9+
- [#6299](https://github.com/saleor/saleor-dashboard/pull/6299) [`cee423f`](https://github.com/saleor/saleor-dashboard/commit/cee423f98f59f76842482236e7d5bbab971222cf) Thanks [@mirekm](https://github.com/mirekm)! - Fix visibility of checkboxes (when focused) in DataGrid
10+
11+
- [#6300](https://github.com/saleor/saleor-dashboard/pull/6300) [`57e859a`](https://github.com/saleor/saleor-dashboard/commit/57e859a13b6b9e1670c358a9ad2291a63356c0f2) Thanks [@mirekm](https://github.com/mirekm)! - Fix variant form initialisation
12+
13+
- [#6285](https://github.com/saleor/saleor-dashboard/pull/6285) [`d65d066`](https://github.com/saleor/saleor-dashboard/commit/d65d06657d599c7a638c5b164acd3cb32fdee68f) Thanks [@mirekm](https://github.com/mirekm)! - Improved Variants Generator to support required non-selection attributes with a dedicated tab. Also added contextual tooltips explaining why generation is disabled.
14+
15+
- [#6301](https://github.com/saleor/saleor-dashboard/pull/6301) [`d097e37`](https://github.com/saleor/saleor-dashboard/commit/d097e370223d4088257994268409f4f863f8a09f) Thanks [@mirekm](https://github.com/mirekm)! - Attribute configuration: allow users to filter attribute values by slug or name when there are more than 5 values.
16+
17+
- [#6276](https://github.com/saleor/saleor-dashboard/pull/6276) [`d0f142e`](https://github.com/saleor/saleor-dashboard/commit/d0f142e077b11f44d18f8e7e40a621c2416d13cf) Thanks [@mirekm](https://github.com/mirekm)! - Improve table design consistency across the dashboard with unified styling for ResponsiveTable components, better loading states, and improved scroll behavior for variant navigation
18+
319
## 3.22.28
420

521
### Patch Changes

0 commit comments

Comments
 (0)