Skip to content

O3-4574 Correct rendering of ICRC forms and Distress scales #100

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

Open
krishna-shrivastav232702 wants to merge 1 commit into
base: O3-4574-fast-data-entry
Choose a base branch
from
Open

O3-4574 Correct rendering of ICRC forms and Distress scales #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
},
"devDependencies": {
"@carbon/react": "1.71.0",
"@openmrs/esm-framework": "next",
"@openmrs/esm-framework": "^6.2.1-pre.2825",
"@playwright/test": "^1.50.1",
"@swc-node/loader": "^1.3.7",
"@swc/core": "^1.3.84",
Expand Down Expand Up @@ -79,7 +79,7 @@
"jest-cli": "^28.1.3",
"jest-environment-jsdom": "^28.1.3",
"lodash-es": "^4.17.21",
"openmrs": "next",
"openmrs": "^6.2.1-pre.2825",
Copy link

@Pratibha0280 Pratibha0280 Mar 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@krishna-shrivastav232702 Is there a specific need for the package updates, or were they introduced unintentionally?

Copy link
Author

@krishna-shrivastav232702 krishna-shrivastav232702 Mar 31, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, to the best of my knowledge, a package update is needed to resolve the useLeftNavStore issue because the packages automatically changed when i ran the command "yarn up openmrs@next @openmrs/esm-framework@next" please correct me if i am wrong

Copy link

@Pratibha0280 Pratibha0280 Mar 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it thanks for explaining. However, wouldn't it have been better to address the useLeftNavStore issue separately instead of updating packages together? Just want to make sure we're not introducing unintended changes.

Copy link
Author

@krishna-shrivastav232702 krishna-shrivastav232702 Mar 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As per the Slack discussions, the fast-data-entry app is broken and should be fixed as part of GSoC 2025. The app is breaking due to missing functions, and the documentation states that this command should be run if any functions are missing. You can refer to this Slack chat: https://openmrs.slack.com/archives/C03U8H2AY/p1742489600215209

Copy link

@Bharath-K-Shetty Bharath-K-Shetty Apr 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey,@Pratibha0280 @krishna-shrivastav232702 it is best practice to discard the changes that have happened to the yarn.lock file before pushing the pr.

"prettier": "^2.8.8",
"pretty-quick": "^3.1.3",
"react": "^18.2.0",
Expand Down
10 changes: 5 additions & 5 deletions src/forms-page/FormsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@ const FormsPage = () => {
const categoryRows = formCategoriesToShow.map((name) => {
const category = formCategories.find((category) => category.name === name);
let rows = [];
if (category && cleanRows && cleanRows.length) {
const uuids = category.forms?.map((form) => form.formUUID);
rows = cleanRows
.filter((row) => uuids.includes(row.uuid))
.sort((a, b) => uuids.indexOf(a.uuid) - uuids.indexOf(b.uuid));
if (category) {
rows = (category?.forms || []).map((form) => ({
uuid: form?.formUUID,
display: form?.name,
}));
}
return { ...{ name, rows } };
});
Expand Down
Loading