From 193af6d44c12e0d641e29df473b34ac7cdd56d52 Mon Sep 17 00:00:00 2001
From: Fabian Gerke <124085586+FabianGerke@users.noreply.github.com>
Date: Fri, 15 Nov 2024 11:44:33 +0100
Subject: [PATCH 1/2] feat: show images count in sitemap table (#807)

---
 apps/web/public/sitemap_style.xsl | 8 ++++++--
 docs/changelog/changelog_en.md    | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/apps/web/public/sitemap_style.xsl b/apps/web/public/sitemap_style.xsl
index 96ae35a4d..b8344e844 100644
--- a/apps/web/public/sitemap_style.xsl
+++ b/apps/web/public/sitemap_style.xsl
@@ -150,8 +150,9 @@
                 <table id="sitemap" cellpadding="3">
                   <thead>
                     <tr>
-                      <th width="75%">URL</th>
-                      <th width="25%">Last Modified</th>
+                      <th width="70%">URL</th>
+                      <th width="10%">Images</th>
+                      <th width="20%">Last Modified</th>
                     </tr>
                   </thead>
                   <tbody>
@@ -167,6 +168,9 @@
                             <xsl:value-of select="sitemap:loc"/>
                           </a>
                         </td>
+                        <td>
+                          <xsl:value-of select="count(image:image)"/>
+                        </td>
                         <td>
                           <xsl:value-of select="sitemap:lastmod"/>
                         </td>
diff --git a/docs/changelog/changelog_en.md b/docs/changelog/changelog_en.md
index e39a04c3c..6224bab47 100644
--- a/docs/changelog/changelog_en.md
+++ b/docs/changelog/changelog_en.md
@@ -43,6 +43,7 @@
 - Enabled font color customization for the hero banner via a template property.
 - Added a new carousel compoment.
 - Added an edit mode toolbar and JSON editor for the front end. Note that this is a preparatory step. Further functionality will be added in an upcoming version.
+- Added the image count to the item sitemaps.
 
 ### 🩹 Fixed
 

From 9554dec46e8d03a8cfe6ef37fef10a298bee128f Mon Sep 17 00:00:00 2001
From: Kevin Stederoth <43753494+ksted@users.noreply.github.com>
Date: Mon, 18 Nov 2024 07:22:24 +0100
Subject: [PATCH 2/2] ci: add upload to staging instance (#793)

* ci: add upload to staging instance

* ci: allow manual deployment to either environment

* docs: update changelog
---
 .github/workflows/upload.yml   | 32 +++++++++++++++++++++++++-------
 docs/changelog/changelog_en.md |  9 +++++++++
 2 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/upload.yml b/.github/workflows/upload.yml
index 94574c2ee..b721bf035 100644
--- a/.github/workflows/upload.yml
+++ b/.github/workflows/upload.yml
@@ -1,12 +1,20 @@
 name: Deploy PWA
 
 on:
-  # release:
-  #   types: [published]
-  # push:
-  #   branches: [main]
+  release:
+    types: [published]
+  push:
+    branches: [main]
   workflow_dispatch:
     inputs:
+      environment:
+        description: 'The environment to deploy to'
+        type: choice
+        required: true
+        default: 'staging'
+        options:
+          - staging
+          - production
       tag-version:
         description: 'The tag version, branch name or SHA to checkout'
         required: true
@@ -22,7 +30,7 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
         with:
-          ref: ${{ inputs.tag-version }}
+          ref: ${{ inputs.tag-version || github.ref }}
 
       - name: Enable corepack
         run: corepack enable
@@ -84,10 +92,20 @@ jobs:
             ./middleware
           outPath: pwa.tar.gz
 
-      - name: Upload File
-        id: upload
+      - name: Upload build to production
+        if: github.event_name == 'release'  || (github.event_name == 'workflow_dispatch' && ${{ inputs.environment }} == 'production')
+        id: upload-production
         uses: JantHsueh/upload-file-action@1.0
         with:
           url: 'https://pwapublish.plentysystems.com'
           forms: '{ "token": "${{ secrets.URL_ENDPOINT_TOKEN }}" }'
           fileForms: '{ "file": "pwa.tar.gz" }'
+
+      - name: Upload build to staging
+        if: github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && ${{ inputs.environment }} == 'staging')
+        id: upload-staging
+        uses: JantHsueh/upload-file-action@1.0
+        with:
+          url: 'https://pwapublish.plentysystems.com'
+          forms: '{ "token": "${{ secrets.URL_ENDPOINT_TOKEN_STAGING }}" }'
+          fileForms: '{ "file": "pwa.tar.gz" }'
diff --git a/docs/changelog/changelog_en.md b/docs/changelog/changelog_en.md
index 6224bab47..d398dd93d 100644
--- a/docs/changelog/changelog_en.md
+++ b/docs/changelog/changelog_en.md
@@ -13,6 +13,15 @@
 - Newsletter email confirmation
 - The default data for the homepage is now available for both English and German.
 
+#### GitHub Action: Upload
+
+The **Upload** action now supports deploying the PWA to different environments:
+
+- Production: triggered manually or when creating a GitHub release
+- Staging: triggered manually or when pushing a change to the `main` branch
+
+Each client supports two PWA instances. With this change, you can designate the live instance as the production environment and the preview instance as the staging environment. The production environment uses the GitHub Actions Secret `URL_ENDPOINT_TOKEN`; the staging environment uses the GitHub Actions Secret `URL_ENDPOINT_TOKEN_STAGING`.
+
 ### 🩹 Fixed
 
 - Load more accurate images sizes for product page.