Merge remote-tracking branch 'upstream/development' into development

Author: github-actions[bot]

.github/workflows/branch-deletion-pr-creation.yml

@@ -38,10 +38,18 @@ jobs:
 
       - name: Process branches
         id: branch-data
+        env:
+          MIN_AGE_DAYS: ${{ github.event.inputs.min_age_days || '27' }}
         run: |
           set -e
           ALL_BRANCHES=$(git branch -r | grep -v "origin/HEAD" | sed 's/origin\///')
-          MIN_AGE_DAYS=${{ github.event.inputs.min_age_days || 27 }}
+          MIN_AGE_DAYS=${MIN_AGE_DAYS:-27}
+
+          echo "MIN_AGE_DAYS=${MIN_AGE_DAYS}"
+
+          PROTECTED_COUNT=0
+          MERGED_COUNT=0
+          UNMERGED_COUNT=0
 
           PROTECTED_BRANCHES=()
           MERGED_BRANCHES_TO_PROCESS=()
@@ -54,38 +62,56 @@ jobs:
 
           for BRANCH in $ALL_BRANCHES; do
             branch_lower=$(echo "$BRANCH" | tr '[:upper:]' '[:lower:]')
-            if [[ $branch_lower =~ (backup|development|main|master|production) ]]; then
-              PROTECTED_BRANCHES+=("$BRANCH (protected)")
+            if [[ $branch_lower == *backup* || $branch_lower =~ ^(development|main|master|production)(-[0-9]+)?$ ]]; then
+              PROTECTED_BRANCHES+=("$BRANCH")
+              PROTECTED_COUNT=$((PROTECTED_COUNT+1))
             elif git branch -r --merged origin/development | grep -q "origin/$BRANCH"; then
               MERGED_BRANCHES_TO_PROCESS+=("$BRANCH")
+              MERGED_COUNT=$((MERGED_COUNT+1))
             else
-              UNMERGED_BRANCHES+=("$BRANCH (not merged)")
+              UNMERGED_BRANCHES+=("$BRANCH")
+              UNMERGED_COUNT=$((UNMERGED_COUNT+1))
             fi
           done
 
+          echo "branch totals: protected=${PROTECTED_COUNT} merged=${MERGED_COUNT} unmerged=${UNMERGED_COUNT}"
+
           for BRANCH in "${MERGED_BRANCHES_TO_PROCESS[@]}"; do
             MERGE_HASH=$(git log --grep="Merge branch.*$BRANCH" origin/development -n 1 --pretty=format:"%H" || true)
-            [ -z "$MERGE_HASH" ] && MERGE_HASH=$(git log -n 1 origin/$BRANCH --pretty=format:"%H")
-            
-            MERGE_DATE=$(git show -s --format=%ct $MERGE_HASH)
-            DAYS_AGO=$(( ($(date +%s) - MERGE_DATE) / 86400 ))
-            
+            if [ -z "$MERGE_HASH" ]; then
+              MERGE_HASH=$(git log -n 1 origin/$BRANCH --pretty=format:"%H" || true)
+            fi
+
+            if [ -z "$MERGE_HASH" ]; then
+              echo "WARN: no merge commit found for $BRANCH — skipping"
+              UNMERGED_BRANCHES+=("$BRANCH (no-merge-hash)")
+              UNMERGED_COUNT=$((UNMERGED_COUNT+1))
+              continue
+            fi
+
+            MERGE_DATE_EPOCH=$(git show -s --format=%ct $MERGE_HASH 2>/dev/null || true)
+            if [ -z "$MERGE_DATE_EPOCH" ]; then
+              echo "WARN: could not read commit date for $BRANCH (hash=$MERGE_HASH) — skipping"
+              UNMERGED_BRANCHES+=("$BRANCH (no-merge-date)")
+              UNMERGED_COUNT=$((UNMERGED_COUNT+1))
+              continue
+            fi
+
+            DAYS_AGO=$(( ($(date +%s) - MERGE_DATE_EPOCH) / 86400 ))
+
             if [[ $DAYS_AGO -ge $MIN_AGE_DAYS ]]; then
-              BRANCHES_TO_DELETE+=("$BRANCH")
+              BRANCHES_TO_DELETE+=("$BRANCH (${DAYS_AGO}d since merge)")
             else
-              BRANCHES_TOO_RECENT+=("$BRANCH (too recent: ${DAYS_AGO}d)")
+              BRANCHES_TOO_RECENT+=("$BRANCH (${DAYS_AGO}d since merge)")
             fi
+            echo "checked $BRANCH: hash=$MERGE_HASH date=$MERGE_DATE_EPOCH days=${DAYS_AGO}"
           done
 
-           ALL_NON_DELETED=(
-            "${PROTECTED_BRANCHES[@]}" 
-            "${BRANCHES_TOO_RECENT[@]}"
-            "${UNMERGED_BRANCHES[@]}"
-          )
-
           echo "HAS_BRANCHES=$([ ${#BRANCHES_TO_DELETE[@]} -gt 0 ] && echo true || echo false)" >> $GITHUB_ENV
           echo "BRANCHES_TO_DELETE=$(printf -- '- %s\n' "${BRANCHES_TO_DELETE[@]}" | jq -Rs .)" >> $GITHUB_ENV
-          echo "ALL_NON_DELETED=$(printf -- '- %s\n' "${ALL_NON_DELETED[@]}" | jq -Rs .)" >> $GITHUB_ENV
+          echo "PROTECTED_BRANCHES=$(printf -- '- %s\n' "${PROTECTED_BRANCHES[@]}" | jq -Rs .)" >> $GITHUB_ENV
+          echo "BRANCHES_TOO_RECENT=$(printf -- '- %s\n' "${BRANCHES_TOO_RECENT[@]}" | jq -Rs .)" >> $GITHUB_ENV
+          echo "UNMERGED_BRANCHES=$(printf -- '- %s\n' "${UNMERGED_BRANCHES[@]}" | jq -Rs .)" >> $GITHUB_ENV
 
       - name: Create Deletion PR
         if: env.HAS_BRANCHES == 'true'
@@ -97,8 +123,14 @@ jobs:
             ### Branches for Deletion
             ${{ fromJSON(env.BRANCHES_TO_DELETE) }}
 
-            ### Protected/Recent Branches
-            ${{ fromJSON(env.ALL_NON_DELETED) }}
+            ### Protected Branches
+            ${{ fromJSON(env.PROTECTED_BRANCHES) }}
+
+            ### Recent Merges (too recent to delete)
+            ${{ fromJSON(env.BRANCHES_TOO_RECENT) }}
+
+            ### Unmerged Branches
+            ${{ fromJSON(env.UNMERGED_BRANCHES) }}
           base: development
           labels: Internal WIP
           assignees: MarkvanMents,OlufunkeMoronfolu

.gitignore

@@ -8,6 +8,7 @@ hugo.exe
 /.hugo_build.lock
 /.claude/audit.log
 /.claude/settings.local.json
+/.mcp.json
 
 # For Mac users
 .DS_Store

content/en/docs/community-tools/contribute-to-mendix-docs/markdown-shortcodes.md

@@ -189,7 +189,7 @@ If the tab pane contains code with an asterisk (`*`) in it, the linter rule for
 
 Mendix videos are hosted on Vidyard. For more information, see [the Videos section of the Style Guide](https://mendix.atlassian.net/wiki/spaces/RNDHB/pages/2510061889/Images+Icons+and+Videos#Videos).
 
-{{< vidyard "GwE17mzGma5NAvDnXrVdFA" >}}
+{{< vidyard id="GwE17mzGma5NAvDnXrVdFA" date_updated="YYYY-MM-DD" >}}
 
 ## Other Markdown and HTML Guidelines
 

content/en/docs/deployment/on-premises-design/ms-windows/sql-server/restoring-a-sql-server-database.md

@@ -15,7 +15,7 @@ This how-to teaches you how to do the following:
 
 For a deep-dive look into this action, check out this video:
 
-{{< vidyard "WZu7QtHZPjtYUTdcV58PKr?" >}}
+{{< vidyard id="WZu7QtHZPjtYUTdcV58PKr?" >}}
 
 ## Prerequisites
 

content/en/docs/developerportal/digital-execution/implement-mendix/mendix-ecosystem.md

@@ -10,7 +10,7 @@ aliases:
 
 ## Introduction
 
-{{< vidyard "AVffVf7KCVt7h1ioBvUQ1f" >}} 
+{{< vidyard id="AVffVf7KCVt7h1ioBvUQ1f" >}} 
 
 This section offers an overview of the Mendix platform, and outlines the 5 P’s of Digital Transformation and their importance to your Mendix success.  
 

content/en/docs/howto8/front-end/customize-styling/calypso.md

@@ -19,7 +19,7 @@ Calypso is the easiest styling solution for most users. However, if you already
 
 For a deep-dive look into styling with Calypso, check out this video:
 
-{{< vidyard "M2NCccTnfnh7Yx2gjEyBpf" >}}
+{{< vidyard id="M2NCccTnfnh7Yx2gjEyBpf" >}}
 
 ## Prerequisites
 

content/en/docs/howto8/general/dev-best-practices.md

@@ -18,7 +18,7 @@ Even with the powerful navigation and search support in Mendix Studio Pro, adher
 
 For a deep-dive look into implementing such best practices, check out this video:
 
-{{< vidyard "exmmApZY4jMYxqidrzehEQ" >}}
+{{< vidyard id="exmmApZY4jMYxqidrzehEQ" >}}
 
 ## Project Setup
 

content/en/docs/howto8/general/install.md

@@ -11,7 +11,7 @@ Mendix Studio Pro enables you to build apps on the Mendix Platform. This how-to
 
 For a deep-dive demonstration of how to install Studio Pro, follow along in this video:
 
-{{< vidyard "WUp2tLi68nXFQd7xhPbDtt" >}}
+{{< vidyard id="WUp2tLi68nXFQd7xhPbDtt" >}}
 
 ## Prerequisites
 

content/en/docs/marketplace/genai/mendix-cloud-genai/navigate_mxgenai.md

@@ -58,11 +58,17 @@ After a resource is provisioned, you can change its plan size, either upgrade or
 
 ### Team
 
-{{< figure src="/attachments/appstore/platform-supported-content/modules/genai/navigate_mxgenai/GenAIResource_Team.png" >}}
+{{< figure src="/attachments/appstore/platform-supported-content/modules/genai/navigate_mxgenai/genai-resource-team.png" >}}
 
-The **Team** page allows you to manage access to the Mendix Cloud GenAI resource. All users listed in this overview have access to the resource in the GenAI resource portal and can create new keys or invite new users. You can add new users via the **Add Member** button and remove them using the **Remove Member** button next to their name in the overview.
+The **Team** page allows you to manage access to the Mendix Cloud GenAI resource. By default, internal members listed in this **Overview** have access to the resource in the GenAI resource portal and can create new keys or invite new users. You can add new users via the **Add Member** button and remove them using the **Remove Member** button next to their name in the overview.
 
-{{% alert color="info" %}}Currently, you can only invite people within the same organization.{{% /alert %}} 
+#### Inviting External Members
+
+You can invite members from outside your organization to access your GenAI resources by entering their email address in **Add Member**. This option is available only if your company admin has enabled external user invitations. 
+
+You can track invitations in the **Pending Invites** tab. Invited users will receive an email with a link to accept or decline the invitation. If they do not yet have a Mendix account, the link redirects them to create one. Once the invitation is accepted, the resource will appear in their GenAI portal overview.
+
+Pending invitations can be withdrawn at any time and will automatically expire after two weeks. External members can create and delete keys, export consumption data, manage knowledge base content and collections, and change the model. However, they can not modify the display name or environment, or manage team membership.
 
 ### Keys
 

content/en/docs/marketplace/platform-supported-content/modules/native-mobile-resources.md

@@ -11,9 +11,9 @@ The [Native Mobile Resources](https://marketplace.mendix.com/link/component/1095
 
 For excellent deep-dive demonstrations of how to use these native mobile widgets, check out the videos below on the [Carousel](#carousel) and [Popup Menu](#popup-menu) widgets:
 
-{{< vidyard "2Mzw7r4zLuyrvDcP1bhz4j" >}}
+{{< vidyard id="2Mzw7r4zLuyrvDcP1bhz4j" >}}
 
-{{< vidyard "wBDgxvFKGwFYkyxKhpHVLT" >}}
+{{< vidyard id="wBDgxvFKGwFYkyxKhpHVLT" >}}
 
 {{% alert color="info" %}}
 Native Mobile Resources v3.1.4 and above will indicate their version inside *themesource/nativemobileresources/.version* located in the app directory. Versions v3.1.3 and below included a constant in the module indicating version.