Add latest changes from gitlab-org/gitlab@master

3 files changed, 34 insertions, 5 deletions

diff --git a/app/assets/javascripts/packages_and_registries/package_registry/components/details/metadata/pypi.vue b/app/assets/javascripts/packages_and_registries/package_registry/components/details/metadata/pypi.vue
index 498ddbae7b1..d71773adb9d 100644
--- a/app/assets/javascripts/packages_and_registries/package_registry/components/details/metadata/pypi.vue
+++ b/app/assets/javascripts/packages_and_registries/package_registry/components/details/metadata/pypi.vue
@@ -8,6 +8,9 @@ import DetailsRow from '~/vue_shared/components/registry/details_row.vue';
 export default {
   i18n: {
     requiredPython: s__('PackageRegistry|Required Python: %{pythonVersion}'),
+    summary: s__('PackageRegistry|Summary: %{summary}'),
+    authorEmail: s__('PackageRegistry|Author email: %{authorEmail}'),
+    keywords: s__('PackageRegistry|Keywords: %{keywords}'),
   },
   components: {
     DetailsRow,
@@ -24,12 +27,33 @@ export default {
 
 <template>
   <div>
-    <details-row icon="information-o" padding="gl-p-4" data-testid="pypi-required-python">
+    <details-row dashed icon="information-o" padding="gl-p-4" data-testid="pypi-required-python">
       <gl-sprintf :message="$options.i18n.requiredPython">
         <template #pythonVersion>
           <strong>{{ packageMetadata.requiredPython }}</strong>
         </template>
       </gl-sprintf>
     </details-row>
+    <details-row dashed icon="doc-text" padding="gl-p-4" data-testid="pypi-summary">
+      <gl-sprintf :message="$options.i18n.summary">
+        <template #summary>
+          <strong>{{ packageMetadata.summary }}</strong>
+        </template>
+      </gl-sprintf>
+    </details-row>
+    <details-row dashed icon="doc-text" padding="gl-p-4" data-testid="pypi-keywords">
+      <gl-sprintf :message="$options.i18n.keywords">
+        <template #keywords>
+          <strong>{{ packageMetadata.keywords }}</strong>
+        </template>
+      </gl-sprintf>
+    </details-row>
+    <details-row dashed icon="mail" padding="gl-p-4" data-testid="pypi-author-email">
+      <gl-sprintf :message="$options.i18n.authorEmail">
+        <template #authorEmail>
+          <strong>{{ packageMetadata.authorEmail }}</strong>
+        </template>
+      </gl-sprintf>
+    </details-row>
   </div>
 </template>
diff --git a/app/assets/javascripts/packages_and_registries/package_registry/graphql/queries/get_package_metadata.query.graphql b/app/assets/javascripts/packages_and_registries/package_registry/graphql/queries/get_package_metadata.query.graphql
index fc8b39b37ab..b95b5c2bc74 100644
--- a/app/assets/javascripts/packages_and_registries/package_registry/graphql/queries/get_package_metadata.query.graphql
+++ b/app/assets/javascripts/packages_and_registries/package_registry/graphql/queries/get_package_metadata.query.graphql
@@ -12,7 +12,10 @@ query getPackageMetadata($id: PackagesPackageID!) {
       }
       ... on PypiMetadata {
         id
+        authorEmail
+        keywords
         requiredPython
+        summary
       }
       ... on ConanMetadata {
         id
diff --git a/app/assets/javascripts/vue_shared/components/registry/details_row.vue b/app/assets/javascripts/vue_shared/components/registry/details_row.vue
index 72e06b45561..85b4ea241ef 100644
--- a/app/assets/javascripts/vue_shared/components/registry/details_row.vue
+++ b/app/assets/javascripts/vue_shared/components/registry/details_row.vue
@@ -32,12 +32,14 @@ export default {
 
 <template>
   <div
-    class="gl-display-flex gl-align-items-center gl-font-monospace gl-font-sm gl-word-break-all"
+    class="gl-display-flex gl-align-items-top gl-font-monospace gl-font-sm gl-word-break-all"
     :class="[padding, borderClass]"
   >
-    <gl-icon v-if="icon" :name="icon" class="gl-mr-4" />
-    <span>
+    <div v-if="icon" class="gl-w-5 gl-mr-4">
+      <gl-icon :name="icon" />
+    </div>
+    <div>
       <slot></slot>
-    </span>
+    </div>
   </div>
 </template>