Merge branch 'development' into feature/OP-240/Application-Component

OpenCatalogi · Feb 29, 2024 · 828925d · 828925d
2 parents 818087e + 532e205
commit 828925d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pwa/src/apiService/resources/search.ts b/pwa/src/apiService/resources/search.ts
@@ -23,7 +23,7 @@ export default class Search {
       endpoint += "&isBasedOn=IS NULL";
     }
 
-    if (window.sessionStorage.getItem("GITHUB_ORGANIZATION_URL") !== "") {
+    if (window.sessionStorage.getItem("GITHUB_ORGANIZATION_URL") !== "" && window.sessionStorage.getItem("GITHUB_ORGANIZATION_URL") !== "false") {
       endpoint += `&embedded.url.embedded.organisation.github=${window.sessionStorage.getItem(
         "GITHUB_ORGANIZATION_URL",
       )}`;

diff --git a/pwa/src/templates/templateParts/header/HeaderTemplate.tsx b/pwa/src/templates/templateParts/header/HeaderTemplate.tsx
@@ -89,7 +89,7 @@ export const HeaderTemplate: React.FC<HeaderTemplateProps> = ({ layoutClassName
       <div className={styles.headerMiddleBar}>
         <Container layoutClassName={styles.primaryNavContainer}>
           <div className={clsx(styles.logoContainer, styles.logoDesktop)}>
-            {window.sessionStorage.getItem("HEADER_LOGO_URL") ? (
+            {window.sessionStorage.getItem("HEADER_LOGO_URL") !== "false" ? (
               <img
                 onClick={() => navigate("/")}
                 src={window.sessionStorage.getItem("HEADER_LOGO_URL") ?? LogoRotterdam}
@@ -123,7 +123,7 @@ export const HeaderTemplate: React.FC<HeaderTemplateProps> = ({ layoutClassName
           ariaLabel={{ container: t("Jumbotron"), card: t("Jumbotron card") }}
           role="contentinfo"
           isCard={window.sessionStorage.getItem("JUMBOTRON_ISCARD") === "true"}
-          container={window.sessionStorage.getItem("JUMBOTRON_CONTAINER") === "true"}
+          container={true}
           subTitle={window.sessionStorage.getItem("JUMBOTRON_SUBTITLE") ?? ""}
           description={
             window.sessionStorage.getItem("JUMBOTRON_DESCRIPTION") ||