@openshift-assisted/ui-lib 2.8.2-cim → 2.8.3-cim

package/lib/ocm/services/InfraEnvsService.ts

@@ -11,9 +11,12 @@ import InfraEnvCache from './InfraEnvIdsCacheService';
 import { getDummyInfraEnvField } from '../components/clusterConfiguration/staticIp/data/dummyData';
 
 const InfraEnvsService = {
-  async getInfraEnvId(clusterId: Cluster['id'], cpuArchitecture: CpuArchitecture): Promise<string> {
+  async getInfraEnvId(
+    clusterId: Cluster['id'],
+    cpuArchitecture: CpuArchitecture,
+  ): Promise<string | Error> {
     let infraEnvId = InfraEnvCache.getInfraEnvId(clusterId, cpuArchitecture);
-    if (infraEnvId === null) {
+    if (infraEnvId instanceof Error) {
       const { data: infraEnvs } = await InfraEnvsAPI.list(clusterId);
       if (infraEnvs.length > 0) {
         InfraEnvCache.updateInfraEnvs(clusterId, infraEnvs);
@@ -21,11 +24,6 @@ const InfraEnvsService = {
       }
       if (!infraEnvId) {
         InfraEnvCache.removeInfraEnvId(clusterId, cpuArchitecture);
-        throw new Error(
-          `No InfraEnv could be found for clusterId: ${clusterId} and architecture ${
-            cpuArchitecture || ''
-          }`,
-        );
       }
     }
     return infraEnvId;
@@ -33,15 +31,11 @@ const InfraEnvsService = {
 
   async getInfraEnv(clusterId: Cluster['id'], cpuArchitecture: CpuArchitecture) {
     const infraEnvId = await InfraEnvsService.getInfraEnvId(clusterId, cpuArchitecture);
-    if (infraEnvId) {
+    if (infraEnvId && !(infraEnvId instanceof Error)) {
       const { data } = await InfraEnvsAPI.get(infraEnvId);
       return data;
     } else {
-      throw new Error(
-        `No InfraEnv could be found for clusterId: ${clusterId} and architecture ${
-          cpuArchitecture || ''
-        }`,
-      );
+      return new Error(`Failed to retrieve the infraEnv for ${clusterId}`);
     }
   },
 
@@ -67,6 +61,7 @@ const InfraEnvsService = {
     }
 
     InfraEnvCache.updateInfraEnvs(params.clusterId, [infraEnv]);
+    return infraEnv;
   },
 
   async removeAll(clusterId: Cluster['id']) {
@@ -126,6 +121,10 @@ const InfraEnvsService = {
       return updatedInfraEnv;
     });
   },
+
+  makeInfraEnvName(cpuArchitecture: string, name?: string) {
+    return `${name || ''}_infra-env-${cpuArchitecture}`;
+  },
 };
 
 export default InfraEnvsService;

package/lib/ocm/services/apis/EventsAPI.ts

@@ -1,11 +1,23 @@
 import { EventList, V2Events } from '../../../common';
 import { client } from '../../api';
 
+let _getRequestAbortController = new AbortController();
+
 const EventsAPI = {
   makeBaseURI() {
     return '/v2/events';
   },
 
+  abort() {
+    _getRequestAbortController.abort();
+    /*
+     * The AbortController.signal can only be aborted once per instance.
+     * Therefore in order for other requests to be also abortable we need
+     * to create a new instance when this event occurs
+     */
+    _getRequestAbortController = new AbortController();
+  },
+
   createParams({
     clusterId,
     hostIds,
@@ -36,7 +48,9 @@ const EventsAPI = {
   },
 
   list(options: V2Events) {
-    return client.get<EventList>(`${EventsAPI.makeBaseURI()}${EventsAPI.createParams(options)}`);
+    return client.get<EventList>(`${EventsAPI.makeBaseURI()}${EventsAPI.createParams(options)}`, {
+      signal: _getRequestAbortController.signal,
+    });
   },
 };
 

package/package.json

@@ -130,5 +130,5 @@
       ]
     }
   },
-  "version": "2.8.2-cim"
+  "version": "2.8.3-cim"
 }