remove unneeded installationVersion from package

neptunian · neptunian · commit 15001d457ce9 · 2020-04-30T16:05:00.000-04:00
diff --git a/x-pack/plugins/ingest_manager/common/types/models/epm.ts b/x-pack/plugins/ingest_manager/common/types/models/epm.ts
@@ -205,7 +205,6 @@ export interface RegistryVarsEntry {
 interface PackageAdditions {
   title: string;
   latestVersion: string;
-  installedVersion?: string;
   assets: AssetsGroupedByServiceByType;
 }
 
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/header.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/header.tsx
@@ -29,7 +29,12 @@ const Text = styled.span`
 type HeaderProps = PackageInfo & { iconType?: IconType };
 
 export function Header(props: HeaderProps) {
-  const { iconType, name, title, version, installedVersion, latestVersion } = props;
+  const { iconType, name, title, version, latestVersion } = props;
+
+  let installedVersion;
+  if ('savedObject' in props) {
+    installedVersion = props.savedObject.attributes.version;
+  }
   const hasWriteCapabilites = useCapabilities().write;
   const { toListView } = useLinks();
   const ADD_DATASOURCE_URI = useLink(`${EPM_PATH}/${name}-${version}/add-datasource`);
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/index.tsx
@@ -32,7 +32,10 @@ export function Detail() {
       const packageInfo = response.data?.response;
       const title = packageInfo?.title;
       const name = packageInfo?.name;
-      const installedVersion = packageInfo?.installedVersion;
+      let installedVersion;
+      if (packageInfo && 'savedObject' in packageInfo) {
+        installedVersion = packageInfo.savedObject.attributes.version;
+      }
       const status: InstallStatus = packageInfo?.status as any;
 
       // track install status state
diff --git a/x-pack/plugins/ingest_manager/server/services/epm/packages/index.ts b/x-pack/plugins/ingest_manager/server/services/epm/packages/index.ts
@@ -43,7 +43,6 @@ export function createInstallableFrom<T>(
     ? {
         ...from,
         status: InstallationStatus.installed,
-        installedVersion: savedObject.attributes.version,
         savedObject,
       }
     : {

Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,6 @@ export interface RegistryVarsEntry {`
`205`	`205`	`interface PackageAdditions {`
`206`	`206`	`title: string;`
`207`	`207`	`latestVersion: string;`
`208`		`- installedVersion?: string;`
`209`	`208`	`assets: AssetsGroupedByServiceByType;`
`210`	`209`	`}`
`211`	`210`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,6 @@ export function createInstallableFrom<T>(`
`43`	`43`	`? {`
`44`	`44`	`...from,`
`45`	`45`	`status: InstallationStatus.installed,`
`46`		`- installedVersion: savedObject.attributes.version,`
`47`	`46`	`savedObject,`
`48`	`47`	`}`
`49`	`48`	`: {`