fix(hub-common): update spatial element from default dcat us template (…

…#1788)
Esri · Jan 31, 2025 · 064deea · 064deea
1 parent 98d11a7
commit 064deea
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 2 deletions.
diff --git a/packages/common/src/sites/feeds/_internal/defaults.ts b/packages/common/src/sites/feeds/_internal/defaults.ts
@@ -31,7 +31,7 @@ const DCAT_US_1X_DEFAULT = {
     fn: "{{owner}}",
     hasEmail: "{{orgContactEmail}}",
   },
-  spatial: "{{extent}}",
+  spatial: "{{extent:computeSpatialProperty}}",
 };
 
 const DCAT_US_3X_DEFAULT = {

diff --git a/packages/common/src/sites/feeds/getFeedTemplate.ts b/packages/common/src/sites/feeds/getFeedTemplate.ts
@@ -58,7 +58,20 @@ function getDcatApConfig(feedsConfig: IFeedsConfiguration, version: string) {
 
 function getDcatUsConfig(feedsConfig: IFeedsConfiguration, version: string) {
   if (getMajorVersion(version) === "1") {
-    return feedsConfig.dcatUS1X || feedsConfig.dcatUS11;
+    const dcatUsConfig = feedsConfig.dcatUS1X || feedsConfig.dcatUS11;
+    // Some sites may have dcat us config with invalid
+    // extent value for spatial property i.e. '{{extent}}'
+    //
+    // Following fixes that by replacing invalid default extent
+    // value to valid one i.e. '{{{extent:computeSpatialProperty}}'
+    if (
+      dcatUsConfig &&
+      typeof dcatUsConfig.spatial === "string" &&
+      dcatUsConfig.spatial.replace(/\s/g, "") === "{{extent}}"
+    ) {
+      dcatUsConfig.spatial = "{{extent:computeSpatialProperty}}";
+    }
+    return dcatUsConfig;
   }
 
   if (getMajorVersion(version) === "3") {

diff --git a/packages/common/test/sites/feeds/getFeedTemplate.test.ts b/packages/common/test/sites/feeds/getFeedTemplate.test.ts
@@ -40,6 +40,22 @@ describe("getFeedTemplate", () => {
     const chk = getFeedTemplate({ feedsConfig, format, version });
     expect(chk).toEqual(dcatUsConfig);
   });
+  it("gets DCAT US configuration containing spatial field with valid extent value", async () => {
+    const dcatUsConfig = {
+      title: "{{title}}",
+      spatial: "   {{  extent  }}   ",
+    };
+    const feedsConfig: IFeedsConfiguration = {
+      dcatUS1X: dcatUsConfig,
+    };
+    const format: FeedFormat = "dcat-us";
+    const version = "1.1";
+    const chk = getFeedTemplate({ feedsConfig, format, version });
+    expect(chk).toEqual(dcatUsConfig);
+    expect(chk).toBeDefined();
+    expect(chk.spatial).toEqual("{{extent:computeSpatialProperty}}");
+    expect(chk.title).toEqual("{{title}}");
+  });
   it("throws error if DCAT US version is not supported", async () => {
     const dcatUsConfig = {
       title: "{{title}}",