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.

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

[Filters] Fix view based filters when string input is enabled #7050

Merged
merged 11 commits into from
Oct 24, 2023
5 changes: 3 additions & 2 deletions src/plugins/filters/components/FilterField.vue
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
type="text"
:aria-label="label"
:disabled="useGlobal"
:value="persistedValue(filter)"
@change="updateFilterValueFromString($event, filter)"
:value="persistedValue(filter.comparator)"
@change="updateFilterValueFromString($event, filter.comparator)"
/>
</template>

Expand Down Expand Up @@ -125,6 +125,7 @@ export default {
}
}
},
emits: ['filterTextValueChanged', 'filterSelected', 'clearFilters', 'filterSingleSelected'],
data() {
return {
isEditing: this.openmct.editor.isEditing()
Expand Down
9 changes: 5 additions & 4 deletions src/plugins/filters/components/FilterObject.vue
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@
:use-global="persistedFilters.useGlobal"
:persisted-filters="updatedFilters[metadatum.key]"
label="Specific Filter"
@filterSelected="updateMultipleFiltersWithSelectedValue"
@filterTextValueChanged="updateFiltersWithTextValue"
@filterSingleSelected="updateSingleSelection"
@clearFilters="clearFilters"
@filter-selected="updateMultipleFiltersWithSelectedValue"
@filter-text-value-changed="updateFiltersWithTextValue"
@filter-single-selected="updateSingleSelection"
@clear-filters="clearFilters"
/>
</ul>
</div>
Expand Down Expand Up @@ -98,6 +98,7 @@ export default {
}
}
},
emits: ['updateFilters'],
data() {
return {
expanded: false,
Expand Down
9 changes: 5 additions & 4 deletions src/plugins/filters/components/FiltersView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,21 @@
<global-filters
:global-filters="globalFilters"
:global-metadata="globalMetadata"
@persistGlobalFilters="persistGlobalFilters"
@persist-global-filters="persistGlobalFilters"
/>
<filter-object
v-for="(child, key) in children"
:key="key"
:filter-object="child"
:persisted-filters="persistedFilters[key]"
@updateFilters="persistFilters"
@update-filters="persistFilters"
/>
</ul>
</template>

<script>
import _ from 'lodash';
import { toRaw } from 'vue';

import FilterObject from './FilterObject.vue';
import GlobalFilters from './GlobalFilters.vue';
Expand Down Expand Up @@ -271,14 +272,14 @@ export default {
this.openmct.objects.mutate(
this.providedObject,
'configuration.filters',
this.persistedFilters
toRaw(this.persistedFilters)
);
},
mutateConfigurationGlobalFilters() {
this.openmct.objects.mutate(
this.providedObject,
'configuration.globalFilters',
this.globalFilters
toRaw(this.globalFilters)
);
}
}
Expand Down
9 changes: 5 additions & 4 deletions src/plugins/filters/components/GlobalFilters.vue
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@
:filter-field="metadatum"
:persisted-filters="updatedFilters[metadatum.key]"
label="Global Filter"
@filterSelected="updateFiltersWithSelectedValue"
@filterTextValueChanged="updateFiltersWithTextValue"
@filterSingleSelected="updateSingleSelection"
@clearFilters="clearFilters"
@filter-selected="updateFiltersWithSelectedValue"
@filter-text-value-changed="updateFiltersWithTextValue"
@filter-single-selected="updateSingleSelection"
@clear-filters="clearFilters"
/>
</ul>
</li>
Expand All @@ -73,6 +73,7 @@ export default {
}
}
},
emits: ['persistGlobalFilters'],
data() {
return {
expanded: false,
Expand Down
11 changes: 9 additions & 2 deletions src/plugins/telemetryTable/TelemetryTable.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ define([
'./TelemetryTableColumn',
'./TelemetryTableUnitColumn',
'./TelemetryTableConfiguration',
'../../utils/staleness'
'../../utils/staleness',
'vue'
], function (
EventEmitter,
_,
Expand All @@ -39,8 +40,11 @@ define([
TelemetryTableColumn,
TelemetryTableUnitColumn,
TelemetryTableConfiguration,
StalenessUtils
StalenessUtils,
Vue
) {
const { toRaw } = Vue;

class TelemetryTable extends EventEmitter {
constructor(domainObject, openmct) {
super();
Expand Down Expand Up @@ -372,6 +376,9 @@ define([
this.domainObject.configuration.filters &&
this.domainObject.configuration.filters[keyString];

// de-reactify it
filters = toRaw(filters);

return { filters } || {};
}

Expand Down
17 changes: 11 additions & 6 deletions src/plugins/telemetryTable/components/table-footer-indicator.vue
Original file line number Diff line number Diff line change
Expand Up @@ -157,14 +157,19 @@ export default {
},
getFilterLabels(filterObject, metadatum) {
let filterLabels = [];

Object.values(filterObject).forEach((comparator) => {
comparator.forEach((filterValue) => {
metadatum.filters[0].possibleValues.forEach((option) => {
if (option.value === filterValue) {
filterLabels.push(option.label);
}
if (typeof comparator !== 'string') {
comparator.forEach((filterValue) => {
metadatum.filters[0].possibleValues.forEach((option) => {
if (option.value === filterValue) {
filterLabels.push(option.label);
}
});
});
});
} else {
filterLabels.push(comparator);
}
});

return filterLabels;
Expand Down