Skip to content

Commit

Permalink
fix: conflict[WTEL-4099]
Browse files Browse the repository at this point in the history
  • Loading branch information
Lera24 committed Sep 19, 2024
2 parents d12009b + 9ef7964 commit 75be8ad
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/modules/Filters/components/filter-search.vue
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ const v$ =
{ $autoDirty: true },
);
v$.value.$touch();
if (v$) v$.value.$touch();
async function changeMode({ value }, { clearValue = true } = {}) {
if (clearValue) await setValue({ name: filterName.value, value: '' });
Expand Down
7 changes: 5 additions & 2 deletions src/store/new/modules/tableStoreModule/tableStoreModule.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import FilterEvent from '../../../../modules/Filters/enums/FilterEvent.enum.js';
import { queryToSortAdapter, sortToQueryAdapter } from '../../../../scripts/sortQueryAdapters.js';
import {
queryToSortAdapter,
sortToQueryAdapter,
} from '../../../../scripts/sortQueryAdapters.js';

const state = () => ({
headers: [],
Expand All @@ -18,7 +21,7 @@ const getters = {

FIELDS: (state) => {
const fields = state.headers.reduce((fields, { show, field }) => {
if (show) return [...fields, field];
if (show || show === undefined) return [...fields, field];
return fields;
}, []);

Expand Down

0 comments on commit 75be8ad

Please sign in to comment.