Merge branch 'develop' into feat/multiplepatch

PalisadoesFoundation · Jan 17, 2024 · bd552a8 · bd552a8
2 parents a7e0ad7 + 5e4b1e1
commit bd552a8
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 0 deletions.
diff --git a/public/locales/en.json b/public/locales/en.json
@@ -328,6 +328,7 @@
     "sortPost": "Sort Post",
     "tag": " Your browser does not support the video tag",
     "postCreatedSuccess": "Congratulations! You have Posted Something."
+    "pinPost": "Pin post"
   },
   "postNotFound": {
     "post": "Post",

diff --git a/public/locales/fr.json b/public/locales/fr.json
@@ -323,6 +323,7 @@
     "sortPost": "Trier les publications",
     "tag": "Votre navigateur ne prend pas en charge la balise vidéo",
     "postCreatedSuccess": "Félicitations ! Vous avez publié quelque chose."
+    "pinPost": "Épingler le message"
   },
   "postNotFound": {
     "post": "Poste",

diff --git a/public/locales/hi.json b/public/locales/hi.json
@@ -323,6 +323,7 @@
     "sortPost": "पोस्ट को क्रमित करें",
     "tag": "आपका ब्राउज़र वीडियो टैग का समर्थन नहीं करता",
     "postCreatedSuccess": "बधाई हो! आपने कुछ पोस्ट किया है।"
+    "pinPost": "पोस्ट को पिन करें"
   },
   "postNotFound": {
     "post": "पोस्ट",

diff --git a/public/locales/sp.json b/public/locales/sp.json
@@ -323,6 +323,7 @@
     "sortPost": "Ordenar Publicaciones",
     "tag": "Su navegador no admite la etiqueta de video",
     "postCreatedSuccess": "¡Felicidades! Has publicado algo."
+    "pinPost": "Fijar publicación"
   },
   "postNotFound": {
     "post": "Publicaciones",

diff --git a/public/locales/zh.json b/public/locales/zh.json
@@ -323,6 +323,7 @@
     "sortPost": "排序帖子",
     "tag": "您的浏览器不支持视频标签",
     "postCreatedSuccess": "恭喜！您已经发布了一些内容。"
+    "pinPost": "针柱"
   },
   "postNotFound": {
     "post": "郵政",

diff --git a/src/GraphQl/Mutations/mutations.ts b/src/GraphQl/Mutations/mutations.ts
@@ -295,6 +295,7 @@ export const CREATE_POST_MUTATION = gql`
     $videoUrl: URL
     $organizationId: ID!
     $file: String
+    $pinned: Boolean
   ) {
     createPost(
       data: {
@@ -303,6 +304,7 @@ export const CREATE_POST_MUTATION = gql`
         imageUrl: $imageUrl
         videoUrl: $videoUrl
         organizationId: $organizationId
+        pinned: $pinned
       }
       file: $file
     ) {

diff --git a/src/screens/OrgPost/OrgPost.test.tsx b/src/screens/OrgPost/OrgPost.test.tsx
@@ -210,6 +210,16 @@ describe('Organisation Post Page', () => {
     userEvent.type(screen.getByTestId('modalinfo'), formData.postinfo);
     userEvent.upload(screen.getByTestId('addMediaField'), formData.postImage);
     userEvent.upload(screen.getByTestId('addMediaField'), formData.postVideo);
+    userEvent.upload(
+      screen.getByTestId('organisationImage'),
+      formData.postImage
+    );
+    userEvent.upload(
+      screen.getByTestId('organisationImage'),
+      formData.postVideo
+    );
+    userEvent.click(screen.getByTestId('pinPost'));
+    expect(screen.getByTestId('pinPost')).toBeChecked();
 
     userEvent.click(screen.getByTestId('createPostBtn'));
 

diff --git a/src/screens/OrgPost/OrgPost.tsx b/src/screens/OrgPost/OrgPost.tsx
@@ -45,6 +45,7 @@ function orgPost(): JSX.Element {
     postImage: '',
     postVideo: '',
     addMedia: '',
+    pinPost: false,
   });
   const [sortingOption, setSortingOption] = useState('latest');
   const [file, setFile] = useState<File | null>(null);
@@ -63,6 +64,7 @@ function orgPost(): JSX.Element {
       postImage: '',
       postVideo: '',
       addMedia: '',
+      pinPost: false,
     });
   };
 
@@ -98,6 +100,7 @@ function orgPost(): JSX.Element {
       postinfo: _postinfo,
       postImage,
       postVideo,
+      pinPost,
     } = postformState;
 
     const posttitle = _posttitle.trim();
@@ -114,6 +117,7 @@ function orgPost(): JSX.Element {
           text: postinfo,
           organizationId: currentUrl,
           file: postImage || postVideo || postformState.addMedia,
+          pinned: pinPost,
         },
       });
 
@@ -127,6 +131,7 @@ function orgPost(): JSX.Element {
           postImage: '',
           postVideo: '',
           addMedia: '',
+          pinPost: false,
         });
         setPostModalIsOpen(false);
       }
@@ -441,6 +446,21 @@ function orgPost(): JSX.Element {
                 </button>
               </div>
             )}
+            <Form.Label htmlFor="pinpost" className="mt-3">
+              {t('pinPost')}
+            </Form.Label>
+            <Form.Switch
+              id="pinPost"
+              type="checkbox"
+              data-testid="pinPost"
+              defaultChecked={postformState.pinPost}
+              onChange={(): void =>
+                setPostFormState({
+                  ...postformState,
+                  pinPost: !postformState.pinPost,
+                })
+              }
+            />
           </Modal.Body>
 
           <Modal.Footer>