Application Analytics (opensearch-project#299)

* Add database schema for application Signed-off-by: Eugene Lee <[email protected]> * Finished front end for Application overview Signed-off-by: Eugene Lee <[email protected]> * Finished application detail page tabs Signed-off-by: Eugene Lee <[email protected]> * WIP: Overview Page Signed-off-by: Eugene Lee <[email protected]> * Rough sketch of App Analytics UI Signed-off-by: Eugene Lee <[email protected]> * Create dummy page Signed-off-by: Eugene Lee <[email protected]> * Create app complete. Stabilizing dashboard component. Signed-off-by: Eugene Lee <[email protected]> * Update to 1.2 Observability Signed-off-by: Eugene Lee <[email protected]> * notebooks internal error Signed-off-by: Eugene Lee <[email protected]> * Address comments on PR: copyright headers, indentation, unnecessary render props Signed-off-by: Eugene Lee <[email protected]> * Set max width of app and event Signed-off-by: Eugene Lee <[email protected]> * Remove optional after description Signed-off-by: Eugene Lee <[email protected]> * Change to singular Signed-off-by: Eugene Lee <[email protected]> * Remove count badge for log source Signed-off-by: Eugene Lee <[email protected]> * opensearch-project#290: Change form row label to ppl base query Signed-off-by: Eugene Lee <[email protected]> * opensearch-project#291: Change description and help text for log source Signed-off-by: Eugene Lee <[email protected]> * Pass down proper props Signed-off-by: Eugene Lee <[email protected]> * Resolve gradle error and module not found error Signed-off-by: Eugene Lee <[email protected]> * Resolve kotlin errors Signed-off-by: Eugene Lee <[email protected]> * Fix parsers Signed-off-by: Eugene Lee <[email protected]> * Add praseItemList Signed-off-by: Eugene Lee <[email protected]> * Camelcase fields Signed-off-by: Eugene Lee <[email protected]> * Remove whitespace, add copyright Signed-off-by: Eugene Lee <[email protected]> * opensearch-project#292: Add autocomplete to Log Source accordion Signed-off-by: Eugene Lee <[email protected]> * Lexicographic kotlin import Signed-off-by: Eugene Lee <[email protected]> * Add newline at end of files Signed-off-by: Eugene Lee <[email protected]> * opensearch-project#293: Add service map to create page Signed-off-by: Eugene Lee <[email protected]> * opensearch-project#304: Activate Clear All button for services Signed-off-by: Eugene Lee <[email protected]> * opensearch-project#305: Add button to clear base query Signed-off-by: Eugene Lee <[email protected]> * opensearch-project#295: Add eui combo box for trace groups Signed-off-by: Eugene Lee <[email protected]> * Separate out configuration renders Signed-off-by: Eugene Lee <[email protected]> * debug adding filters traces Signed-off-by: Eugene Lee <[email protected]> * opensearch-project#296: Add traces table to config Signed-off-by: Eugene Lee <[email protected]> * Change from tsx to ts Signed-off-by: Eugene Lee <[email protected]> * opensearch-project#309: Add page props and add app specific filters Signed-off-by: Eugene Lee <[email protected]> * opensearch-project#308: Add button to clear trace groups Signed-off-by: Eugene Lee <[email protected]> * opensearch-project#311: Allow services and traces to be selected Signed-off-by: Eugene Lee <[email protected]> * Remove link to traces on table Signed-off-by: Eugene Lee <[email protected]> * Disable clear all if nothing selected Signed-off-by: Eugene Lee <[email protected]> * disable clear all when no log source Signed-off-by: Eugene Lee <[email protected]> * Remove comment, add style to constant, temporarily remove availability Signed-off-by: Eugene Lee <[email protected]> * Address PR comments Signed-off-by: Eugene Lee <[email protected]> * Revert type assignment Signed-off-by: Eugene Lee <[email protected]> * Update tests, builds and doc (opensearch-project#318) * rebased with bwc tests Signed-off-by: Shenoy Pratik <[email protected]> * updated bwc tests Signed-off-by: Shenoy Pratik <[email protected]> * added release notes Signed-off-by: Shenoy Pratik <[email protected]> * Fix errors and address comments Signed-off-by: Eugene Lee <[email protected]> * opensearch-project#319: Disable create until required fields are filled out Signed-off-by: Eugene Lee <[email protected]> * opensearch-project#329: Add missing field tool tip Signed-off-by: Eugene Lee <[email protected]> * Remove unnecessary imports Signed-off-by: Eugene Lee <[email protected]> * opensearch-project#320: Add clear modal for friction Signed-off-by: Eugene Lee <[email protected]> Co-authored-by: Shenoy Pratik <[email protected]>
eugenesk24 · Jan 25, 2022 · f8db35f · f8db35f
1 parent d33c4b5
commit f8db35f
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 1 deletion.
diff --git a/dashboards-observability/public/components/application_analytics/components/application.tsx b/dashboards-observability/public/components/application_analytics/components/application.tsx
@@ -224,10 +224,17 @@ export function Application(props: AppDetailProps) {
         </EuiPageHeader>
         <EuiTabbedContent
           className="appAnalyticsTabs"
+<<<<<<< HEAD
           initialSelectedTab={ appAnalyticsTabs[0] }
           selectedTab={ appAnalyticsTabs.find(tab => { tab.id === selectedTabId }) }
           onTabClick={ (selectedTab: EuiTabbedContentTab) => handleContentTabClick(selectedTab) }
           tabs={ appAnalyticsTabs }
+=======
+          initialSelectedTab={ memorizedAppAnalyticsTabs[0] }
+          selectedTab={ memorizedAppAnalyticsTabs.find(tab => { tab.id === selectedTabId }) }
+          onTabClick={ (selectedTab: EuiTabbedContentTab) => handleContentTabClick(selectedTab) }
+          tabs={ memorizedAppAnalyticsTabs }
+>>>>>>> f1569f2 (Application Analytics (#299))
       />
       </EuiPageBody>
     </EuiPage>

diff --git a/...ility/public/components/application_analytics/components/config_components/log_config.tsx b/...ility/public/components/application_analytics/components/config_components/log_config.tsx
@@ -105,4 +105,4 @@ export const LogConfig = (props: LogConfigProps) => {
       {isModalVisible && modalLayout}
     </div>
   );
-}
+}
diff --git a/...rvability/public/components/application_analytics/components/helpers/modal_containers.tsx b/...rvability/public/components/application_analytics/components/helpers/modal_containers.tsx
@@ -0,0 +1,40 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import React from 'react';
+import {
+  EuiOverlayMask,
+  EuiConfirmModal,
+} from '@elastic/eui';
+
+/* The file contains helper functions for modal layouts
+ * getDeleteModal - returns a confirm-modal with clear option
+ */
+
+export const getClearModal = (
+  onCancel: (
+    event?: React.KeyboardEvent<HTMLDivElement> | React.MouseEvent<HTMLButtonElement, MouseEvent>
+  ) => void,
+  onConfirm: (event?: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void,
+  title: string,
+  message: string,
+  confirmMessage?: string
+) => {
+  return (
+    <EuiOverlayMask>
+      <EuiConfirmModal
+        title={title}
+        onCancel={onCancel}
+        onConfirm={onConfirm}
+        cancelButtonText="Cancel"
+        confirmButtonText={confirmMessage || 'Delete'}
+        buttonColor="danger"
+        defaultFocusedButton="confirm"
+      >
+        {message}
+      </EuiConfirmModal>
+    </EuiOverlayMask>
+  );
+};
diff --git a/dashboards-observability/server/adaptors/application_analytics/application_adaptor.ts b/dashboards-observability/server/adaptors/application_analytics/application_adaptor.ts
-Original file line number
+Diff line change
@@ Expand Up / @@ -105,4 +105,4 @@ export const LogConfig = (props: LogConfigProps) => { @@
           {isModalVisible && modalLayout}
         </div>
       );
-    }
+    }