[IM] add screenshot detail view and image endpoint

x-pack/legacy/plugins/integrations_manager/common/types.ts

@@ -32,6 +32,10 @@ export interface RegistryListItem {
   title?: string;
 }
 
+export interface ScreenshotItem {
+  src: string;
+}
+
 // from /package/{name}
 // https://github.com/elastic/integrations-registry/blob/master/docs/api/package.json
 export type ServiceName = 'kibana' | 'elasticsearch' | 'filebeat' | 'metricbeat';
@@ -67,6 +71,7 @@ export interface RegistryPackage {
   icon: string;
   requirement: RequirementsByServiceName;
   title?: string;
+  screenshots?: ScreenshotItem[];
 }
 
 // Managers public HTTP response types

x-pack/legacy/plugins/integrations_manager/public/hooks/use_links.tsx

@@ -6,6 +6,7 @@
 
 import { generatePath } from 'react-router-dom';
 import { PLUGIN } from '../../common/constants';
+import { API_ROOT } from '../../common/routes';
 import { patterns } from '../routes';
 import { useCore } from '.';
 import { DetailViewPanelName } from '..';
@@ -31,6 +32,7 @@ function appRoot(path: string) {
 export function useLinks() {
   return {
     toAssets: (path: string) => addBasePath(`/plugins/${PLUGIN.ID}/assets/${path}`),
+    toImage: (path: string) => addBasePath(`${API_ROOT}${path}`),
     toListView: () => appRoot(patterns.LIST_VIEW),
     toDetailView: ({ name, version, panel }: DetailParams) => {
       // panel is optional, but `generatePath` won't accept `path: undefined`

x-pack/legacy/plugins/integrations_manager/public/screens/detail/content.tsx

@@ -37,8 +37,12 @@ export function Content(props: ContentProps) {
       `
     : LeftColumn;
 
+  // fixes IE11 problem with nested flex items
+  const ContentFlexGroup = styled(EuiFlexGroup)`
+    flex: 0 0 auto !important;
+  `;
   return (
-    <EuiFlexGroup>
+    <ContentFlexGroup>
       <SideNavColumn>
         <SideNavLinks name={name} version={version} active={panel || DEFAULT_PANEL} />
       </SideNavColumn>
@@ -48,7 +52,7 @@ export function Content(props: ContentProps) {
       <RightColumn>
         <RightColumnContent {...props} />
       </RightColumn>
-    </EuiFlexGroup>
+    </ContentFlexGroup>
   );
 }
 

x-pack/legacy/plugins/integrations_manager/public/screens/detail/overview_panel.tsx

@@ -6,25 +6,21 @@
 import React, { Fragment } from 'react';
 import { EuiSpacer, EuiText, EuiTitle } from '@elastic/eui';
 import { IntegrationInfo } from '../../../common/types';
+import { Screenshots } from './screenshots';
 
 export function OverviewPanel(props: IntegrationInfo) {
-  const { description } = props;
+  const { description, screenshots } = props;
   return (
     <Fragment>
-      <EuiTitle size="xs">
-        <span>About</span>
+      <EuiTitle size="s">
+        <h3>About</h3>
       </EuiTitle>
       <EuiText>
         <p>{description}</p>
         <p>Still need a) longer descriptions b) component to show/hide</p>
       </EuiText>
       <EuiSpacer size="xl" />
-      <EuiTitle size="xs">
-        <span>Screenshots</span>
-      </EuiTitle>
-      <EuiText>
-        <p>Where are we getting these images?</p>
-      </EuiText>
+      {screenshots && <Screenshots images={screenshots} />}
     </Fragment>
   );
 }

x-pack/legacy/plugins/integrations_manager/public/screens/detail/screenshots.tsx

@@ -0,0 +1,57 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React, { Fragment } from 'react';
+import { EuiSpacer, EuiText, EuiTitle, EuiImage, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import styled from 'styled-components';
+import { ScreenshotItem } from '../../../common/types';
+import { useLinks, useCore } from '../../hooks';
+
+interface ScreenshotProps {
+  images: ScreenshotItem[];
+}
+
+export function Screenshots(props: ScreenshotProps) {
+  const { theme } = useCore();
+  const { toImage } = useLinks();
+  const { images } = props;
+
+  // for now, just get first image
+  const src = toImage(images[0].src);
+
+  const horizontalPadding: number = parseInt(theme.eui.paddingSizes.xl, 10) * 2;
+  const bottomPadding: number = parseInt(theme.eui.paddingSizes.xl, 10) * 1.75;
+
+  const ScreenshotsContainer = styled(EuiFlexGroup)`
+    background: linear-gradient(360deg, rgba(0, 0, 0, 0.2) 0%, rgba(0, 0, 0, 0) 100%),
+      ${theme.eui.euiColorPrimary};
+    padding: ${theme.eui.paddingSizes.xl} ${horizontalPadding}px ${bottomPadding}px;
+    flex: 0 0 auto;
+    border-radius: ${theme.eui.euiBorderRadius};
+  `;
+  // fixes ie11 problems with nested flex items
+  const NestedEuiFlexItem = styled(EuiFlexItem)`
+    flex: 0 0 auto !important;
+  `;
+  return (
+    <Fragment>
+      <EuiTitle size="s">
+        <h3>Screenshots</h3>
+      </EuiTitle>
+      <EuiSpacer size="m" />
+      <ScreenshotsContainer gutterSize="none" direction="column" alignItems="center">
+        <NestedEuiFlexItem>
+          <EuiText color="ghost" aria-label="screenschot image caption">
+            We need image descriptions to be returned in the response
+          </EuiText>
+          <EuiSpacer />
+        </NestedEuiFlexItem>
+        <NestedEuiFlexItem>
+          <EuiImage url={src} alt="screenhot image preview" size="l" allowFullScreen />
+        </NestedEuiFlexItem>
+      </ScreenshotsContainer>
+    </Fragment>
+  );
+}

x-pack/legacy/plugins/integrations_manager/server/integrations/get.ts

@@ -68,6 +68,9 @@ export async function getIntegrationInfo(options: {
   return createInstallableFrom(updated, savedObject);
 }
 
+export const getImage = async (options: Registry.ImageRequestParams) =>
+  Registry.fetchImage(options);
+
 export async function getInstallationObject(options: {
   savedObjectsClient: SavedObjectsClientContract;
   pkgkey: string;

x-pack/legacy/plugins/integrations_manager/server/integrations/handlers.ts

@@ -12,10 +12,12 @@ import {
   getCategories,
   getClusterAccessor,
   getIntegrationInfo,
+  getImage,
   getIntegrations,
   installIntegration,
   removeInstallation,
 } from './index';
+import { ImageRequestParams } from '../registry';
 
 interface Extra extends ResponseToolkit {
   context: PluginContext;
@@ -31,6 +33,10 @@ interface PackageRequest extends Request {
   };
 }
 
+interface ImageRequest extends Request {
+  params: Request['params'] & ImageRequestParams;
+}
+
 interface InstallAssetRequest extends Request {
   params: AssetRequestParams;
 }
@@ -65,6 +71,14 @@ export async function handleGetInfo(req: PackageRequest, extra: Extra) {
   return integrationInfo;
 }
 
+export const handleGetImage = async (req: ImageRequest, extra: Extra) => {
+  const response = await getImage(req.params);
+  const newResponse = extra.response(response.body);
+  // set the content type from the registry response
+  newResponse.header('Content-Type', response.headers.get('content-type') || '');
+  return newResponse;
+};
+
 export async function handleRequestInstall(req: InstallAssetRequest, extra: Extra) {
   const { pkgkey, asset } = req.params;
   if (!asset) throw new Error('Unhandled empty/default asset case');

x-pack/legacy/plugins/integrations_manager/server/registry/index.ts

@@ -5,6 +5,7 @@
  */
 
 import { URL } from 'url';
+import { Response } from 'node-fetch';
 import {
   AssetsGroupedByServiceByType,
   AssetParts,
@@ -15,7 +16,7 @@ import {
 } from '../../common/types';
 import { cacheGet, cacheSet } from './cache';
 import { ArchiveEntry, untarBuffer } from './extract';
-import { fetchUrl, getResponseStream } from './requests';
+import { fetchUrl, getResponseStream, getResponse } from './requests';
 import { streamToBuffer } from './streams';
 import { integrationsManagerConfigStore } from '../config';
 
@@ -25,6 +26,11 @@ export interface SearchParams {
   category?: CategoryId;
 }
 
+export interface ImageRequestParams {
+  pkgkey: string;
+  imgPath: string;
+}
+
 export async function fetchList(params?: SearchParams): Promise<RegistryList> {
   const { registryUrl } = integrationsManagerConfigStore.getConfig();
   const url = new URL(`${registryUrl}/search`);
@@ -40,6 +46,12 @@ export async function fetchInfo(key: string): Promise<RegistryPackage> {
   return fetchUrl(`${registryUrl}/package/${key}`).then(JSON.parse);
 }
 
+export async function fetchImage(params: ImageRequestParams): Promise<Response> {
+  const { registryUrl } = integrationsManagerConfigStore.getConfig();
+  const { pkgkey, imgPath } = params;
+  return getResponse(`${registryUrl}/package/${pkgkey}/img/${imgPath}`);
+}
+
 export async function fetchCategories(): Promise<CategorySummaryList> {
   const { registryUrl } = integrationsManagerConfigStore.getConfig();
   return fetchUrl(`${registryUrl}/categories`).then(JSON.parse);

x-pack/legacy/plugins/integrations_manager/server/routes.ts

@@ -8,6 +8,8 @@ import { ServerRoute } from '../common/types';
 import * as CommonRoutes from '../common/routes';
 import * as Integrations from './integrations/handlers';
 
+const API_IMG_PATTERN = `${CommonRoutes.API_ROOT}/package/{pkgkey}/img/{imgPath*}`;
+
 // Manager public API paths
 export const routes: ServerRoute[] = [
   {
@@ -22,6 +24,12 @@ export const routes: ServerRoute[] = [
     options: { tags: [`access:${PLUGIN.ID}`], json: { space: 2 } },
     handler: Integrations.handleGetList,
   },
+  {
+    method: 'GET',
+    path: API_IMG_PATTERN,
+    options: { tags: [`access:${PLUGIN.ID}`], json: { space: 2 } },
+    handler: Integrations.handleGetImage,
+  },
   {
     method: 'GET',
     path: CommonRoutes.API_INFO_PATTERN,

x-pack/test/integrations_manager_api_integration/apis/image.ts

@@ -0,0 +1,61 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import ServerMock from 'mock-http-server';
+import { FtrProviderContext } from '../../api_integration/ftr_provider_context';
+
+export default function({ getService }: FtrProviderContext) {
+  describe('images', () => {
+    const server = new ServerMock({ host: 'localhost', port: 6666 });
+    beforeEach(() => {
+      server.start(() => {});
+    });
+    afterEach(() => {
+      server.stop(() => {});
+    });
+    it('fetches a png screenshot image from the registry', async () => {
+      server.on({
+        method: 'GET',
+        path: '/package/auditd-2.0.4/img/screenshots/auditbeat-file-integrity-dashboard.png',
+        reply: {
+          headers: { 'content-type': 'image/png' },
+        },
+      });
+
+      const supertest = getService('supertest');
+      const fetchImage = async () => {
+        await supertest
+          .get(
+            '/api/integrations_manager/package/auditd-2.0.4/img/screenshots/auditbeat-file-integrity-dashboard.png'
+          )
+          .set('kbn-xsrf', 'xxx')
+          .expect('Content-Type', 'image/png')
+          .expect(200);
+      };
+      await fetchImage();
+    });
+
+    it('fetches an icon image from the registry', async () => {
+      server.on({
+        method: 'GET',
+        path: '/package/auditd-2.0.4/img/icon.svg',
+        reply: {
+          headers: { 'content-type': 'image/svg' },
+        },
+      });
+
+      const supertest = getService('supertest');
+      const fetchImage = async () => {
+        await supertest
+          .get('/api/integrations_manager/package/auditd-2.0.4/img/icon.svg')
+          .set('kbn-xsrf', 'xxx')
+          .expect('Content-Type', 'image/svg')
+          .expect(200);
+      };
+      await fetchImage();
+    });
+  });
+}

x-pack/test/integrations_manager_api_integration/apis/index.js

@@ -8,5 +8,6 @@ export default function ({ loadTestFile }) {
   describe('Integrations Manager Endpoints', function () {
     this.tags('ciGroup7');
     loadTestFile(require.resolve('./list'));
+    loadTestFile(require.resolve('./image'));
   });
 }