Fixes broken app when management is turned off (#4891) (#4904)

* fixes broken app when management is turned off Signed-off-by: Ashwin P Chandran <ashwinpc@amazon.com> * updates changelog Signed-off-by: Ashwin P Chandran <ashwinpc@amazon.com> --------- Signed-off-by: Ashwin P Chandran <ashwinpc@amazon.com> (cherry picked from commit 1068939) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> # Conflicts: # CHANGELOG.md Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-project · Sep 5, 2023 · 5a07a92 · 5a07a92
1 parent a47e612
commit 5a07a92
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/src/core/types/capabilities.ts b/src/core/types/capabilities.ts
@@ -47,6 +47,6 @@ export interface Capabilities {
   /** Catalogue capabilities. Catalogue entries drive the visibility of the OpenSearch Dashboards homepage options. */
   catalogue: Record<string, boolean>;
 
-  /** Custom capabilities, registered by plugins. */
-  [key: string]: Record<string, boolean | Record<string, boolean>>;
+  /** Custom capabilities, registered by plugins. undefined if the key does not exist */
+  [key: string]: Record<string, boolean | Record<string, boolean>> | undefined;
 }
diff --git a/...earch_dashboards_react/public/overview_page/overview_page_footer/overview_page_footer.tsx b/...earch_dashboards_react/public/overview_page/overview_page_footer/overview_page_footer.tsx
@@ -52,7 +52,8 @@ export const OverviewPageFooter: FC<Props> = ({ addBasePath, path }) => {
     },
   } = useOpenSearchDashboards<CoreStart>();
 
-  const { show, save } = application.capabilities.advancedSettings;
+  const { show, save } = application.capabilities.advancedSettings ?? {};
+
   const isAdvancedSettingsEnabled = show && save;
 
   const defaultRoutebutton =

diff --git a/src/plugins/vis_augmenter/public/ui_actions_bootstrap.ts b/src/plugins/vis_augmenter/public/ui_actions_bootstrap.ts
@@ -71,8 +71,15 @@ export const bootstrapUiActions = (uiActions: UiActionsSetup) => {
   uiActions.registerTrigger(externalActionTrigger);
   uiActions.registerTrigger(pluginResourceDeleteTrigger);
 
-  uiActions.addTriggerAction(EXTERNAL_ACTION_TRIGGER, openEventsFlyoutAction);
-  uiActions.addTriggerAction(CONTEXT_MENU_TRIGGER, viewEventsOptionAction);
-  uiActions.addTriggerAction(SAVED_OBJECT_DELETE_TRIGGER, savedObjectDeleteAction);
   uiActions.addTriggerAction(PLUGIN_RESOURCE_DELETE_TRIGGER, pluginResourceDeleteAction);
+  uiActions.addTriggerAction(EXTERNAL_ACTION_TRIGGER, openEventsFlyoutAction);
+
+  // These triggers are registered by other plugins. If they are disabled can throw an error.
+  try {
+    uiActions.addTriggerAction(CONTEXT_MENU_TRIGGER, viewEventsOptionAction);
+    uiActions.addTriggerAction(SAVED_OBJECT_DELETE_TRIGGER, savedObjectDeleteAction);
+  } catch (e) {
+    // eslint-disable-next-line no-console
+    console.error(e);
+  }
 };