Merge pull request #21 from koopjs/b/3169-fix-license-fallbacks

b/3169 custom licensing
koopjs · Apr 5, 2022 · 700aea6 · 700aea6
2 parents 57a323d + 2c4566c
commit 700aea6
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 0 deletions.
diff --git a/src/dcat-us/dataset-formatter.test.ts b/src/dcat-us/dataset-formatter.test.ts
@@ -696,6 +696,44 @@ describe('formatDcatDataset', () => {
     expect(actual.license).toEqual(expectedLicense);
   });
 
+  it('license should be overwritten if it is specified as "none"', () => {
+    const dataset = {
+      owner: 'fpgis.CALFIRE',
+      created: 1570747289000,
+      modified: 1570747379000,
+      tags: ['Uno', 'Dos', 'Tres'],
+      extent: {
+        coordinates: [
+          [-123.8832, 35.0024],
+          [-118.3281, 42.0122],
+        ],
+        type: 'envelope',
+      },
+      name: 'DCAT_Test',
+      description: 'Some Description',
+      source: 'Test Source',
+      id: '00000000000000000000000000000000_0',
+      type: 'Feature Layer',
+      url: 'https://services1.arcgis.com/jUJYIo9tSA7EHvfZ/arcgis/rest/services/DCAT_Test/FeatureServer/0',
+      layer: {
+        geometryType: 'esriGeometryPolygon',
+      },
+      server: {
+        spatialReference: {
+          wkid: 3310,
+        },
+      },
+      license: 'none'
+    };
+
+    const expectedLicense = 'a-custom-license';
+
+    const actual = JSON.parse(formatDcatDataset(dataset, siteUrl, siteModel, buildDatasetTemplate({
+      license: '{{license || a-custom-license}}'
+    })));
+    expect(actual.license).toEqual(expectedLicense);
+  });
+
   test('Hub Page gets default keyword when no tags', () => {
     const datasetWithNoTags = {
       owner: 'fpgis.CALFIRE',

diff --git a/src/dcat-us/dataset-formatter.ts b/src/dcat-us/dataset-formatter.ts
@@ -24,6 +24,11 @@ export function formatDcatDataset (hubDataset: HubDatasetAttributes, siteUrl: st
     licenseInfo = ''
   } = hubDataset;
 
+  // Override hub.js default license value of 'none'
+  if (hubDataset.license === 'none') {
+    hubDataset.license = null;
+  }
+
   const defaultDataset = {
     '@type': 'dcat:Dataset',
     identifier: landingPage,