Add latest changes from gitlab-org/gitlab@13-2-stable-ee

1 files changed, 41 insertions, 57 deletions

diff --git a/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue b/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue
index 595baeeb14f..bd35d3fead9 100644
--- a/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue
+++ b/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue
@@ -4,8 +4,11 @@ import Icon from '~/vue_shared/components/icon.vue';
 import UserAvatarImage from '../user_avatar/user_avatar_image.vue';
 import { glEmojiTag } from '../../../emoji';
 
+const MAX_SKELETON_LINES = 4;
+
 export default {
   name: 'UserPopover',
+  maxSkeletonLines: MAX_SKELETON_LINES,
   components: {
     Icon,
     GlPopover,
@@ -22,11 +25,6 @@ export default {
       required: true,
       default: null,
     },
-    loaded: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
   },
   computed: {
     statusHtml() {
@@ -42,14 +40,8 @@ export default {
 
       return '';
     },
-    nameIsLoading() {
-      return !this.user.name;
-    },
-    workInformationIsLoading() {
-      return !this.user.loaded && this.user.workInformation === null;
-    },
-    locationIsLoading() {
-      return !this.user.loaded && this.user.location === null;
+    userIsLoading() {
+      return !this.user?.loaded;
     },
   },
 };
@@ -58,54 +50,46 @@ export default {
 <template>
   <!-- 200ms delay so not every mouseover triggers Popover -->
   <gl-popover :target="target" :delay="200" boundary="viewport" triggers="hover" placement="top">
-    <div class="user-popover d-flex">
-      <div class="p-1 flex-shrink-1">
-        <user-avatar-image :img-src="user.avatarUrl" :size="60" css-classes="mr-2" />
+    <div class="gl-p-3 gl-line-height-normal gl-display-flex" data-testid="user-popover">
+      <div class="gl-p-2 flex-shrink-1">
+        <user-avatar-image :img-src="user.avatarUrl" :size="60" css-classes="gl-mr-3!" />
       </div>
-      <div class="p-1 w-100">
-        <h5 class="m-0">
-          <span v-if="user.name">{{ user.name }}</span>
-          <gl-skeleton-loading v-else :lines="1" class="animation-container-small mb-1" />
-        </h5>
-        <div class="text-secondary mb-2">
-          <span v-if="user.username">@{{ user.username }}</span>
-          <gl-skeleton-loading v-else :lines="1" class="animation-container-small mb-1" />
-        </div>
-        <div class="text-secondary">
-          <div v-if="user.bio" class="d-flex mb-1">
-            <icon name="profile" class="category-icon flex-shrink-0" />
-            <span ref="bio" class="ml-1">{{ user.bio }}</span>
-          </div>
-          <div v-if="user.workInformation" class="d-flex mb-1">
-            <icon
-              v-show="!workInformationIsLoading"
-              name="work"
-              class="category-icon flex-shrink-0"
-            />
-            <span ref="workInformation" class="ml-1">{{ user.workInformation }}</span>
-          </div>
-          <gl-skeleton-loading
-            v-if="workInformationIsLoading"
-            :lines="1"
-            class="animation-container-small mb-1"
-          />
-        </div>
-        <div class="js-location text-secondary d-flex">
-          <icon
-            v-show="!locationIsLoading && user.location"
-            name="location"
-            class="category-icon flex-shrink-0"
-          />
-          <span v-if="user.location" class="ml-1">{{ user.location }}</span>
+      <div class="gl-p-2 gl-w-full">
+        <template v-if="userIsLoading">
+          <!-- `gl-skeleton-loading` does not support equal length lines -->
+          <!-- This can be migrated to `gl-skeleton-loader` when https://gitlab.com/gitlab-org/gitlab-ui/-/issues/872 is completed -->
           <gl-skeleton-loading
-            v-if="locationIsLoading"
+            v-for="n in $options.maxSkeletonLines"
+            :key="n"
             :lines="1"
-            class="animation-container-small mb-1"
+            class="animation-container-small gl-mb-2"
           />
-        </div>
-        <div v-if="statusHtml" class="js-user-status mt-2">
-          <span v-html="statusHtml"></span>
-        </div>
+        </template>
+        <template v-else>
+          <div class="gl-mb-3">
+            <h5 class="gl-m-0">
+              {{ user.name }}
+            </h5>
+            <span class="gl-text-gray-700">@{{ user.username }}</span>
+          </div>
+          <div class="gl-text-gray-700">
+            <div v-if="user.bio" class="gl-display-flex gl-mb-2">
+              <icon name="profile" class="gl-text-gray-600 gl-flex-shrink-0" />
+              <span ref="bio" class="ml-1" v-html="user.bioHtml"></span>
+            </div>
+            <div v-if="user.workInformation" class="gl-display-flex gl-mb-2">
+              <icon name="work" class="gl-text-gray-600 gl-flex-shrink-0" />
+              <span ref="workInformation" class="gl-ml-2">{{ user.workInformation }}</span>
+            </div>
+          </div>
+          <div v-if="user.location" class="js-location gl-text-gray-700 gl-display-flex">
+            <icon name="location" class="gl-text-gray-600 flex-shrink-0" />
+            <span class="gl-ml-2">{{ user.location }}</span>
+          </div>
+          <div v-if="statusHtml" class="js-user-status gl-mt-3">
+            <span v-html="statusHtml"></span>
+          </div>
+        </template>
       </div>
     </div>
   </gl-popover>