fix(nimbus): Handle features without schemas in new UI

experimenter/experimenter/nimbus_ui/forms.py

@@ -1,3 +1,4 @@
+import json
 from collections import defaultdict
 
 from django import forms
@@ -420,15 +421,22 @@ def __init__(self, *args, **kwargs):
         ):
             self.fields["value"].initial = ""
 
-        if self.instance.id is not None and self.instance.feature_config:
-            if schema := self.instance.feature_config.schemas.filter(
-                version=None
-            ).first():
-                self.fields["value"].widget.attrs.update(
-                    {
-                        "data-schema": schema.schema,
-                    }
-                )
+        if (
+            self.instance.id is not None
+            and self.instance.feature_config
+            and (
+                schema := self.instance.feature_config.schemas.filter(
+                    version=None
+                ).first()
+            )
+            and schema is not None
+            and schema.schema is not None
+        ):
+            self.fields["value"].widget.attrs.update(
+                {
+                    "data-schema": json.dumps(schema.schema),
+                }
+            )
 
     def clean_value(self):
         value = self.cleaned_data.get("value")

experimenter/experimenter/nimbus_ui/static/js/edit_branches.js

@@ -44,12 +44,18 @@ const setupCodemirrorFeatures = () => {
   const textareas = document.querySelectorAll(selector);
 
   textareas.forEach((textarea) => {
-    const jsonSchema = JSON.parse(textarea.dataset["schema"]);
+    const extensions = [];
 
-    setupCodemirror(selector, textarea, [
-      linter(schemaLinter(jsonSchema)),
-      autocompletion({ override: [schemaAutocomplete(jsonSchema)] }),
-    ]);
+    if (textarea.dataset.schema) {
+      const jsonSchema = JSON.parse(textarea.dataset.schema);
+
+      extensions.push(
+        linter(schemaLinter(jsonSchema)),
+        autocompletion({ override: [schemaAutocomplete(jsonSchema)] }),
+      );
+    }
+
+    setupCodemirror(selector, textarea, extensions);
   });
 };
 

experimenter/experimenter/nimbus_ui/tests/test_forms.py

@@ -25,6 +25,7 @@
     NimbusDocumentationLinkFactory,
     NimbusExperimentFactory,
     NimbusFeatureConfigFactory,
+    NimbusVersionedSchemaFactory,
 )
 from experimenter.kinto.tasks import (
     nimbus_check_kinto_push_queue_by_collection,
@@ -3513,3 +3514,36 @@ def test_initial_value_not_overridden_for_existing_value(self):
         instance = NimbusBranchFeatureValue(value={"foo": "bar"})
         form = NimbusBranchFeatureValueForm(instance=instance)
         self.assertIsNone(form.fields["value"].initial)
+
+
+class TestBranchFeatureValueForm(RequestFormTestCase):
+    def test_schemas(self):
+        feature_with_schema = NimbusFeatureConfigFactory.create(
+            name="with-schema",
+            application=NimbusExperiment.Application.IOS,
+            schemas=[NimbusVersionedSchemaFactory.build(version=None)],
+        )
+
+        feature_without_schema = NimbusFeatureConfigFactory.create(
+            name="without-schema",
+            application=NimbusExperiment.Application.IOS,
+            schemas=[
+                NimbusVersionedSchemaFactory.build(version=None, schema=None),
+            ],
+        )
+
+        experiment = NimbusExperimentFactory.create_with_lifecycle(
+            NimbusExperimentFactory.Lifecycles.CREATED,
+            application=NimbusExperiment.Application.IOS,
+            feature_configs=[feature_with_schema, feature_without_schema],
+        )
+
+        forms = {
+            fv.feature_config.slug: NimbusBranchFeatureValueForm(instance=fv)
+            for fv in experiment.reference_branch.feature_values.all()
+        }
+
+        self.assertIn("data-schema", forms["with-schema"].fields["value"].widget.attrs)
+        self.assertNotIn(
+            "data-schema", forms["without-schema"].fields["value"].widget.attrs
+        )