From cb95af3c4610a12118acf6a4acd01e51fc2d41a2 Mon Sep 17 00:00:00 2001
From: F4ilji <F4ilj@yandex.ru>
Date: Sun, 27 Jul 2025 13:29:01 +0500
Subject: [PATCH] update form handling in Page.vue and Show.vue components to
 use optional chaining for safer access to form IDs

---
 resources/js/Pages/Client/Programs/Show.vue | 6 +++---
 resources/js/Pages/Page.vue                 | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/js/Pages/Client/Programs/Show.vue b/resources/js/Pages/Client/Programs/Show.vue
index e22a063..662ca9b 100644
--- a/resources/js/Pages/Client/Programs/Show.vue
+++ b/resources/js/Pages/Client/Programs/Show.vue
@@ -237,7 +237,7 @@ export default {
     <BasicFooter />
   </BasicPageWrapper>
 
-  <div class="fixed bottom-0 end-0 z-60 sm:max-w-xl w-full mx-auto p-6">
+  <div v-if="form?.id !== null" class="fixed bottom-0 end-0 z-60 sm:max-w-xl w-full mx-auto p-6">
     <div class="hs-accordion-group">
       <div class="hs-accordion border-gray-200 active bg-white border rounded-xl" id="hs-active-bordered-heading-two">
         <button class="hs-accordion-toggle hs-accordion-active:text-blue-600 inline-flex justify-between items-center gap-x-3 w-full font-semibold text-start text-gray-800 py-4 px-8 hover:text-gray-500 disabled:opacity-50 disabled:pointer-events-none rounded-xl" aria-expanded="true" aria-controls="hs-basic-active-bordered-collapse-two">
@@ -271,7 +271,7 @@ export default {
   </div>
 
 
-  <div v-if="form" id="hs-vertically-centered-scrollable-modal" class="hs-overlay hidden size-full fixed top-0 start-0 z-[1000000] overflow-x-hidden overflow-y-auto pointer-events-none" role="dialog" tabindex="-1" aria-labelledby="hs-vertically-centered-scrollable-modal-label">
+  <div v-if="form?.id !== null" id="hs-vertically-centered-scrollable-modal" class="hs-overlay hidden size-full fixed top-0 start-0 z-[1000000] overflow-x-hidden overflow-y-auto pointer-events-none" role="dialog" tabindex="-1" aria-labelledby="hs-vertically-centered-scrollable-modal-label">
     <div class="hs-overlay-open:mt-7 hs-overlay-open:opacity-100 hs-overlay-open:duration-500 mt-0 opacity-0 ease-out transition-all sm:max-w-3xl sm:w-full m-3 sm:mx-auto h-[calc(100%-56px)] min-h-[calc(100%-56px)] flex items-center">
       <div class="w-full max-h-full overflow-hidden flex flex-col bg-white border border-gray-200 shadow-2xs rounded-xl pointer-events-auto dark:bg-neutral-800 dark:border-neutral-700 dark:shadow-neutral-700/70">
         <div class="flex justify-between items-center py-3 px-4 border-gray-200 dark:border-neutral-700">
@@ -286,7 +286,7 @@ export default {
           </button>
         </div>
         <div class="p-2 overflow-y-auto">
-          <Form :form-id="form.id" />
+          <Form :form-id="form?.id" />
         </div>
       </div>
     </div>
diff --git a/resources/js/Pages/Page.vue b/resources/js/Pages/Page.vue
index 3c17aac..7938da5 100644
--- a/resources/js/Pages/Page.vue
+++ b/resources/js/Pages/Page.vue
@@ -38,7 +38,7 @@
     <BasicFooter />
   </BasicPageWrapper>
 
-  <div v-if="settings?.form.id" class="fixed bottom-0 end-0 z-60 sm:max-w-xl w-full mx-auto p-6">
+  <div v-if="settings?.form?.id" class="fixed bottom-0 end-0 z-60 sm:max-w-xl w-full mx-auto p-6">
     <div class="hs-accordion-group">
       <div class="hs-accordion border-gray-200 active bg-white border rounded-xl" id="hs-active-bordered-heading-two">
         <button class="hs-accordion-toggle hs-accordion-active:text-blue-600 inline-flex justify-between items-center gap-x-3 w-full font-semibold text-start text-gray-800 py-4 px-8 hover:text-gray-500 disabled:opacity-50 disabled:pointer-events-none rounded-xl" aria-expanded="true" aria-controls="hs-basic-active-bordered-collapse-two">
@@ -72,7 +72,7 @@
   </div>
 
 
-  <div v-if="settings?.form.id" id="hs-vertically-centered-scrollable-modal" class="hs-overlay hidden size-full fixed top-0 start-0 z-[1000000] overflow-x-hidden overflow-y-auto pointer-events-none" role="dialog" tabindex="-1" aria-labelledby="hs-vertically-centered-scrollable-modal-label">
+  <div v-if="settings?.form?.id" id="hs-vertically-centered-scrollable-modal" class="hs-overlay hidden size-full fixed top-0 start-0 z-[1000000] overflow-x-hidden overflow-y-auto pointer-events-none" role="dialog" tabindex="-1" aria-labelledby="hs-vertically-centered-scrollable-modal-label">
     <div class="hs-overlay-open:mt-7 hs-overlay-open:opacity-100 hs-overlay-open:duration-500 mt-0 opacity-0 ease-out transition-all sm:max-w-3xl sm:w-full m-3 sm:mx-auto h-[calc(100%-56px)] min-h-[calc(100%-56px)] flex items-center">
       <div class="w-full max-h-full overflow-hidden flex flex-col bg-white border border-gray-200 shadow-2xs rounded-xl pointer-events-auto dark:bg-neutral-800 dark:border-neutral-700 dark:shadow-neutral-700/70">
         <div class="flex justify-between items-center py-3 px-4 border-gray-200 dark:border-neutral-700">
@@ -87,7 +87,7 @@
           </button>
         </div>
         <div class="p-2 overflow-y-auto">
-          <Form :form-id="settings?.form.id" />
+          <Form :form-id="settings?.form?.id" />
         </div>
       </div>
     </div>