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

[dataquery/dictionary] Add option to display enums as either value or field in dataquery module #9224

Merged
merged 8 commits into from
May 3, 2024
Merged

[dataquery/dictionary] Add option to display enums as either value or field in dataquery module #9224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a5b787a
[dictionary/dataquery] Add option to show enums as either value or label
driusan Apr 26, 2024
a87f871
Upgrade module label from Alpha to Beta
driusan Apr 26, 2024
9e3e240
eslint
driusan Apr 26, 2024
35d8633
Include labels for PHP instruments
driusan Apr 26, 2024
cc0ffc0
Use setting in cross-sectional view
driusan Apr 26, 2024
413fb84
Use setting in longitudinal view
driusan Apr 26, 2024
d21ed63
eslint
driusan Apr 26, 2024
c342c11
Fix breadcrumbs
driusan May 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion modules/dataquery/jsx/definefilters.addfiltermodal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,11 @@ function valueInput(fielddict: FieldDictionary,
i++
) {
const opt = fielddict.options[i];
opts[opt] = opt;
if (fielddict.labels) {
opts[opt] = fielddict.labels[i];
} else {
opts[opt] = opt;
}
}
if (op == 'in') {
return <SelectElement
Expand Down
4 changes: 2 additions & 2 deletions modules/dataquery/jsx/hooks/usebreadcrumbs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ function useBreadcrumbs(
useEffect(() => {
const breadcrumbs = [
{
text: 'Data Query Tool (Alpha)',
text: 'Data Query Tool (Beta)',
/**
* OnClick handler for the main breadcrumb
*
Expand Down Expand Up @@ -77,7 +77,7 @@ function useBreadcrumbs(
*/
onClick: (e) => {
e.preventDefault();
setActiveTab('View Data');
setActiveTab('ViewData');
},
});
}
Expand Down
1 change: 1 addition & 0 deletions modules/dataquery/jsx/types.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ export type FieldDictionary = {
cardinality: 'unique' | 'single' | 'optional' | 'many',
visits?: string[], // session only
options?: string[], // enum only
labels?: string[], // enum only, and only if provided
}

export interface DictionaryCategory {
Expand Down