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

Leading topbar home button to welcome page

Browse Source 
Signed-off-by: alexfront <alex.andreev.email@gmail.com>
This commit is contained in:
alexfront 2022-09-09 12:33:54 +03:00
parent 96cbbd4ecc
commit f461beae57
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/renderer/components/layout/top-bar/top-bar.tsx
View File

@ -15,8 +15,6 @@ import type { TopBarRegistration } from "./top-bar-registration";
import isLinuxInjectable from "../../../../common/vars/is-linux.injectable"; import isLinuxInjectable from "../../../../common/vars/is-linux.injectable";
import isWindowsInjectable from "../../../../common/vars/is-windows.injectable"; import isWindowsInjectable from "../../../../common/vars/is-windows.injectable";
import type { NavigateToCatalog } from "../../../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable"; import type { NavigateToCatalog } from "../../../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable";
import navigateToCatalogInjectable from "../../../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable";
import catalogRouteInjectable from "../../../../common/front-end-routing/routes/catalog/catalog-route.injectable";
import routeIsActiveInjectable from "../../../routes/route-is-active.injectable"; import routeIsActiveInjectable from "../../../routes/route-is-active.injectable";
import { UpdateButton } from "../../update-button"; import { UpdateButton } from "../../update-button";
import topBarPrevEnabledInjectable from "./prev-enabled.injectable"; import topBarPrevEnabledInjectable from "./prev-enabled.injectable";
@ -28,10 +26,12 @@ import closeWindowInjectable from "./close-window.injectable";
import maximizeWindowInjectable from "./maximize-window.injectable"; import maximizeWindowInjectable from "./maximize-window.injectable";
import toggleMaximizeWindowInjectable from "./toggle-maximize-window.injectable"; import toggleMaximizeWindowInjectable from "./toggle-maximize-window.injectable";
import watchHistoryStateInjectable from "../../../remote-helpers/watch-history-state.injectable"; import watchHistoryStateInjectable from "../../../remote-helpers/watch-history-state.injectable";
import welcomeRouteInjectable from "../../../../common/front-end-routing/routes/welcome/welcome-route.injectable";
import navigateToWelcomeInjectable from "../../../../common/front-end-routing/routes/welcome/navigate-to-welcome.injectable";
interface Dependencies { interface Dependencies {
navigateToCatalog: NavigateToCatalog; navigateToWelcomePage: NavigateToCatalog;
catalogRouteIsActive: IComputedValue<boolean>; welcomeRouteIsActive: IComputedValue<boolean>;
items: IComputedValue<TopBarRegistration[]>; items: IComputedValue<TopBarRegistration[]>;
isWindows: boolean; isWindows: boolean;
isLinux: boolean; isLinux: boolean;
@ -48,8 +48,8 @@ interface Dependencies {
const NonInjectedTopBar = observer(({ const NonInjectedTopBar = observer(({
items, items,
navigateToCatalog, navigateToWelcomePage,
catalogRouteIsActive, welcomeRouteIsActive,
isWindows, isWindows,
isLinux, isLinux,
prevEnabled, prevEnabled,
@ -65,7 +65,7 @@ const NonInjectedTopBar = observer(({
const elem = useRef<HTMLDivElement | null>(null); const elem = useRef<HTMLDivElement | null>(null);
const goHome = () => { const goHome = () => {
navigateToCatalog(); navigateToWelcomePage();
}; };
const windowSizeToggle = (evt: React.MouseEvent) => { const windowSizeToggle = (evt: React.MouseEvent) => {
@ -103,7 +103,7 @@ const NonInjectedTopBar = observer(({
data-testid="home-button" data-testid="home-button"
material="home" material="home"
onClick={goHome} onClick={goHome}
disabled={catalogRouteIsActive.get()} disabled={welcomeRouteIsActive.get()}
/> />
<Icon <Icon
data-testid="history-back" data-testid="history-back"
@ -182,15 +182,15 @@ const renderRegisteredItems = (items: TopBarRegistration[]) => (
export const TopBar = withInjectables<Dependencies>(NonInjectedTopBar, { export const TopBar = withInjectables<Dependencies>(NonInjectedTopBar, {
getProps: (di) => ({ getProps: (di) => ({
navigateToCatalog: di.inject(navigateToCatalogInjectable), navigateToWelcomePage: di.inject(navigateToWelcomeInjectable),
items: di.inject(topBarItemsInjectable), items: di.inject(topBarItemsInjectable),
isLinux: di.inject(isLinuxInjectable), isLinux: di.inject(isLinuxInjectable),
isWindows: di.inject(isWindowsInjectable), isWindows: di.inject(isWindowsInjectable),
prevEnabled: di.inject(topBarPrevEnabledInjectable), prevEnabled: di.inject(topBarPrevEnabledInjectable),
nextEnabled: di.inject(topBarNextEnabledInjectable), nextEnabled: di.inject(topBarNextEnabledInjectable),
catalogRouteIsActive: di.inject( welcomeRouteIsActive: di.inject(
routeIsActiveInjectable, routeIsActiveInjectable,
di.inject(catalogRouteInjectable), di.inject(welcomeRouteInjectable),
), ),
openAppContextMenu: di.inject(openAppContextMenuInjectable), openAppContextMenu: di.inject(openAppContextMenuInjectable),
goBack: di.inject(goBackInjectable), goBack: di.inject(goBackInjectable),