fix app-paths.test.ts

Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
Sebastian Malton committed 2022-05-04 08:47:18 -04:00
1 parent 51c309cae3
commit 06ed22e740
3 files changed
+7 -7

No files matched your search

+6 -1
View File
@@ -4,6 +4,7 @@
*/ */
import { getInjectable } from "@ogre-tools/injectable"; import { getInjectable } from "@ogre-tools/injectable";
import assert from "assert"; import assert from "assert";
import { onApiError } from "../../renderer/api/on-api-error";
import { apiKubePrefix, isDevelopment } from "../vars"; import { apiKubePrefix, isDevelopment } from "../vars";
import { createStoresAndApisInjectionToken } from "./create-stores-apis.token"; import { createStoresAndApisInjectionToken } from "./create-stores-apis.token";
import { KubeJsonApi } from "./kube-json-api"; import { KubeJsonApi } from "./kube-json-api";
@@ -13,7 +14,7 @@ const apiKubeInjectable = getInjectable({
instantiate: (di) => { instantiate: (di) => {
assert(di.inject(createStoresAndApisInjectionToken), "apiKube is only available in certain environments"); assert(di.inject(createStoresAndApisInjectionToken), "apiKube is only available in certain environments");
return new KubeJsonApi({ const apiKube = new KubeJsonApi({
serverAddress: `http://127.0.0.1:${window.location.port}`, serverAddress: `http://127.0.0.1:${window.location.port}`,
apiBase: apiKubePrefix, apiBase: apiKubePrefix,
debug: isDevelopment, debug: isDevelopment,
@@ -22,6 +23,10 @@ const apiKubeInjectable = getInjectable({
"Host": window.location.host, "Host": window.location.host,
}, },
}); });
apiKube.onError.addListener(onApiError);
return apiKube;
}, },
}); });
@@ -4,16 +4,12 @@
*/ */
import { getInjectable } from "@ogre-tools/injectable"; import { getInjectable } from "@ogre-tools/injectable";
import { apiBase } from "../../common/k8s-api"; import { apiBase } from "../../common/k8s-api";
import apiKubeInjectable from "../../common/k8s-api/api-kube.injectable";
import { onApiError } from "./on-api-error"; import { onApiError } from "./on-api-error";
const setupOnApiErrorListenersInjectable = getInjectable({ const setupOnApiErrorListenersInjectable = getInjectable({
id: "setup-on-api-error-listeners", id: "setup-on-api-error-listeners",
setup: async (di) => { setup: () => {
const apiKube = await di.inject(apiKubeInjectable);
apiBase?.onError.addListener(onApiError); apiBase?.onError.addListener(onApiError);
apiKube?.onError.addListener(onApiError);
}, },
instantiate: () => undefined, instantiate: () => undefined,
}); });
@@ -10,7 +10,6 @@ const createStoresAndApisInjectable = getInjectable({
id: "create-stores-and-apis", id: "create-stores-and-apis",
instantiate: () => isClusterPageContext(), instantiate: () => isClusterPageContext(),
injectionToken: createStoresAndApisInjectionToken, injectionToken: createStoresAndApisInjectionToken,
causesSideEffects: true,
}); });
export default createStoresAndApisInjectable; export default createStoresAndApisInjectable;