Merge branch 'main' into jpople/hj-341/reclassify-button-fix

ethyca · Jan 13, 2025 · 7510c7b · 7510c7b
2 parents 32e7e85 + 73188c5
commit 7510c7b
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 3 deletions.
diff --git a/.github/workflows/cypress_e2e.yml b/.github/workflows/cypress_e2e.yml
@@ -26,6 +26,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Setup Python 3.10
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.10"
+
       - name: Install Nox
         run: pip install nox>=2022
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,7 @@ Changes can also be flagged with a GitHub label for tracking purposes. The URL o
 - Added cache-clearing methods to the `DBCache` model to allow deleting cache entries [#5629](https://github.com/ethyca/fides/pull/5629)
 
 ### Changed
+- Updated brand link url [#5656](https://github.com/ethyca/fides/pull/5656)
 - Changed "Reclassify" D&D button to show in an overflow menu when row actions are overcrowded [#5655](https://github.com/ethyca/fides/pull/5655)
 
 ### Fixed

diff --git a/clients/fides-js/src/components/BrandLink.tsx b/clients/fides-js/src/components/BrandLink.tsx
@@ -5,7 +5,7 @@ import EthycaLogo from "./EthycaLogo";
 const BrandLink = () => (
   <div className="fides-brand">
     <a
-      href="https://fid.es/powered"
+      href="https://ethyca.com/"
       target="_blank"
       rel="noopener noreferrer"
       className="fides-brand-link"

diff --git a/clients/fides-js/src/components/EthycaLogo.tsx b/clients/fides-js/src/components/EthycaLogo.tsx
@@ -7,6 +7,8 @@ const EthycaLogo = () => (
     height="20"
     fill="currentColor"
     className="ethyca-logo"
+    role="img"
+    aria-label="Ethyca"
   >
     <path d="M11.5602 0H8.70311V7.9999H11.5602V0ZM23.0026 12.0001H20.1455V20H23.0026V12.0001ZM14.1258 20H17.5799L12.1315 11.9774V17.0631L14.1258 20ZM8.13179 17.0626V11.9769L2.68588 19.9995H6.14003L8.13129 17.0626H8.13179ZM23.5744 2.93688V8.02263L29.0198 0H25.5682L23.5739 2.93688H23.5744ZM19.5742 2.93688L17.5799 0H14.1258L19.5742 8.02263V2.93688ZM19.5717 8.57121H12.132V11.4283H19.5717V8.57121ZM31 8.57121H23.5603V11.4283H31V8.57121ZM8.13179 8.57121H0.691589V11.4283H8.13179V8.57121Z" />
   </svg>

diff --git a/clients/privacy-center/components/BrandLink.tsx b/clients/privacy-center/components/BrandLink.tsx
@@ -22,9 +22,17 @@ const BrandLink = ({
       right={right}
       textDecoration="none"
       _hover={{ textDecoration: "none" }}
+      href="https://ethyca.com/"
       {...props}
     >
-      Powered by <EthycaLogo color="minos.500" h="20px" w="31px" />
+      Powered by{" "}
+      <EthycaLogo
+        color="minos.500"
+        h="20px"
+        w="31px"
+        role="img"
+        aria-label="Ethyca"
+      />
     </Link>
   );
 };

diff --git a/clients/privacy-center/cypress/e2e/consent-banner.cy.ts b/clients/privacy-center/cypress/e2e/consent-banner.cy.ts
@@ -333,7 +333,7 @@ describe("Consent overlay", () => {
               cy.get("a.fides-brand-link").should(
                 "have.attr",
                 "href",
-                "https://fid.es/powered",
+                "https://ethyca.com/",
               );
             });
           });

diff --git a/clients/privacy-center/public/fides-js-components-demo.html b/clients/privacy-center/public/fides-js-components-demo.html
@@ -207,6 +207,7 @@
           privacyCenterUrl: "http://localhost:3001",
           fidesApiUrl: "http://localhost:8080/api/v1",
           fidesPrimaryColor: "#008000",
+          showFidesBrandLink: true,
         },
       };
       if (init !== "false") {