Merge pull request #118 from hifis-net/fix-organisations-carousel

Fix organisations carousel on frontpage

Author: cmeessen

frontend/components/home/helmholtz/HorizontalScrollContainer.tsx

@@ -1,5 +1,5 @@
-// SPDX-FileCopyrightText: 2022 Christian Meeßen (GFZ) <[email protected]>
-// SPDX-FileCopyrightText: 2022 Helmholtz Centre Potsdam - GFZ German Research Centre for Geosciences
+// SPDX-FileCopyrightText: 2022 - 2023 Christian Meeßen (GFZ) <[email protected]>
+// SPDX-FileCopyrightText: 2022 - 2023 Helmholtz Centre Potsdam - GFZ German Research Centre for Geosciences
 // SPDX-FileCopyrightText: 2022 Marc Hanisch (GFZ) <[email protected]>
 //
 // SPDX-License-Identifier: EUPL-1.2
@@ -22,22 +22,25 @@ export default function HorizontalScrollContainer(
     >
       {
         organisations.map(item => {
-          return(
-            <Link
-              key={`link_${item.name}`}
-              href={`/organisations/${item.rsd_path}`}
-              passHref
-              >
-              <img
-                alt={item.name}
-                src={getImageUrl(item.logo_id) ?? undefined}
-                className="p-10 hover:cursor-pointer max-w-none w-auto"
-                style = {{
-                  height: '200px',
-                }}
-              />
-            </Link>
-          )
+          const imageUrl = getImageUrl(item.logo_id)
+          if (imageUrl !== null) {
+            return(
+              <Link
+                key={`link_${item.name}`}
+                href={`/organisations/${item.rsd_path}`}
+                passHref
+                >
+                <img
+                  alt={item.name}
+                  src={imageUrl}
+                  className="p-10 hover:cursor-pointer max-w-none w-auto"
+                  style = {{
+                    height: '200px',
+                  }}
+                />
+              </Link>
+            )
+          }
         })
       }
     </div>

frontend/components/home/helmholtz/index.tsx

@@ -69,7 +69,7 @@ export default function Home() {
 
   useEffect(() => {
     async function getData () {
-      const url = '/api/v1/rpc/organisations_overview?parent=is.null&software_cnt=gt.0'
+      const url = '/api/v1/rpc/organisations_overview?parent=is.null&software_cnt=gt.0&is_tenant=eq.true'
       const data = await getOrganisationsList({url})
       setOrganisations(data)
     }
@@ -220,7 +220,7 @@ export default function Home() {
               <h2 className="text-5xl pb-2">Contributions</h2>
               <div className='text-2xl'>We present software contributions by</div>
                 <ParticipatingOrganisations organisations={organisations} sbRef={simplebarRef}/>
-              <div className='text-xl pt-2'>Your organisation is not in the list? We will open the RSD for self service soon. Stay tuned.</div>
+              <div className='text-xl pt-2'>Your organisation is not on the list? <a onClick={handleClickAddSoftware} className="underline">Add your software</a> now.</div>
             </div>
           </div>
         }