[CANVAS] Relax workpad schema to allow existing templates to work (el…

…astic#54019) (elastic#54643) Co-authored-by: Elastic Machine <[email protected]> Co-authored-by: Elastic Machine <[email protected]>
lizozom · Jan 13, 2020 · a1aa908 · a1aa908
1 parent 6ca9018
commit a1aa908
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/x-pack/legacy/plugins/canvas/i18n/templates/template_strings.ts b/x-pack/legacy/plugins/canvas/i18n/templates/template_strings.ts
@@ -42,7 +42,7 @@ export const getTemplateStrings = (): TemplateStringDict => ({
       defaultMessage: 'Pitch',
     }),
     help: i18n.translate('xpack.canvas.templates.pitchHelp', {
-      defaultMessage: 'Branded presentation with large photos"',
+      defaultMessage: 'Branded presentation with large photos',
     }),
   },
   Status: {

diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_templates/index.js b/x-pack/legacy/plugins/canvas/public/components/workpad_templates/index.js
@@ -24,7 +24,10 @@ export const WorkpadTemplates = compose(
     cloneWorkpad: props => workpad => {
       workpad.id = getId('workpad');
       workpad.name = `My Canvas Workpad - ${workpad.name}`;
+      // Remove unneeded fields
       workpad.tags = undefined;
+      workpad.displayName = undefined;
+      workpad.help = undefined;
       return workpadService
         .create(workpad)
         .then(() => props.router.navigateTo('loadWorkpad', { id: workpad.id, page: 1 }))

diff --git a/x-pack/plugins/canvas/server/routes/workpad/workpad_schema.ts b/x-pack/plugins/canvas/server/routes/workpad/workpad_schema.ts
@@ -24,11 +24,13 @@ export const WorkpadElementSchema = schema.object({
 
 export const WorkpadPageSchema = schema.object({
   elements: schema.arrayOf(WorkpadElementSchema),
-  groups: schema.arrayOf(
-    schema.object({
-      id: schema.string(),
-      position: PositionSchema,
-    })
+  groups: schema.maybe(
+    schema.arrayOf(
+      schema.object({
+        id: schema.string(),
+        position: PositionSchema,
+      })
+    )
   ),
   id: schema.string(),
   style: schema.recordOf(schema.string(), schema.string()),