Fix merge conflicts (#50531)

elastic · Nov 13, 2019 · 42912ae · 42912ae
1 parent 39132a0
commit 42912ae
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/src/legacy/core_plugins/telemetry/index.ts b/src/legacy/core_plugins/telemetry/index.ts
@@ -50,10 +50,8 @@ const telemetry = (kibana: any) => {
         allowChangingOptInStatus: Joi.boolean().default(true),
         optIn: Joi.when('allowChangingOptInStatus', {
           is: false,
-          then: Joi.valid(true).required(),
-          otherwise: Joi.boolean()
-            .allow(null)
-            .default(null),
+          then: Joi.valid(true).default(true),
+          otherwise: Joi.boolean().default(true),
         }),
 
         // `config` is used internally and not intended to be set

diff --git a/...legacy/core_plugins/telemetry/public/components/__snapshots__/telemetry_form.test.js.snap b/...legacy/core_plugins/telemetry/public/components/__snapshots__/telemetry_form.test.js.snap
diff --git a/src/legacy/core_plugins/telemetry/public/components/telemetry_form.js b/src/legacy/core_plugins/telemetry/public/components/telemetry_form.js
@@ -116,7 +116,7 @@ export class TelemetryForm extends Component {
                 type: 'boolean',
                 value: telemetryOptInProvider.getOptIn() || false,
                 description: this.renderDescription(),
-                defVal: false,
+                defVal: true,
               }}
               save={this.toggleOptIn}
               clear={this.toggleOptIn}

diff --git a/src/legacy/core_plugins/telemetry/server/telemetry_config/get_telemetry_opt_in.ts b/src/legacy/core_plugins/telemetry/server/telemetry_config/get_telemetry_opt_in.ts
@@ -44,7 +44,7 @@ export const getTelemetryOptIn: GetTelemetryOptIn = ({
   }
 
   if (telemetrySavedObject === null || typeof telemetrySavedObject.enabled !== 'boolean') {
-    return null;
+    return configTelemetryOptIn;
   }
 
   const savedOptIn = telemetrySavedObject.enabled;