Skip to content

Commit

Permalink
fix(editor): Make inputs in the filter component regular inputs by de…
Browse files Browse the repository at this point in the history
…fault (#8980)
  • Loading branch information
elsmr committed Mar 27, 2024
1 parent ddc0f57 commit 295b650
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 21 deletions.
17 changes: 4 additions & 13 deletions cypress/e2e/30-if-node.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,8 @@ describe('If Node (filter component)', () => {

// Add
ndv.actions.addFilterCondition(FILTER_PARAM_NAME);
ndv.getters
.filterConditionLeft(FILTER_PARAM_NAME, 0)
.find('.cm-content')
.first()
.type('first left');
ndv.getters
.filterConditionLeft(FILTER_PARAM_NAME, 1)
.find('.cm-content')
.first()
.type('second left');
ndv.getters.filterConditionLeft(FILTER_PARAM_NAME, 0).find('input').type('first left');
ndv.getters.filterConditionLeft(FILTER_PARAM_NAME, 1).find('input').type('second left');
ndv.actions.addFilterCondition(FILTER_PARAM_NAME);
ndv.getters.filterConditions(FILTER_PARAM_NAME).should('have.length', 3);

Expand All @@ -42,9 +34,8 @@ describe('If Node (filter component)', () => {
ndv.getters.filterConditions(FILTER_PARAM_NAME).should('have.length', 2);
ndv.getters
.filterConditionLeft(FILTER_PARAM_NAME, 0)
.find('.cm-content')
.first()
.should('have.text', 'second left');
.find('input')
.should('have.value', 'second left');
ndv.actions.removeFilterCondition(FILTER_PARAM_NAME, 1);
ndv.getters.filterConditions(FILTER_PARAM_NAME).should('have.length', 1);
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const ndvStore = useNDVStore();
const { debounce } = useDebounce();
function createCondition(): FilterConditionValue {
return { id: uuid(), leftValue: '=', rightValue: '=', operator: DEFAULT_OPERATOR_VALUE };
return { id: uuid(), leftValue: '', rightValue: '', operator: DEFAULT_OPERATOR_VALUE };
}
const allowedCombinators = computed<FilterTypeCombinator[]>(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,7 @@ describe('FilterConditions.vue', () => {
expect(getByTestId('filter-conditions')).toBeInTheDocument();
expect(await findAllByTestId('filter-condition')).toHaveLength(1);
expect(getByTestId('filter-condition-left')).toBeInTheDocument();
expect(
within(getByTestId('filter-condition-left')).getByTestId('inline-expression-editor-input'),
).toBeInTheDocument();
expect(getByTestId('filter-operator-select')).toBeInTheDocument();
expect(getByTestId('filter-condition-right')).toBeInTheDocument();
expect(
within(getByTestId('filter-condition-right')).getByTestId('inline-expression-editor-input'),
).toBeInTheDocument();

// Only visible when multiple conditions
expect(queryByTestId('filter-combinator-select')).not.toBeInTheDocument();
Expand Down

0 comments on commit 295b650

Please sign in to comment.