Simplify explicit input to only include what is **absolutely necessary**

elastic · Jun 22, 2023 · bc9c863 · bc9c863
1 parent 6982698
commit bc9c863
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/...on_embeddable/public/navigation_embeddable/components/navigation_embeddable_component.tsx b/...on_embeddable/public/navigation_embeddable/components/navigation_embeddable_component.tsx
@@ -31,7 +31,7 @@ export const NavigationEmbeddableComponent = () => {
     setDashboardListGroupItems(
       (selectedDashboards ?? []).map((dashboard) => {
         return {
-          label: dashboard.label ?? dashboard.attributes.title,
+          label: dashboard.label || dashboard.title,
           iconType: 'dashboardApp',
           color: dashboard.id === currentDashboardId ? 'text' : 'primary',
         };

diff --git a/...beddable/public/navigation_embeddable/components/navigation_embeddable_dashboard_list.tsx b/...beddable/public/navigation_embeddable/components/navigation_embeddable_dashboard_list.tsx
@@ -25,9 +25,7 @@ export const NavigationEmbeddableDashboardList = ({ onDashboardSelected, ...othe
     (state) => state.componentState.currentDashboardId
   );
 
-  const [dashboardListOptions, setDashboardListOptions] = useState<
-    Array<EuiSelectableOption<DashboardItem>>
-  >([]);
+  const [dashboardListOptions, setDashboardListOptions] = useState<EuiSelectableOption[]>([]);
 
   const { loading: loadingDashboardList, value: dashboardList } = useAsync(async () => {
     return await navEmbeddable.fetchDashboardList();
@@ -47,9 +45,9 @@ export const NavigationEmbeddableDashboardList = ({ onDashboardSelected, ...othe
           }),
           checked: isCurrentDashboard ? 'on' : undefined,
           label: dashboard.attributes.title,
-        };
+        } as EuiSelectableOption;
       }) ?? [];
-    setDashboardListOptions(dashboardOptions as Array<EuiSelectableOption<DashboardItem>>);
+    setDashboardListOptions(dashboardOptions);
   }, [dashboardList, currentDashboardId, onDashboardSelected]);
 
   return loadingDashboardList ? (

diff --git a/...ddable/public/navigation_embeddable/components/navigation_embeddable_dashboard_picker.tsx b/...ddable/public/navigation_embeddable/components/navigation_embeddable_dashboard_picker.tsx
@@ -69,8 +69,10 @@ export const NavigationEmbeddableDashboardPicker = () => {
           onClick={() => {
             if (selectedDashboard) {
               navEmbeddable.dispatch.addLink({
-                ...selectedDashboard,
-                label: dashboardLabel === '' ? selectedDashboard.attributes.title : dashboardLabel,
+                label: dashboardLabel,
+                id: selectedDashboard.id,
+                title: selectedDashboard.attributes.title,
+                description: selectedDashboard.attributes.description,
               });
             }
             setDashboardLabel('');

diff --git a/src/plugins/navigation_embeddable/public/navigation_embeddable/types.ts b/src/plugins/navigation_embeddable/public/navigation_embeddable/types.ts
@@ -6,14 +6,19 @@
  * Side Public License, v 1.
  */
 
-import { EmbeddableInput, EmbeddableOutput } from '@kbn/embeddable-plugin/public';
-import { DashboardItem } from '@kbn/dashboard-plugin/common/content_management';
 import { ReduxEmbeddableState } from '@kbn/presentation-util-plugin/public';
+import { DashboardItem } from '@kbn/dashboard-plugin/common/content_management';
+import { EmbeddableInput, EmbeddableOutput } from '@kbn/embeddable-plugin/public';
 
-export type DashboardLink = DashboardItem & { label?: string };
+export interface DashboardLink {
+  id: string;
+  title: string;
+  label?: string;
+  description?: string;
+}
 
 export interface NavigationEmbeddableInput extends EmbeddableInput {
-  dashboardLinks?: DashboardLink[]; // probably want to simplify this so we are only storing what is absolutely necessary
+  dashboardLinks?: DashboardLink[];
 }
 
 export interface NavigationEmbeddableComponentState {