Merge branch 'main' into elasticsearch-integration

elastic · Mar 24, 2022 · 2003a01 · 2003a01
2 parents ab0e65b + 83117a4
commit 2003a01
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 4 deletions.
diff --git a/src/plugins/presentation_util/public/components/solution_toolbar/index.ts b/src/plugins/presentation_util/public/components/solution_toolbar/index.ts
@@ -7,4 +7,5 @@
  */
 
 export { SolutionToolbar } from './solution_toolbar';
+/** @deprecated QuickButtonGroup  - use `IconButtonGroup` from `@kbn/shared-ux-components */
 export * from './items';
diff --git a/src/plugins/presentation_util/public/components/solution_toolbar/items/index.ts b/src/plugins/presentation_util/public/components/solution_toolbar/items/index.ts
@@ -10,6 +10,7 @@ export { SolutionToolbarButton } from './button';
 export { SolutionToolbarPopover } from './popover';
 export { AddFromLibraryButton } from './add_from_library';
 export type { QuickButtonProps } from './quick_group';
+/** @deprecated use `IconButtonGroup` from `@kbn/shared-ux-components */
 export { QuickButtonGroup } from './quick_group';
 export { PrimaryActionButton } from './primary_button';
 export { PrimaryActionPopover } from './primary_popover';
diff --git a/...plugins/presentation_util/public/components/solution_toolbar/solution_toolbar.stories.tsx b/...plugins/presentation_util/public/components/solution_toolbar/solution_toolbar.stories.tsx
@@ -13,6 +13,7 @@ import { EuiContextMenu } from '@elastic/eui';
 
 import { SolutionToolbar } from './solution_toolbar';
 import { SolutionToolbarPopover } from './items';
+
 import { AddFromLibraryButton, PrimaryActionButton, QuickButtonGroup } from './items';
 
 const quickButtons = [

diff --git a/src/plugins/presentation_util/public/index.ts b/src/plugins/presentation_util/public/index.ts
@@ -54,6 +54,7 @@ export {
   AddFromLibraryButton,
   PrimaryActionButton,
   PrimaryActionPopover,
+  /** @deprecated QuickButtonGroup  - use `IconButtonGroup` from `@kbn/shared-ux-components */
   QuickButtonGroup,
   SolutionToolbar,
   SolutionToolbarButton,

diff --git a/x-pack/plugins/canvas/public/components/workpad_header/workpad_header.component.tsx b/x-pack/plugins/canvas/public/components/workpad_header/workpad_header.component.tsx
@@ -11,6 +11,7 @@ import PropTypes from 'prop-types';
 import { Shortcuts } from 'react-shortcuts';
 import { EuiFlexItem, EuiFlexGroup, EuiButtonIcon, EuiToolTip } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+
 import {
   AddFromLibraryButton,
   QuickButtonGroup,

diff --git a/...k/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/page.tsx b/...k/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/page.tsx
@@ -20,6 +20,7 @@ import { useMlKibana, useMlApiContext } from '../../../contexts/kibana';
 import { MlPageHeader } from '../../../components/page_header';
 import { AnalyticsIdSelector, AnalyticsSelectorIds } from '../components/analytics_selector';
 import { AnalyticsEmptyPrompt } from '../analytics_management/components/empty_prompt';
+import { useUrlState } from '../../../util/url_state';
 
 export const Page: FC<{
   jobId: string;
@@ -37,6 +38,8 @@ export const Page: FC<{
   const jobIdToUse = jobId ?? analyticsId?.job_id;
   const analysisTypeToUse = analysisType || analyticsId?.analysis_type;
 
+  const [, setGlobalState] = useUrlState('_g');
+
   const checkJobsExist = async () => {
     try {
       const { count } = await getDataFrameAnalytics(undefined, undefined, 0);
@@ -51,6 +54,20 @@ export const Page: FC<{
     checkJobsExist();
   }, []);
 
+  useEffect(
+    function updateUrl() {
+      if (analyticsId !== undefined) {
+        setGlobalState({
+          ml: {
+            ...(analyticsId.analysis_type ? { analysisType: analyticsId.analysis_type } : {}),
+            ...(analyticsId.job_id ? { jobId: analyticsId.job_id } : {}),
+          },
+        });
+      }
+    },
+    [analyticsId?.job_id, analyticsId?.model_id]
+  );
+
   const getEmptyState = () => {
     if (jobsExist === false) {
       return <AnalyticsEmptyPrompt />;

diff --git a/...cation/data_frame_analytics/pages/components/analytics_selector/analytics_id_selector.tsx b/...cation/data_frame_analytics/pages/components/analytics_selector/analytics_id_selector.tsx
@@ -190,11 +190,13 @@ export function AnalyticsIdSelector({ setAnalyticsId, jobsOnly = false }: Props)
 
   const selectionValue = {
     selectable: (item: TableItem) => {
-      const selectedId = selected?.job_id ?? selected?.model_id;
       const isDFA = isDataFrameAnalyticsConfigs(item);
       const itemId = isDFA ? item.id : item.model_id;
       const isBuiltInModel = isDFA ? false : item.tags.includes(BUILT_IN_MODEL_TAG);
-      return (selected === undefined || selectedId === itemId) && !isBuiltInModel;
+      return (
+        (selected === undefined || selected?.job_id === itemId || selected?.model_id === itemId) &&
+        !isBuiltInModel
+      );
     },
     onSelectionChange: (selectedItem: TableItem[]) => {
       const item = selectedItem[0];
@@ -208,7 +210,7 @@ export function AnalyticsIdSelector({ setAnalyticsId, jobsOnly = false }: Props)
 
       setSelected({
         model_id: isDFA ? undefined : item.model_id,
-        job_id: isDFA ? item.id : undefined,
+        job_id: isDFA ? item.id : item.metadata?.analytics_config.id,
         analysis_type: analysisType,
       });
     },

diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/job_map/page.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/job_map/page.tsx
@@ -22,7 +22,7 @@ import { AnalyticsIdSelector, AnalyticsSelectorIds } from '../components/analyti
 import { AnalyticsEmptyPrompt } from '../analytics_management/components/empty_prompt';
 
 export const Page: FC = () => {
-  const [globalState] = useUrlState('_g');
+  const [globalState, setGlobalState] = useUrlState('_g');
   const [isLoading, setIsLoading] = useState(false);
   const [jobsExist, setJobsExist] = useState(true);
   const { refresh } = useRefreshAnalyticsList({ isLoading: setIsLoading });
@@ -51,6 +51,20 @@ export const Page: FC = () => {
     checkJobsExist();
   }, []);
 
+  useEffect(
+    function updateUrl() {
+      if (analyticsId !== undefined) {
+        setGlobalState({
+          ml: {
+            ...(analyticsId.job_id && !analyticsId.model_id ? { jobId: analyticsId.job_id } : {}),
+            ...(analyticsId.model_id ? { modelId: analyticsId.model_id } : {}),
+          },
+        });
+      }
+    },
+    [analyticsId?.job_id, analyticsId?.model_id]
+  );
+
   const getEmptyState = () => {
     if (jobsExist === false) {
       return <AnalyticsEmptyPrompt />;