Skip to content

Commit ffa578a

Browse files
web-forms (Vue UI): remove remnants of “unsupported control”
We now support all of the control types (at least partially)!
1 parent c631c17 commit ffa578a

File tree

4 files changed

+4
-38
lines changed

4 files changed

+4
-38
lines changed

packages/web-forms/src/components/FormQuestion.vue

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import RangeControl from './controls/Range/RangeControl.vue';
1313
import RankControl from './controls/RankControl.vue';
1414
import SelectControl from './controls/SelectControl.vue';
1515
import TriggerControl from './controls/TriggerControl.vue';
16-
import UnsupportedControl from './controls/UnsupportedControl.vue';
1716
import UploadControl from './controls/Upload/UploadControl.vue';
1817
1918
defineProps<{ question: ControlNode }>();
@@ -50,8 +49,6 @@ const submitPressed = inject('submitPressed');
5049
<RangeControl v-else-if="isRangeNode(question)" :node="question" />
5150

5251
<TriggerControl v-else-if="isTriggerNode(question)" :question="question" />
53-
54-
<UnsupportedControl v-else :question="question" />
5552
</div>
5653
</template>
5754

packages/web-forms/src/components/controls/UnsupportedControl.vue

Lines changed: 0 additions & 12 deletions
This file was deleted.

packages/web-forms/tests/components/FormQuestion.test.ts

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import InputControl from '@/components/controls/Input/InputControl.vue';
2-
import SelectControl from '@/components/controls/SelectControl.vue';
32
import RankControl from '@/components/controls/RankControl.vue';
4-
import UnsupportedControl from '@/components/controls/UnsupportedControl.vue';
3+
import SelectControl from '@/components/controls/SelectControl.vue';
4+
import FormQuestion from '@/components/FormQuestion.vue';
55
import type { SelectNode } from '@getodk/xforms-engine';
66
import { mount } from '@vue/test-utils';
77
import { describe, expect, it } from 'vitest';
8-
import FormQuestion from '@/components/FormQuestion.vue';
9-
import { fakeUnsupportedControlNode, getReactiveForm, globalMountOptions } from '../helpers';
8+
import { getReactiveForm, globalMountOptions } from '../helpers';
109

1110
const mountComponent = async (formPath: string, questionNumber: number) => {
1211
const xform = await getReactiveForm(formPath);
@@ -53,19 +52,4 @@ describe('FormQuestion', () => {
5352
);
5453
expect(component.find('#family_and_friends .rank-label').text()).toEqual('Family and Friends');
5554
});
56-
57-
it('shows UnsupportedControl for unsupported / unimplemented question type', () => {
58-
const component = mount(FormQuestion, {
59-
props: {
60-
question: fakeUnsupportedControlNode(),
61-
},
62-
global: globalMountOptions,
63-
});
64-
65-
const unsupported = component.findComponent(UnsupportedControl);
66-
67-
expect(unsupported.exists()).toBe(true);
68-
69-
expect(component.text()).toEqual('Unsupported field {dummy} in the form definition.');
70-
});
7155
});

packages/web-forms/tests/helpers.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { xformFixturesByIdentifier } from '@getodk/common/fixtures/xforms.ts';
22
import type { AnyFunction } from '@getodk/common/types/helpers.d.ts';
3-
import type { AnyControlNode, RootNode } from '@getodk/xforms-engine';
3+
import type { RootNode } from '@getodk/xforms-engine';
44
import { createInstance } from '@getodk/xforms-engine';
55
import type { MountingOptions } from '@vue/test-utils';
66
import PrimeVue from 'primevue/config';
@@ -66,9 +66,6 @@ export const globalMountOptions: GlobalMountOptions = {
6666
},
6767
};
6868

69-
export const fakeUnsupportedControlNode = () =>
70-
Object.assign({ nodeType: 'dummy', validationState: {} }, {} as AnyControlNode);
71-
7269
// TODO: how the heck is `undefined` a key of anything?!
7370
type StringKeyOf<T> = Extract<keyof T, string>;
7471

0 commit comments

Comments
 (0)