Fixed layouts not refreshing correctly

Author: Haxxer

resources/js/calendar-layouts.js

@@ -37,22 +37,30 @@ export default () => ({
             "static_data.settings.layout": layout.name.toLowerCase(),
         });
 
-        do_update_all(window.hash)
-            .then(() => {
-                window.onbeforeunload = function() { }
-                window.location.reload(false);
-            })
-            .catch((error) => {
-                this.$store.calendar.update({
-                    "static_data.settings.layout": previous_layout
+        if(window.location.href.endsWith("/edit")) {
+            do_update_all(window.hash)
+                .then(() => {
+                    window.onbeforeunload = function () {
+                    }
+                    window.location.reload(false);
+                })
+                .catch((error) => {
+                    this.$store.calendar.update({
+                        "static_data.settings.layout": previous_layout
+                    });
+                    this.$store.calendar.static_data.settings.layout = previous_layout;
+                    this.$dispatch("app-busy-end");
+                    this.$dispatch('notify', {
+                        content: error.response.data.message,
+                        type: "error"
+                    });
                 });
-                this.$store.calendar.static_data.settings.layout = previous_layout;
-                this.$dispatch("app-busy-end");
-                this.$dispatch('notify', {
-                    content: error.response.data.message,
-                    type: "error"
-                });
-            });
+        }else{
+            window.location = window.location.href.split("/create")[0] + "/create?resume=1";
+            // window.onbeforeunload = function () {
+            // }
+            // window.location.reload(false);
+        }
     }
 
 })

resources/js/calendar/calendar_create_page.js

@@ -157,54 +157,22 @@ export default (calendar_structure) => ({
         bind_calendar_events();
 
         document.addEventListener("DOMContentLoaded", () => {
-
-            const queryString = window.location.search;
-            if (should_resume(queryString)) {
-                this.autoload();
+            if (this.should_resume(window.location.search)) {
+                this.autoload(false);
             } else {
                 this.queryAutoload();
             }
 
-            window.dispatchEvent(new CustomEvent("rebuild-calendar"));
-
-        });
-
-        function should_resume(queryString) {
-            const urlParams = new URLSearchParams(queryString);
-            return urlParams.has("resume");
-        }
-
-        window.dispatchEvent(new CustomEvent("events-changed"));
-
-        this.$nextTick(async () => {
-
-            let autoload = await this.queryAutoload();
-            if(autoload) return;
-
-            this.$dispatch('calendar-loaded', {
-                hash: window.hash,
-                calendar_name: window.calendar_name,
-                calendar_id: window.calendar_id,
-                static_data: window.static_data,
-                dynamic_data: window.dynamic_data,
-                is_linked: window.is_linked,
-                has_parent: window.has_parent,
-                parent_hash: window.parent_hash,
-                parent_offset: window.parent_offset,
-                events: window.events,
-                event_categories: window.event_categories,
-                last_static_change: window.last_static_change,
-                last_dynamic_change: window.last_dynamic_change,
-                advancement: window.advancement
-            });
-
             this.evaluate_current_step();
-
         });
 
         window.dispatchEvent(new CustomEvent("events-changed"));
     },
 
+    should_resume(queryString) {
+        const urlParams = new URLSearchParams(queryString);
+        return urlParams.has("resume");
+    },
 
     autosave() {
         let saved_data = JSON.stringify({
@@ -262,14 +230,25 @@ export default (calendar_structure) => ({
 
             this.evaluate_current_step();
 
-            this.$dispatch(
-                'calendar-loaded', {
-                    calendar_name: data.calendar_name,
-                    static_data: data.static_data,
-                    dynamic_data: data.dynamic_data,
-                    events: data.events
-                }
-            )
+            this.$dispatch('calendar-loaded', {
+                hash: window.hash,
+                calendar_name: window.calendar_name,
+                calendar_id: window.calendar_id,
+                static_data: window.static_data,
+                dynamic_data: window.dynamic_data,
+                is_linked: window.is_linked,
+                has_parent: window.has_parent,
+                parent_hash: window.parent_hash,
+                parent_offset: window.parent_offset,
+                events: window.events,
+                event_categories: window.event_categories,
+                last_static_change: window.last_static_change,
+                last_dynamic_change: window.last_dynamic_change,
+                advancement: window.advancement
+            });
+
+            window.dispatchEvent(new CustomEvent("rebuild-calendar"));
+            window.dispatchEvent(new CustomEvent("events-changed"));
 
             if (popup) {
                 swal.fire({

resources/js/calendar/create_button.js

@@ -84,9 +84,6 @@ export default () => ({
             clearTimeout(this.timeout);
         }
 
-        let updateMethod;
-        let updateParams = [];
-
         this.save_status = "saving";
 
         create_calendar()

resources/views/components/collapsible.blade.php

@@ -13,16 +13,16 @@
     x-data="{
         open: {{ $open ? 'true' : 'false' }},
         show: true,
-        step: @js($step),
+        step: Number(@js($step)),
         toggle() {
             this.open = !this.open;
 
             // TODO: Use this within any components (clock?) that need it
             $dispatch('{{ Str::slug($contains) }}-toggled', this.open);
         },
         evaluate_calendar_step($event) {
-            this.show = $event.detail.done || (this.step !== null && $event.detail.step >= this.step);
-            if(this.step !== null && $event.detail.step === this.step){
+            this.show = $event.detail.done || (this.step && $event.detail.step >= this.step);
+            if(this.step && $event.detail.step === this.step){
                 this.open = true;
             }
         }

resources/views/components/weekdays-collapsible.blade.php

@@ -73,7 +73,7 @@
     </div>
 @endif
 
-<div class="flex flex-col" x-show='overflow_weekdays'>
+<div class="flex flex-col" x-show='overflow_weekdays && weekdays.length'>
     <x-separator class="mt-[1rem]"></x-separator>
 
     <strong>Start the first year on:</strong>