Merge branch 'fix/packages-nuget-metadata' into 'master'

Fix detail page of NuGet package with missing metadata

See merge request gitlab-org/gitlab!72013

app/assets/javascripts/packages_and_registries/package_registry/components/details/metadata/nuget.vue

@@ -24,7 +24,13 @@ export default {
 
 <template>
   <div>
-    <details-row icon="project" padding="gl-p-4" dashed data-testid="nuget-source">
+    <details-row
+      v-if="packageEntity.metadata.projectUrl"
+      icon="project"
+      padding="gl-p-4"
+      dashed
+      data-testid="nuget-source"
+    >
       <gl-sprintf :message="$options.i18n.sourceText">
         <template #link>
           <gl-link :href="packageEntity.metadata.projectUrl" target="_blank">{{
@@ -33,7 +39,12 @@ export default {
         </template>
       </gl-sprintf>
     </details-row>
-    <details-row icon="license" padding="gl-p-4" data-testid="nuget-license">
+    <details-row
+      v-if="packageEntity.metadata.licenseUrl"
+      icon="license"
+      padding="gl-p-4"
+      data-testid="nuget-license"
+    >
       <gl-sprintf :message="$options.i18n.licenseText">
         <template #link>
           <gl-link :href="packageEntity.metadata.licenseUrl" target="_blank">{{

app/graphql/types/packages/nuget/metadatum_type.rb

@@ -10,9 +10,9 @@ module Types
         authorize :read_package
 
         field :id, ::Types::GlobalIDType[::Packages::Nuget::Metadatum], null: false, description: 'ID of the metadatum.'
-        field :license_url, GraphQL::Types::String, null: false, description: 'License URL of the Nuget package.'
-        field :project_url, GraphQL::Types::String, null: false, description: 'Project URL of the Nuget package.'
-        field :icon_url, GraphQL::Types::String, null: false, description: 'Icon URL of the Nuget package.'
+        field :license_url, GraphQL::Types::String, null: true, description: 'License URL of the Nuget package.'
+        field :project_url, GraphQL::Types::String, null: true, description: 'Project URL of the Nuget package.'
+        field :icon_url, GraphQL::Types::String, null: true, description: 'Icon URL of the Nuget package.'
       end
     end
   end

doc/api/graphql/reference/index.md

@@ -12148,10 +12148,10 @@ Nuget metadata.
 
 | Name | Type | Description |
 | ---- | ---- | ----------- |
-| <a id="nugetmetadataiconurl"></a>`iconUrl` | [`String!`](#string) | Icon URL of the Nuget package. |
+| <a id="nugetmetadataiconurl"></a>`iconUrl` | [`String`](#string) | Icon URL of the Nuget package. |
 | <a id="nugetmetadataid"></a>`id` | [`PackagesNugetMetadatumID!`](#packagesnugetmetadatumid) | ID of the metadatum. |
-| <a id="nugetmetadatalicenseurl"></a>`licenseUrl` | [`String!`](#string) | License URL of the Nuget package. |
-| <a id="nugetmetadataprojecturl"></a>`projectUrl` | [`String!`](#string) | Project URL of the Nuget package. |
+| <a id="nugetmetadatalicenseurl"></a>`licenseUrl` | [`String`](#string) | License URL of the Nuget package. |
+| <a id="nugetmetadataprojecturl"></a>`projectUrl` | [`String`](#string) | Project URL of the Nuget package. |
 
 ### `OncallParticipantType`
 

spec/frontend/packages_and_registries/package_registry/components/details/metadata/nuget_spec.js

@@ -9,9 +9,8 @@ import { PACKAGE_TYPE_NUGET } from '~/packages_and_registries/package_registry/c
 
 import DetailsRow from '~/vue_shared/components/registry/details_row.vue';
 
-const nugetPackage = { packageType: PACKAGE_TYPE_NUGET, metadata: nugetMetadata() };
-
 describe('Nuget Metadata', () => {
+  let nugetPackage = { packageType: PACKAGE_TYPE_NUGET, metadata: nugetMetadata() };
   let wrapper;
 
   const mountComponent = () => {
@@ -52,4 +51,30 @@ describe('Nuget Metadata', () => {
     expect(element.props('icon')).toBe(icon);
     expect(findElementLink(element).attributes('href')).toBe(nugetPackage.metadata[link]);
   });
+
+  describe('without source', () => {
+    beforeAll(() => {
+      nugetPackage = {
+        packageType: PACKAGE_TYPE_NUGET,
+        metadata: { iconUrl: 'iconUrl', licenseUrl: 'licenseUrl' },
+      };
+    });
+
+    it('does not show additional metadata', () => {
+      expect(findNugetSource().exists()).toBe(false);
+    });
+  });
+
+  describe('without license', () => {
+    beforeAll(() => {
+      nugetPackage = {
+        packageType: PACKAGE_TYPE_NUGET,
+        metadata: { iconUrl: 'iconUrl', projectUrl: 'projectUrl' },
+      };
+    });
+
+    it('does not show additional metadata', () => {
+      expect(findNugetLicense().exists()).toBe(false);
+    });
+  });
 });

spec/graphql/types/packages/nuget/metadatum_type_spec.rb

@@ -10,4 +10,10 @@ RSpec.describe GitlabSchema.types['NugetMetadata'] do
 
     expect(described_class).to include_graphql_fields(*expected_fields)
   end
+
+  %w[projectUrl licenseUrl iconUrl].each do |optional_field|
+    it "#{optional_field} can be null" do
+      expect(described_class.fields[optional_field].type).to be_nullable
+    end
+  end
 end