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.

Sign up for GitHub

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

Merge Develop To Staging November'24 Second Week | Patch #9040

Merged
merged 10 commits into from
Nov 7, 2024
+6,469 −7,253
Merged

Merge Develop To Staging November'24 Second Week | Patch #9040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3008cc2
Removed Unused cypress test files (#9012)
nihal467 Nov 6, 2024
bbcfef0
Sort imports (#9019)
sainak Nov 6, 2024
4f775ad
displaying full names on hover for long names only (#8972)
SwanandBhuskute Nov 6, 2024
1e45600
checks for username and username in card overflow fix (#8940)
SwanandBhuskute Nov 6, 2024
5c95d54
Fixed the Typo Issue in the district admin cypress function (#9023)
nihal467 Nov 6, 2024
4ac3ce9
Improve code splitting (#8979)
sainak Nov 6, 2024
0f9cc52
Fix same-day discharge date selection in DateInputV2 component (#9014)
JavidSumra Nov 6, 2024
9d19543
Added dynamic lock icon and strong types (#9006)
nithish1018 Nov 6, 2024
acfc8a0
Added No records found in ABDM and button placement adjusted in Inves…
nithish1018 Nov 6, 2024
c27f595
partially revert c9343d5 to fix investigation issues (#9026)
sainak Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ ESLINT_NO_DEV_ERRORS=true
CARE_CDN_URL="https://egov-s3-facility-10bedicu.s3.amazonaws.com https://egov-s3-patient-data-10bedicu.s3.amazonaws.com http://localhost:4566"
REACT_ALLOWED_LOCALES="en,hi,ta,ml,mr,kn"

REACT_ENABLED_APPS="ohcnetwork/care_livekit_fe@main"
REACT_ENABLED_APPS=""
2 changes: 0 additions & 2 deletions .envrc
View file
Open in desktop

This file was deleted.

7 changes: 5 additions & 2 deletions .prettierrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,8 @@
"jsxSingleQuote": false,
"arrowParens": "always",
"tailwindFunctions": ["classNames"],
"plugins": ["prettier-plugin-tailwindcss"]
}
"importOrder": ["<THIRD_PARTY_MODULES>", "^@/lib/(.*)$", "^@/CAREUI/(.*)$", "^@/components/ui/(.*)$", "^@/components/(.*)$", "^@/hooks/(.*)$", "^@/common/(.*)$", "^@/(.*)$", "^[./]"],
"importOrderSeparation": true,
"importOrderSortSpecifiers": true,
"plugins": ["prettier-plugin-tailwindcss", "@trivago/prettier-plugin-sort-imports"]
}
3 changes: 1 addition & 2 deletions cypress.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { defineConfig } from "cypress";
import fs from "fs";
import cypressSplit from "cypress-split";
import fs from "fs";

export default defineConfig({
projectId: "wf7d2m",
Expand Down Expand Up @@ -30,7 +30,6 @@ export default defineConfig({
baseUrl: "http://localhost:4000",
retries: 2,
requestTimeout: 15000,
excludeSpecPattern: "**/*roles.cy.ts",
},
env: {
API_URL: process.env.REACT_CARE_API_URL ?? "http://localhost:9000",
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/assets_spec/AssetHomepage.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ describe("Asset Tab", () => {
const serialNumber = Math.floor(Math.random() * 10 ** 10).toString();

before(() => {
loginPage.loginAsDisctrictAdmin();
loginPage.loginAsDistrictAdmin();
cy.saveLocalStorage();
});

Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/assets_spec/AssetsCreation.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ describe("Asset", () => {
const serialNumber = Math.floor(Math.random() * 10 ** 10).toString();

before(() => {
loginPage.loginAsDisctrictAdmin();
loginPage.loginAsDistrictAdmin();
cy.saveLocalStorage();
});

Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/assets_spec/AssetsManage.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ describe("Asset", () => {
const initiallocationName = "Camera Location";

before(() => {
loginPage.loginAsDisctrictAdmin();
loginPage.loginAsDistrictAdmin();
cy.saveLocalStorage();
});

Expand Down
19 changes: 0 additions & 19 deletions cypress/e2e/auth_spec/roles.cy.ts
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion cypress/e2e/facility_spec/FacilityCreation.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ describe("Facility Creation", () => {
const triageErrorMessage = ["This field is required"];

before(() => {
loginPage.loginAsDisctrictAdmin();
loginPage.loginAsDistrictAdmin();
cy.saveLocalStorage();
});

Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/facility_spec/FacilityHomepage.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ describe("Facility Homepage Function", () => {
const facilityType = "Private Hospital";

before(() => {
loginPage.loginAsDisctrictAdmin();
loginPage.loginAsDistrictAdmin();
cy.saveLocalStorage();
});

Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/facility_spec/FacilityInventory.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ describe("Inventory Management Section", () => {
const inventoryName = "PPE";

before(() => {
loginPage.loginAsDisctrictAdmin();
loginPage.loginAsDistrictAdmin();
cy.saveLocalStorage();
});

Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/facility_spec/FacilityManage.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ describe("Facility Manage Functions", () => {
const currentUpdatedOccupied = "100";

before(() => {
loginPage.loginAsDisctrictAdmin();
loginPage.loginAsDistrictAdmin();
cy.saveLocalStorage();
});

Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/patient_spec/PatientBedManagement.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ describe("Patient swtich bed functionality", () => {
const switchPatientTwo = "Dummy Patient 7";

before(() => {
loginPage.loginAsDisctrictAdmin();
loginPage.loginAsDistrictAdmin();
cy.saveLocalStorage();
});

Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/patient_spec/PatientConsultationCreation.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ describe("Patient Consultation in multiple combination", () => {
const patientIpNumber = `${Math.floor(Math.random() * 90 + 10)}/${Math.floor(Math.random() * 9000 + 1000)}`;

before(() => {
loginPage.loginAsDisctrictAdmin();
loginPage.loginAsDistrictAdmin();
cy.saveLocalStorage();
});

Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/patient_spec/PatientConsultationDischarge.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ describe("Patient Discharge based on multiple reason", () => {
const doctorName = "Custom Doctor";

before(() => {
loginPage.loginAsDisctrictAdmin();
loginPage.loginAsDistrictAdmin();
cy.saveLocalStorage();
});

Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/patient_spec/PatientDoctorConnect.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ describe("Patient Doctor Connect in consultation page", () => {
const teleIcuUser = "Dev Doctor Two";

before(() => {
loginPage.loginAsDisctrictAdmin();
loginPage.loginAsDistrictAdmin();
cy.saveLocalStorage();
});

Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/patient_spec/PatientDoctorNotes.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ describe("Patient Discussion notes in the consultation page", () => {
const discussionNotesSuccessMessage = "Note added successfully";

before(() => {
loginPage.loginAsDisctrictAdmin();
loginPage.loginAsDistrictAdmin();
cy.saveLocalStorage();
});

Expand Down
4 changes: 2 additions & 2 deletions cypress/e2e/patient_spec/PatientFileUpload.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ function runTests(
const patientNameTwo = "Dummy Patient 4";
const patientNameThree = "Dummy Patient 5";
before(() => {
loginPage.loginAsDisctrictAdmin();
loginPage.loginAsDistrictAdmin();
cy.saveLocalStorage();
});

Expand Down Expand Up @@ -90,7 +90,7 @@ function runTests(
patientFileUpload.verifyUploadFilePresence(newFileName);
patientFileUpload.verifyFileRenameOption(false);
// Login as District Admin
loginPage.loginAsDisctrictAdmin();
loginPage.loginAsDistrictAdmin();
cy.reload();
// Verify the file edit option is available
patientFileUpload.verifyUploadFilePresence(newFileName);
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/patient_spec/PatientHomepage.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ describe("Patient Homepage present functionalities", () => {
const patientToDateBadge = "2023-12-07";

before(() => {
loginPage.loginAsDisctrictAdmin();
loginPage.loginAsDistrictAdmin();
cy.saveLocalStorage();
});

Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/patient_spec/PatientLogUpdate.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => {
const domicilaryPatient = "Dummy Patient 11";

before(() => {
loginPage.loginAsDisctrictAdmin();
loginPage.loginAsDistrictAdmin();
cy.saveLocalStorage();
});

Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/patient_spec/PatientPrescription.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const medicineIndicator = "Test Indicator";

describe("Patient Medicine Administration", () => {
before(() => {
loginPage.loginAsDisctrictAdmin();
loginPage.loginAsDistrictAdmin();
cy.saveLocalStorage();
});

Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/patient_spec/PatientRegistration.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ describe("Patient Creation with consultation", () => {
const patientOccupation = "Student";

before(() => {
loginPage.loginAsDisctrictAdmin();
loginPage.loginAsDistrictAdmin();
cy.saveLocalStorage();
});

Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/resource_spec/ResourcesHomepage.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ describe("Resource Page", () => {
const phone_number = "9999999999";

before(() => {
loginPage.loginAsDisctrictAdmin();
loginPage.loginAsDistrictAdmin();
cy.saveLocalStorage();
});

Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/users_spec/UsersCreation.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ describe("User Creation", () => {
];

before(() => {
loginPage.loginAsDisctrictAdmin();
loginPage.loginAsDistrictAdmin();
cy.saveLocalStorage();
});

Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/users_spec/UsersHomepage.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ describe("User Homepage", () => {
const doctorUserName = "devdoctor1";

before(() => {
loginPage.loginAsDisctrictAdmin();
loginPage.loginAsDistrictAdmin();
cy.saveLocalStorage();
});

Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/users_spec/UsersManage.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ describe("Manage User", () => {
const linkedskill = "General Medicine";

before(() => {
loginPage.loginAsDisctrictAdmin();
loginPage.loginAsDistrictAdmin();
cy.saveLocalStorage();
});

Expand Down
38 changes: 0 additions & 38 deletions cypress/fixtures/users.json
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion cypress/pageobject/Login/LoginPage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// LoginPage.ts

class LoginPage {
loginAsDisctrictAdmin(): void {
loginAsDistrictAdmin(): void {
cy.loginByApi("devdistrictadmin", "Coronasafe@123");
}

Expand Down
Loading
Loading