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

Introduced Reusable JSON Parser and Validator with Schema, File Preview, and Selected Import Support for XLSX/CSV Files #7367

Merged
merged 37 commits into from
Apr 24, 2024
Merged
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
7f3fe63
Merge pull request #7347 from coronasafe/staging
gigincg Mar 6, 2024
df574da
added new package
UdaySagar-Git Mar 8, 2024
dc13d21
removed 2 packages
UdaySagar-Git Mar 8, 2024
844a0b8
changed route for external result import modal
UdaySagar-Git Mar 8, 2024
b90d2ce
updated schemas
UdaySagar-Git Mar 9, 2024
e67c48f
custom schema parser
UdaySagar-Git Mar 9, 2024
96ad539
modified schema parser
UdaySagar-Git Mar 9, 2024
1f69649
added file drag and drop component
UdaySagar-Git Mar 9, 2024
5815422
modified assest import modal to use reusable component
UdaySagar-Git Mar 9, 2024
b058f7f
excel viewer component
UdaySagar-Git Mar 9, 2024
c82f017
modified import name
UdaySagar-Git Mar 9, 2024
ece63ff
external result upload modal
UdaySagar-Git Mar 9, 2024
d82afc9
lazy import
UdaySagar-Git Mar 9, 2024
2276112
Modified templete for external results import file
UdaySagar-Git Mar 9, 2024
0635b06
Merge pull request #7387 from coronasafe/staging
gigincg Mar 11, 2024
aeb0e30
cypress fix
UdaySagar-Git Mar 12, 2024
8eae489
updated cypress templete
UdaySagar-Git Mar 12, 2024
e12dc4d
fixes incorrect date format with csv files
UdaySagar-Git Mar 12, 2024
57a5bfa
cypress fix
UdaySagar-Git Mar 12, 2024
0e4376c
Added documentation
UdaySagar-Git Mar 12, 2024
e4f4e22
Merge branch 'develop' into fix-#7333
UdaySagar-Git Mar 12, 2024
6c2e225
Merge branch 'develop' into fix-#7333
nihal467 Mar 19, 2024
8849b45
code reviews
UdaySagar-Git Mar 19, 2024
493ba86
Error on hover
UdaySagar-Git Mar 19, 2024
cbe26c2
Merge remote-tracking branch 'upstream/master' into fix-#7333
UdaySagar-Git Mar 26, 2024
d467c35
Merge remote-tracking branch 'upstream/develop' into fix-#7333
UdaySagar-Git Mar 26, 2024
12a8f1e
merges pr #7339
UdaySagar-Git Mar 26, 2024
d3b9269
Merge branch 'develop' into fix-#7333
Ashesh3 Apr 2, 2024
942dd20
fix the flaky test
nihal467 Apr 2, 2024
5136ea8
change the cypress to use Reusable component
nihal467 Apr 2, 2024
dba25bc
Merge branch 'develop' into fix-#7333
nihal467 Apr 2, 2024
f1d83c0
fix type errors
UdaySagar-Git Apr 2, 2024
7766a62
Merge branch 'develop' into fix-#7333
nihal467 Apr 2, 2024
d0ea3e1
Merge branch 'develop' into fix-#7333
UdaySagar-Git Apr 7, 2024
cd2c4cf
Merge remote-tracking branch 'upstream/develop' into fix-#7333
UdaySagar-Git Apr 16, 2024
4366aff
Merge remote-tracking branch 'upstream/develop' into fix-#7333
UdaySagar-Git Apr 18, 2024
481d3fa
lint fix
UdaySagar-Git Apr 18, 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
6 changes: 3 additions & 3 deletions cypress/e2e/external_results_spec/external_result.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ describe("Edit Profile Testing", () => {
cy.intercept("POST", "/api/v1/external_result/bulk_upsert").as("import");
cy.get("div").contains("Import/Export").click();
cy.get("div").contains("Import Results").click();
cy.get("[id=result-upload]")
.selectFile("cypress/fixtures/externalresultsample.csv")
cy.get("[data-testid=import-file]")
.selectFile("cypress/fixtures/externalresultsample.csv", { force: true })
.wait(100);
cy.get("button").contains("Save").click();
cy.get("#submit").contains("Import").click();
cy.wait("@import").then((interception) => {
expect(interception.response.statusCode).to.equal(202);
});
Expand Down
2 changes: 1 addition & 1 deletion cypress/fixtures/externalresultsample.csv
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
District,srf id,name,age,age in,gender,mobile number,address,ward,local body,local body type,source,Sample Collection Date,result date,test type,lab name,sample type,patient status,Is Repeat,patient category,result
District,SRF ID,Name,Age,Age in,Gender,Mobile Number,Address,Ward,Local Body,Local Body Type,Source,Sample Collection Date,Result Date,Test Type,Lab Name,Sample Type,Patient Status,Is Repeat,Patient Category,Result
Ernakulam,00/EKM/0000,Test Upload,24,years,m,8888888888,Upload test address,7,Poothrikka,grama panchayath,Secondary contact aparna,2020-10-14,2020-10-14,Antigen,Karothukuzhi Laboratory,Ag-SD_Biosensor_Standard_Q_COVID-19_Ag_detection_kit,Asymptomatic,NO,Cat 17: All individuals who wish to get themselves tested,Negative
2 changes: 1 addition & 1 deletion cypress/pageobject/Asset/AssetCreation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ export class AssetPage {
}

importAssetFile() {
cy.get("[data-testid=import-asset-file]")
cy.get("[data-testid=import-file]")
.selectFile("cypress/fixtures/sampleAsset.xlsx", { force: true })
.wait(100);
}
Expand Down
Loading
Loading