Add message; remove toolbar project; add time to present

elastic · Apr 26, 2021 · 4503c52 · 4503c52
1 parent 481a802
commit 4503c52
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 13 deletions.
diff --git a/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts b/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts
@@ -432,7 +432,7 @@ export const stackManagementSchema: MakeSchemaFrom<UsageStats> = {
     type: 'text',
     _meta: { description: 'Non-default value of setting.' },
   },
-  'labs:presentation:unifiedToolbar': {
+  'labs:presentation:timeToPresent': {
     type: 'boolean',
     _meta: { description: 'Non-default value of setting.' },
   },

diff --git a/src/plugins/kibana_usage_collection/server/collectors/management/types.ts b/src/plugins/kibana_usage_collection/server/collectors/management/types.ts
@@ -119,5 +119,5 @@ export interface UsageStats {
   'banners:textColor': string;
   'banners:backgroundColor': string;
   'labs:canvas:enable_ui': boolean;
-  'labs:presentation:unifiedToolbar': boolean;
+  'labs:presentation:timeToPresent': boolean;
 }
diff --git a/src/plugins/presentation_util/common/labs.ts b/src/plugins/presentation_util/common/labs.ts
@@ -8,9 +8,9 @@
 
 import { i18n } from '@kbn/i18n';
 
-export const UNIFIED_TOOLBAR = 'labs:presentation:unifiedToolbar';
+export const TIME_TO_PRESENT = 'labs:presentation:timeToPresent';
 
-export const projectIDs = [UNIFIED_TOOLBAR] as const;
+export const projectIDs = [TIME_TO_PRESENT] as const;
 export const environmentNames = ['kibana', 'browser', 'session'] as const;
 export const solutionNames = ['canvas', 'dashboard', 'presentation'] as const;
 
@@ -19,17 +19,18 @@ export const solutionNames = ['canvas', 'dashboard', 'presentation'] as const;
  * provided to users of our solutions in Kibana.
  */
 export const projects: { [ID in ProjectID]: ProjectConfig & { id: ID } } = {
-  [UNIFIED_TOOLBAR]: {
-    id: UNIFIED_TOOLBAR,
+  [TIME_TO_PRESENT]: {
+    id: TIME_TO_PRESENT,
     isActive: false,
+    isDisplayed: false,
     environments: ['kibana', 'browser', 'session'],
-    name: i18n.translate('presentationUtil.labs.enableUnifiedToolbarProjectName', {
-      defaultMessage: 'Unified Toolbar',
+    name: i18n.translate('presentationUtil.labs.enableTimeToPresentProjectName', {
+      defaultMessage: 'Canvas Presentation UI',
     }),
     description: i18n.translate('presentationUtil.labs.enableUnifiedToolbarProjectDescription', {
-      defaultMessage: 'Enable the new unified toolbar design for Presentation solutions',
+      defaultMessage: 'Enable the new presentation-oriented UI for Canvas.',
     }),
-    solutions: ['dashboard', 'canvas'],
+    solutions: ['canvas'],
   },
 };
 
@@ -51,6 +52,7 @@ export interface ProjectConfig {
   id: ProjectID;
   name: string;
   isActive: boolean;
+  isDisplayed: boolean;
   environments: EnvironmentName[];
   description: string;
   solutions: SolutionName[];

diff --git a/src/plugins/presentation_util/public/components/labs/labs_flyout.tsx b/src/plugins/presentation_util/public/components/labs/labs_flyout.tsx
@@ -10,6 +10,8 @@ import React, { ReactNode, useRef, useState, useEffect } from 'react';
 import {
   EuiFlyout,
   EuiTitle,
+  EuiSpacer,
+  EuiText,
   EuiFlyoutBody,
   EuiFlyoutFooter,
   EuiFlyoutHeader,
@@ -124,7 +126,7 @@ export const LabsFlyout = (props: Props) => {
   return (
     <EuiOverlayMask onClick={() => onClose()} headerZindexLocation="below">
       <EuiFlyout onClose={onClose} hideCloseButton={true}>
-        <EuiFlyoutHeader>
+        <EuiFlyoutHeader hasBorder>
           <EuiTitle size="m">
             <h2>
               <EuiFlexGroup gutterSize="s" alignItems="center" responsive={false}>
@@ -135,6 +137,10 @@ export const LabsFlyout = (props: Props) => {
               </EuiFlexGroup>
             </h2>
           </EuiTitle>
+          <EuiSpacer size="s" />
+          <EuiText size="s" color="subdued">
+            <p>{strings.getDescriptionMessage()}</p>
+          </EuiText>
         </EuiFlyoutHeader>
         <EuiFlyoutBody>
           <ProjectList {...{ projects, solutions, onStatusChange }} />

diff --git a/src/plugins/presentation_util/public/components/labs/project_list.tsx b/src/plugins/presentation_util/public/components/labs/project_list.tsx
@@ -29,6 +29,10 @@ export const ProjectList = (props: Props) => {
 
   const items = Object.values(projects)
     .map((project) => {
+      if (!project.isDisplayed) {
+        return null;
+      }
+
       // Filter out any panels that don't match the solutions filter, (if provided).
       if (solutions && !solutions.some((solution) => project.solutions.includes(solution))) {
         return null;

diff --git a/src/plugins/presentation_util/public/components/labs/project_list_item.stories.tsx b/src/plugins/presentation_util/public/components/labs/project_list_item.stories.tsx
@@ -37,7 +37,7 @@ export function EmptyList() {
 export const ListItem = (
   props: Pick<
     Props['project'],
-    'description' | 'isActive' | 'name' | 'solutions' | 'environments'
+    'description' | 'isActive' | 'name' | 'solutions' | 'environments' | 'isDisplayed'
   > &
     Omit<ProjectStatus, 'defaultValue'>
 ) => {

diff --git a/src/plugins/presentation_util/public/i18n/labs.tsx b/src/plugins/presentation_util/public/i18n/labs.tsx
@@ -83,6 +83,11 @@ export const LabsStrings = {
         i18n.translate('presentationUtil.labs.components.titleLabel', {
           defaultMessage: 'Lab projects',
         }),
+      getDescriptionMessage: () =>
+        i18n.translate('presentationUtil.labs.components.descriptionMessage', {
+          defaultMessage:
+            'Lab projects are features and functionality that are in-progress or experimental in nature.  They can be enabled and disabled locally for your browser or tab, or in Kibana.',
+        }),
       getResetToDefaultLabel: () =>
         i18n.translate('presentationUtil.labs.components.resetToDefaultLabel', {
           defaultMessage: 'Reset to defaults',

diff --git a/src/plugins/telemetry/schema/oss_plugins.json b/src/plugins/telemetry/schema/oss_plugins.json
@@ -8331,7 +8331,13 @@
             "description": "Non-default value of setting."
           }
         },
-        "labs:presentation:unifiedToolbar": {
+        "labs:presentation:timeToPresent": {
+          "type": "boolean",
+          "_meta": {
+            "description": "Non-default value of setting."
+          }
+        },
+        "labs:canvas:enable_ui": {
           "type": "boolean",
           "_meta": {
             "description": "Non-default value of setting."