Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Production Release v24.51.0 #9446

Merged
merged 30 commits into from
Dec 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
3b04654
Refactored Location Management Cypress Test (#9301)
nihal467 Dec 5, 2024
40c9788
Add 'Update Details' Button in Community Nurse Log Update Details Pag…
kihan2518B Dec 5, 2024
72fcf8d
Sidebar Duotone icons (#9281)
shivankacker Dec 5, 2024
6e3f6e3
Bump cypress from 13.16.0 to 13.16.1 (#9302)
dependabot[bot] Dec 5, 2024
a24b9ca
Fixed Add a better search UI for patients index page #8691 (#8834)
i0am0arunava Dec 5, 2024
ee725b0
Fixes patient profile created date showing modified date (#9309)
SwanandBhuskute Dec 6, 2024
fac77a7
Bump class-variance-authority from 0.7.0 to 0.7.1 (#9314)
dependabot[bot] Dec 6, 2024
f87a2a4
fix: update Care's DPG URL (#9322)
Tanuj1718 Dec 9, 2024
be0ef48
Updated Test Details page form UI (#9138)
modamaan Dec 9, 2024
e8518ce
Bump react-i18next from 15.1.1 to 15.1.3 (#9291)
dependabot[bot] Dec 9, 2024
3e4890a
Bump cross-spawn from 7.0.3 to 7.0.6 (#9158)
dependabot[bot] Dec 9, 2024
0f58adc
Bump i18next-http-backend from 2.6.2 to 3.0.1 (#9303)
dependabot[bot] Dec 9, 2024
d9a620c
Reorder Patient Search Buttons (#9319)
shivankacker Dec 10, 2024
d520018
Fix excessive vertical padding in all pages (#9331)
rithviknishad Dec 10, 2024
a88b881
removed lodash imports and dependencies and wrote js equivalents (#9116)
SwanandBhuskute Dec 10, 2024
b67f03c
Bump cmdk from 1.0.0 to 1.0.4 (#9348)
dependabot[bot] Dec 10, 2024
0f7a9d8
Fixed User Default View in Resource and Shifting (#9306)
nithish1018 Dec 10, 2024
b25ecd0
Bump nanoid from 3.3.7 to 3.3.8 (#9346)
dependabot[bot] Dec 10, 2024
1f173e8
User Management Redesign and User Details Page (#9080)
Jacobjeevan Dec 11, 2024
67f9c6e
fix infinite loading (#9354)
manmeetnagii Dec 11, 2024
7ef2299
Fix Infinite render on country code change (#9337)
JavidSumra Dec 11, 2024
bd19bcb
Users Manage Test Fix (#9368)
Jacobjeevan Dec 11, 2024
e89530d
Upgrade cypress version (#9375)
AdityaJ2305 Dec 11, 2024
113dddd
Fix: [Clear Button is active when no input is selected in Dropdown] (…
Rustix69 Dec 11, 2024
3ba5dc6
Fixed the user management page cypress issue (#9384)
nihal467 Dec 11, 2024
f70b3ad
Fixed Flaky test in the user advance filters (#9385)
nihal467 Dec 11, 2024
732ccd6
Merge pull request #9380 from ohcnetwork/develop
rithviknishad Dec 11, 2024
376eb70
User creation form bug fix (#9406)
Jacobjeevan Dec 13, 2024
a67ab4f
fixed critical care update redirection
nihal467 Dec 16, 2024
39066a6
Merge pull request #9455 from ohcnetwork/fix-critical
khavinshankar Dec 16, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cypress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@v4
with:
node-version: "20"
node-version: "22.11.0"

- name: Install dependencies 📦
run: npm run install-all
Expand Down
91 changes: 46 additions & 45 deletions cypress/e2e/assets_spec/AssetsCreation.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,21 +43,21 @@ describe("Asset", () => {

const qr_id_1 = uuidv4();

assetPage.enterAssetDetails(
"New Test Asset 1",
"Test Description",
"Working",
qr_id_1,
"Manufacturer's Name",
"2025-12-25",
"Customer Support's Name",
phone_number,
"[email protected]",
"Vendor's Name",
serialNumber,
"25122021",
"Test note for asset creation!",
);
assetPage.enterAssetDetails({
name: "New Test Asset 1",
description: "Test Description",
workingStatus: "Working",
qrId: qr_id_1,
manufacturer: "Manufacturer's Name",
warranty: "2025-12-25",
supportName: "Customer Support's Name",
supportPhone: phone_number,
supportEmail: "[email protected]",
vendorName: "Vendor's Name",
serialNumber: serialNumber,
lastServicedOn: "25122021",
notes: "Test note for asset creation!",
});

assetPage.clickCreateAddMore();
assetPage.verifySuccessNotification("Asset created successfully");
Expand All @@ -66,21 +66,21 @@ describe("Asset", () => {

assetPage.selectLocation("Camera Loc");
assetPage.selectAssetClass("ONVIF Camera");
assetPage.enterAssetDetails(
"New Test Asset 2",
"Test Description",
"Working",
qr_id_2,
"Manufacturer's Name",
"2025-12-25",
"Customer Support's Name",
phone_number,
"[email protected]",
"Vendor's Name",
serialNumber,
"25122021",
"Test note for asset creation!",
);
assetPage.enterAssetDetails({
name: "New Test Asset 2",
description: "Test Description",
workingStatus: "Working",
qrId: qr_id_2,
manufacturer: "Manufacturer's Name",
warranty: "2025-12-25",
supportName: "Customer Support's Name",
supportPhone: phone_number,
supportEmail: "[email protected]",
vendorName: "Vendor's Name",
serialNumber: serialNumber,
lastServicedOn: "25122021",
notes: "Test note for asset creation!",
});

assetPage.interceptAssetCreation();
assetPage.clickCreateAsset();
Expand Down Expand Up @@ -139,21 +139,22 @@ describe("Asset", () => {

const qr_id_1 = uuidv4();

assetPage.enterAssetDetails(
"New Test Asset Vital",
"Test Description",
"Working",
qr_id_1,
"Manufacturer's Name",
"2025-12-25",
"Customer Support's Name",
phone_number,
"[email protected]",
"Vendor's Name",
serialNumber,
"25122021",
"Test note for asset creation!",
);
assetPage.enterAssetDetails({
name: "New Test Asset Vital",
description: "Test Description",
workingStatus: "Working",
qrId: qr_id_1,
manufacturer: "Manufacturer's Name",
warranty: "2025-12-25",
supportName: "Customer Support's Name",
supportPhone: phone_number,
supportEmail: "[email protected]",
vendorName: "Vendor's Name",
serialNumber: serialNumber,
lastServicedOn: "25122021",
notes: "Test note for asset creation!",
});

assetPage.interceptAssetCreation();
assetPage.clickCreateAsset();
assetPage.verifyAssetCreation();
Expand Down
10 changes: 4 additions & 6 deletions cypress/e2e/facility_spec/FacilityCreation.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import FacilityPage from "../../pageobject/Facility/FacilityCreation";
import FacilityHome from "../../pageobject/Facility/FacilityHome";
import LoginPage from "../../pageobject/Login/LoginPage";
import ManageUserPage from "../../pageobject/Users/ManageUserPage";
import { UserCreationPage } from "../../pageobject/Users/UserCreation";
import { nonAdminRoles } from "../../pageobject/utils/userConfig";

describe("Facility Creation", () => {
Expand All @@ -13,7 +12,6 @@ describe("Facility Creation", () => {
const loginPage = new LoginPage();
const facilityHome = new FacilityHome();
const manageUserPage = new ManageUserPage();
const userCreationPage = new UserCreationPage();
const facilityFeature = [
"CT Scan",
"X-Ray",
Expand Down Expand Up @@ -87,7 +85,7 @@ describe("Facility Creation", () => {
facilityPage.scrollToFacilityTriage();
facilityPage.clickAddFacilityTriage();
manageUserPage.clickSubmit();
userCreationPage.verifyErrorMessages(triageErrorMessage);
cy.verifyErrorMessages(triageErrorMessage);
// create a entry and verify reflection
facilityPage.fillEntryDate(triageDate);
facilityPage.fillTriageEntryFields(
Expand Down Expand Up @@ -123,7 +121,7 @@ describe("Facility Creation", () => {
// create facility with multiple capacity and verify form error message for facility form
facilityPage.visitCreateFacilityPage();
facilityPage.submitForm();
userCreationPage.verifyErrorMessages(facilityErrorMessage);
cy.verifyErrorMessages(facilityErrorMessage);
facilityPage.fillFacilityName(facilityName);
facilityPage.selectFacilityType(facilityType);
facilityPage.clickfacilityfeatureoption();
Expand Down Expand Up @@ -270,12 +268,12 @@ describe("Facility Creation", () => {
// add no bed capacity and verify form error message
facilityPage.isVisibleselectBedType();
facilityPage.saveAndExitBedCapacityForm();
userCreationPage.verifyErrorMessages(bedErrorMessage);
cy.verifyErrorMessages(bedErrorMessage);
facilityPage.clickcancelbutton();
// add no doctor capacity and verify form error message
facilityPage.isVisibleAreaOfSpecialization();
facilityPage.clickdoctorcapacityaddmore();
userCreationPage.verifyErrorMessages(doctorErrorMessage);
cy.verifyErrorMessages(doctorErrorMessage);
facilityPage.clickcancelbutton();
cy.url().then((newUrl) => {
facilityUrl1 = newUrl;
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/facility_spec/FacilityHomepage.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ describe("Facility Homepage Function", () => {
cy.clickSubmitButton("Notify");
facilityNotify.verifyErrorMessage(notificationErrorMsg);
// close pop-up and verify
facilityHome.verifyAndCloseNotifyModal();
cy.clickCancelButton("Cancel");
// signout as district admin and login as a Nurse
loginPage.ensureLoggedIn();
loginPage.clickSignOutBtn();
Expand Down
Loading
Loading