mirror of
https://github.com/lensapp/lens.git
synced 2025-05-20 05:10:56 +00:00
Remove non agnostic timeslots from agnostic application
Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
This commit is contained in:
Janne Savolainen
parent
1a1ce8ee6c
commit
b5fb7b932f
@ -2,20 +2,8 @@ export { feature } from "./src/feature";
|
||||
|
||||
export { onLoadOfApplicationInjectionToken } from "./src/start-application/timeslots/on-load-of-application-injection-token";
|
||||
export { beforeApplicationIsLoadingInjectionToken } from "./src/start-application/timeslots/before-application-is-loading-injection-token";
|
||||
export { beforeAnythingInjectionToken } from "./src/start-application/timeslots/before-anything-injection-token";
|
||||
|
||||
export { afterBeforeAnythingInjectionToken } from "./src/start-application/timeslots/after-before-anything-injection-token";
|
||||
export { afterApplicationIsLoadedInjectionToken } from "./src/start-application/timeslots/after-application-is-loaded-injection-token";
|
||||
|
||||
export { untilReadyToStartInjectionToken } from "./src/start-application/triggers/until-ready-to-start-injection-token";
|
||||
export type { UntilReadyToStart } from "./src/start-application/triggers/until-ready-to-start-injection-token";
|
||||
|
||||
export { untilApplicationIsShownInjectionToken } from "./src/start-application/triggers/until-application-is-shown-injection-token";
|
||||
export type { UntilApplicationIsShown } from "./src/start-application/triggers/until-application-is-shown-injection-token";
|
||||
|
||||
export { untilApplicationIsReadyToLoadInjectionToken } from "./src/start-application/triggers/until-application-is-ready-to-load-injection-token";
|
||||
export type { UntilApplicationIsReadyToLoad } from "./src/start-application/triggers/until-application-is-ready-to-load-injection-token";
|
||||
|
||||
export type { StartApplication } from "./src/start-application/start-application.injectable";
|
||||
export { startApplicationInjectionToken } from "./src/start-application/start-application.injectable";
|
||||
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
module.exports =
|
||||
require("@k8slens/jest").monorepoPackageConfig(__dirname).configForReact;
|
||||
require("@k8slens/jest").monorepoPackageConfig(__dirname).configForNode;
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "git+https://github.com/lensapp/monorepo.git"
|
||||
"url": "git+https://github.com/lensapp/lens.git"
|
||||
},
|
||||
"main": "dist/index.js",
|
||||
"types": "dist/index.d.ts",
|
||||
|
||||
@ -1,21 +1,8 @@
|
||||
import { getInjectable, getInjectionToken } from "@ogre-tools/injectable";
|
||||
import { runManySyncFor, runManyFor } from "@ogre-tools/injectable-utils";
|
||||
import { beforeAnythingInjectionToken } from "./timeslots/before-anything-injection-token";
|
||||
import {
|
||||
afterBeforeAnythingInjectionToken
|
||||
} from "./timeslots/after-before-anything-injection-token";
|
||||
import { untilReadyToStartInjectionToken } from "./triggers/until-ready-to-start-injection-token";
|
||||
import {
|
||||
beforeApplicationIsLoadingInjectionToken
|
||||
} from "./timeslots/before-application-is-loading-injection-token";
|
||||
import { untilApplicationIsReadyToLoadInjectionToken } from "./triggers/until-application-is-ready-to-load-injection-token";
|
||||
import {
|
||||
onLoadOfApplicationInjectionToken
|
||||
} from "./timeslots/on-load-of-application-injection-token";
|
||||
import {
|
||||
afterApplicationIsLoadedInjectionToken
|
||||
} from "./timeslots/after-application-is-loaded-injection-token";
|
||||
import { untilApplicationIsShownInjectionToken } from "./triggers/until-application-is-shown-injection-token";
|
||||
import { runManyFor } from "@ogre-tools/injectable-utils";
|
||||
import { beforeApplicationIsLoadingInjectionToken } from "./timeslots/before-application-is-loading-injection-token";
|
||||
import { onLoadOfApplicationInjectionToken } from "./timeslots/on-load-of-application-injection-token";
|
||||
import { afterApplicationIsLoadedInjectionToken } from "./timeslots/after-application-is-loaded-injection-token";
|
||||
|
||||
export type StartApplication = () => void;
|
||||
|
||||
@ -28,20 +15,7 @@ const startApplicationInjectable = getInjectable({
|
||||
id: "start-application",
|
||||
|
||||
instantiate: (di): StartApplication => {
|
||||
const untilReadyToStart = di.inject(untilReadyToStartInjectionToken);
|
||||
const untilApplicationIsReadyToLoad = di.inject(untilApplicationIsReadyToLoadInjectionToken);
|
||||
const untilApplicationIsShown = di.inject(untilApplicationIsShownInjectionToken);
|
||||
|
||||
const runManyAsync = runManyFor(di)
|
||||
const runManySync = runManySyncFor(di)
|
||||
|
||||
const beforeAnything = runManySync(
|
||||
beforeAnythingInjectionToken
|
||||
);
|
||||
|
||||
const afterBeforeAnything = runManySync(
|
||||
afterBeforeAnythingInjectionToken
|
||||
);
|
||||
|
||||
const beforeApplicationIsLoading = runManyAsync(
|
||||
beforeApplicationIsLoadingInjectionToken
|
||||
@ -54,16 +28,9 @@ const startApplicationInjectable = getInjectable({
|
||||
);
|
||||
|
||||
return async () => {
|
||||
beforeAnything();
|
||||
afterBeforeAnything();
|
||||
|
||||
await untilReadyToStart()
|
||||
|
||||
await beforeApplicationIsLoading();
|
||||
await untilApplicationIsReadyToLoad();
|
||||
|
||||
await onLoadOfApplication();
|
||||
await untilApplicationIsShown();
|
||||
|
||||
await afterApplicationIsLoaded();
|
||||
};
|
||||
|
||||
@ -0,0 +1,82 @@
|
||||
import {
|
||||
createContainer,
|
||||
DiContainer,
|
||||
getInjectable,
|
||||
} from "@ogre-tools/injectable";
|
||||
import { registerFeature } from "@k8slens/feature-core";
|
||||
import { feature } from "../feature";
|
||||
import { startApplicationInjectionToken } from "./start-application.injectable";
|
||||
import { beforeApplicationIsLoadingInjectionToken } from "./timeslots/before-application-is-loading-injection-token";
|
||||
import asyncFn, { AsyncFnMock } from "@async-fn/jest";
|
||||
import { onLoadOfApplicationInjectionToken } from "./timeslots/on-load-of-application-injection-token";
|
||||
import { afterApplicationIsLoadedInjectionToken } from "./timeslots/after-application-is-loaded-injection-token";
|
||||
|
||||
describe("starting-of-application", () => {
|
||||
let di: DiContainer;
|
||||
|
||||
let beforeApplicationIsLoadingMock: AsyncFnMock<() => Promise<void>>;
|
||||
let onLoadOfApplicationMock: AsyncFnMock<() => Promise<void>>;
|
||||
let afterApplicationIsLoadedMock: AsyncFnMock<() => Promise<void>>;
|
||||
|
||||
beforeEach(() => {
|
||||
di = createContainer("irrelevant");
|
||||
|
||||
registerFeature(di, feature);
|
||||
|
||||
beforeApplicationIsLoadingMock = asyncFn();
|
||||
onLoadOfApplicationMock = asyncFn();
|
||||
afterApplicationIsLoadedMock = asyncFn();
|
||||
|
||||
const beforeApplicationIsLoadingInjectable = getInjectable({
|
||||
id: "before-application-is-loading",
|
||||
instantiate: () => ({ run: beforeApplicationIsLoadingMock }),
|
||||
injectionToken: beforeApplicationIsLoadingInjectionToken,
|
||||
});
|
||||
|
||||
const onLoadOfApplicationInjectable = getInjectable({
|
||||
id: "on-load-of-application",
|
||||
instantiate: () => ({ run: onLoadOfApplicationMock }),
|
||||
injectionToken: onLoadOfApplicationInjectionToken,
|
||||
});
|
||||
|
||||
const afterApplicationIsLoadedInjectable = getInjectable({
|
||||
id: "after-application-is-loaded",
|
||||
instantiate: () => ({ run: afterApplicationIsLoadedMock }),
|
||||
injectionToken: afterApplicationIsLoadedInjectionToken,
|
||||
});
|
||||
|
||||
di.register(
|
||||
beforeApplicationIsLoadingInjectable,
|
||||
onLoadOfApplicationInjectable,
|
||||
afterApplicationIsLoadedInjectable
|
||||
);
|
||||
});
|
||||
|
||||
describe("when application is started", () => {
|
||||
beforeEach(() => {
|
||||
const startApplication = di.inject(startApplicationInjectionToken);
|
||||
|
||||
startApplication();
|
||||
});
|
||||
|
||||
it("calls runnables registered in before application is loading", () => {
|
||||
expect(beforeApplicationIsLoadingMock).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
describe("when runnables in before application is loading resolve", () => {
|
||||
beforeEach(async () => {
|
||||
await beforeApplicationIsLoadingMock.resolve();
|
||||
});
|
||||
|
||||
it("calls runnables registered in on load of application", () => {
|
||||
expect(onLoadOfApplicationMock).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("when runnables in before application is loading resolve, calls runnables registered in after load of application", async () => {
|
||||
await onLoadOfApplicationMock.resolve();
|
||||
|
||||
expect(afterApplicationIsLoadedMock).toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
@ -1,6 +0,0 @@
|
||||
import { getInjectionToken } from "@ogre-tools/injectable";
|
||||
import type { Runnable } from "@ogre-tools/injectable-utils";
|
||||
|
||||
export const afterBeforeAnythingInjectionToken = getInjectionToken<Runnable>({
|
||||
id: "after-before-anything",
|
||||
});
|
||||
@ -1,6 +0,0 @@
|
||||
import { getInjectionToken } from "@ogre-tools/injectable";
|
||||
import type { Runnable } from "@ogre-tools/injectable-utils";
|
||||
|
||||
export const beforeAnythingInjectionToken = getInjectionToken<Runnable>({
|
||||
id: "before-anything",
|
||||
});
|
||||
@ -1,8 +0,0 @@
|
||||
import { getInjectionToken } from "@ogre-tools/injectable";
|
||||
|
||||
export type UntilApplicationIsReadyToLoad = () => Promise<void>;
|
||||
|
||||
export const untilApplicationIsReadyToLoadInjectionToken =
|
||||
getInjectionToken<UntilApplicationIsReadyToLoad>({
|
||||
id: "until-application-is-ready-to-load-injection-token",
|
||||
});
|
||||
@ -1,8 +0,0 @@
|
||||
import { getInjectionToken } from "@ogre-tools/injectable";
|
||||
|
||||
export type UntilApplicationIsShown = () => Promise<void>;
|
||||
|
||||
export const untilApplicationIsShownInjectionToken =
|
||||
getInjectionToken<UntilApplicationIsShown>({
|
||||
id: "until-application-is-shown-injection-token",
|
||||
});
|
||||
@ -1,8 +0,0 @@
|
||||
import { getInjectionToken } from "@ogre-tools/injectable";
|
||||
|
||||
export type UntilReadyToStart = () => Promise<void>;
|
||||
|
||||
export const untilReadyToStartInjectionToken =
|
||||
getInjectionToken<UntilReadyToStart>({
|
||||
id: "until-ready-to-start-injection-token",
|
||||
});
|
||||
@ -1,192 +0,0 @@
|
||||
import {
|
||||
createContainer,
|
||||
DiContainer,
|
||||
getInjectable,
|
||||
} from "@ogre-tools/injectable";
|
||||
import { registerFeature } from "@k8slens/feature-core";
|
||||
import { feature } from "./feature";
|
||||
import { startApplicationInjectionToken } from "./start-application/start-application.injectable";
|
||||
import { beforeAnythingInjectionToken } from "./start-application/timeslots/before-anything-injection-token";
|
||||
import { afterBeforeAnythingInjectionToken } from "./start-application/timeslots/after-before-anything-injection-token";
|
||||
import { beforeApplicationIsLoadingInjectionToken } from "./start-application/timeslots/before-application-is-loading-injection-token";
|
||||
import { untilReadyToStartInjectionToken } from "./start-application/triggers/until-ready-to-start-injection-token";
|
||||
import asyncFn, { AsyncFnMock } from "@async-fn/jest";
|
||||
import { untilApplicationIsReadyToLoadInjectionToken } from "./start-application/triggers/until-application-is-ready-to-load-injection-token";
|
||||
import { onLoadOfApplicationInjectionToken } from "./start-application/timeslots/on-load-of-application-injection-token";
|
||||
import { untilApplicationIsShownInjectionToken } from "./start-application/triggers/until-application-is-shown-injection-token";
|
||||
import { afterApplicationIsLoadedInjectionToken } from "./start-application/timeslots/after-application-is-loaded-injection-token";
|
||||
|
||||
describe("starting-application", () => {
|
||||
let di: DiContainer;
|
||||
let untilReadyToStartMock: AsyncFnMock<() => Promise<void>>;
|
||||
let untilApplicationIsReadyToLoadMock: AsyncFnMock<() => Promise<void>>;
|
||||
let untilApplicationIsShownMock: AsyncFnMock<() => Promise<void>>;
|
||||
|
||||
let beforeAnythingMock: jest.Mock;
|
||||
let afterBeforeAnythingMock: jest.Mock;
|
||||
let beforeApplicationIsLoadingMock: AsyncFnMock<() => Promise<void>>;
|
||||
let onLoadOfApplicationMock: AsyncFnMock<() => Promise<void>>;
|
||||
let afterApplicationIsLoadedMock: AsyncFnMock<() => Promise<void>>;
|
||||
|
||||
beforeEach(() => {
|
||||
di = createContainer("irrelevant");
|
||||
|
||||
registerFeature(di, feature);
|
||||
|
||||
untilReadyToStartMock = asyncFn();
|
||||
untilApplicationIsReadyToLoadMock = asyncFn();
|
||||
untilApplicationIsShownMock = asyncFn();
|
||||
|
||||
beforeAnythingMock = jest.fn();
|
||||
afterBeforeAnythingMock = jest.fn();
|
||||
beforeApplicationIsLoadingMock = asyncFn();
|
||||
onLoadOfApplicationMock = asyncFn();
|
||||
afterApplicationIsLoadedMock = asyncFn();
|
||||
|
||||
const beforeAnythingInjectable = getInjectable({
|
||||
id: "before-anything",
|
||||
instantiate: () => ({ run: beforeAnythingMock }),
|
||||
injectionToken: beforeAnythingInjectionToken,
|
||||
});
|
||||
|
||||
const afterBeforeAnythingInjectable = getInjectable({
|
||||
id: "after-before-anything",
|
||||
instantiate: () => ({ run: afterBeforeAnythingMock }),
|
||||
injectionToken: afterBeforeAnythingInjectionToken,
|
||||
});
|
||||
|
||||
const beforeApplicationIsLoadingInjectable = getInjectable({
|
||||
id: "before-application-is-loading",
|
||||
instantiate: () => ({ run: beforeApplicationIsLoadingMock }),
|
||||
injectionToken: beforeApplicationIsLoadingInjectionToken,
|
||||
});
|
||||
|
||||
const onLoadOfApplicationInjectable = getInjectable({
|
||||
id: "on-load-of-application",
|
||||
instantiate: () => ({ run: onLoadOfApplicationMock }),
|
||||
injectionToken: onLoadOfApplicationInjectionToken,
|
||||
});
|
||||
|
||||
const afterApplicationIsLoadedInjectable = getInjectable({
|
||||
id: "after-application-is-loaded",
|
||||
instantiate: () => ({ run: afterApplicationIsLoadedMock }),
|
||||
injectionToken: afterApplicationIsLoadedInjectionToken,
|
||||
});
|
||||
|
||||
const untilReadyToStartInjectable = getInjectable({
|
||||
id: "until-ready-to-start",
|
||||
instantiate: () => untilReadyToStartMock,
|
||||
injectionToken: untilReadyToStartInjectionToken,
|
||||
});
|
||||
|
||||
const untilApplicationIsReadyToLoadInjectable = getInjectable({
|
||||
id: "until-application-is-ready-to-load",
|
||||
instantiate: () => untilApplicationIsReadyToLoadMock,
|
||||
injectionToken: untilApplicationIsReadyToLoadInjectionToken,
|
||||
});
|
||||
|
||||
const untilApplicationIsShownInjectable = getInjectable({
|
||||
id: "until-application-is-shown",
|
||||
instantiate: () => untilApplicationIsShownMock,
|
||||
injectionToken: untilApplicationIsShownInjectionToken,
|
||||
});
|
||||
|
||||
di.register(
|
||||
untilReadyToStartInjectable,
|
||||
untilApplicationIsReadyToLoadInjectable,
|
||||
untilApplicationIsShownInjectable,
|
||||
|
||||
beforeAnythingInjectable,
|
||||
afterBeforeAnythingInjectable,
|
||||
beforeApplicationIsLoadingInjectable,
|
||||
onLoadOfApplicationInjectable,
|
||||
afterApplicationIsLoadedInjectable
|
||||
);
|
||||
});
|
||||
|
||||
describe("when application is started", () => {
|
||||
beforeEach(() => {
|
||||
const startApplication = di.inject(startApplicationInjectionToken);
|
||||
|
||||
startApplication();
|
||||
});
|
||||
|
||||
it("calls the runnable registered in the before anything timeslot", () => {
|
||||
expect(beforeAnythingMock).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("calls the runnable registered in the after before anything timeslot", () => {
|
||||
expect(afterBeforeAnythingMock).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("does not call runnables registered in before application is loading yet", () => {
|
||||
expect(beforeApplicationIsLoadingMock).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("calls the trigger for when application is ready to start", () => {
|
||||
expect(untilReadyToStartMock).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
describe("when application is ready to be started", () => {
|
||||
beforeEach(async () => {
|
||||
await untilReadyToStartMock.resolve();
|
||||
});
|
||||
|
||||
it("calls runnables registered in before application is loading", () => {
|
||||
expect(beforeApplicationIsLoadingMock).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("does not call the trigger for until application is ready to load yet", () => {
|
||||
expect(untilApplicationIsReadyToLoadMock).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
describe("when runnables in before application is loading resolve", () => {
|
||||
beforeEach(async () => {
|
||||
await beforeApplicationIsLoadingMock.resolve();
|
||||
});
|
||||
|
||||
it("calls the trigger for until application is ready to load", () => {
|
||||
expect(untilApplicationIsReadyToLoadMock).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("does not call runnables registered in on load of application yet", () => {
|
||||
expect(onLoadOfApplicationMock).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
describe("when until application is ready to load resolves", () => {
|
||||
beforeEach(async () => {
|
||||
await untilApplicationIsReadyToLoadMock.resolve();
|
||||
});
|
||||
|
||||
it("calls runnables registered in on load of application", () => {
|
||||
expect(onLoadOfApplicationMock).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("does not call the trigger for until application is shown yet", () => {
|
||||
expect(untilApplicationIsShownMock).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
describe("when runnables in before application is loading resolve", () => {
|
||||
beforeEach(async () => {
|
||||
await onLoadOfApplicationMock.resolve();
|
||||
});
|
||||
|
||||
it("calls the trigger for until application is shown", () => {
|
||||
expect(untilApplicationIsShownMock).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("does not call runnables registered in after load of application yet", () => {
|
||||
expect(afterApplicationIsLoadedMock).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('when until application is shown resolves, calls runnables registered in after load of application', async () => {
|
||||
await untilApplicationIsShownMock.resolve();
|
||||
|
||||
expect(afterApplicationIsLoadedMock).toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
Loading…
Reference in New Issue
Block a user