Merge branch 'main' into feat/dashboard-modal-close-on-confirm-save

# Conflicts:
#	packages/gridstack/src/components/ConfigurableDashboard/ConfigurableDashboard.vue
#	packages/gridstack/src/components/SaveDashboardModal/SaveDashboardModal.vue

packages/gridstack/src/components/ConfigurableDashboard/ConfigurableDashboard.vue

@@ -26,6 +26,16 @@
         @confirm-save="onConfirmSave"
       />
     </DismissibleModal>
+    <DismissibleModal
+      v-model:modal-displayed="showDeleteModal"
+      class="basic-modal"
+    >
+      <DeleteDashboardModal
+        v-if="showDeleteModal"
+        :dashboard-name="selectedDashboardConfigurationName"
+        @confirm-delete="onDeleteDashboardConfiguration"
+      />
+    </DismissibleModal>
   </div>
 </template>
 
@@ -82,6 +92,14 @@ const dashboardConfig = defineModel<WidgetConfiguration[]>('dashboardConfig', {
  */
 const currentConfig = ref(dashboardConfig.value)
 const editMode = ref<boolean>(false)
+const showSaveModal = ref(false)
+const showDeleteModal = ref<boolean>(false)
+const selectedDashboardConfigurationName = computed(() => {
+  const config = props.dashboardConfigurationOptions.find(
+    (option) => option.id === selectedDashboardConfiguration.value
+  )
+  return config ? config.name : undefined
+})
 
 const prepareSave = () => {
   showSaveModal.value = true
@@ -91,6 +109,7 @@ const onConfirmSave = (name: string) => {
   editMode.value = false
   currentConfig.value = dashboardConfig.value
   emit('save', dashboardConfig.value, name)
+  showSaveModal.value = false
 }
 
 const onCancelEdit = () => {

packages/gridstack/src/components/SaveDashboardModal/SaveDashboardModal.vue

@@ -13,7 +13,7 @@
     />
     <ErrorBox v-if="showError" class="error-message" :error="nameError" />
 
-    <BaseButton :disabled="!name" @click="submitAndClose" class="save-button">
+    <BaseButton :disabled="!name" @click="submit" class="save-button">
       Speichern
     </BaseButton>
   </div>