Merge branch 'master' into fix-ui-react-keys

elastic · Jan 28, 2021 · 0ab3dca · 0ab3dca
2 parents ed42b99 + b0f4c98
commit 0ab3dca
Show file tree

Hide file tree

Showing 20 changed files with 808 additions and 479 deletions.
diff --git a/docs/user/images/alerts-and-actions.png b/docs/user/images/alerts-and-actions.png
diff --git a/docs/user/images/app-navigation-search.png b/docs/user/images/app-navigation-search.png
diff --git a/docs/user/images/features-control.png b/docs/user/images/features-control.png
diff --git a/docs/user/images/home-page.png b/docs/user/images/home-page.png
diff --git a/docs/user/images/kibana-main-menu.png b/docs/user/images/kibana-main-menu.png
diff --git a/docs/user/images/login-screen.png b/docs/user/images/login-screen.png
diff --git a/docs/user/images/roles-and-privileges.png b/docs/user/images/roles-and-privileges.png
diff --git a/docs/user/images/select-your-space.png b/docs/user/images/select-your-space.png
diff --git a/docs/user/images/tags-search.png b/docs/user/images/tags-search.png
diff --git a/docs/user/images/visualization-journey.png b/docs/user/images/visualization-journey.png
diff --git a/docs/user/introduction.asciidoc b/docs/user/introduction.asciidoc
diff --git a/x-pack/plugins/upgrade_assistant/public/application/app.tsx b/x-pack/plugins/upgrade_assistant/public/application/app.tsx
@@ -16,10 +16,10 @@ export interface AppDependencies extends ContextValue {
   i18n: I18nStart;
 }
 
-export const RootComponent = ({ i18n, ...contexValue }: AppDependencies) => {
+export const RootComponent = ({ i18n, ...contextValue }: AppDependencies) => {
   return (
     <i18n.Context>
-      <AppContextProvider value={contexValue}>
+      <AppContextProvider value={contextValue}>
         <div data-test-subj="upgradeAssistantRoot">
           <EuiPageHeader>
             <EuiPageHeaderSection>

diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/latest_minor_banner.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/latest_minor_banner.tsx
@@ -10,40 +10,49 @@ import { EuiCallOut, EuiLink } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 
 import { CURRENT_MAJOR_VERSION, NEXT_MAJOR_VERSION } from '../../../common/version';
+import { useAppContext } from '../app_context';
 
-export const LatestMinorBanner: React.FunctionComponent = () => (
-  <EuiCallOut
-    title={
-      <FormattedMessage
-        id="xpack.upgradeAssistant.tabs.incompleteCallout.calloutTitle"
-        defaultMessage="Issues list might be incomplete"
-      />
-    }
-    color="warning"
-    iconType="help"
-  >
-    <p>
-      <FormattedMessage
-        id="xpack.upgradeAssistant.tabs.incompleteCallout.calloutBody.calloutDetail"
-        defaultMessage="The complete list of {breakingChangesDocButton} in Elasticsearch {nextEsVersion}
+export const LatestMinorBanner: React.FunctionComponent = () => {
+  const { docLinks } = useAppContext();
+
+  const { ELASTIC_WEBSITE_URL } = docLinks;
+  const esDocBasePath = `${ELASTIC_WEBSITE_URL}guide/en/elasticsearch/reference`;
+
+  return (
+    <EuiCallOut
+      title={
+        <FormattedMessage
+          id="xpack.upgradeAssistant.tabs.incompleteCallout.calloutTitle"
+          defaultMessage="Issues list might be incomplete"
+        />
+      }
+      color="warning"
+      iconType="help"
+    >
+      <p>
+        <FormattedMessage
+          id="xpack.upgradeAssistant.tabs.incompleteCallout.calloutBody.calloutDetail"
+          defaultMessage="The complete list of {breakingChangesDocButton} in Elasticsearch {nextEsVersion}
             will be available in the final {currentEsVersion} minor release. When the list
             is complete, this warning will go away."
-        values={{
-          breakingChangesDocButton: (
-            <EuiLink
-              href="https://www.elastic.co/guide/en/elasticsearch/reference/master/breaking-changes.html"
-              target="_blank"
-            >
-              <FormattedMessage
-                id="xpack.upgradeAssistant.tabs.incompleteCallout.calloutBody.breackingChangesDocButtonLabel"
-                defaultMessage="deprecations and breaking changes"
-              />
-            </EuiLink>
-          ),
-          nextEsVersion: `${NEXT_MAJOR_VERSION}.x`,
-          currentEsVersion: `${CURRENT_MAJOR_VERSION}.x`,
-        }}
-      />
-    </p>
-  </EuiCallOut>
-);
+          values={{
+            breakingChangesDocButton: (
+              <EuiLink
+                href={`${esDocBasePath}/master/breaking-changes.html`} // Pointing to master here, as we want to direct users to breaking changes for the next major ES version
+                target="_blank"
+                external
+              >
+                <FormattedMessage
+                  id="xpack.upgradeAssistant.tabs.incompleteCallout.calloutBody.breackingChangesDocButtonLabel"
+                  defaultMessage="deprecations and breaking changes"
+                />
+              </EuiLink>
+            ),
+            nextEsVersion: `${NEXT_MAJOR_VERSION}.x`,
+            currentEsVersion: `${CURRENT_MAJOR_VERSION}.x`,
+          }}
+        />
+      </p>
+    </EuiCallOut>
+  );
+};
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs.test.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/tabs.test.tsx
@@ -17,6 +17,19 @@ const promisesToResolve = () => new Promise((resolve) => setTimeout(resolve, 0))
 
 const mockHttp = httpServiceMock.createSetupContract();
 
+jest.mock('../app_context', () => {
+  return {
+    useAppContext: () => {
+      return {
+        docLinks: {
+          DOC_LINK_VERSION: 'current',
+          ELASTIC_WEBSITE_URL: 'https://www.elastic.co/',
+        },
+      };
+    },
+  };
+});
+
 describe('UpgradeAssistantTabs', () => {
   test('renders loading state', async () => {
     mockHttp.get.mockReturnValue(

diff --git a/...istant/public/application/components/tabs/checkup/__snapshots__/checkup_tab.test.tsx.snap b/...istant/public/application/components/tabs/checkup/__snapshots__/checkup_tab.test.tsx.snap
diff --git a/...plugins/upgrade_assistant/public/application/components/tabs/checkup/checkup_tab.test.tsx b/...plugins/upgrade_assistant/public/application/components/tabs/checkup/checkup_tab.test.tsx
@@ -20,6 +20,19 @@ const defaultProps = {
   setSelectedTabIndex: jest.fn(),
 };
 
+jest.mock('../../../app_context', () => {
+  return {
+    useAppContext: () => {
+      return {
+        docLinks: {
+          DOC_LINK_VERSION: 'current',
+          ELASTIC_WEBSITE_URL: 'https://www.elastic.co/',
+        },
+      };
+    },
+  };
+});
+
 /**
  * Mostly a dumb container with copy, test the three main states.
  */