Skip to content
This repository was archived by the owner on Jan 6, 2026. It is now read-only.
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
11 changes: 1 addition & 10 deletions src/renderer/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import { initialize as initializeIpcListeners } from './ipc';
import NodeScreen from './NodeScreen';
import DataRefresher from './DataRefresher';
import electron from './electronGlobal';
import Sidebar from './Presentational/Sidebar/Sidebar';
import { SidebarWrapper } from './Presentational/SidebarWrapper/SidebarWrapper';
import NNSplash from './Presentational/NNSplashScreen/NNSplashScreen';
import { dragWindowContainer } from './app.css';
Expand Down Expand Up @@ -81,15 +80,7 @@ const MainScreen = () => {
flex: 1,
}}
>
<SidebarWrapper>
{(sUserNodes) => (
<Sidebar
offline={false}
updateAvailable={false}
sUserNodes={sUserNodes}
/>
)}
</SidebarWrapper>
<SidebarWrapper />

<NodeScreen />
</div>
Expand Down
40 changes: 32 additions & 8 deletions src/renderer/Generics/redesign/Banner/Banner.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,31 @@ export interface BannerProps {
/**
* Is it offline?
*/
offline: boolean;
offline?: boolean;
/**
* Is update available?
*/
updateAvailable: boolean;
updateAvailable?: boolean;
/**
* Is docker not running?
*/
dockerStopped?: boolean;
onClick?: () => void;
}

/**
* Primary UI component for user interaction
*/
export const Banner = ({ offline, updateAvailable }: BannerProps) => {
export const Banner = ({
offline,
updateAvailable,
dockerStopped,
onClick,
}: BannerProps) => {
let iconId: IconId = 'blank';
let title = '';
let description = '';
let onClick = () => {};
let internalOnClick = () => {};
if (offline) {
iconId = 'boltstrike';
title = 'Currently offline';
Expand All @@ -35,16 +45,30 @@ export const Banner = ({ offline, updateAvailable }: BannerProps) => {
iconId = 'download1';
title = 'Update available';
description = 'New version ready to install';
onClick = () => {
internalOnClick = () => {
console.log('update nice node!');
};
} else if (dockerStopped) {
iconId = 'play';
title = 'Docker is not running';
description = 'Click to start Docker';
internalOnClick = () => {
console.log('Start Docker!');
};
}
const onClickBanner = () => {
internalOnClick();
if (onClick) {
onClick();
}
};

return (
<div
style={updateAvailable ? { cursor: 'pointer' } : {}}
style={onClick ? { cursor: 'pointer' } : {}}
className={container}
onClick={onClick}
onKeyDown={onClick}
onClick={onClickBanner}
onKeyDown={onClickBanner}
role="button"
tabIndex={0}
>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
import electron from '../../electronGlobal';
import { Banner } from '../../Generics/redesign/Banner/Banner';
import { useGetIsDockerRunningQuery } from '../../state/settingsService';

export const DockerStoppedBanner = () => {
const qIsDockerRunning = useGetIsDockerRunningQuery(null, {
pollingInterval: 15000,
});

const onClickStartDocker = async () => {
await electron.startDocker();
// todo: verify it is started and changed banner for 5 secs?
qIsDockerRunning.refetch();
// console.log('installDocker finished. Install result: ', installResult);
};

return (
<Banner dockerStopped onClick={onClickStartDocker} />
// <div
// style={updateAvailable ? { cursor: 'pointer' } : {}}
// className={container}
// onClick={onClick}
// onKeyDown={onClick}
// role="button"
// tabIndex={0}
// >
// <div className={innerContainer}>
// <Icon iconId={iconId} />
// <div className={textContainer}>
// <div className={titleStyle}>{title}</div>
// <div className={descriptionStyle}>{description}</div>
// </div>
// </div>
// </div>
);
};
15 changes: 13 additions & 2 deletions src/renderer/Presentational/Sidebar/Sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import { IconId } from '../../assets/images/icons';
import { Modal } from '../../Generics/redesign/Modal/Modal';
import AddNodeStepper from '../AddNodeStepper/AddNodeStepper';
import PreferencesWrapper from '../PreferencesModal/PreferencesWrapper';
import { DockerStoppedBanner } from '../DockerInstallation/StartDockerBanner';

export interface SidebarProps {
/**
Expand All @@ -25,7 +26,11 @@ export interface SidebarProps {
* Nice Node update available?
*/
updateAvailable: boolean;
sUserNodes: UserNodes;
/**
* Is docker not running?
*/
dockerStopped: boolean;
sUserNodes?: UserNodes;
}

const itemListData: { iconId: IconId; label: string; count?: number }[] = [
Expand Down Expand Up @@ -62,7 +67,12 @@ const NODE_SIDEBAR_STATUS_MAP: Record<NodeStatus, SidebarNodeStatus> = {
unknown: 'error',
};

const Sidebar = ({ sUserNodes, updateAvailable, offline }: SidebarProps) => {
const Sidebar = ({
sUserNodes,
updateAvailable,
offline,
dockerStopped,
}: SidebarProps) => {
const dispatch = useAppDispatch();
const [sIsModalOpenAddNode, setIsModalOpenAddNode] = useState<boolean>();
const [sIsModalOpenSettings, setIsModalOpenSettings] =
Expand Down Expand Up @@ -115,6 +125,7 @@ const Sidebar = ({ sUserNodes, updateAvailable, offline }: SidebarProps) => {

return (
<div className={container}>
{dockerStopped && <DockerStoppedBanner />}
{renderBanners()}
<div className={nodeList}>
<div className={titleItem}>
Expand Down
29 changes: 22 additions & 7 deletions src/renderer/Presentational/SidebarWrapper/SidebarWrapper.tsx
Original file line number Diff line number Diff line change
@@ -1,23 +1,31 @@
import React, { ReactElement, useEffect } from 'react';
import { ReactElement, useEffect } from 'react';
import { useAppDispatch, useAppSelector } from '../../state/hooks';
import {
selectSelectedNodeId,
selectUserNodes,
updateSelectedNodeId,
} from '../../state/node';
import { useGetIsDockerRunningQuery } from '../../state/settingsService';
import Sidebar from '../Sidebar/Sidebar';

export interface SidebarWrapperProps {
children: ReactElement;
}

export const SidebarWrapper = ({
children,
}: {
children: (sUserNodes: any) => React.ReactNode;
}) => {
export const SidebarWrapper = () => {
const sSelectedNodeId = useAppSelector(selectSelectedNodeId);
const sUserNodes = useAppSelector(selectUserNodes);
const dispatch = useAppDispatch();
// todo: implement a back-off polling strategy which can be "reset"
const qIsDockerRunning = useGetIsDockerRunningQuery(null, {
pollingInterval: 15000,
});
// default to docker is running while data is being fetched, so
// the user isn't falsely warned
let isDockerRunning = true;
if (qIsDockerRunning && !qIsDockerRunning.fetching) {
isDockerRunning = qIsDockerRunning.data;
}

// Default selected node to be the first node
useEffect(() => {
Expand All @@ -31,5 +39,12 @@ export const SidebarWrapper = ({
}
}, [sSelectedNodeId, sUserNodes, dispatch]);

return <>{children(sUserNodes)}</>;
return (
<Sidebar
offline={false}
updateAvailable={false}
dockerStopped={!isDockerRunning}
sUserNodes={sUserNodes}
/>
);
};