Merge branch 'dev' of https://github.com/wri/wri-odp into dev

wri · Oct 29, 2024 · 8a2196e · 8a2196e
2 parents c5b52cf + b6fe90d
commit 8a2196e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 9 deletions.
diff --git a/deployment/frontend/src/components/datasets/sections/API.tsx b/deployment/frontend/src/components/datasets/sections/API.tsx
@@ -105,7 +105,7 @@ const QueryInstructions = () => {
         : publicCkanUrl
 
     const ckanBaseUrl = `${publicCkanUrl}/api/3/action`
-    const ckanDatasetGetUrl = `${ckanBaseUrl}/package_show?id=${dataset.id}`
+    const ckanDatasetGetUrl = `${ckanBaseUrl}/package_show?id=${dataset.name}`
 
     const rwBaseUrl = `https://api.resourcewatch.org/v1`
     const rwDatasetGetUrl = `${rwBaseUrl}/dataset/${dataset.rw_id}`
@@ -165,7 +165,7 @@ const UseCases = ({ usecases }: { usecases: string }) => {
         : publicCkanUrl
 
     const ckanBaseUrl = `${publicCkanUrl}/api/3/action`
-    const ckanDatasetGetUrl = `${ckanBaseUrl}/package_show?id=${dataset.id}`
+    const ckanDatasetGetUrl = `${ckanBaseUrl}/package_show?id=${dataset.name}`
 
     useEffect(() => {
         if (!highlighted && divRef.current) {
@@ -210,7 +210,7 @@ const SnippetInstructions = ({
         : publicCkanUrl
     const ckanBaseUrl = `${publicCkanUrl}/api/3/action`
 
-    const ckanPackageShowUrl = `${ckanBaseUrl}/package_show?id=${dataset.id}`
+    const ckanPackageShowUrl = `${ckanBaseUrl}/package_show?id=${dataset.name}`
     const ckanPackageShowSnippet = getSnippetFn(ckanPackageShowUrl)
 
     const rwBaseUrl = `https://api.resourcewatch.org/v1`

diff --git a/e2e-tests/cypress/e2e/web_search_indexing.cy.js b/e2e-tests/cypress/e2e/web_search_indexing.cy.js
@@ -1,6 +1,19 @@
-describe('Meta Robots Tag Test', () => {
-  it('should contain a "noindex, nofollow" robots meta tag on the homepage', () => {
-    cy.visit('http://ckan-dev:5000/private-admin/');
-    cy.get('head meta[name="robots"]').should('have.attr', 'content', 'noindex,nofollow');
-  });
-});
+describe(
+  "Meta Robots Tag Test",
+  {
+    retries: {
+      runMode: 5,
+      openMode: 0,
+    },
+  },
+  () => {
+    it('should contain a "noindex, nofollow" robots meta tag on the homepage', () => {
+      cy.visit("http://ckan-dev:5000/private-admin/");
+      cy.get('head meta[name="robots"]').should(
+        "have.attr",
+        "content",
+        "noindex,nofollow",
+      );
+    });
+  },
+);