Skip to content
Open
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
13 changes: 12 additions & 1 deletion src/main/anchor.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { BrowserWindow, dialog } from 'electron';
import { FetchAnchorIDLRequest } from '../types/types';
import { execAsync, RESOURCES_PATH } from './const';
import { logger } from './logger';
Expand All @@ -22,4 +23,14 @@ const fetchAnchorIdl = async (msg: FetchAnchorIDLRequest) => {
};
};

export default fetchAnchorIdl;
const selectAnchorDir = async (msg: any, mainWindow: BrowserWindow | null) => {
if (mainWindow) {
const res = await dialog.showOpenDialog(mainWindow, {
properties: ['openDirectory'],
});
return { res };
}
return { error: 'No Electron window found' };
};

export { fetchAnchorIdl, selectAnchorDir };
5 changes: 4 additions & 1 deletion src/main/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { autoUpdater } from 'electron-updater';
import path from 'path';
import 'regenerator-runtime/runtime';
import { Buffer } from 'buffer';
import fetchAnchorIdl from './anchor';
import { fetchAnchorIdl, selectAnchorDir } from './anchor';
import { RESOURCES_PATH } from './const';
import { initAccountPromises } from './ipc/accounts';
import { initConfigPromises } from './ipc/config';
Expand Down Expand Up @@ -41,6 +41,9 @@ ipcMain.on(
let res = {};
try {
switch (method) {
case 'select-anchor-dir':
res = await selectAnchorDir(msg, mainWindow);
break;
case 'validator-logs':
res = await validatorLogs(msg);
break;
Expand Down
273 changes: 143 additions & 130 deletions src/renderer/nav/Validator.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -116,146 +116,159 @@ const Validator = () => {
}

return (
<div className="p-3">
<ButtonToolbar aria-label="Toolbar with button groups">
<div className="flex gap-2 mb-2">
<DropdownButton
size="sm"
className="mt-2 mb-4"
variant="dark"
title={
validatorImageTag !== '' ? validatorImageTag : 'Docker image'
}
disabled={containerInspect?.State}
onSelect={(image: string) => {
logger.info(`selected image: ${image}`);
setValidatorImageTag(image);
}}
align="end"
>
{validatorImageTags.map((tag: string) => {
const image = `${validatorImageName}:${tag}`;
return (
<Dropdown.Item eventKey={image} href="#">
{image}
</Dropdown.Item>
);
})}
</DropdownButton>

<Button
size="sm"
disabled={validatorImageTag === ''}
onClick={() => {
logger.info(`GOGOGO ${JSON.stringify(validatorImageTag)}`);

if (!containerInspect || !containerInspect.State) {
toast.promise(
window.promiseIpc
.send('DOCKER-CreateValidatorContainer', validatorImageTag)
.then((info: any) => {
// setValidatorImageTags(tags);
logger.info(`hooray ${JSON.stringify(info)}`);
return info;
})
.then(() => {
// eslint-disable-next-line promise/catch-or-return, promise/no-nesting
ipcDockerToast('StartValidatorContainer').then(() => {
<div className="grid grid-cols-2">
<div className="p-3">
<ButtonToolbar aria-label="Toolbar with button groups">
<div className="gap-2 mb-2">
<div>
<span>Validator</span>
<DropdownButton
size="sm"
className="mt-2 ml-2 inline"
variant="dark"
title={
validatorImageTag !== '' ? validatorImageTag : 'Docker image'
}
disabled={containerInspect?.State}
onSelect={(image: string) => {
logger.info(`selected image: ${image}`);
setValidatorImageTag(image);
}}
align="end"
>
{validatorImageTags.map((tag: string) => {
const image = `${validatorImageName}:${tag}`;
return (
<Dropdown.Item eventKey={image} href="#">
{image}
</Dropdown.Item>
);
})}
</DropdownButton>
</div>
<div>
<Button
size="sm"
disabled={validatorImageTag === ''}
onClick={() => {
logger.info(`GOGOGO ${JSON.stringify(validatorImageTag)}`);
if (!containerInspect || !containerInspect.State) {
toast.promise(
window.promiseIpc
.send(
'DOCKER-CreateValidatorContainer',
validatorImageTag
)
.then((info: any) => {
// setValidatorImageTags(tags);
logger.info(`hooray ${JSON.stringify(info)}`);
return info;
})
.then(() => {
// eslint-disable-next-line promise/catch-or-return, promise/no-nesting
ipcDockerToast('StartValidatorContainer').then(() => {
logger.info('STARTED CONTAINER');
logger.info('START AMMAN');
// TODO: StartAmmanValidator blocks, no toast for now
window.promiseIpc.send(
`DOCKER-StartAmmanValidator`
);
logger.info('STARTED AMMAN');
return 'ok';
});
return 'ok';
}),
{
pending: `CreateValidatorContainer submitted`,
success: `CreateValidatorContainer succeeded 👌`,
error: `CreateValidatorContainer failed 🤯`,
}
);
} else if (
containerInspect &&
containerInspect.State &&
!containerInspect.State.Running
) {
ipcDockerToast('StartValidatorContainer')
.then(() => {
logger.info('STARTED CONTAINER');
logger.info('START AMMAN');
// TODO: StartAmmanValidator blocks, no toast for now
window.promiseIpc.send(`DOCKER-StartAmmanValidator`);
logger.info('STARTED AMMAN');
return 'ok';
});
return 'ok';
}),
{
pending: `CreateValidatorContainer submitted`,
success: `CreateValidatorContainer succeeded 👌`,
error: `CreateValidatorContainer failed 🤯`,
}
);
} else if (
containerInspect &&
containerInspect.State &&
!containerInspect.State.Running
) {
ipcDockerToast('StartValidatorContainer')
.then(() => {
logger.info('STARTED CONTAINER');
})
.catch(logger.error);
} else {
logger.info('START AMMAN');
// TODO: StartAmmanValidator blocks, no toast for now
window.promiseIpc.send(`DOCKER-StartAmmanValidator`);
logger.info('STARTED AMMAN');
return 'ok';
})
.catch(logger.error);
} else {
logger.info('START AMMAN');
// TODO: StartAmmanValidator blocks, no toast for now
window.promiseIpc.send(`DOCKER-StartAmmanValidator`);
}
}}
className="mt-2 mb-4"
variant="dark"
>
Start validator
</Button>
<Button
size="sm"
disabled={!containerInspect?.State?.Running}
onClick={() => {
ipcDockerToast('StopAmmanValidator');
}}
className="mt-2 mb-4"
variant="dark"
>
Stop Amman validator
</Button>
<Button
size="sm"
disabled={!containerInspect?.State?.Running}
onClick={() => {
ipcDockerToast('StopValidatorContainer');
}}
className="mt-2 mb-4"
variant="dark"
>
Stop Container
</Button>
<Button
size="sm"
disabled={!containerInspect?.State}
onClick={() => {
ipcDockerToast('RemoveValidatorContainer');
}}
className="mt-2 mb-4"
variant="dark"
>
Remove Container
</Button>
}
}}
className="mt-2 mb-4"
variant="dark"
>
Start validator
</Button>
<Button
size="sm"
disabled={!containerInspect?.State?.Running}
onClick={() => {
ipcDockerToast('StopAmmanValidator');
}}
className="mt-2 mb-4"
variant="dark"
>
Stop Amman validator
</Button>
<Button
size="sm"
disabled={!containerInspect?.State?.Running}
onClick={() => {
ipcDockerToast('StopValidatorContainer');
}}
className="mt-2 mb-4"
variant="dark"
>
Stop Container
</Button>
<Button
size="sm"
disabled={!containerInspect?.State}
onClick={() => {
ipcDockerToast('RemoveValidatorContainer');
}}
className="mt-2 mb-4"
variant="dark"
>
Remove Container
</Button>
</div>
</div>
</ButtonToolbar>
<InputGroup size="sm">
<FormControl
ref={filterRef}
placeholder="Filter logs"
aria-label="Amount"
onKeyDown={debounce(() => {
window.electron.ipcRenderer.validatorLogs({
filter: filterRef.current.value || '',
net: validator.net,
});
}, 300)}
/>
</InputGroup>
<div className="overflow-auto">
<pre
className="text-xs bg-surface-600 h-full p-2 whitespace-pre-wrap break-all overflow-auto"
dangerouslySetInnerHTML={{ __html: validatorLogs }}
/>
</div>
</ButtonToolbar>
<InputGroup size="sm">
<FormControl
ref={filterRef}
placeholder="Filter logs"
aria-label="Amount"
onKeyDown={debounce(() => {
window.electron.ipcRenderer.validatorLogs({
filter: filterRef.current.value || '',
net: validator.net,
});
}, 300)}
/>
</InputGroup>
<div className="overflow-auto">
<pre
className="text-xs bg-surface-600 h-full p-2 whitespace-pre-wrap break-all overflow-auto"
// eslint-disable-next-line react/no-danger
dangerouslySetInnerHTML={{ __html: validatorLogs }}
/>
</div>
<div>
<p>Anchor Project</p>
<Button variant="primary">Select Anchor Workspace</Button>
</div>
</div>
);
Expand Down