Merge branch 'develop' into Issues/ohcnetwork#9077/IconOverlap

Srayash · Nov 11, 2024 · 8dec072 · 8dec072
2 parents beae7d4 + cc9d0c9
commit 8dec072
Show file tree

Hide file tree

Showing 11 changed files with 149 additions and 12 deletions.
diff --git a/.github/workflows/auto-testing-label.yml b/.github/workflows/auto-testing-label.yml
@@ -38,7 +38,7 @@ jobs:
               }
 
               if (isChangesRequired) {
-                await github.issues.createComment({
+                await github.rest.issues.createComment({
                   owner: context.repo.owner,
                   repo: context.repo.repo,
                   issue_number: pr.number,

diff --git a/cypress/e2e/facility_spec/FacilityHomepage.cy.ts b/cypress/e2e/facility_spec/FacilityHomepage.cy.ts
@@ -2,13 +2,15 @@
 import { AssetPagination } from "../../pageobject/Asset/AssetPagination";
 import FacilityPage from "../../pageobject/Facility/FacilityCreation";
 import FacilityHome from "../../pageobject/Facility/FacilityHome";
+import FacilityNotify from "../../pageobject/Facility/FacilityNotify";
 import LoginPage from "../../pageobject/Login/LoginPage";
 import ManageUserPage from "../../pageobject/Users/ManageUserPage";
 import { UserPage } from "../../pageobject/Users/UserSearch";
 
 describe("Facility Homepage Function", () => {
   const loginPage = new LoginPage();
   const facilityHome = new FacilityHome();
+  const facilityNotify = new FacilityNotify();
   const facilityPage = new FacilityPage();
   const manageUserPage = new ManageUserPage();
   const userPage = new UserPage();
@@ -22,6 +24,8 @@ describe("Facility Homepage Function", () => {
   const district = "Ernakulam";
   const localBody = "Aikaranad";
   const facilityType = "Private Hospital";
+  const notificationErrorMsg = "Message cannot be empty";
+  const notificationMessage = "Test Notification";
 
   before(() => {
     loginPage.loginAsDistrictAdmin();
@@ -30,6 +34,7 @@ describe("Facility Homepage Function", () => {
 
   beforeEach(() => {
     cy.restoreLocalStorage();
+    cy.clearLocalStorage(/filters--.+/);
     cy.awaitUrl("/facility");
   });
 
@@ -41,9 +46,6 @@ describe("Facility Homepage Function", () => {
     facilityHome.clickViewCnsButton();
     facilityHome.verifyCnsUrl();
     facilityHome.navigateBack();
-    // view notify button
-    facilityHome.clickFacilityNotifyButton();
-    facilityHome.verifyAndCloseNotifyModal();
     // view facility button
     facilityHome.clickViewFacilityDetails();
     facilityPage.getFacilityName().should("be.visible");
@@ -134,6 +136,51 @@ describe("Facility Homepage Function", () => {
     facilityHome.verifyLiveMonitorUrl();
   });
 
+  it("Verify Notice Board Functionality", () => {
+    // search facility and verify it's loaded or not
+    manageUserPage.interceptFacilitySearchReq();
+    manageUserPage.typeFacilitySearch(facilityName);
+    manageUserPage.verifyFacilitySearchReq();
+    // verify facility name and card reflection
+    facilityNotify.verifyUrlContains("Dummy+Facility+40");
+    facilityPage.verifyFacilityBadgeContent(facilityName);
+    manageUserPage.assertFacilityInCard(facilityName);
+    // send notification to a facility
+    facilityHome.clickFacilityNotifyButton();
+    facilityNotify.verifyFacilityName(facilityName);
+    facilityNotify.fillNotifyText(notificationMessage);
+    facilityNotify.interceptPostNotificationReq();
+    cy.submitButton("Notify");
+    facilityNotify.verifyPostNotificationReq();
+    cy.verifyNotification("Facility Notified");
+    cy.closeNotification();
+    cy.wait(2000);
+    // Verify the frontend error on empty message
+    facilityHome.clickFacilityNotifyButton();
+    facilityNotify.verifyFacilityName(facilityName);
+    cy.submitButton("Notify");
+    facilityNotify.verifyErrorMessage(notificationErrorMsg);
+    // close pop-up and verify
+    facilityHome.verifyAndCloseNotifyModal();
+    // signout as district admin and login as a Nurse
+    loginPage.ensureLoggedIn();
+    loginPage.clickSignOutBtn();
+    loginPage.loginManuallyAsNurse();
+    // Verify Notice Board Reflection
+    facilityNotify.interceptGetNotificationReq("MESSAGE");
+    facilityNotify.visitNoticeBoard();
+    facilityNotify.verifyGetNotificationReq();
+    facilityNotify.verifyFacilityNoticeBoardMessage(notificationMessage);
+    facilityNotify.interceptGetNotificationReq();
+    // Verify Sidebar Notification Reflection
+    facilityNotify.openNotificationSlide();
+    facilityNotify.verifyGetNotificationReq();
+    cy.verifyContentPresence("#notification-slide-msg", [notificationMessage]);
+    facilityNotify.closeNotificationSlide();
+    loginPage.ensureLoggedIn();
+    loginPage.clickSignOutBtn();
+  });
+
   afterEach(() => {
     cy.saveLocalStorage();
   });

diff --git a/cypress/pageobject/Facility/FacilityHome.ts b/cypress/pageobject/Facility/FacilityHome.ts
@@ -35,7 +35,8 @@ class FacilityHome {
   }
 
   clickFacilityNotifyButton() {
-    cy.get("#facility-notify").first().click();
+    cy.get("#facility-notify", { timeout: 10000 }).should("be.visible");
+    cy.get("#facility-notify").focus().click();
   }
 
   clickLiveMonitorButton() {

diff --git a/cypress/pageobject/Facility/FacilityNotify.ts b/cypress/pageobject/Facility/FacilityNotify.ts
@@ -0,0 +1,58 @@
+export default class FacilityNotify {
+  verifyFacilityName(facilityName: string) {
+    cy.verifyContentPresence("#notify-facility-name", [facilityName]);
+  }
+
+  verifyErrorMessage(errorMessage: string) {
+    cy.verifyContentPresence(".error-text", [errorMessage]);
+  }
+
+  fillNotifyText(message: string) {
+    cy.get("#NotifyModalMessageInput").scrollIntoView();
+    cy.get("#NotifyModalMessageInput").click().type(message);
+  }
+
+  verifyFacilityNoticeBoardMessage(message: string) {
+    cy.get("#notification-message", { timeout: 10000 }).should("be.visible");
+    cy.verifyContentPresence("#notification-message", [message]);
+  }
+
+  openNotificationSlide() {
+    cy.get("#notification-slide-btn").should("be.visible").click();
+  }
+
+  closeNotificationSlide() {
+    cy.get("#close-slide-over").should("be.visible").click();
+  }
+
+  visitNoticeBoard() {
+    cy.get("a[href='/notice_board']").should("be.visible").click();
+  }
+
+  visitNotificationSideBar() {
+    cy.get("#notification-slide-btn").should("be.visible").click();
+  }
+
+  verifyUrlContains(substring: string) {
+    cy.url().should("include", substring);
+  }
+
+  interceptPostNotificationReq() {
+    cy.intercept("POST", "**/api/v1/notification/notify").as("notifyFacility");
+  }
+
+  verifyPostNotificationReq() {
+    cy.wait("@notifyFacility").its("response.statusCode").should("eq", 204);
+  }
+
+  interceptGetNotificationReq(event: string = "") {
+    cy.intercept(
+      "GET",
+      `**/api/v1/notification/?offset=0&event=${event}&*=SYSTEM`,
+    ).as("getNotifications");
+  }
+
+  verifyGetNotificationReq() {
+    cy.wait("@getNotifications").its("response.statusCode").should("eq", 200);
+  }
+}
diff --git a/cypress/pageobject/Login/LoginPage.ts b/cypress/pageobject/Login/LoginPage.ts
@@ -34,6 +34,10 @@ class LoginPage {
     cy.get("#sign-out-button").scrollIntoView();
     cy.get("#sign-out-button").contains("Sign Out").should("exist");
   }
+
+  clickSignOutBtn(): void {
+    cy.verifyAndClickElement("#sign-out-button", "Sign Out");
+  }
 }
 
 export default LoginPage;
diff --git a/cypress/pageobject/Users/ManageUserPage.ts b/cypress/pageobject/Users/ManageUserPage.ts
@@ -99,6 +99,14 @@ export class ManageUserPage {
     cy.get("#search").click().type(facilityName);
   }
 
+  interceptFacilitySearchReq() {
+    cy.intercept("GET", "**/api/v1/facility/**").as("searchFacility");
+  }
+
+  verifyFacilitySearchReq() {
+    cy.wait("@searchFacility").its("response.statusCode").should("eq", 200);
+  }
+
   assertFacilityInCard(facilityName: string) {
     cy.get("#facility-name-card").should("contain", facilityName);
   }

diff --git a/src/components/Common/Sidebar/SidebarItem.tsx b/src/components/Common/Sidebar/SidebarItem.tsx
@@ -9,6 +9,7 @@ import useAppHistory from "@/hooks/useAppHistory";
 export type SidebarIcon = React.ReactNode;
 
 type SidebarItemProps = {
+  id?: string;
   ref?: React.Ref<HTMLAnchorElement>;
   text: string;
   icon: SidebarIcon;
@@ -31,6 +32,7 @@ const SidebarItemBase = forwardRef<HTMLAnchorElement, SidebarItemBaseProps>(
     return (
       <Link
         ref={ref}
+        id={props?.id}
         className={`tooltip relative ml-1 mr-2 h-12 flex-1 cursor-pointer rounded-md py-1 font-medium text-gray-600 transition md:flex-none ${
           props.selected
             ? "bg-white text-green-800 shadow"

diff --git a/src/components/Facility/FacilityCard.tsx b/src/components/Facility/FacilityCard.tsx
@@ -185,7 +185,10 @@ export const FacilityCard = (props: {
                     <DialogModal
                       show={notifyModalFor === facility.id}
                       title={
-                        <span className="flex justify-center text-2xl">
+                        <span
+                          className="flex justify-center text-2xl"
+                          id="notify-facility-name"
+                        >
                           Notify: {facility.name}
                         </span>
                       }

diff --git a/src/components/Facility/PatientNotesSlideover.tsx b/src/components/Facility/PatientNotesSlideover.tsx
@@ -161,15 +161,19 @@ export default function PatientNotesSlideover(props: PatientNotesProps) {
         id="expand_doctor_notes"
         className={classNames(
           "tooltip flex h-8 w-8 cursor-pointer items-center justify-center rounded bg-primary-800 text-secondary-100 text-opacity-70 hover:bg-primary-700 hover:text-opacity-100",
-          show && "rotate-180",
         )}
         onClick={() => setShow(!show)}
       >
         <CareIcon
-          icon="l-angle-up"
+          icon={show ? "l-angle-down" : "l-angle-up"}
           className="tooltip text-lg transition-all delay-150 duration-300 ease-out"
         />
-        <span className="tooltip-text tooltip-top rotate-[-180deg] text-xs">
+        <span
+          className={classNames(
+            "tooltip-text text-xs",
+            show ? "tooltip-bottom -translate-x-16" : "tooltip-top",
+          )}
+        >
           {t("minimize")}
         </span>
       </div>
@@ -181,7 +185,12 @@ export default function PatientNotesSlideover(props: PatientNotesProps) {
           icon="l-times"
           className="tooltip text-lg transition-all delay-150 duration-300 ease-out"
         />
-        <span className="tooltip-text tooltip-bottom -translate-x-11 text-xs">
+        <span
+          className={classNames(
+            "tooltip-text text-xs",
+            show ? "tooltip-bottom -translate-x-11" : "tooltip-top",
+          )}
+        >
           {t("close")}
         </span>
       </div>

diff --git a/src/components/Notifications/NoticeBoard.tsx b/src/components/Notifications/NoticeBoard.tsx
@@ -26,7 +26,9 @@ export const NoticeBoard = () => {
             className="overflow-hidden rounded shadow-md"
           >
             <div className="px-6 py-4">
-              <div className="text-justify text-lg">{item.message}</div>
+              <div className="text-justify text-lg" id="notification-message">
+                {item.message}
+              </div>
               <div className="text-md my-2 text-secondary-700">
                 {formatName(item.caused_by)} -{" "}
                 <span className="font-bold text-primary-700">

diff --git a/src/components/Notifications/NotificationsList.tsx b/src/components/Notifications/NotificationsList.tsx
@@ -115,7 +115,9 @@ const NotificationTile = ({
           />
         </div>
       </div>
-      <div className="py-1 text-sm">{result.message}</div>
+      <div className="py-1 text-sm" id="notification-slide-msg">
+        {result.message}
+      </div>
       <div className="flex flex-col justify-end gap-2">
         <div className="py-1 text-right text-xs text-secondary-700">
           {formatDateTime(result.created_date)}
@@ -474,6 +476,7 @@ export default function NotificationsList({
     <>
       <Item
         text={t("Notifications")}
+        id="notification-slide-btn"
         do={() => setOpen(!open)}
         icon={<CareIcon icon="l-bell" className="h-5" />}
         badgeCount={unreadCount}