From 2268b7d95ce64384d8b2bf808132a22ab1912c53 Mon Sep 17 00:00:00 2001
From: Boubaker Khanfir <boubaker.khanfir@gmail.com>
Date: Fri, 22 Nov 2024 17:09:04 +0100
Subject: [PATCH] feat: Adjust Default configuration on first Server startup -
 MEED-7833 - Meeds-io/MIPs#159

---
 .../plugin/SpaceTemplateSidebarPlugin.java     |  2 +-
 .../NavigationConfigurationInitService.java    |  2 +-
 .../NavigationSettingsSidebarPreviewItem.vue   | 18 +++++++++++-------
 ...avigationSettingsAddSidebarSpacesDrawer.vue |  5 ++++-
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/component/core/src/main/java/io/meeds/social/navigation/plugin/SpaceTemplateSidebarPlugin.java b/component/core/src/main/java/io/meeds/social/navigation/plugin/SpaceTemplateSidebarPlugin.java
index 8f62c05dad9..06a500dd489 100644
--- a/component/core/src/main/java/io/meeds/social/navigation/plugin/SpaceTemplateSidebarPlugin.java
+++ b/component/core/src/main/java/io/meeds/social/navigation/plugin/SpaceTemplateSidebarPlugin.java
@@ -103,7 +103,7 @@ private Map<String, String> buildSpaceTemplateProperties(SpaceTemplate spaceTemp
     Map<String, String> properties = new HashMap<>();
     properties.put(SPACE_TEMPLATE_ID_PROP_NAME, String.valueOf(spaceTemplate.getId()));
     properties.put(SPACES_LIMIT, String.valueOf(SPACES_LIMIT_DEFAULT));
-    properties.put(SPACES_SORT_BY, SidebarSpaceSortBy.TITLE.name());
+    properties.put(SPACES_SORT_BY, SidebarSpaceSortBy.LAST_ACCESS.name());
     return properties;
   }
 
diff --git a/component/core/src/main/java/io/meeds/social/navigation/service/NavigationConfigurationInitService.java b/component/core/src/main/java/io/meeds/social/navigation/service/NavigationConfigurationInitService.java
index 7237cf5e54b..ad74caf1a11 100644
--- a/component/core/src/main/java/io/meeds/social/navigation/service/NavigationConfigurationInitService.java
+++ b/component/core/src/main/java/io/meeds/social/navigation/service/NavigationConfigurationInitService.java
@@ -75,7 +75,7 @@ public class NavigationConfigurationInitService {
   @Value("${navigation.configuration.allowUserCustomHome:true}")
   private boolean                        allowUserCustomHome;
 
-  @Value("${navigation.configuration.defaultMode:HIDDEN}")
+  @Value("${navigation.configuration.defaultMode:ICON}")
   private SidebarMode                    defaultMode;
 
   private List<TopbarApplication>        defaultTopbarApplications;
diff --git a/webapp/src/main/webapp/vue-apps/general-settings/components/navigation/sidebar/NavigationSettingsSidebarPreviewItem.vue b/webapp/src/main/webapp/vue-apps/general-settings/components/navigation/sidebar/NavigationSettingsSidebarPreviewItem.vue
index 8c943f99831..792134c07a8 100644
--- a/webapp/src/main/webapp/vue-apps/general-settings/components/navigation/sidebar/NavigationSettingsSidebarPreviewItem.vue
+++ b/webapp/src/main/webapp/vue-apps/general-settings/components/navigation/sidebar/NavigationSettingsSidebarPreviewItem.vue
@@ -31,8 +31,10 @@
     </template>
   </div>
   <div v-else-if="isSpaces || isSpaceTemplate">
-    <template v-if="item?.items?.length">
-      <v-list-item class="d-flex" dense>
+    <template v-if="item?.items?.length || isSpaces">
+      <v-list-item
+        class="d-flex"
+        dense>
         <v-list-item-avatar min-width="36">
           <v-icon size="18">{{ item.icon || 'fa-folder' }}</v-icon>
         </v-list-item-avatar>
@@ -42,11 +44,13 @@
           </v-list-item-title>
         </v-list-item-content>
       </v-list-item>
-      <portal-general-settings-navigation-settings-sidebar-preview-item
-        v-for="(subItem, index) in item.items"
-        :key="`${subItem.name}_${subItem.icon}_${index}`"
-        :settings="settings"
-        :item="subItem" />
+      <template v-if="item?.items?.length">
+        <portal-general-settings-navigation-settings-sidebar-preview-item
+          v-for="(subItem, index) in item.items"
+          :key="`${subItem.name}_${subItem.icon}_${index}`"
+          :settings="settings"
+          :item="subItem" />
+      </template>
     </template>
   </div>
   <v-list-item
diff --git a/webapp/src/main/webapp/vue-apps/general-settings/components/navigation/sidebar/drawer/NavigationSettingsAddSidebarSpacesDrawer.vue b/webapp/src/main/webapp/vue-apps/general-settings/components/navigation/sidebar/drawer/NavigationSettingsAddSidebarSpacesDrawer.vue
index 52cf326d0c7..25c0396a852 100644
--- a/webapp/src/main/webapp/vue-apps/general-settings/components/navigation/sidebar/drawer/NavigationSettingsAddSidebarSpacesDrawer.vue
+++ b/webapp/src/main/webapp/vue-apps/general-settings/components/navigation/sidebar/drawer/NavigationSettingsAddSidebarSpacesDrawer.vue
@@ -97,7 +97,7 @@
           <number-input
             v-model="limit"
             :step="1"
-            :min="1"
+            :min="minSpaces"
             :max="10" />
         </div>
       </div>
@@ -141,6 +141,9 @@ export default {
     spaceTemplate() {
       return this.spaceTemplateId && this.spaceTemplates?.find?.(t => Number(t.id) === Number(this.spaceTemplateId)) || null;
     },
+    minSpaces() {
+      return this.option === 'SPACES' ? 0 : 1;
+    },
     disabled() {
       return !this.modified
         || (this.option === 'SPACE_TEMPLATE' && !this.spaceTemplteId)