Merge branch '5.x' of https://github.com/statamic/cms into starter-ki…

…t-module-folders
statamic · Dec 19, 2024 · f4e122c · f4e122c
2 parents 03741d6 + 0b6e0d2
commit f4e122c
Show file tree

Hide file tree

Showing 50 changed files with 974 additions and 57 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,68 @@
 # Release Notes
 
+## 5.44.0 (2024-12-18)
+
+### What's new
+- Static warm command will recheck whether page is cached when using queue [#11273](https://github.com/statamic/cms/issues/11273) by @arthurperton
+- Add `--max-requests` option to the static warm command [#11278](https://github.com/statamic/cms/issues/11278) by @arthurperton
+- Add formStackSize option for inline publish form stacks [#11274](https://github.com/statamic/cms/issues/11274) by @duncanmcclean
+
+### What's fixed
+- Fix addon service provider autoloading [#11285](https://github.com/statamic/cms/issues/11285) by @jasonvarga
+- Fix CP thumbnail placeholder [#11279](https://github.com/statamic/cms/issues/11279) by @duncanmcclean
+- Fix replicator preview for Group fields [#11280](https://github.com/statamic/cms/issues/11280) by @duncanmcclean
+
+
+
+## 5.43.2 (2024-12-18)
+
+### What's fixed
+- Fix static properties in addon providers [#11283](https://github.com/statamic/cms/issues/11283) by @jasonvarga
+
+
+
+## 5.43.1 (2024-12-18)
+
+### What's fixed
+- Fix autoload error on Windows [#11282](https://github.com/statamic/cms/issues/11282) by @jasonvarga
+- Improve starter kit installer error handling [#11281](https://github.com/statamic/cms/issues/11281) by @jesseleite
+
+
+
+## 5.43.0 (2024-12-17)
+
+### What's new
+- Add filters from collection/taxonomy list to breadcrumb back link [#11243](https://github.com/statamic/cms/issues/11243) by @florianbrinkmann
+- OAuth: option not to create or update user during authentication [#10853](https://github.com/statamic/cms/issues/10853) by @miloslavkostir
+- Add some options to the static warm command to limit the number of requests [#11258](https://github.com/statamic/cms/issues/11258) by @arthurperton
+- Table Fieldtype: Add `max_columns` and `max_rows` options [#11224](https://github.com/statamic/cms/issues/11224) by @duncanmcclean
+
+### What's fixed
+- Handle hidden fields on nav page edit form [#11272](https://github.com/statamic/cms/issues/11272) by @duncanmcclean
+- Support Laravel Prompts 0.3+ [#11267](https://github.com/statamic/cms/issues/11267) by @duncanmcclean
+- Update `embed_url` and `trackable_embed_url` modifiers to be valid with additional query strings [#11265](https://github.com/statamic/cms/issues/11265) by @martyf
+- Fix term filter on entries listing [#11268](https://github.com/statamic/cms/issues/11268) by @duncanmcclean
+- Prevent "Set Alt" button from running Replace Asset action prematurely [#11269](https://github.com/statamic/cms/issues/11269) by @duncanmcclean
+- Fix autoloading when addon has multiple service providers [#11128](https://github.com/statamic/cms/issues/11128) by @duncanmcclean
+- Fix ButtonGroup not showing active state if value are numbers [#10916](https://github.com/statamic/cms/issues/10916) by @morhi
+- Support glide urls with URL params [#11003](https://github.com/statamic/cms/issues/11003) by @ryanmitchell
+- Throw 404 on collection routes if taxonomy isn’t assigned to collection [#10438](https://github.com/statamic/cms/issues/10438) by @aerni
+- Move bard source button into field actions [#11250](https://github.com/statamic/cms/issues/11250) by @jasonvarga
+- Fix collection title format when using translations [#11248](https://github.com/statamic/cms/issues/11248) by @ajnsn
+- Bump nanoid from 3.3.6 to 3.3.8 [#11251](https://github.com/statamic/cms/issues/11251) by @dependabot
+
+
+
+## 5.42.1 (2024-12-11)
+
+### What's fixed
+- Fix asset upload concurrency on folder upload [#11225](https://github.com/statamic/cms/issues/11225) by @daun
+- Fix subdirectory autodiscovery on Windows [#11246](https://github.com/statamic/cms/issues/11246) by @jasonvarga
+- Fix type error in `HandleEntrySchedule` job [#11244](https://github.com/statamic/cms/issues/11244) by @duncanmcclean
+- Fix `no_results` cascade [#11234](https://github.com/statamic/cms/issues/11234) by @JohnathonKoster
+
+
+
 ## 5.42.0 (2024-12-05)
 
 ### What's new

diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
         "guzzlehttp/guzzle": "^6.3 || ^7.0",
         "james-heinrich/getid3": "^1.9.21",
         "laravel/framework": "^10.40 || ^11.34",
-        "laravel/prompts": "^0.1.16",
+        "laravel/prompts": "^0.1.16 || ^0.2.0 || ^0.3.0",
         "league/commonmark": "^2.2",
         "league/csv": "^9.0",
         "league/glide": "^2.3",

diff --git a/config/oauth.php b/config/oauth.php
@@ -15,6 +15,44 @@
         'callback' => 'oauth/{provider}/callback',
     ],
 
+    /*
+    |--------------------------------------------------------------------------
+    | Create User
+    |--------------------------------------------------------------------------
+    |
+    | Whether or not a user account should be created upon authentication
+    | with an OAuth provider. If disabled, a user account will be need
+    | to be explicitly created ahead of time.
+    |
+    */
+
+    'create_user' => true,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Merge User Data
+    |--------------------------------------------------------------------------
+    |
+    | When authenticating with an OAuth provider, the user data returned
+    | such as their name will be merged with the existing user account.
+    |
+    */
+
+    'merge_user_data' => true,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Unauthorized Redirect
+    |--------------------------------------------------------------------------
+    |
+    | This controls where the user is taken after authenticating with
+    | an OAuth provider but their account is unauthorized. This may
+    | happen when the create_user option has been set to false.
+    |
+    */
+
+    'unauthorized_redirect' => null,
+
     /*
     |--------------------------------------------------------------------------
     | Remember Me

diff --git a/package-lock.json b/package-lock.json
diff --git a/resources/js/components/assets/Uploader.vue b/resources/js/components/assets/Uploader.vue
@@ -68,6 +68,15 @@ export default {
     },
 
 
+    computed: {
+
+        activeUploads() {
+            return this.uploads.filter(u => u.instance.state === 'started');
+        }
+
+    },
+
+
     methods: {
 
         browse() {
@@ -230,6 +239,9 @@ export default {
         },
 
         processUploadQueue() {
+            // If we're already uploading, don't start another
+            if (this.activeUploads.length) return;
+
             // Make sure we're not grabbing a running or failed upload
             const upload = this.uploads.find(u => u.instance.state === 'new' && !u.errorMessage);
             if (!upload) return;
@@ -248,6 +260,8 @@ export default {
                 response.status === 200
                     ? this.handleUploadSuccess(id, json)
                     : this.handleUploadError(id, response.status, json);
+
+                this.processUploadQueue();
             });
         },
 

diff --git a/resources/js/components/entries/PublishActions.vue b/resources/js/components/entries/PublishActions.vue
@@ -216,8 +216,20 @@ export default {
         },
 
         handleAxiosError(e) {
+            if (e.response && e.response.status === 422) {
+                const { message, errors } = e.response.data;
+                this.error = message;
+                this.errors = errors;
+                this.$toast.error(message);
+                this.$reveal.invalid();
+            } else if (e.response) {
+                this.$toast.error(e.response.data.message);
+            } else {
+                this.$toast.error(e || 'Something went wrong');
+            }
+
             this.saving = false;
-            this.$toast.error(e || __('Something went wrong'));
+            this.$emit('failed');
         }
 
     }

diff --git a/resources/js/components/fieldtypes/ButtonGroupFieldtype.vue b/resources/js/components/fieldtypes/ButtonGroupFieldtype.vue
@@ -7,10 +7,10 @@
                 ref="button"
                 type="button"
                 :name="name"
-                @click="updateSelectedOption($event.target.value)"
+                @click="updateSelectedOption(option.value)"
                 :value="option.value"
                 :disabled="isReadOnly"
-                :class="{'active': value === option.value}"
+                :class="{'active': value == option.value}"
                 v-text="option.label || option.value"
             />
         </div>

diff --git a/resources/js/components/fieldtypes/GroupFieldtype.vue b/resources/js/components/fieldtypes/GroupFieldtype.vue
@@ -30,10 +30,12 @@
                                 :errors="errors(field.handle)"
                                 :field-path="fieldPath(field.handle)"
                                 :read-only="isReadOnly"
+                                :show-field-previews="config.replicator_preview"
                                 @updated="updated(field.handle, $event)"
                                 @meta-updated="updateMeta(field.handle, $event)"
                                 @focus="$emit('focus')"
                                 @blur="$emit('blur')"
+                                @replicator-preview-updated="previewUpdated(field.handle, $event)"
                             />
                         </div>
                     </div>
@@ -57,18 +59,21 @@
 import Fieldtype from './Fieldtype.vue';
 import SetField from './replicator/Field.vue';
 import { ValidatesFieldConditions } from '../field-conditions/FieldConditions.js';
+import ManagesPreviewText from "./replicator/ManagesPreviewText";
 
 export default {
     mixins: [
         Fieldtype,
         ValidatesFieldConditions,
+        ManagesPreviewText,
     ],
     components: { SetField },
     data() {
         return {
             containerWidth: null,
             focused: false,
             fullScreenMode: false,
+            previews: {},
             provide: {
                 group: this.makeGroupProvide(),
                 storeName: this.storeName,
@@ -86,7 +91,7 @@ export default {
         replicatorPreview() {
             if (! this.showFieldPreviews || ! this.config.replicator_preview) return;
 
-            return Object.values(this.value).join(', ');
+            return replicatorPreviewHtml(this.previewText);
         },
         internalFieldActions() {
             return [
@@ -150,6 +155,10 @@ export default {
             this.$emit('meta-updated', { ...this.meta, [handle]: value });
         },
 
+        previewUpdated(handle, value) {
+            this.previews = { ...this.previews, [handle]: value };
+        },
+
         fieldPath(handle) {
             return (this.fieldPathPrefix || this.handle) + '.' + handle;
         },

diff --git a/resources/js/components/fieldtypes/assets/AssetRow.vue b/resources/js/components/fieldtypes/assets/AssetRow.vue
@@ -34,6 +34,7 @@
         <td class="w-24" v-if="showSetAlt">
             <button
                 class="asset-set-alt text-blue dark:text-dark-blue-100 px-4 text-sm hover:text-black dark:hover:text-dark-100"
+                type="button"
                 @click="editOrOpen"
                 v-if="needsAlt"
             >

diff --git a/resources/js/components/fieldtypes/assets/AssetTile.vue b/resources/js/components/fieldtypes/assets/AssetTile.vue
@@ -85,6 +85,7 @@
             </div>
             <button
                 class="asset-meta-btn"
+                type="button"
                 @click="edit"
                 v-if="showSetAlt && needsAlt"
             >

diff --git a/resources/js/components/fieldtypes/bard/BardFieldtype.vue b/resources/js/components/fieldtypes/bard/BardFieldtype.vue
@@ -31,9 +31,6 @@
                         :config="config"
                         :bard="_self"
                         :editor="editor" />
-                    <button class="bard-toolbar-button" @click="showSource = !showSource" v-if="allowSource" v-tooltip="__('Show HTML Source')" :aria-label="__('Show HTML Source')">
-                        <svg-icon name="show-source" class="w-4 h-4 "/>
-                    </button>
                 </div>
             </div>
         </publish-field-fullscreen-header>
@@ -49,9 +46,6 @@
                     :config="config"
                     :bard="_self"
                     :editor="editor" />
-                <button class="bard-toolbar-button" @click="showSource = !showSource" v-if="allowSource" v-tooltip="__('Show HTML Source')" :aria-label="__('Show HTML Source')">
-                    <svg-icon name="show-source" class="w-4 h-4 "/>
-                </button>
             </div>
         </div>
 
@@ -370,6 +364,12 @@ export default {
                     visibleWhenReadOnly: true,
                     visible: this.config.fullscreen,
                 },
+                {
+                    title: __('Show HTML Source'),
+                    run: () => this.showSource = !this.showSource,
+                    visibleWhenReadOnly: true,
+                    visible: this.allowSource,
+                },
             ];
         },
 

diff --git a/resources/js/components/fieldtypes/relationship/RelationshipFieldtype.vue b/resources/js/components/fieldtypes/relationship/RelationshipFieldtype.vue
@@ -19,6 +19,7 @@
         :creatables="creatables"
         :form-component="formComponent"
         :form-component-props="formComponentProps"
+        :form-stack-size="formStackSize"
         :status-icons="statusIcons"
         :columns="columns"
         :search="canSearch"
@@ -131,6 +132,10 @@ export default {
             return this.meta.formComponentProps;
         },
 
+        formStackSize() {
+            return this.meta.formStackSize;
+        },
+
         taggable() {
             return this.meta.taggable;
         },

diff --git a/resources/js/components/inputs/relationship/CreateButton.vue b/resources/js/components/inputs/relationship/CreateButton.vue
@@ -26,6 +26,7 @@
             :item-url="creatable.url"
             :component="component"
             :component-props="componentProps"
+            :stack-size="stackSize"
             @created="itemCreated"
             @closed="stopCreating"
         />
@@ -47,6 +48,7 @@ export default {
         creatables: Array,
         component: String,
         componentProps: Object,
+        stackSize: String,
     },
 
     data() {

diff --git a/resources/js/components/inputs/relationship/InlinePublishForm.vue b/resources/js/components/inputs/relationship/InlinePublishForm.vue
@@ -3,6 +3,9 @@
     <div>
     <stack name="inline-editor"
         :before-close="shouldClose"
+        :narrow="stackSize === 'narrow'"
+        :half="stackSize === 'half'"
+        :full="stackSize === 'full'"
         @closed="close"
     >
     <div class="h-full overflow-scroll overflow-x-auto p-6 bg-gray-300 dark:bg-dark-800">
@@ -44,6 +47,7 @@ export default {
     props: {
         component: String,
         componentProps: Object,
+        stackSize: String,
     },
 
     data() {

diff --git a/resources/js/components/inputs/relationship/Item.vue b/resources/js/components/inputs/relationship/Item.vue
@@ -22,6 +22,7 @@
                 :item="item"
                 :component="formComponent"
                 :component-props="formComponentProps"
+                :stack-size="formStackSize"
                 @updated="itemUpdated"
                 @closed="isEditing = false"
             />
@@ -67,6 +68,7 @@ export default {
         readOnly: Boolean,
         formComponent: String,
         formComponentProps: Object,
+        formStackSize: String,
     },
 
     data() {