Merge pull request #3045 from dlabrecq/revert

Revert previous API update
project-koku · Apr 4, 2023 · 4a9d696 · 4a9d696
2 parents 5ac74fa + 567743d
commit 4a9d696
Show file tree

Hide file tree

Showing 68 changed files with 128 additions and 598 deletions.
diff --git a/src/api/accountSettings.ts b/src/api/accountSettings.ts
@@ -1,7 +1,6 @@
 import axios from 'axios';
 
 import type { PagedLinks, PagedMetaData } from './api';
-import type { AwsOcpTag } from './tags/awsOcpTags';
 
 export interface AccountSettingsData {
   cost_type?: string;
@@ -15,12 +14,5 @@ export interface AccountSettings {
 }
 
 export function fetchAccountSettings() {
-  const fetch = () => axios.get<AwsOcpTag>(`account-settings/`);
-
-  const insights = (window as any).insights;
-  if (insights && insights.chrome && insights.chrome.auth && insights.chrome.auth.getUser) {
-    return insights.chrome.auth.getUser().then(() => fetch());
-  } else {
-    return fetch();
-  }
+  return axios.get<AccountSettings>(`account-settings/`);
 }
diff --git a/src/api/costModels.ts b/src/api/costModels.ts
@@ -40,56 +40,21 @@ export interface CostModelRequest {
 export type CostModels = PagedResponse<CostModel>;
 
 export function fetchCostModels(query = '') {
-  const fetch = () => axios.get<CostModels>(`cost-models/${query && '?'}${query}`);
-
-  const insights = (window as any).insights;
-  if (insights && insights.chrome && insights.chrome.auth && insights.chrome.auth.getUser) {
-    return insights.chrome.auth.getUser().then(() => fetch());
-  } else {
-    return fetch();
-  }
+  return axios.get<CostModels>(`cost-models/${query && '?'}${query}`);
 }
 
 export function fetchCostModel(uuid: string) {
-  const fetch = () => axios.get<CostModels>(`cost-models/${uuid}/`);
-
-  const insights = (window as any).insights;
-  if (insights && insights.chrome && insights.chrome.auth && insights.chrome.auth.getUser) {
-    return insights.chrome.auth.getUser().then(() => fetch());
-  } else {
-    return fetch();
-  }
+  return axios.get<CostModels>(`cost-models/${uuid}/`);
 }
 
 export function addCostModel(request: CostModelRequest) {
-  const fetch = () => axios.post(`cost-models/`, request);
-
-  const insights = (window as any).insights;
-  if (insights && insights.chrome && insights.chrome.auth && insights.chrome.auth.getUser) {
-    return insights.chrome.auth.getUser().then(() => fetch());
-  } else {
-    return fetch();
-  }
+  return axios.post(`cost-models/`, request);
 }
 
 export function updateCostModel(uuid: string, request: CostModelRequest) {
-  const fetch = () => axios.put(`cost-models/${uuid}/`, request);
-
-  const insights = (window as any).insights;
-  if (insights && insights.chrome && insights.chrome.auth && insights.chrome.auth.getUser) {
-    return insights.chrome.auth.getUser().then(() => fetch());
-  } else {
-    return fetch();
-  }
+  return axios.put(`cost-models/${uuid}/`, request);
 }
 
 export function deleteCostModel(uuid: string) {
-  const fetch = () => axios.delete(`cost-models/${uuid}/`);
-
-  const insights = (window as any).insights;
-  if (insights && insights.chrome && insights.chrome.auth && insights.chrome.auth.getUser) {
-    return insights.chrome.auth.getUser().then(() => fetch());
-  } else {
-    return fetch();
-  }
+  return axios.delete(`cost-models/${uuid}/`);
 }
diff --git a/src/api/export/awsExport.ts b/src/api/export/awsExport.ts
@@ -4,17 +4,9 @@ import axios from 'axios';
 
 export function runExport(reportType: ReportType, query: string) {
   const path = ReportTypePaths[reportType];
-  const fetch = () =>
-    axios.get<string>(`${path}?${query}`, {
-      headers: {
-        Accept: 'text/csv',
-      },
-    });
-
-  const insights = (window as any).insights;
-  if (insights && insights.chrome && insights.chrome.auth && insights.chrome.auth.getUser) {
-    return insights.chrome.auth.getUser().then(() => fetch());
-  } else {
-    return fetch();
-  }
+  return axios.get<string>(`${path}?${query}`, {
+    headers: {
+      Accept: 'text/csv',
+    },
+  });
 }
diff --git a/src/api/export/awsOcpExport.ts b/src/api/export/awsOcpExport.ts
@@ -4,17 +4,9 @@ import axios from 'axios';
 
 export function runExport(reportType: ReportType, query: string) {
   const path = ReportTypePaths[reportType];
-  const fetch = () =>
-    axios.get<string>(`${path}?${query}`, {
-      headers: {
-        Accept: 'text/csv',
-      },
-    });
-
-  const insights = (window as any).insights;
-  if (insights && insights.chrome && insights.chrome.auth && insights.chrome.auth.getUser) {
-    return insights.chrome.auth.getUser().then(() => fetch());
-  } else {
-    return fetch();
-  }
+  return axios.get<string>(`${path}?${query}`, {
+    headers: {
+      Accept: 'text/csv',
+    },
+  });
 }
diff --git a/src/api/export/azureExport.ts b/src/api/export/azureExport.ts
@@ -4,17 +4,9 @@ import axios from 'axios';
 
 export function runExport(reportType: ReportType, query: string) {
   const path = ReportTypePaths[reportType];
-  const fetch = () =>
-    axios.get<string>(`${path}?${query}`, {
-      headers: {
-        Accept: 'text/csv',
-      },
-    });
-
-  const insights = (window as any).insights;
-  if (insights && insights.chrome && insights.chrome.auth && insights.chrome.auth.getUser) {
-    return insights.chrome.auth.getUser().then(() => fetch());
-  } else {
-    return fetch();
-  }
+  return axios.get<string>(`${path}?${query}`, {
+    headers: {
+      Accept: 'text/csv',
+    },
+  });
 }
diff --git a/src/api/export/azureOcpExport.ts b/src/api/export/azureOcpExport.ts
@@ -4,17 +4,9 @@ import axios from 'axios';
 
 export function runExport(reportType: ReportType, query: string) {
   const path = ReportTypePaths[reportType];
-  const fetch = () =>
-    axios.get<string>(`${path}?${query}`, {
-      headers: {
-        Accept: 'text/csv',
-      },
-    });
-
-  const insights = (window as any).insights;
-  if (insights && insights.chrome && insights.chrome.auth && insights.chrome.auth.getUser) {
-    return insights.chrome.auth.getUser().then(() => fetch());
-  } else {
-    return fetch();
-  }
+  return axios.get<string>(`${path}?${query}`, {
+    headers: {
+      Accept: 'text/csv',
+    },
+  });
 }
diff --git a/src/api/export/gcpExport.ts b/src/api/export/gcpExport.ts
@@ -4,17 +4,9 @@ import axios from 'axios';
 
 export function runExport(reportType: ReportType, query: string) {
   const path = ReportTypePaths[reportType];
-  const fetch = () =>
-    axios.get<string>(`${path}?${query}`, {
-      headers: {
-        Accept: 'text/csv',
-      },
-    });
-
-  const insights = (window as any).insights;
-  if (insights && insights.chrome && insights.chrome.auth && insights.chrome.auth.getUser) {
-    return insights.chrome.auth.getUser().then(() => fetch());
-  } else {
-    return fetch();
-  }
+  return axios.get<string>(`${path}?${query}`, {
+    headers: {
+      Accept: 'text/csv',
+    },
+  });
 }
diff --git a/src/api/export/gcpOcpExport.ts b/src/api/export/gcpOcpExport.ts
@@ -4,17 +4,9 @@ import axios from 'axios';
 
 export function runExport(reportType: ReportType, query: string) {
   const path = ReportTypePaths[reportType];
-  const fetch = () =>
-    axios.get<string>(`${path}?${query}`, {
-      headers: {
-        Accept: 'text/csv',
-      },
-    });
-
-  const insights = (window as any).insights;
-  if (insights && insights.chrome && insights.chrome.auth && insights.chrome.auth.getUser) {
-    return insights.chrome.auth.getUser().then(() => fetch());
-  } else {
-    return fetch();
-  }
+  return axios.get<string>(`${path}?${query}`, {
+    headers: {
+      Accept: 'text/csv',
+    },
+  });
 }
diff --git a/src/api/export/ibmExport.ts b/src/api/export/ibmExport.ts
@@ -4,17 +4,9 @@ import axios from 'axios';
 
 export function runExport(reportType: ReportType, query: string) {
   const path = ReportTypePaths[reportType];
-  const fetch = () =>
-    axios.get<string>(`${path}?${query}`, {
-      headers: {
-        Accept: 'text/csv',
-      },
-    });
-
-  const insights = (window as any).insights;
-  if (insights && insights.chrome && insights.chrome.auth && insights.chrome.auth.getUser) {
-    return insights.chrome.auth.getUser().then(() => fetch());
-  } else {
-    return fetch();
-  }
+  return axios.get<string>(`${path}?${query}`, {
+    headers: {
+      Accept: 'text/csv',
+    },
+  });
 }
diff --git a/src/api/export/ociExport.ts b/src/api/export/ociExport.ts
@@ -4,17 +4,9 @@ import axios from 'axios';
 
 export function runExport(reportType: ReportType, query: string) {
   const path = ReportTypePaths[reportType];
-  const fetch = () =>
-    axios.get<string>(`${path}?${query}`, {
-      headers: {
-        Accept: 'text/csv',
-      },
-    });
-
-  const insights = (window as any).insights;
-  if (insights && insights.chrome && insights.chrome.auth && insights.chrome.auth.getUser) {
-    return insights.chrome.auth.getUser().then(() => fetch());
-  } else {
-    return fetch();
-  }
+  return axios.get<string>(`${path}?${query}`, {
+    headers: {
+      Accept: 'text/csv',
+    },
+  });
 }
diff --git a/src/api/export/ocpCloudExport.ts b/src/api/export/ocpCloudExport.ts
@@ -4,17 +4,9 @@ import axios from 'axios';
 
 export function runExport(reportType: ReportType, query: string) {
   const path = ReportTypePaths[reportType];
-  const fetch = () =>
-    axios.get<string>(`${path}?${query}`, {
-      headers: {
-        Accept: 'text/csv',
-      },
-    });
-
-  const insights = (window as any).insights;
-  if (insights && insights.chrome && insights.chrome.auth && insights.chrome.auth.getUser) {
-    return insights.chrome.auth.getUser().then(() => fetch());
-  } else {
-    return fetch();
-  }
+  return axios.get<string>(`${path}?${query}`, {
+    headers: {
+      Accept: 'text/csv',
+    },
+  });
 }
diff --git a/src/api/export/ocpExport.ts b/src/api/export/ocpExport.ts
@@ -4,17 +4,9 @@ import axios from 'axios';
 
 export function runExport(reportType: ReportType, query: string) {
   const path = ReportTypePaths[reportType];
-  const fetch = () =>
-    axios.get<string>(`${path}?${query}`, {
-      headers: {
-        Accept: 'text/csv',
-      },
-    });
-
-  const insights = (window as any).insights;
-  if (insights && insights.chrome && insights.chrome.auth && insights.chrome.auth.getUser) {
-    return insights.chrome.auth.getUser().then(() => fetch());
-  } else {
-    return fetch();
-  }
+  return axios.get<string>(`${path}?${query}`, {
+    headers: {
+      Accept: 'text/csv',
+    },
+  });
 }
diff --git a/src/api/export/rhelExport.ts b/src/api/export/rhelExport.ts
@@ -4,17 +4,9 @@ import axios from 'axios';
 
 export function runExport(reportType: ReportType, query: string) {
   const path = ReportTypePaths[reportType];
-  const fetch = () =>
-    axios.get<string>(`${path}?${query}`, {
-      headers: {
-        Accept: 'text/csv',
-      },
-    });
-
-  const insights = (window as any).insights;
-  if (insights && insights.chrome && insights.chrome.auth && insights.chrome.auth.getUser) {
-    return insights.chrome.auth.getUser().then(() => fetch());
-  } else {
-    return fetch();
-  }
+  return axios.get<string>(`${path}?${query}`, {
+    headers: {
+      Accept: 'text/csv',
+    },
+  });
 }
diff --git a/src/api/forecasts/awsForecast.ts b/src/api/forecasts/awsForecast.ts
@@ -9,12 +9,5 @@ export const ForecastTypePaths: Partial<Record<ForecastType, string>> = {
 
 export function runForecast(forecastType: ForecastType, query: string) {
   const path = ForecastTypePaths[forecastType];
-  const fetch = () => axios.get<Forecast>(`${path}?${query}`);
-
-  const insights = (window as any).insights;
-  if (insights && insights.chrome && insights.chrome.auth && insights.chrome.auth.getUser) {
-    return insights.chrome.auth.getUser().then(() => fetch());
-  } else {
-    return fetch();
-  }
+  return axios.get<Forecast>(`${path}?${query}`);
 }
diff --git a/src/api/forecasts/awsOcpForecast.ts b/src/api/forecasts/awsOcpForecast.ts
@@ -9,12 +9,5 @@ export const ForecastTypePaths: Partial<Record<ForecastType, string>> = {
 
 export function runForecast(forecastType: ForecastType, query: string) {
   const path = ForecastTypePaths[forecastType];
-  const fetch = () => axios.get<Forecast>(`${path}?${query}`);
-
-  const insights = (window as any).insights;
-  if (insights && insights.chrome && insights.chrome.auth && insights.chrome.auth.getUser) {
-    return insights.chrome.auth.getUser().then(() => fetch());
-  } else {
-    return fetch();
-  }
+  return axios.get<Forecast>(`${path}?${query}`);
 }
diff --git a/src/api/forecasts/azureForecast.ts b/src/api/forecasts/azureForecast.ts
@@ -9,12 +9,5 @@ export const ForecastTypePaths: Partial<Record<ForecastType, string>> = {
 
 export function runForecast(forecastType: ForecastType, query: string) {
   const path = ForecastTypePaths[forecastType];
-  const fetch = () => axios.get<Forecast>(`${path}?${query}`);
-
-  const insights = (window as any).insights;
-  if (insights && insights.chrome && insights.chrome.auth && insights.chrome.auth.getUser) {
-    return insights.chrome.auth.getUser().then(() => fetch());
-  } else {
-    return fetch();
-  }
+  return axios.get<Forecast>(`${path}?${query}`);
 }
diff --git a/src/api/forecasts/azureOcpForecast.ts b/src/api/forecasts/azureOcpForecast.ts
@@ -9,12 +9,5 @@ export const ForecastTypePaths: Partial<Record<ForecastType, string>> = {
 
 export function runForecast(forecastType: ForecastType, query: string) {
   const path = ForecastTypePaths[forecastType];
-  const fetch = () => axios.get<Forecast>(`${path}?${query}`);
-
-  const insights = (window as any).insights;
-  if (insights && insights.chrome && insights.chrome.auth && insights.chrome.auth.getUser) {
-    return insights.chrome.auth.getUser().then(() => fetch());
-  } else {
-    return fetch();
-  }
+  return axios.get<Forecast>(`${path}?${query}`);
 }