Merge branch 'main' into feat/conditional-fields

Author: Baspa

.github/workflows/pr-auto-assign.yml

@@ -18,8 +18,8 @@ jobs:
       - name: Determine label based on branch prefix or author
         id: label
         run: |
-          # Check if it's a Dependabot PR
-          if [[ "${{ github.actor }}" == "dependabot[bot]" ]]; then
+          # Check if it's a Dependabot PR (using the PR author, not the workflow actor)
+          if [[ "${{ github.event.pull_request.user.login }}" == "dependabot[bot]" ]]; then
             echo "label=dependencies" >> $GITHUB_OUTPUT
           # Check branch prefixes
           elif [[ "${{ github.head_ref }}" == feature/* ]] || [[ "${{ github.head_ref }}" == feat/* ]]; then
@@ -34,7 +34,7 @@ jobs:
 
       - name: Add label to PR
         if: steps.label.outputs.label != ''
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             github.rest.issues.addLabels({
@@ -45,10 +45,15 @@ jobs:
             })
 
       - name: Assign reviewer and assignee
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             const assignee = 'baspa';
+            const prAuthor = context.payload.pull_request.user.login;
+            
+            console.log(`PR Author: ${prAuthor}`);
+            console.log(`Assignee: ${assignee}`);
+            console.log(`Are they the same? ${prAuthor.toLowerCase() === assignee.toLowerCase()}`);
             
             // Always assign as assignee (you can be assigned to your own PR)
             github.rest.issues.addAssignees({
@@ -59,8 +64,8 @@ jobs:
             });
             console.log(`Assigned ${assignee} as assignee`);
             
-            // Only assign reviewer if they are not the PR author
-            if (context.payload.pull_request.user.login !== assignee) {
+            // Only assign reviewer if they are not the PR author (case-insensitive comparison)
+            if (prAuthor.toLowerCase() !== assignee.toLowerCase()) {
               github.rest.pulls.requestReviewers({
                 owner: context.repo.owner,
                 repo: context.repo.repo,

resources/css/fields.css

@@ -1,59 +0,0 @@
-/* Hide Trix caption field for RichEditor when hideCaptions is enabled */
-
-/* Target the specific figcaption with attachment__caption class */
-[data-hide-captions="true"] figcaption.attachment__caption {
-    display: none !important;
-}
-
-/* Target figcaption with data-trix-placeholder attribute */
-[data-hide-captions="true"] figcaption[data-trix-placeholder] {
-    display: none !important;
-}
-
-/* Target any figcaption within the editor area */
-[data-hide-captions="true"] .trix-content figcaption,
-[data-hide-captions="true"] .trix-editor figcaption,
-[data-hide-captions="true"] .fi-fo-rich-editor figcaption {
-    display: none !important;
-}
-
-/* Target Filament's rich editor container */
-[data-hide-captions="true"] .fi-fo-rich-editor .trix-content figcaption,
-[data-hide-captions="true"] .fi-fo-rich-editor .trix-editor figcaption {
-    display: none !important;
-}
-
-/* More specific targeting for the attachment caption */
-[data-hide-captions="true"] .trix-content figure figcaption.attachment__caption,
-[data-hide-captions="true"] .trix-editor figure figcaption.attachment__caption {
-    display: none !important;
-}
-
-/* Hide the caption input field that appears when uploading images */
-[data-hide-captions="true"] .trix-content figcaption input,
-[data-hide-captions="true"] .trix-content figcaption textarea {
-    display: none !important;
-}
-
-/* Alternative selectors for different Trix versions */
-[data-hide-captions="true"] .trix-content .attachment__caption,
-[data-hide-captions="true"] .trix-content .attachment__name,
-[data-hide-captions="true"] .trix-content .attachment__size {
-    display: none !important;
-}
-
-/* Hide caption fields in the editor */
-[data-hide-captions="true"] .trix-content [data-trix-content-type] figcaption {
-    display: none !important;
-}
-
-/* Hide any caption-related elements */
-[data-hide-captions="true"] .trix-content .caption,
-[data-hide-captions="true"] .trix-content .image-caption {
-    display: none !important;
-}
-
-/* Global targeting for any figcaption when hideCaptions is enabled */
-[data-hide-captions="true"] figcaption {
-    display: none !important;
-} 

src/Concerns/HasContentCleaning.php

@@ -131,9 +131,9 @@ public function getForm(): array
                                 ->relationship('children')
                                 ->live(debounce: 250)
                                 ->labelKey('name')
-                                ->maxDepth(0)
                                 ->indentable(false)
-                                ->reorderable(true)
+                                ->moveable(true)
+                                ->reorderable(false)
                                 ->addable(fn (string $operation) => $operation !== 'create')
                                 ->disabled(fn (string $operation) => $operation === 'create')
                                 ->hint(fn (string $operation) => $operation === 'create' ? __('Fields can be added once the field is created.') : '')