Fix lint

Dsek-LTH · Aug 31, 2023 · e32fad5 · e32fad5
1 parent b001f92
commit e32fad5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/backend/services/core/src/datasources/News.ts b/backend/services/core/src/datasources/News.ts
@@ -93,7 +93,8 @@ export function convertArticle({
     status,
     author,
     member,
-    author_id: authorId,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    author_id: authorId, // we want to remove this field from output
     ...rest
   } = article;
   const a: gql.Article = {

diff --git a/frontend/components/Calendar/EventCard.tsx b/frontend/components/Calendar/EventCard.tsx
@@ -19,7 +19,6 @@ import articleStyles from '~/components/News/articleStyles';
 import Comments from '~/components/Social/Comments/Comments';
 import GoingButton from '~/components/Social/SocialButton/GoingButton';
 import InterestedButton from '~/components/Social/SocialButton/InterestedButton';
-import { authorIsUser } from '~/functions/authorFunctions';
 import selectTranslation from '~/functions/selectTranslation';
 import startAndEndDateToStringRows from '~/functions/startAndEndDateToStringRows';
 import
@@ -267,7 +266,7 @@ export default function EventCard({
         {event.organizer}
       </Typography>
 
-      {(hasAccess(apiContext, 'event:update') || authorIsUser(event.author, user)) && (
+      {(hasAccess(apiContext, 'event:update') || event.author?.id === user.id) && (
       <Link href={routes.editEvent(event.id)}>{t('edit')}</Link>
       )}
     </Stack>

diff --git a/frontend/components/Link.tsx b/frontend/components/Link.tsx
@@ -1,6 +1,6 @@
-import React from 'react';
+import { Link as MuiLink } from '@mui/material';
 import NextLink from 'next/link';
-import { Box, Link as MuiLink } from '@mui/material';
+import React from 'react';
 
 function Link({
   href,

diff --git a/frontend/components/News/ArticleRequest.tsx b/frontend/components/News/ArticleRequest.tsx
@@ -16,14 +16,14 @@ import
 {
   authorIsUser,
   getMemberSignature,
-  getSignature,
 } from '~/functions/authorFunctions';
 
 import Article from '~/components/News/article';
 import
 {
   ArticleQuery,
-  ArticleRequest as ArticleRequestType,
+  ArticleRequestsQuery,
+  RejectedRequestsQuery,
   useApproveRequestMutation, useRejectRequestMutation,
   useUndoRejectionMutation,
 } from '~/generated/graphql';
@@ -67,7 +67,7 @@ function ReasonPrompt({ open, onClose }: { open: boolean; onClose: (value?: stri
 }
 
 type ArticleProps = {
-  article: Omit<ArticleRequestType, 'author'> & { author: ArticleQuery['article']['author'] };
+  article: ArticleRequestsQuery['articleRequests'][number] | RejectedRequestsQuery['rejectedRequests']['articles'][number];
   refetch?: () => void;
   rejected?: boolean;
 };
@@ -94,6 +94,7 @@ export default function ArticleRequest({
   });
   const fixedArticle: ArticleQuery['article'] = {
     ...article,
+    __typename: 'Article',
     likers: [],
     isLikedByMe: false,
     comments: [],