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

Jump to bottom

feat: [DHIS2-17956] Display name for org unit in changelog #3826

Merged
merged 12 commits into from
Oct 15, 2024
Merged

feat: [DHIS2-17956] Display name for org unit in changelog #3826

Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
75dd871
feat: update client to list converter
henrikmv Sep 25, 2024
284a227
feat: changes in tooltip component
henrikmv Sep 26, 2024
3c147c7
feat: add orgunit context stages and events widget
henrikmv Sep 26, 2024
2d76188
feat: use cache for subvalues
henrikmv Sep 26, 2024
fdd87eb
feat: orgunit context event workspace
henrikmv Sep 27, 2024
29d96a2
fix: renaming of return statement
henrikmv Sep 30, 2024
7c820e1
Merge branch 'master' of https://github.com/dhis2/capture-app into hv…
henrikmv Oct 2, 2024
f8de7ff
feat: display name for orgunit
henrikmv Oct 2, 2024
95b0864
Merge branch 'master' of https://github.com/dhis2/capture-app into hv…
henrikmv Oct 4, 2024
7ef97c8
Merge branch 'master' of https://github.com/dhis2/capture-app into hv…
henrikmv Oct 14, 2024
f3f987d
fix: merge conflict
henrikmv Oct 14, 2024
8ac4eb6
fix: improve flow type
henrikmv Oct 15, 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 src/core_modules/capture-core/converters/clientToList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ type ImageClientValue = {
previewUrl: string,
};


function convertFileForDisplay(clientValue: FileClientValue) {
// Fallback until https://dhis2.atlassian.net/browse/DHIS2-16994 is implemented
if (typeof clientValue === 'string' || clientValue instanceof String) {
Expand Down Expand Up @@ -88,9 +87,10 @@ function convertStatusForDisplay(clientValue: Object) {
);
}

function convertOrgUnitForDisplay(clientValue: { id: string }) {
function convertOrgUnitForDisplay(clientValue: string | Object) {
Copy link
Contributor

Choose a reason for hiding this comment

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

NIT: improve the flow type clientValue: string | {id: string}

const orgUnitId = typeof clientValue === 'string' ? clientValue : clientValue.id;
return (
<TooltipOrgUnit orgUnitId={clientValue.id} />
<TooltipOrgUnit orgUnitId={orgUnitId} />
);
}

Expand Down
Loading