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

Remove usages of legacy global navigation

Browse Source 
Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
Sebastian Malton 2022-12-22 11:33:10 -05:00
parent 12276af878
commit 501ce156c0
3 changed files with 45 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/renderer/components/error-boundary/error-boundary.tsx
View File

@ -9,9 +9,11 @@ import type { ErrorInfo } from "react";
import React from "react"; import React from "react";
import { observer } from "mobx-react"; import { observer } from "mobx-react";
import { Button } from "../button"; import { Button } from "../button";
import { navigation } from "../../navigation";
import { issuesTrackerUrl, slackUrl } from "../../../common/vars"; import { issuesTrackerUrl, slackUrl } from "../../../common/vars";
import type { SingleOrMany } from "../../utils"; import type { SingleOrMany } from "../../utils";
import type { ObservableHistory } from "mobx-observable-history";
import { withInjectables } from "@ogre-tools/injectable-react";
import observableHistoryInjectable from "../../navigation/observable-history.injectable";
export interface ErrorBoundaryProps { export interface ErrorBoundaryProps {
children?: SingleOrMany<React.ReactNode>; children?: SingleOrMany<React.ReactNode>;
@ -22,8 +24,12 @@ interface State {
errorInfo?: ErrorInfo; errorInfo?: ErrorInfo;
} }
interface Dependencies {
observableHistory: ObservableHistory<unknown>;
}
@observer @observer
export class ErrorBoundary extends React.Component<ErrorBoundaryProps, State> { class NonInjectedErrorBoundary extends React.Component<ErrorBoundaryProps & Dependencies, State> {
public state: State = {}; public state: State = {};
componentDidCatch(error: Error, errorInfo: ErrorInfo) { componentDidCatch(error: Error, errorInfo: ErrorInfo) {
@ -32,7 +38,7 @@ export class ErrorBoundary extends React.Component<ErrorBoundaryProps, State> {
back = () => { back = () => {
this.setState({ error: undefined, errorInfo: undefined }); this.setState({ error: undefined, errorInfo: undefined });
navigation.goBack(); this.props.observableHistory.goBack();
}; };
render() { render() {
@ -88,3 +94,10 @@ export class ErrorBoundary extends React.Component<ErrorBoundaryProps, State> {
return this.props.children; return this.props.children;
} }
} }
export const ErrorBoundary = withInjectables<Dependencies, ErrorBoundaryProps>(NonInjectedErrorBoundary, {
getProps: (di, props) => ({
...props,
observableHistory: di.inject(observableHistoryInjectable),
}),
});

32
src/renderer/components/layout/tab-layout.tsx
View File

@ -13,7 +13,11 @@ import type { IClassName } from "../../utils";
import { cssNames } from "../../utils"; import { cssNames } from "../../utils";
import { Tab, Tabs } from "../tabs"; import { Tab, Tabs } from "../tabs";
import { ErrorBoundary } from "../error-boundary"; import { ErrorBoundary } from "../error-boundary";
import { navigate, navigation } from "../../navigation"; import type { ObservableHistory } from "mobx-observable-history";
import { withInjectables } from "@ogre-tools/injectable-react";
import observableHistoryInjectable from "../../navigation/observable-history.injectable";
import type { Navigate } from "../../navigation/navigate.injectable";
import navigateInjectable from "../../navigation/navigate.injectable";
export interface TabLayoutProps { export interface TabLayoutProps {
className?: IClassName; className?: IClassName;
@ -32,8 +36,22 @@ export interface TabLayoutRoute {
default?: boolean; // initial tab to open with provided `url, by default tabs[0] is used default?: boolean; // initial tab to open with provided `url, by default tabs[0] is used
} }
export const TabLayout = observer(({ className, contentClass, tabs = [], scrollable, children }: TabLayoutProps) => { interface Dependencies {
const currentLocation = navigation.location.pathname; observableHistory: ObservableHistory<unknown>;
navigate: Navigate;
}
const NonInjectedTabLayout = observer((props: TabLayoutProps & Dependencies) => {
const {
className,
contentClass,
tabs = [],
scrollable,
children,
observableHistory,
navigate,
} = props;
const currentLocation = observableHistory.location.pathname;
const hasTabs = tabs.length > 0; const hasTabs = tabs.length > 0;
const startTabUrl = hasTabs ? (tabs.find(tab => tab.default) || tabs[0])?.url : null; const startTabUrl = hasTabs ? (tabs.find(tab => tab.default) || tabs[0])?.url : null;
@ -72,3 +90,11 @@ export const TabLayout = observer(({ className, contentClass, tabs = [], scrolla
</div> </div>
); );
}); });
export const TabLayout = withInjectables<Dependencies, TabLayoutProps>(NonInjectedTabLayout, {
getProps: (di, props) => ({
...props,
observableHistory: di.inject(observableHistoryInjectable),
navigate: di.inject(navigateInjectable),
}),
});

7
src/renderer/navigation/index.ts
View File

@ -4,17 +4,10 @@
*/ */
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 { asLegacyGlobalForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api";
import navigateInjectable from "./navigate.injectable"; import navigateInjectable from "./navigate.injectable";
import observableHistoryInjectable from "./observable-history.injectable";
export { searchParamsOptions } from "./search-params"; export { searchParamsOptions } from "./search-params";
/**
* @deprecated use `di.inject(observableHistoryInjectable)` instead
*/
export const navigation = asLegacyGlobalForExtensionApi(observableHistoryInjectable);
/** /**
* @deprecated use `di.inject(navigateInjectable)` instead * @deprecated use `di.inject(navigateInjectable)` instead
*/ */