hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Fix compile error

Browse Source 
Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
Sebastian Malton 2022-06-22 12:58:09 -04:00
parent 15ba895cde
commit efc6c9c05a
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/renderer/components/+helm-charts/helm-chart-details.tsx
View File

@ -19,7 +19,7 @@ import { Badge } from "../badge";
import { Tooltip, withStyles } from "@material-ui/core"; import { Tooltip, withStyles } from "@material-ui/core";
import { withInjectables } from "@ogre-tools/injectable-react"; import { withInjectables } from "@ogre-tools/injectable-react";
import createInstallChartTabInjectable from "../dock/install-chart/create-install-chart-tab.injectable"; import createInstallChartTabInjectable from "../dock/install-chart/create-install-chart-tab.injectable";
import type { ShowCheckedErrorNotification } from "../notifications"; import type { ShowCheckedErrorNotification } from "../notifications/show-checked-error.injectable";
import type { SingleValue } from "react-select"; import type { SingleValue } from "react-select";
import AbortController from "abort-controller"; import AbortController from "abort-controller";
import showCheckedErrorNotificationInjectable from "../notifications/show-checked-error.injectable"; import showCheckedErrorNotificationInjectable from "../notifications/show-checked-error.injectable";

4
src/renderer/components/notifications/notifications.store.tsx
View File

@ -5,7 +5,6 @@
import type React from "react"; import type React from "react";
import { action, observable, makeObservable } from "mobx"; import { action, observable, makeObservable } from "mobx";
import type { Disposer } from "../../utils";
import { autoBind } from "../../utils"; import { autoBind } from "../../utils";
import uniqueId from "lodash/uniqueId"; import uniqueId from "lodash/uniqueId";
import type { JsonApiErrorParsed } from "../../../common/k8s-api/json-api"; import type { JsonApiErrorParsed } from "../../../common/k8s-api/json-api";
@ -20,9 +19,6 @@ export enum NotificationStatus {
INFO = "info", INFO = "info",
} }
export type ShowNotification = (message: NotificationMessage, opts?: CreateNotificationOptions) => Disposer;
export type ShowCheckedErrorNotification = (message: unknown, fallback: string, opts?: CreateNotificationOptions) => Disposer;
export interface CreateNotificationOptions { export interface CreateNotificationOptions {
id?: NotificationId; id?: NotificationId;
timeout?: number; timeout?: number;

6
src/renderer/components/notifications/notifications.tsx
View File

@ -9,19 +9,23 @@ import React from "react";
import { reaction } from "mobx"; import { reaction } from "mobx";
import { disposeOnUnmount, observer } from "mobx-react"; import { disposeOnUnmount, observer } from "mobx-react";
import { JsonApiErrorParsed } from "../../../common/k8s-api/json-api"; import { JsonApiErrorParsed } from "../../../common/k8s-api/json-api";
import type { Disposer } from "../../utils";
import { cssNames, prevDefault } from "../../utils"; import { cssNames, prevDefault } from "../../utils";
import type { Notification, NotificationsStore, ShowCheckedErrorNotification, ShowNotification } from "./notifications.store"; import type { CreateNotificationOptions, Notification, NotificationMessage, NotificationsStore } from "./notifications.store";
import { Animate } from "../animate"; import { Animate } from "../animate";
import { Icon } from "../icon"; import { Icon } from "../icon";
import { withInjectables } from "@ogre-tools/injectable-react"; import { withInjectables } from "@ogre-tools/injectable-react";
import notificationsStoreInjectable from "./notifications-store.injectable"; import notificationsStoreInjectable from "./notifications-store.injectable";
import { asLegacyGlobalFunctionForExtensionApi } from "../../../extensions/as-legacy-globals-for-extension-api/as-legacy-global-function-for-extension-api"; import { asLegacyGlobalFunctionForExtensionApi } from "../../../extensions/as-legacy-globals-for-extension-api/as-legacy-global-function-for-extension-api";
import showSuccessNotificationInjectable from "./show-success-notification.injectable"; import showSuccessNotificationInjectable from "./show-success-notification.injectable";
import type { ShowCheckedErrorNotification } from "./show-checked-error.injectable";
import showCheckedErrorNotificationInjectable from "./show-checked-error.injectable"; import showCheckedErrorNotificationInjectable from "./show-checked-error.injectable";
import showErrorNotificationInjectable from "./show-error-notification.injectable"; import showErrorNotificationInjectable from "./show-error-notification.injectable";
import showInfoNotificationInjectable from "./show-info-notification.injectable"; import showInfoNotificationInjectable from "./show-info-notification.injectable";
import showShortInfoNotificationInjectable from "./show-short-info.injectable"; import showShortInfoNotificationInjectable from "./show-short-info.injectable";
export type ShowNotification = (message: NotificationMessage, opts?: CreateNotificationOptions) => Disposer;
interface Dependencies { interface Dependencies {
store: NotificationsStore; store: NotificationsStore;
} }

9
src/renderer/components/notifications/show-checked-error.injectable.ts
View File

@ -4,20 +4,25 @@
*/ */
import { getInjectable } from "@ogre-tools/injectable"; import { getInjectable } from "@ogre-tools/injectable";
import { JsonApiErrorParsed } from "../../../common/k8s-api/json-api"; import { JsonApiErrorParsed } from "../../../common/k8s-api/json-api";
import type { ShowCheckedErrorNotification } from "./notifications.store"; import loggerInjectable from "../../../common/logger.injectable";
import type { Disposer } from "../../utils";
import type { CreateNotificationOptions } from "./notifications.store";
import showErrorNotificationInjectable from "./show-error-notification.injectable"; import showErrorNotificationInjectable from "./show-error-notification.injectable";
export type ShowCheckedErrorNotification = (message: unknown, fallback: string, opts?: CreateNotificationOptions) => Disposer;
const showCheckedErrorNotificationInjectable = getInjectable({ const showCheckedErrorNotificationInjectable = getInjectable({
id: "show-checked-error-notififcation", id: "show-checked-error-notififcation",
instantiate: (di): ShowCheckedErrorNotification => { instantiate: (di): ShowCheckedErrorNotification => {
const showErrorNotification = di.inject(showErrorNotificationInjectable); const showErrorNotification = di.inject(showErrorNotificationInjectable);
const logger = di.inject(loggerInjectable);
return (message, fallback, opts) => { return (message, fallback, opts) => {
if (typeof message === "string" || message instanceof Error || message instanceof JsonApiErrorParsed) { if (typeof message === "string" || message instanceof Error || message instanceof JsonApiErrorParsed) {
return showErrorNotification(message, opts); return showErrorNotification(message, opts);
} }
console.warn("Unknown notification error message, falling back to default", message); logger.warn("[NOTIFICATIONS]: Unknown notification error message, falling back to default", message);
return showErrorNotification(fallback, opts); return showErrorNotification(fallback, opts);
}; };