Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Introduce API for changing the status bar colour #7556

Merged
merged 5 commits into from
Apr 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/**
* Copyright (c) OpenLens Authors. All rights reserved.
* Licensed under MIT License. See LICENSE in root directory for more information.
*/
import { getInjectable } from "@ogre-tools/injectable";
import { observable } from "mobx";

export type StatusBarStatus = "default" | "warning" | "error";

const statusBarCurrentStatusInjectable = getInjectable({
id: "status-bar-current-status",
instantiate: () => observable.box<StatusBarStatus>("default"),
});

export default statusBarCurrentStatusInjectable;
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/**
* Copyright (c) OpenLens Authors. All rights reserved.
* Licensed under MIT License. See LICENSE in root directory for more information.
*/
import { getInjectable } from "@ogre-tools/injectable";
import { action } from "mobx";
import type { StatusBarStatus } from "./current-status.injectable";
import statusBarCurrentStatusInjectable from "./current-status.injectable";

export type SetStatusBarStatus = (newStatus: StatusBarStatus) => void;

const setStatusBarStatusInjectable = getInjectable({
id: "set-status-bar-status",
instantiate: (di): SetStatusBarStatus => {
const status = di.inject(statusBarCurrentStatusInjectable);

return action((newStatus) => status.set(newStatus));
},
});

export default setStatusBarStatusInjectable;
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
*/
import type { Injectable } from "@ogre-tools/injectable";
import { getInjectable } from "@ogre-tools/injectable";
import type { IComputedValue } from "mobx";
import { computed } from "mobx";
import { extensionRegistratorInjectionToken } from "../../../extensions/extension-loader/extension-registrator-injection-token";
import type { LensRendererExtension } from "../../../extensions/lens-renderer-extension";
Expand Down Expand Up @@ -39,7 +38,6 @@ const toItemInjectableFor = (extension: LensRendererExtension, getRandomId: () =
const id = `${getRandomId()}-status-bar-item-for-extension-${extension.sanitizedExtensionId}`;
let component: React.ComponentType;
let position: "left" | "right";
const visible: IComputedValue<boolean> | undefined = registration?.visible;

if (registration?.item) {
const { item } = registration;
Expand Down Expand Up @@ -77,7 +75,7 @@ const toItemInjectableFor = (extension: LensRendererExtension, getRandomId: () =
origin: extension.sanitizedExtensionId,
component,
position,
visible: visible ?? computed(() => true),
visible: registration?.visible ?? computed(() => true),
}),

injectionToken: statusBarItemInjectionToken,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,12 @@
* Licensed under MIT License. See LICENSE in root directory for more information.
*/
import { getInjectable } from "@ogre-tools/injectable";
import type { IComputedValue } from "mobx";
import { computed } from "mobx";
import type { StatusBarItemProps } from "./status-bar-registration";
import type { StatusBarItem } from "./status-bar-item-injection-token";
import { statusBarItemInjectionToken } from "./status-bar-item-injection-token";
import { computedInjectManyInjectable } from "@ogre-tools/injectable-extension-for-mobx";

interface StatusItem {
export interface StatusItem {
origin?: string;
component: React.ComponentType<StatusBarItemProps>;
}
Expand All @@ -20,50 +18,38 @@ export interface StatusBarItems {
left: StatusItem[];
}

interface Dependencies {
registrations: IComputedValue<StatusBarItem[]>;
}

function getStatusBarItems({ registrations }: Dependencies): IComputedValue<StatusBarItems> {
return computed(() => {
const res: StatusBarItems = {
left: [],
right: [],
};

for (const registration of registrations.get()) {
const { position = "right", component, visible, origin } = registration;

if (!visible.get()) {
continue;
}

res[position].push({
origin,
component,
});
}

// This is done so that the first ones registered are closest to the corner
res.right.reverse();

return res;
});
}

const statusBarItemsInjectable = getInjectable({
id: "status-bar-items",

instantiate: (di) => {
const computedInjectMany = di.inject(
computedInjectManyInjectable,
);
const computedInjectMany = di.inject(computedInjectManyInjectable);
const registrations = computedInjectMany(statusBarItemInjectionToken);

return computed(() => {
const res: StatusBarItems = {
left: [],
right: [],
};

for (const registration of registrations.get()) {
const { position = "right", component, visible, origin } = registration;

if (!visible.get()) {
continue;
}

res[position].push({
origin,
component,
});
}

// This is done so that the first ones registered are closest to the corner
res.right.reverse();

return getStatusBarItems({
registrations: computedInjectMany(statusBarItemInjectionToken),
return res;
});
},

});

export default statusBarItemsInjectable;
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,20 @@
color: white;

grid-area: status-bar;
background-color: var(--blue);
height: var(--status-bar-height);
font-size: var(--font-size-small);

display: inline-grid;
grid-template-columns: 1fr 1fr;
background-color: var(--colorInfo);

&.status-warning {
background-color: var(--colorWarning);
}

&.status-error {
background-color: var(--colorError);
}
}

.leftSide {
Expand Down
Loading