Merge Margins management & cleanup Meeds-io/MIPs#103 (#3206)

Meeds-io · Nov 22, 2023 · 97b554d · 97b554d
2 parents be0422a + 105a729
commit 97b554d
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 14 deletions.
diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/gettingStarted.jsp b/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/gettingStarted.jsp
@@ -25,7 +25,7 @@
     }
 %>
 <div class="VuetifyApp">
-  <div style="" id="GettingStartedPortlet">
+  <div style="" id="GettingStartedPortlet" data-can-close="<%=canClose%>">
     <div data-app="true"
       class="v-application v-application--is-ltr theme--light" id="app">
       <div class="v-application--wrap">

diff --git a/webapp/portlet/src/main/webapp/skin/less/portlet/ActivityStream/Style.less b/webapp/portlet/src/main/webapp/skin/less/portlet/ActivityStream/Style.less
@@ -237,15 +237,6 @@
           padding-left: 10px ~'; /** orientation=lt */ ';
           padding-right: 10px ~'; /** orientation=rt */ ';
 
-          .v-application {
-            &:not(.hiddenable-widget) {
-              margin-bottom: 20px;
-            }
-            &.hiddenable-widget > .v-application--wrap > div {
-              margin-bottom: 20px;
-            }
-          }
-
           /* Added for sticky container */
           .UIContainer, .NormalContainerBlock, .VIEW-CONTAINER, .UIIntermediateContainer, .UIRowContainer {
             display: inline;
@@ -281,6 +272,7 @@
           top: 13px;
           height: auto;
           display: block;
+          padding-bottom: @applicationSpaceBottom !important;
           z-index: @zindexStickyContainer;
         }
       }

diff --git a/webapp/portlet/src/main/webapp/vue-apps/getting-started/main.js b/webapp/portlet/src/main/webapp/vue-apps/getting-started/main.js
@@ -12,6 +12,13 @@ export function hideGettingStarted() {
 const parentAppElement = document.querySelector('#GettingStartedPortlet .btClose');
 if (parentAppElement) {
   parentAppElement.onclick = () => {
-    hideGettingStarted().then(() => document.querySelector('#GettingStartedPortlet').parentElement.remove());
+    hideGettingStarted().then(() => {
+      const parentElementToHide = parentAppElement.closest('.PORTLET-FRAGMENT');
+      hideGettingStarted().then(() => parentElementToHide.classList.add('hidden'));
+    });
   };
 }
+const parentElementToHide = document.querySelector('#GettingStartedPortlet');
+if (parentElementToHide && parentElementToHide.dataset.canClose === 'true') {
+  parentElementToHide.closest('.PORTLET-FRAGMENT').classList.add('hidden');
+}
diff --git a/webapp/portlet/src/main/webapp/vue-apps/links/components/LinksApp.vue b/webapp/portlet/src/main/webapp/vue-apps/links/components/LinksApp.vue
@@ -68,6 +68,15 @@ export default {
       return !this.previewMode && this.$root.canEdit;
     },
   },
+  watch: {
+    canView() {
+      if (this.canView) {
+        this.$el.parentElement.closest('.PORTLET-FRAGMENT').classList.remove('hidden');
+      } else {
+        this.$el.parentElement.closest('.PORTLET-FRAGMENT').classList.add('hidden');
+      }
+    }
+  },
   created() {
     document.addEventListener('cms-preview-mode', this.switchToPreview);
     document.addEventListener('cms-edit-mode', this.switchToEdit);

diff --git a/...c/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotifications.vue b/...c/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotifications.vue
@@ -6,7 +6,7 @@
       @back="closeDetail" />
     <v-card
       v-else
-      class="my-3 card-border-radius"
+      class="card-border-radius"
       flat>
       <v-list @click="openNotificationSettingDetail">
         <v-list-item>

diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-header/components/SpaceHeader.vue b/webapp/portlet/src/main/webapp/vue-apps/space-header/components/SpaceHeader.vue
@@ -2,7 +2,7 @@
   <v-app :class="hasNavigations && 'hasNavigations' | ''">
     <v-card
       color="transparent"
-      class="mb-6 card-border-radius overflow-hidden"
+      class="card-border-radius overflow-hidden"
       flat>
       <v-hover>
         <v-img

diff --git a/...main/webapp/vue-apps/suggestions-people-space/components/ExoSuggestionsPeopleAndSpace.vue b/...main/webapp/vue-apps/suggestions-people-space/components/ExoSuggestionsPeopleAndSpace.vue
@@ -68,6 +68,13 @@ export default {
         this.$nextTick().then(() => this.$root.$applicationLoaded());
       }
     },
+    isVisible() {
+      if (this.isVisible) {
+        this.$el.closest('.PORTLET-FRAGMENT').classList.remove('hidden');
+      } else {
+        this.$el.closest('.PORTLET-FRAGMENT').classList.add('hidden');
+      }
+    }
   },
   created() {
     if (this.displayPeopleSuggestions) {
@@ -81,6 +88,11 @@ export default {
       this.loading--;
     }
   },
+  mounted() {
+    if (!this.isVisible) {
+      this.$el.closest('.PORTLET-FRAGMENT').classList.add('hidden');
+    }
+  },
   methods: {
     initPeopleSuggestionsList() {
       return this.$userService.getUserSuggestions()

diff --git a/...portlet/src/main/webapp/vue-apps/user-setting-security/components/UserSettingSecurity.vue b/...portlet/src/main/webapp/vue-apps/user-setting-security/components/UserSettingSecurity.vue
@@ -6,7 +6,7 @@
         @back="closeSecurityDetail" />
       <v-card
         v-else
-        class="my-3 card-border-radius"
+        class="card-border-radius"
         flat>
         <v-list>
           <v-list-item>

diff --git a/webapp/portlet/src/main/webapp/vue-apps/who-is-online-app/components/ExoWhoIsOnline.vue b/webapp/portlet/src/main/webapp/vue-apps/who-is-online-app/components/ExoWhoIsOnline.vue
@@ -36,6 +36,15 @@ export default {
       return this.users && this.users.length;
     },
   },
+  watch: {
+    display() {
+      if (this.display) {
+        this.$el.closest('.PORTLET-FRAGMENT').classList.remove('hidden');
+      } else {
+        this.$el.closest('.PORTLET-FRAGMENT').classList.add('hidden');
+      }
+    }
+  },
   mounted() {
     this.$root.$applicationLoaded();
   },

diff --git a/webapp/portlet/src/main/webapp/vue-apps/who-is-online-app/main.js b/webapp/portlet/src/main/webapp/vue-apps/who-is-online-app/main.js
@@ -28,6 +28,9 @@ export function init() {
   exoi18n.loadLanguageAsync(lang, url)
     .then(() => {
       const onlineUsers = JSON.parse(document.getElementById('whoIsOnlineDefaultValue').value);
+      if (!onlineUsers.length) {
+        document.querySelector('#OnlinePortlet').closest('.PORTLET-FRAGMENT').classList.add('hidden');
+      }
       if (onlineUsers && onlineUsers.length) {
         const avatars = JSON.parse(document.getElementById('whoIsOnlineAvatarsDefaultValue').value);
         onlineUsers.forEach(user => {