diff --git a/api/origin_trials_api.py b/api/origin_trials_api.py index 9cb5cf0f..955ba333 100644 --- a/api/origin_trials_api.py +++ b/api/origin_trials_api.py @@ -98,8 +98,8 @@ class OriginTrialsAPI(basehandlers.EntitiesAPIHandler): 'Origin trial feature name not found in file') if not body.get('ot_is_deprecation_trial', {}).get('value', False): - use_counter = body.get('ot_webfeature_use_counter', {}).get('value') - if use_counter is None: + use_counter = body.get('ot_webfeature_use_counter', {}).get('') + if not use_counter: validation_errors['ot_webfeature_use_counter'] = ( 'No UseCounter specified for non-deprecation trial.') elif f'{use_counter} =' not in webfeature_file: diff --git a/client-src/elements/form-definition.js b/client-src/elements/form-definition.js index 14b9d512..907610a0 100644 --- a/client-src/elements/form-definition.js +++ b/client-src/elements/form-definition.js @@ -511,8 +511,8 @@ export const ORIGIN_TRIAL_CREATION_FIELDS = { 'ot_documentation_url', 'ot_feedback_submission_url', 'ot_chromium_trial_name', - 'ot_webfeature_use_counter', 'ot_is_deprecation_trial', + 'ot_webfeature_use_counter', 'ot_has_third_party_support', 'ot_is_critical_trial', 'ot_require_approvals', diff --git a/client-src/elements/form-field-specs.js b/client-src/elements/form-field-specs.js index 3bf18799..e55c92e7 100644 --- a/client-src/elements/form-field-specs.js +++ b/client-src/elements/form-field-specs.js @@ -1284,7 +1284,8 @@ export const ALL_FIELDS = { attrs: TEXT_FIELD_ATTRS, required: true, label: 'Chromium trial name', - help_text: html` Name for the trial, as specified in + help_text: html` Name for the trial, given as the value of the property + "origin_trial_feature_name" as specified in web_feature.mojom.`, + >. Not required for deprecation trials.`, }, ot_require_approvals: { @@ -1432,13 +1432,12 @@ export const ALL_FIELDS = { }, ot_creation__intent_to_experiment_url: { - name: 'intent_to_experiment_url', type: 'input', attrs: URL_FIELD_ATTRS, required: true, label: 'Intent to Experiment link', - help_text: html`After you have started the "Intent to Experiment" discussion - thread, link to it here.`, + help_text: html`Your "Intent to Experiment" discussion thread. The necessary + LGTMs should already have been received.`, }, ot_creation__milestone_desktop_first: {