Skip to content

Dqt improvements field selection #10161

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
marandmart wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Dqt improvements field selection #10161

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
385c085
improvements to the Field Selection section
marandmart Nov 26, 2025
f41a413
small improvements and removed changes meant for other branch
marandmart Nov 26, 2025
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
60 changes: 34 additions & 26 deletions modules/dataquery/jsx/definefields.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,8 +413,8 @@ function DefineFields(props: {

return (
<div>
<div style={{display: 'flex', flexWrap: 'nowrap'}}>
<div style={{width: '80vw', padding: '1em'}}>
<div style={{display: 'flex', gap: '2rem', width: '100%'}}>
<div style={{width: 'calc(70% - 2rem/2)'}}>
<h1>Available Fields</h1>
<FilterableSelectGroup groups={props.allCategories.categories}
mapGroupName={(key) => props.allCategories.modules[key]}
Expand All @@ -423,27 +423,29 @@ function DefineFields(props: {
{fieldList}
</div>
<div style={{
width: '20vw',
padding: '1em',
width: 'calc(30% - 2rem/2)',
position: 'sticky',
top: 0,
maxHeight: '90vh',
overflow: 'auto',
}}>
<div>
<div style={{
display: 'flex',
justifyContent: 'space-between',
alignItems: 'flex-end',
marginBottom: '1em',
}}>
<h2>Selected Fields</h2>
<div>
<button type="button" className="btn btn-primary"
style={{marginBottom: 7}}
onClick={props.onClearAll}>Clear</button>
</div>
<div style={{
display: 'flex',
justifyContent: 'space-between',
alignItems: 'flex-end',
marginBottom: '1em',
flexWrap: 'wrap',
}}>
<h2>Field Selection</h2>
<div>
<button type="button" className="btn btn-primary"
style={{marginBottom: 7}}
onClick={props.onClearAll}>Clear</button>
</div>
</div>
<div style={{
overflowY: 'auto',
overflowX: 'hidden',
maxHeight: '80vh',
}}>
<SelectedFieldList
selected={props.selected}
removeField={props.removeField}
Expand Down Expand Up @@ -527,6 +529,7 @@ function SelectedFieldList(props: {
const style: React.CSSProperties = {display: 'flex',
flexWrap: 'nowrap' as const,
cursor: 'grab',
gap: '4px',
justifyContent: 'space-between'};
if (removingIdx === i) {
style.textDecoration = 'line-through' as const;
Expand All @@ -543,6 +546,7 @@ function SelectedFieldList(props: {
fontStyle: 'italic',
color: '#aaa',
fontSize: '0.7em',
wordBreak: 'break-word' as const,
marginLeft: 20,
};
fieldvisits = <dd style={style}>{item.visits.join(', ')}</dd>;
Expand Down Expand Up @@ -572,13 +576,17 @@ function SelectedFieldList(props: {
onDrop={() => moveSelected()}
>
<div>
<dt>{item.field}</dt>
<dd style={{marginLeft: 20}}>{getDictionaryDescription(
item.module,
item.category,
item.field,
props.fulldictionary,
)}</dd>
<dt style={{wordBreak: 'break-word'}}>{item.field}</dt>
<dd style={{
marginLeft: 20,
wordBreak: 'break-word',
}}>
{getDictionaryDescription(
item.module,
item.category,
item.field,
props.fulldictionary
)}</dd>
{fieldvisits}
</div>
<div
Expand Down
Loading