From a3048a3b7fcebea0394489c1c09ff2e814336bd4 Mon Sep 17 00:00:00 2001
From: Oliver Sand <oliver.sand@sda-se.com>
Date: Thu, 22 Apr 2021 13:08:20 +0200
Subject: [PATCH] Fix some remaining typing issues

Signed-off-by: Oliver Sand <oliver.sand@sda-se.com>
---
 .../src/reader/components/TechDocsPage.test.tsx   | 15 +++++++++++++--
 .../src/reader/components/TechDocsPage.tsx        |  8 ++++----
 .../src/reader/transformers/addBaseUrl.test.ts    |  7 +++++--
 .../src/reader/transformers/addBaseUrl.ts         |  4 ++--
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/plugins/techdocs/src/reader/components/TechDocsPage.test.tsx b/plugins/techdocs/src/reader/components/TechDocsPage.test.tsx
index 4b578bef38..52ddd3794e 100644
--- a/plugins/techdocs/src/reader/components/TechDocsPage.test.tsx
+++ b/plugins/techdocs/src/reader/components/TechDocsPage.test.tsx
@@ -51,8 +51,19 @@ describe('<TechDocsPage />', () => {
     });
 
     const techdocsApi: Partial<TechDocsApi> = {
-      getEntityMetadata: () => Promise.resolve([]),
-      getTechDocsMetadata: () => Promise.resolve([]),
+      getEntityMetadata: () =>
+        Promise.resolve({
+          apiVersion: 'v1',
+          kind: 'Component',
+          metadata: {
+            name: 'backstage',
+          },
+        }),
+      getTechDocsMetadata: () =>
+        Promise.resolve({
+          site_name: 'string',
+          site_description: 'string',
+        }),
     };
     const techdocsStorageApi: Partial<TechDocsStorageApi> = {
       getEntityDocs: (): Promise<string> => Promise.resolve('String'),
diff --git a/plugins/techdocs/src/reader/components/TechDocsPage.tsx b/plugins/techdocs/src/reader/components/TechDocsPage.tsx
index f2635c0dfb..c15f3a6a44 100644
--- a/plugins/techdocs/src/reader/components/TechDocsPage.tsx
+++ b/plugins/techdocs/src/reader/components/TechDocsPage.tsx
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
+import { Content, Page, useApi } from '@backstage/core';
 import React, { useState } from 'react';
 import { useParams } from 'react-router-dom';
-import { Content, Page, useApi } from '@backstage/core';
-import { Reader } from './Reader';
 import { useAsync } from 'react-use';
-import { TechDocsPageHeader } from './TechDocsPageHeader';
 import { techdocsApiRef } from '../../api';
+import { Reader } from './Reader';
+import { TechDocsPageHeader } from './TechDocsPageHeader';
 
 export const TechDocsPage = () => {
   const [documentReady, setDocumentReady] = useState<boolean>(false);
@@ -33,7 +33,7 @@ export const TechDocsPage = () => {
       return techdocsApi.getTechDocsMetadata({ kind, namespace, name });
     }
 
-    return Promise.resolve({ loading: true });
+    return Promise.resolve(undefined);
   }, [kind, namespace, name, techdocsApi, documentReady]);
 
   const entityMetadataRequest = useAsync(() => {
diff --git a/plugins/techdocs/src/reader/transformers/addBaseUrl.test.ts b/plugins/techdocs/src/reader/transformers/addBaseUrl.test.ts
index 5ba86e42ca..4311de5dae 100644
--- a/plugins/techdocs/src/reader/transformers/addBaseUrl.test.ts
+++ b/plugins/techdocs/src/reader/transformers/addBaseUrl.test.ts
@@ -16,14 +16,17 @@
 
 import { createTestShadowDom } from '../../test-utils';
 import { addBaseUrl } from '../transformers';
-import { TechDocsStorage } from '../../api';
+import { TechDocsStorageApi } from '../../api';
 
 const DOC_STORAGE_URL = 'https://example-host.storage.googleapis.com';
 
-const techdocsStorageApi: TechDocsStorage = {
+const techdocsStorageApi: TechDocsStorageApi = {
   getBaseUrl: jest.fn(() => Promise.resolve(DOC_STORAGE_URL)),
   getEntityDocs: () => new Promise(resolve => resolve('yes!')),
   syncEntityDocs: () => new Promise(resolve => resolve(true)),
+  getApiOrigin: jest.fn(),
+  getBuilder: jest.fn(),
+  getStorageUrl: jest.fn(),
 };
 
 const fixture = `
diff --git a/plugins/techdocs/src/reader/transformers/addBaseUrl.ts b/plugins/techdocs/src/reader/transformers/addBaseUrl.ts
index 2872ad36cc..17070dcfe0 100644
--- a/plugins/techdocs/src/reader/transformers/addBaseUrl.ts
+++ b/plugins/techdocs/src/reader/transformers/addBaseUrl.ts
@@ -15,10 +15,10 @@
  */
 import { EntityName } from '@backstage/catalog-model';
 import type { Transformer } from './index';
-import { TechDocsStorage } from '../../api';
+import { TechDocsStorageApi } from '../../api';
 
 type AddBaseUrlOptions = {
-  techdocsStorageApi: TechDocsStorage;
+  techdocsStorageApi: TechDocsStorageApi;
   entityId: EntityName;
   path: string;
 };