UIEXT-3031: Make uischema-provided possible values overwrite oneof possible values

UIEXT-3031 (Support multiple modes for file selection widget)

Author: PaulBrnrther

.changeset/eleven-rings-invite.md

@@ -0,0 +1,5 @@
+---
+"@knime/jsonforms": patch
+---
+
+Prefer uischema possible values over oneOf options in RadioControl and ValueSwitchControl

packages/jsonforms/src/uiComponents/RadioControlBase.vue

@@ -33,10 +33,12 @@ const uiComponent = computed(() =>
 const staticOptions: Ref<PossiblyDisabledOption[] | null | undefined> =
   ref(null);
 
-const { possibleValues } = usePossibleValues(toRef(props, "control"));
+const { possibleValues } = usePossibleValues(toRef(props, "control"), {
+  defaultOnNonProvided: null,
+});
 
 const options = computed(() =>
-  (staticOptions.value ?? possibleValues.value)?.map(disableOption),
+  (possibleValues.value ?? staticOptions.value)?.map(disableOption),
 );
 
 onMounted(() => {

packages/jsonforms/src/uiComponents/__tests__/RadioControl.test.ts

@@ -117,8 +117,7 @@ describe("RadioControl", () => {
     ]);
   });
 
-  it("uses possible values if oneOf is not given", async () => {
-    delete props.control.schema.oneOf;
+  it("uses possible values", async () => {
     props.control.uischema.options!.possibleValues = [
       { id: "VAL 1", text: "Val 1" },
       { id: "VAL 2", text: "Val 2" },
@@ -133,20 +132,4 @@ describe("RadioControl", () => {
       { id: "VAL 2", text: "Val 2" },
     ]);
   });
-
-  it("favors oneOf over possible Values", async () => {
-    props.control.uischema.options!.possibleValues = [
-      { id: "VAL 1", text: "Val 1" },
-      { id: "VAL 2", text: "Val 2" },
-    ];
-    const { wrapper } = await mountJsonFormsControlLabelContent(RadioControl, {
-      props,
-    });
-    expect(
-      wrapper.findComponent(RadioButtons).props().possibleValues,
-    ).toStrictEqual([
-      { id: "LOG", text: "Logarithmic" },
-      { id: "VALUE", text: "Linear" },
-    ]);
-  });
 });

packages/jsonforms/src/uiComponents/composables/usePossibleValues.ts

@@ -15,14 +15,22 @@ export const usePossibleValues = <
   control: Ref<{
     uischema: ChoicesUiSchemaWithProvidedOptions<SpecialChoicesProps>;
   }>,
+  options?: {
+    defaultOnNonProvided?: [] | null; // default is []
+  },
 ) => {
   const uischema = computed(() => control.value.uischema);
   const providedPossibleValues = useProvidedState(uischema, "possibleValues");
   const possibleValues = computed(() => {
     if (uischema.value.providedOptions?.includes("possibleValues")) {
       return providedPossibleValues.value;
     }
-    return uischema.value.options?.possibleValues ?? [];
+    return (
+      uischema.value.options?.possibleValues ??
+      (typeof options?.defaultOnNonProvided === "undefined"
+        ? []
+        : options?.defaultOnNonProvided)
+    );
   });
   return { possibleValues };
 };