Merge branch 'next' of github.com:devforth/adminforth into next

Author: ivictbor

adminforth/spa/src/components/MenuLink.vue

@@ -12,19 +12,20 @@
   >
     <component v-if="item.icon" :is="getIcon(item.icon)" class="w-5 h-5 text-lightSidebarIcons dark:text-darkSidebarIcons  transition duration-75  group-hover:text-lightSidebarIconsHover dark:group-hover:text-darkSidebarIconsHover" ></component>
     <span class="text-ellipsis overflow-hidden ms-3">{{ item.label }}</span>
-    <span v-if="item.badge" class="inline-flex items-center justify-center h-3 py-3 px-1 ms-3 text-sm font-medium rounded-full bg-lightAnnouncementBG dark:bg-darkAnnouncementBG 
-          fill-lightAnnouncementText dark:fill-darkAccent text-lightAnnouncementText dark:text-darkAccent min-w-[1.5rem] max-w-[3rem]"
+    <span v-if="item.badge"
     >
 
         <Tooltip v-if="item.badgeTooltip">
-          {{ item.badge }}
+          <div class="inline-flex items-center justify-center h-3 py-3 px-1 ms-3 text-sm font-medium rounded-full bg-lightAnnouncementBG dark:bg-darkAnnouncementBG 
+          fill-lightAnnouncementText dark:fill-darkAccent text-lightAnnouncementText dark:text-darkAccent min-w-[1.5rem] max-w-[3rem]">{{ item.badge }}</div>
 
           <template #tooltip>
             {{ item.badgeTooltip }}
           </template>
         </Tooltip>
         <template v-else>
-          {{ item.badge }}
+          <div class="inline-flex items-center justify-center h-3 py-3 px-1 ms-3 text-sm font-medium rounded-full bg-lightAnnouncementBG dark:bg-darkAnnouncementBG 
+          fill-lightAnnouncementText dark:fill-darkAccent text-lightAnnouncementText dark:text-darkAccent min-w-[1.5rem] max-w-[3rem]">{{ item.badge }}</div>
         </template> 
 
     </span>

adminforth/spa/src/stores/core.ts

@@ -86,7 +86,9 @@ export const useCoreStore = defineStore('core', () => {
   }
   async function subscribeToMenuBadges() {
     const processItem = (mi: AdminForthConfigMenuItem) => {
-      if (mi.badge) {
+
+      // console.log('🔔 subscribeToMenuBadges', mi.badge, JSON.stringify(mi));
+      if (mi.badge !== undefined) {
         websocket.subscribe(`/opentopic/update-menu-badge/${mi.itemId}`, ({ badge }) => {
           mi.badge = badge;
         });

adminforth/spa/src/views/EditView.vue

@@ -147,7 +147,15 @@ async function saveRecord() {
   saving.value = true;
   const updates = {};
   for (const key in record.value) {
-    let columnIsUpdated = record.value[key] !== coreStore.record[key];
+    let columnIsUpdated = false;
+
+    if (typeof record.value[key] !== typeof coreStore.record[key]) {
+      columnIsUpdated = true;
+    } else if (typeof record.value[key] === 'object') {
+      columnIsUpdated = JSON.stringify(record.value[key]) !== JSON.stringify(coreStore.record[key]);
+    } else {
+      columnIsUpdated = record.value[key] !== coreStore.record[key];
+    }
 
     const column = coreStore.resource.columns.find((c) => c.name === key);