fix: minor fixes here and there

drodil · Nov 1, 2024 · 1dc5fc8 · 1dc5fc8
1 parent 3e7f4b0
commit 1dc5fc8
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 14 deletions.
diff --git a/plugins/qeta-backend/src/database/DatabaseQetaStore.ts b/plugins/qeta-backend/src/database/DatabaseQetaStore.ts
@@ -2385,14 +2385,15 @@ export class DatabaseQetaStore implements QetaStore {
     addPost?: boolean,
   ): Promise<Answer> {
     const additionalInfo = await Promise.all([
-      addVotes ? this.getAnswerVotes(val.id) : undefined,
+      addVotes !== false ? this.getAnswerVotes(val.id) : undefined,
       addComments ? this.getAnswerComments(val.id) : undefined,
       addPost ? this.getPost(user_ref, val.postId, false) : undefined,
       this.db('attachments').select('id').where('answerId', val.id),
     ]);
     return {
       id: val.id,
       postId: val.postId,
+      own: val.author === user_ref,
       author:
         val.anonymous && val.author !== user_ref ? 'anonymous' : val.author,
       content: val.content,

diff --git a/plugins/qeta-backend/src/service/routes/answers.ts b/plugins/qeta-backend/src/service/routes/answers.ts
@@ -75,7 +75,12 @@ export const answersRoutes = (router: Router, options: RouteOptions) => {
       const filter: PermissionCriteria<QetaFilters> = transformConditions(
         decision.conditions,
       );
-      await database.getAnswers(username, request.query, filter);
+      const answers = await database.getAnswers(
+        username,
+        request.query,
+        filter,
+      );
+      response.json(answers);
     } else {
       response.json(await database.getAnswers(username, request.query));
     }
@@ -448,6 +453,12 @@ export const answersRoutes = (router: Router, options: RouteOptions) => {
 
     await authorize(request, qetaReadPostPermission, options, post);
     await authorize(request, qetaReadAnswerPermission, options, answer);
+    if (answer.own) {
+      response
+        .status(400)
+        .send({ errors: 'Cannot vote on own answer', type: 'body' });
+      return;
+    }
 
     // Act
     const voted = await database.voteAnswer(username, answerId, score);

diff --git a/plugins/qeta-backend/src/service/routes/posts.ts b/plugins/qeta-backend/src/service/routes/posts.ts
@@ -488,6 +488,12 @@ export const postsRoutes = (router: Router, options: RouteOptions) => {
     }
 
     await authorize(request, qetaReadPostPermission, options, post);
+    if (post.own) {
+      response
+        .status(400)
+        .send({ errors: 'You cannot vote your own post', type: 'body' });
+      return;
+    }
 
     const voted = await database.votePost(username, postId, score);
 

diff --git a/plugins/qeta-react/src/components/AnswerCard/AnswerCard.tsx b/plugins/qeta-react/src/components/AnswerCard/AnswerCard.tsx
@@ -59,14 +59,19 @@ export const AnswerCard = (props: {
         }`}
       >
         <CardContent>
-          <Grid container spacing={0} justifyContent="flex-start">
-            <Grid container item xs={1} justifyContent="center">
+          <Grid
+            container
+            spacing={0}
+            justifyContent="flex-start"
+            style={{ flexWrap: 'nowrap' }}
+          >
+            <Grid item justifyContent="center">
               <div className={styles.questionCardVote}>
                 <VoteButtons entity={answerEntity} post={question} />
                 <LinkButton entity={answerEntity} />
               </div>
             </Grid>
-            <Grid item xs={11} className={styles.answerCardContent}>
+            <Grid item className={styles.answerCardContent}>
               {editMode ? (
                 <AnswerForm
                   post={question}
@@ -75,12 +80,14 @@ export const AnswerCard = (props: {
                 />
               ) : (
                 <>
-                  <Typography variant="body1" gutterBottom>
-                    <MarkdownRenderer
-                      className="qetaAndwerCardAnswerContent"
-                      content={answerEntity.content}
-                    />
-                  </Typography>
+                  <Grid item>
+                    <Typography variant="body1" gutterBottom>
+                      <MarkdownRenderer
+                        className="qetaAndwerCardAnswerContent"
+                        content={answerEntity.content}
+                      />
+                    </Typography>
+                  </Grid>
                   <Grid
                     container
                     item
@@ -89,7 +96,7 @@ export const AnswerCard = (props: {
                     alignItems="flex-end"
                     className={styles.questionCardMetadata}
                   >
-                    <Grid item xs={9} style={{ alignSelf: 'flex-end' }}>
+                    <Grid item style={{ alignSelf: 'flex-end' }}>
                       {(answerEntity.own ||
                         answerEntity.canDelete ||
                         answerEntity.canEdit) && (

diff --git a/plugins/qeta-react/src/components/FilterPanel/FilterPanel.tsx b/plugins/qeta-react/src/components/FilterPanel/FilterPanel.tsx
@@ -80,6 +80,7 @@ export type PostFilters = Filters & {
 export type AnswerFilters = Filters & {
   orderBy?: 'created' | 'score' | 'updated';
   noVotes?: 'true' | 'false';
+  noCorrectAnswer?: 'true' | 'false';
 };
 
 export type CollectionFilters = Filters & {
@@ -221,7 +222,7 @@ export const FilterPanel = <T extends Filters>(props: FilterPanelProps<T>) => {
                   label={t('filterPanel.noAnswers.label')}
                 />
               )}
-              {postFilters && type !== 'article' && (
+              {(postFilters || answerFilters) && type !== 'article' && (
                 <FormControlLabel
                   control={
                     <Checkbox

diff --git a/plugins/qeta-react/src/components/PostsGrid/PostsGridContent.tsx b/plugins/qeta-react/src/components/PostsGrid/PostsGridContent.tsx
@@ -113,7 +113,7 @@ export const PostsGridContent = (props: {
         >
           {response.posts.map(p => {
             return (
-              <Grid item xs={12} xl={6} key={p.id}>
+              <Grid item xs={12} key={p.id}>
                 <PostsGridItem
                   post={p}
                   type={type}