Skip to content

Allow read-only custom feature browsing #2975

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

Merged
anthonysena merged 1 commit into from
Nov 26, 2024
+46 −40
Merged

Allow read-only custom feature browsing #2975

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 js/components/multi-select.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<div class="multi-select" data-bind="eventListener: [{event: 'hide.bs.dropdown', selector: 'div.dropdown.bootstrap-select', callback: onSelectionComplete}]">
<!-- ko if: multiple == true -->
<select data-bind="selectedOptions: selectedValues, options: optionVals, optionsText: optionsText, multiSelect: { liveSearch: true, selectedTextFormat: selectedTextFormat, noneSelectedText: ko.unwrap(noneSelectedText), noneResultsText: ko.unwrap(noneResultsText), countSelectedText: ko.unwrap(countSelectedText) }" multiple></select>
<select data-bind="attr: disabled, selectedOptions: selectedValues, options: optionVals, optionsText: optionsText, multiSelect: { liveSearch: true, selectedTextFormat: selectedTextFormat, noneSelectedText: ko.unwrap(noneSelectedText), noneResultsText: ko.unwrap(noneResultsText), countSelectedText: ko.unwrap(countSelectedText) }" multiple></select>
<!-- /ko -->
<!-- ko if: multiple == false -->
<select data-bind="options: options, value: selectedValue, optionsText: 'label', optionsValue: 'value', multiSelect: { liveSearch: true, selectedTextFormat: 'count > 2', noneSelectedText: ko.unwrap(noneSelectedText), noneResultsText: ko.unwrap(noneResultsText) }"></select>
<select data-bind="attr: disabled, options: options, value: selectedValue, optionsText: 'label', optionsValue: 'value', multiSelect: { liveSearch: true, selectedTextFormat: 'count > 2', noneSelectedText: ko.unwrap(noneSelectedText), noneResultsText: ko.unwrap(noneResultsText) }"></select>
<!-- /ko -->
</div>
1 change: 1 addition & 0 deletions js/components/multi-select.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ define(

self.multiple = params.multiple;
self.options = params.options;
self.disable = (params.disable || false);

@pieterlukasse pieterlukasse Apr 11, 2025 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

the mismatch of self.disable and attr: disabled, added to the .html above seems to cause an issue.

self.selectedValues = ko.observableArray(params.selectedValues && params.selectedValues());
self.selectedValue = params.selectedValue;
self.selectedTextFormat = params.selectedTextFormat || 'count > 2';
Expand Down
79 changes: 42 additions & 37 deletions js/pages/characterizations/components/feature-analyses/fa-view-edit/fa-design.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
<!-- /ko -->
<textarea data-bind="
css: classes({ element: 'descr', extra: 'form-control' }),
attr: { disabled: $component.canEdit() ? null : true },
attr: { disabled: $component.canEdit() ? null : true }
textInput: $component.data().descr
"></textarea>
</div>
</div>

<div data-bind="css: classes({ element: 'design-panel', extra: 'panel panel-primary' })">
<div data-bind="css: classes({ element: 'design-panel', extra: 'panel panel-primary'})">
<div class="panel-heading" data-bind="text: ko.i18n('cc.fa.design', 'Design')"></div>
<div data-bind="css: classes({ element: 'design-panel-body' })">
<div data-bind="css: classes('type-selector')">
Expand All @@ -32,6 +32,7 @@
data-bind="
if: $component.canEdit() || $component.data().type() === $component.featureTypes.PRESET,
css: classes({ element: 'nav-pill', extra: $component.data().type() === $component.featureTypes.PRESET ? 'active' : null }),
attr: { disabled: $component.canEdit() ? null : true },
click: setType.bind(null, $component.featureTypes.PRESET)
">
<a data-bind="text: ko.i18n('cc.fa.preset', 'Preset')"></a>
Expand All @@ -44,6 +45,7 @@
data-bind="
if: ($component.canEdit() && !$component.featureId()) || $component.data().type() === $component.featureTypes.CRITERIA_SET,
css: classes({ element: 'nav-pill', extra: $component.data().type() === $component.featureTypes.CRITERIA_SET ? 'active' : null }),
attr: { disabled: $component.canEdit() ? null : true },
click: setType.bind(null, $component.featureTypes.CRITERIA_SET)
">
<a data-bind="text: ko.i18n('cc.fa.criteria', 'Criteria')"></a>
Expand All @@ -52,6 +54,7 @@
data-bind="
if: ($component.canEdit() && !$component.featureId()) || $component.data().type() === $component.featureTypes.CUSTOM_FE,
css: classes({ element: 'nav-pill', extra: $component.data().type() === $component.featureTypes.CUSTOM_FE ? 'active' : null }),
attr: { disabled: $component.canEdit() ? null : true },
click: setType.bind(null, $component.featureTypes.CUSTOM_FE)
">
<a data-bind="text: ko.i18n('cc.fa.custom', 'Custom')"></a>
Expand All @@ -63,27 +66,27 @@
<span data-bind="css: classes('criteria-descr'), text: ko.i18n('cc.fa.featureExtractionPresetName', 'FeatureExtraction preset name:')"></span>
<input data-bind="
css: classes({ element: 'preset-input', extra: 'form-control' }),
attr: { disabled: $component.canEdit() ? null : true },
textInput: $component.data().design
" />
</div>
<!-- /ko -->
<div data-bind="
if: $component.data().type() === $component.featureTypes.CRITERIA_SET, css: classes('design')
if: $component.data().type() === $component.featureTypes.CRITERIA_SET,
css: classes('design')
">
<div data-bind="css: classes({extra: 'panel panel-primary'})">
<div data-bind="css: classes({ extra: 'panel-heading' }), text: ko.i18n('cc.fa.analysisType', 'Analysis type:')"></div>
<div data-bind="css: classes('stat-type-selector')">
<multi-select
data-bind="css: classes()"
params="options: $component.statTypeOptions,
params="options: $component.statTypeOptions, disable: !$component.canEdit(),
selectedValue: $component.data().statType, multiple: false"></multi-select>
</div>
</div>
<span data-bind="if: data().statType() === 'PREVALENCE'">
<button data-bind="css: classes({ element: 'add-criteria-group', extra: 'btn btn-success' }), click: addCriteria, text: ko.i18n('cc.fa.addCriteriaFeature', 'Add Criteria feature')"></button>
<button data-bind="css: classes({ element: 'add-criteria-group', extra: 'btn btn-success' }), attr: { disabled: $component.canEdit() ? null : true }, click: addCriteria, text: ko.i18n('cc.fa.addCriteriaFeature', 'Add Criteria feature')"></button>
</span>
<span data-bind="if: data().statType() === 'DISTRIBUTION', css: classes('add-criteria-windowed')">
<span data-bind="if: data().statType() === 'DISTRIBUTION', css: classes('add-criteria-windowed'), attr: { disabled: $component.canEdit() ? null : true }">
<div>
<div class="btn-group">
<button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i>
Expand All @@ -100,35 +103,37 @@
</div>
</span>
<!-- ko foreach: $component.data().design -->
<div data-bind="
css: $component.classes('criteria'),
eventListener: [
{ event: 'click', selector: '.conceptset_import', callback: $component.handleConceptSetImport},
{ event: 'click', selector: '.conceptset_edit', callback: $component.handleEditConceptSet }
]
">
<div data-bind="css: $component.classes('criteria-heading')">
<input
data-bind="css: $component.classes({ element: 'criteria-name', extra: 'form-control' }), textInput: $data.name, placeholder: ko.i18n('cc.fa.criteriaName', 'Criteria name')"
/>
<button
type="button"
data-bind="css: $component.classes({ element: 'criteria-delete', extra: 'btn btn-sm btn-danger' }), click: () => $component.removeCriteria($index())"
><i class="fa fa-trash-alt"></i></button>
</div>
<!-- Aggregate -->
<div data-bind="if: $parent.data().statType() === 'DISTRIBUTION' && $data.criteriaType !== 'DemographicCriteria'">
<aggregate-select params="aggregates: $component.aggregates, currentAggregate: $data.aggregate, domains: $component.domains, criteria: $data"></aggregate-select>
</div>
<div data-bind="if: $data.criteriaType === 'CriteriaGroup'">
<criteria-group params="{ expression: { ConceptSets: $component.data().conceptSets }, group: $data.expression }"></criteria-group>
</div>
<div data-bind="if: $data.criteriaType === 'DemographicCriteria'">
<demographic-criteria params="{ criteria: $data.expression }"></demographic-criteria>
</div>
<div data-bind="if: $data.criteriaType === 'WindowedCriteria'">
<windowed-criteria params="{ expression: { ConceptSets: $component.data().conceptSets }, criteria: $data.expression, disableObservationPeriod: true, defaultObservationPeriod: true }"></windowed-criteria>
</div>
<div data-bind="css: $component.canEdit() ? '' : 'feature-analysis-view-edit__content--disabled'">

@anthonysena anthonysena Nov 6, 2024

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

This CSS class feature-analysis-view-edit__content--disabled is defined by the parent component and I was not sure how to best use it so for now it is hardcoded.

@anthonysena anthonysena Nov 11, 2024

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

@alex-odysseus do you or anyone from your team provide a suggestion to handle this CSS approach?

@anthonysena anthonysena Nov 19, 2024

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Just to follow up on this item: I've attempted to edit the child .less sheets to include the disabled BEM modifier without much luck. I'd propose just hard-coding this now.

<div data-bind="
css: $component.classes('criteria'),
eventListener: [
{ event: 'click', selector: '.conceptset_import', callback: $component.handleConceptSetImport},
{ event: 'click', selector: '.conceptset_edit', callback: $component.handleEditConceptSet }
]
">
<div data-bind="css: $component.classes('criteria-heading')">
<input
data-bind="css: $component.classes({ element: 'criteria-name', extra: 'form-control' }), textInput: $data.name, placeholder: ko.i18n('cc.fa.criteriaName', 'Criteria name')"
/>
<button
type="button"
data-bind="css: $component.classes({ element: 'criteria-delete', extra: 'btn btn-sm btn-danger' }), attr: { disabled: $component.canEdit() ? null : true }, click: () => $component.removeCriteria($index())"
><i class="fa fa-trash-alt"></i></button>
</div>
<!-- Aggregate -->
<div data-bind="if: $parent.data().statType() === 'DISTRIBUTION' && $data.criteriaType !== 'DemographicCriteria'">
<aggregate-select params="aggregates: $component.aggregates, currentAggregate: $data.aggregate, domains: $component.domains, criteria: $data"></aggregate-select>
</div>
<div data-bind="if: $data.criteriaType === 'CriteriaGroup'">
<criteria-group params="{ expression: { ConceptSets: $component.data().conceptSets }, group: $data.expression}"></criteria-group>
</div>
<div data-bind="if: $data.criteriaType === 'DemographicCriteria'">
<demographic-criteria params="{ criteria: $data.expression }"></demographic-criteria>
</div>
<div data-bind="if: $data.criteriaType === 'WindowedCriteria'">
<windowed-criteria params="{ expression: { ConceptSets: $component.data().conceptSets }, criteria: $data.expression, disableObservationPeriod: true, defaultObservationPeriod: true }"></windowed-criteria>
</div>
</div>
</div>
<!-- /ko -->
</div>
Expand All @@ -146,7 +151,7 @@
<span data-bind="css: classes('criteria-sql')">SELECT covariate_id, covariate_name, concept_id, sum_value, average_value FROM (</span>
<textarea data-bind="
css: classes({ element: 'raw-sql-box', extra: 'form-control' }),
attr: { disabled: $component.canEdit() ? null : true, placeholder: demoCustomSqlAnalysisDesign },
attr: { placeholder: demoCustomSqlAnalysisDesign },
textInput: $component.data().design
"></textarea>
<span data-bind="css: classes('criteria-sql')">)</span>
Expand Down
2 changes: 1 addition & 1 deletion js/pages/characterizations/components/feature-analyses/feature-analysis-view-edit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
</div>

<!-- ko if: selectedTabKey -->
<tabs data-bind="css: editorClasses(), visible: !$component.loading()" params="
<tabs data-bind="visible: !$component.loading()" params="
selectedTabKey: $component.selectedTabKey,
selectTab: $component.selectTab,
tabs: $component.tabs">
Expand Down