feat: make requests clickable (#1787)

Informasjonsforvaltning · Oct 20, 2023 · f9d6e55 · f9d6e55
1 parent d528e5a
commit f9d6e55
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 5 deletions.
diff --git a/src/pages/requests/index.tsx b/src/pages/requests/index.tsx
@@ -1,12 +1,15 @@
 import React, { FC, useEffect } from 'react';
+import { compose } from 'redux';
 import withCommunity, {
   Props as CommunityProps
 } from '../../components/with-community';
-import { compose } from 'redux';
 import withErrorBoundary from '../../components/with-error-boundary';
 import ErrorPage from '../error-page';
 import SC from './styled';
 import { formatDate } from '../../lib/date-utils';
+import env from '../../env';
+
+const { FDK_COMMUNITY_BASE_URI } = env;
 
 interface Props extends CommunityProps {}
 
@@ -18,6 +21,10 @@ const RequestsPage: FC<Props> = ({
     getCommunityRequests();
   }, []);
 
+  const notDeletedRequests = requests?.topics?.filter(
+    topic => topic.deleted === 0
+  );
+
   return (
     <main id='content' className='container'>
       <SC.RequestsTitleRow>
@@ -26,10 +33,14 @@ const RequestsPage: FC<Props> = ({
         <SC.RequestInfo>Antall stemmer</SC.RequestInfo>
         <SC.RequestInfo>Antall visninger</SC.RequestInfo>
       </SC.RequestsTitleRow>
-      {requests?.topics &&
-        requests.topics.map(topic => (
+      {notDeletedRequests &&
+        notDeletedRequests.map(topic => (
           <SC.RequestRow key={topic.cid}>
-            <SC.RequestTitle>{topic.title}</SC.RequestTitle>
+            <SC.RequestLink
+              href={`${FDK_COMMUNITY_BASE_URI}/topic/${topic.slug}`}
+            >
+              {topic.title}
+            </SC.RequestLink>
             <SC.RequestInfo>
               {formatDate(new Date(topic.timestampISO))}
             </SC.RequestInfo>

diff --git a/src/pages/requests/styled.ts b/src/pages/requests/styled.ts
@@ -23,12 +23,19 @@ const RequestsTitleRow = styled.div`
   padding-left: 37px;
   padding-right: 37px;
   font-weight: bold;
+  margin-bottom: 5px;
 `;
 
 const RequestTitle = styled.div`
   width: 50%;
   font-weight: bold;
 `;
+const RequestLink = styled.a`
+  width: 50%;
+  font-weight: bold;
+  text-decoration: underline;
+  color: #111 !important;
+`;
 
 const RequestInfo = styled.div`
   width: 16%;
@@ -40,5 +47,6 @@ export default {
   RequestRow,
   RequestsTitleRow,
   RequestTitle,
-  RequestInfo
+  RequestInfo,
+  RequestLink
 };
diff --git a/src/types/domain.d.ts b/src/types/domain.d.ts
@@ -1038,6 +1038,8 @@ export interface CommunityRequest {
   postercount: number;
   downvotes: number;
   upvotes: number;
+  deleted: 1 | 0;
+  slug: string;
 }
 
 export interface CommunityTeaser {