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

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

Merged
merged 11 commits into from
Oct 24, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
41fec78
de-reactifying some objects for clarity, handling strings for filters…
jvigliotta Sep 8, 2023
6eab599
removing debug, fixing string value persistence
jvigliotta Sep 11, 2023
faecdf8
remove unnecessary change
jvigliotta Sep 11, 2023
56d54ca
Merge branch 'master' into filter-string-fix
jvigliotta Sep 12, 2023
8f19281
removing vue utils from non vue files
jvigliotta Oct 2, 2023
a39741c
nipping proxy objects in the bud
jvigliotta Oct 11, 2023
0d96d31
merging master
jvigliotta Oct 12, 2023
527b1c1
Merge branch 'master' into filter-string-fix
jvigliotta Oct 19, 2023
1b5fe2e
Merge branch 'master' into filter-string-fix
jvigliotta Oct 24, 2023
fbf427d
linting
jvigliotta Oct 24, 2023
751053d
Merge branch 'master' into filter-string-fix
ozyx Oct 24, 2023
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 src/plugins/filters/components/FilterField.vue
View file
Open in desktop
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
5 changes: 3 additions & 2 deletions src/plugins/filters/components/FiltersView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@

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

import FilterObject from './FilterObject.vue';
import GlobalFilters from './GlobalFilters.vue';
Expand Down Expand Up @@ -267,14 +268,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
17 changes: 11 additions & 6 deletions src/plugins/telemetryTable/components/TableFooterIndicator.vue
View file
Open in desktop
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