From 68b982d8e9de73cea37a2491b848f69ea6989128 Mon Sep 17 00:00:00 2001 From: Julian Gruber Date: Tue, 11 Feb 2025 16:09:54 +0100 Subject: [PATCH] module -> subnet --- ...ODULE_INTERFACE.md => SUBNET_INTERFACE.md} | 0 main/app-menu.js | 4 +- main/core.js | 4 +- main/index.js | 2 +- main/ipc.js | 4 +- main/preload.js | 2 +- main/typings.ts | 2 +- renderer/src/App.tsx | 4 +- .../img/icons/{modules.svg => subnets.svg} | 0 renderer/src/components/Sidebar.tsx | 8 ++-- renderer/src/hooks/Subnets.tsx | 20 +++++----- renderer/src/lib/checker-config.tsx | 4 +- renderer/src/lib/routes.ts | 2 +- .../src/pages/dashboard/ChartController.tsx | 16 ++++---- renderer/src/pages/settings/Settings.tsx | 10 ++--- .../ModuleCard.tsx => subnets/SubnetCard.tsx} | 38 +++++++++---------- .../Modules.tsx => subnets/Subnets.tsx} | 14 +++---- renderer/src/test/settings.test.tsx | 12 +++--- renderer/src/typings.ts | 2 +- 19 files changed, 74 insertions(+), 74 deletions(-) rename docs/{MODULE_INTERFACE.md => SUBNET_INTERFACE.md} (100%) rename renderer/src/assets/img/icons/{modules.svg => subnets.svg} (100%) rename renderer/src/pages/{modules/ModuleCard.tsx => subnets/SubnetCard.tsx} (70%) rename renderer/src/pages/{modules/Modules.tsx => subnets/Subnets.tsx} (53%) diff --git a/docs/MODULE_INTERFACE.md b/docs/SUBNET_INTERFACE.md similarity index 100% rename from docs/MODULE_INTERFACE.md rename to docs/SUBNET_INTERFACE.md diff --git a/main/app-menu.js b/main/app-menu.js index 426b001df..39bd86003 100644 --- a/main/app-menu.js +++ b/main/app-menu.js @@ -11,8 +11,8 @@ function setupAppMenu (/** @type {import('./typings').Context} */ ctx) { // File menu menu.items[1].submenu?.insert(0, new MenuItem({ - label: 'Save Module Logs As…', - click: () => { ctx.saveModuleLogsAs() } + label: 'Save Subnet Logs As…', + click: () => { ctx.saveSubnetLogsAs() } })) Menu.setApplicationMenu(menu) diff --git a/main/core.js b/main/core.js index a5cb9551d..69f37ca0c 100644 --- a/main/core.js +++ b/main/core.js @@ -35,9 +35,9 @@ let totalJobsCompleted = 0 * @param {Context} ctx */ async function setup (ctx) { - ctx.saveModuleLogsAs = async () => { + ctx.saveSubnetLogsAs = async () => { const opts = { - defaultPath: `checker-modules-${(new Date()).getTime()}.log` + defaultPath: `checker-subnets-${(new Date()).getTime()}.log` } // The dialog might not show if the UI is hidden ctx.showUI() diff --git a/main/index.js b/main/index.js index 79d982151..2a5d2e077 100644 --- a/main/index.js +++ b/main/index.js @@ -124,7 +124,7 @@ const ctx = { getWalletBalance: () => wallet.getBalance(), manualCheckForUpdates: () => { throw new Error('never get here') }, - saveModuleLogsAs: () => { throw new Error('never get here') }, + saveSubnetLogsAs: () => { throw new Error('never get here') }, toggleOpenAtLogin: () => { throw new Error('never get here') }, isOpenAtLogin: () => { throw new Error('never get here') }, exportSeedPhrase: () => { throw new Error('never get here') }, diff --git a/main/ipc.js b/main/ipc.js index ff27b621f..43d1082e0 100644 --- a/main/ipc.js +++ b/main/ipc.js @@ -88,8 +88,8 @@ function setupIpcMain (/** @type {Context} */ ctx) { (_events) => ctx.exportSeedPhrase() ) ipcMain.handle( - 'checker:saveModuleLogsAs', - (_events) => ctx.saveModuleLogsAs() + 'checker:saveSubnetLogsAs', + (_events) => ctx.saveSubnetLogsAs() ) ipcMain.handle( 'checker:checkForUpdates', diff --git a/main/preload.js b/main/preload.js index e416fb2d2..d70b12fa3 100644 --- a/main/preload.js +++ b/main/preload.js @@ -47,7 +47,7 @@ contextBridge.exposeInMainWorld('electron', { ipcRenderer.invoke('checker:toggleOpenAtLogin'), isOpenAtLogin: () => ipcRenderer.invoke('checker:isOpenAtLogin'), exportSeedPhrase: () => ipcRenderer.invoke('checker:exportSeedPhrase'), - saveModuleLogsAs: () => ipcRenderer.invoke('checker:saveModuleLogsAs'), + saveSubnetLogsAs: () => ipcRenderer.invoke('checker:saveSubnetLogsAs'), checkForUpdates: () => ipcRenderer.invoke('checker:checkForUpdates') }, checkerEvents: { diff --git a/main/typings.ts b/main/typings.ts index 140c63040..d8df58b84 100644 --- a/main/typings.ts +++ b/main/typings.ts @@ -41,7 +41,7 @@ export interface Context { isShowingUI: boolean; loadWebUIFromDist: import('electron-serve').loadURL; manualCheckForUpdates: () => void; - saveModuleLogsAs: () => Promise; + saveSubnetLogsAs: () => Promise; openReleaseNotes: () => void; restartToUpdate: () => void; diff --git a/renderer/src/App.tsx b/renderer/src/App.tsx index aaaa4025a..1a3390cc2 100644 --- a/renderer/src/App.tsx +++ b/renderer/src/App.tsx @@ -9,7 +9,7 @@ import { ROUTES } from 'src/lib/routes' import Layout from 'src/components/Layout' import Settings from 'src/pages/settings/Settings' import Wallet from 'src/pages/wallet/Wallet' -import Modules from 'src/pages/modules/Modules' +import Subnets from 'src/pages/subnets/Subnets' import { DialogProvider } from './components/DialogProvider' import { TooltipProvider } from '@radix-ui/react-tooltip' @@ -34,7 +34,7 @@ const App = ():JSX.Element => { } /> } /> } /> - } /> + } /> } diff --git a/renderer/src/assets/img/icons/modules.svg b/renderer/src/assets/img/icons/subnets.svg similarity index 100% rename from renderer/src/assets/img/icons/modules.svg rename to renderer/src/assets/img/icons/subnets.svg diff --git a/renderer/src/components/Sidebar.tsx b/renderer/src/components/Sidebar.tsx index 7cf06fabd..63205a76b 100644 --- a/renderer/src/components/Sidebar.tsx +++ b/renderer/src/components/Sidebar.tsx @@ -2,7 +2,7 @@ import { useState } from 'react' import { NavLink } from 'react-router' import { ROUTES } from 'src/lib/routes' import HomeIcon from 'src/assets/img/icons/home.svg?react' -import ModulesIcon from 'src/assets/img/icons/modules.svg?react' +import SubnetsIcon from 'src/assets/img/icons/subnets.svg?react' import WalletIcon from 'src/assets/img/icons/wallet.svg?react' import SettingsIcon from 'src/assets/img/icons/settings.svg?react' import MenuArrow from 'src/assets/img/icons/menu-arrow.svg?react' @@ -17,9 +17,9 @@ const links = [ Icon: HomeIcon }, { - href: ROUTES.modules, - title: 'Modules', - Icon: ModulesIcon + href: ROUTES.subnets, + title: 'Subnets', + Icon: SubnetsIcon }, { href: ROUTES.wallet, diff --git a/renderer/src/hooks/Subnets.tsx b/renderer/src/hooks/Subnets.tsx index 57c2e5604..1c2b58826 100644 --- a/renderer/src/hooks/Subnets.tsx +++ b/renderer/src/hooks/Subnets.tsx @@ -4,7 +4,7 @@ import SparkLogo from 'src/assets/img/icons/spark-logo.png' import SaturnLogo from 'src/assets/img/icons/saturn-logo.svg' /** - * @returns {Promise} The contract address of the Spark module + * @returns {Promise} The contract address of the Spark subnet */ async function getSparkContractAddress () { const name = Name.parse( @@ -82,7 +82,7 @@ async function getSparkTransfersFromStats () { } /** - * @returns {Promise} The total rewards of the Spark module + * @returns {Promise} The total rewards of the Spark subnet */ async function getSparkTotalRewards () { const [balanceHeld, transfersFromStats] = await Promise.all([ @@ -94,7 +94,7 @@ async function getSparkTotalRewards () { } /* eslint-disable max-len */ -export const modules = { +export const subnets = { spark: { name: 'Spark', description: 'Spark is a trustless protocol for sampling retrievals from Filecoin Storage Providers. Spark aims to drive improvements in the retrievability of data stored on Filecoin.', @@ -131,9 +131,9 @@ export const modules = { } } as const -export type Module = (typeof modules)[keyof typeof modules] & {id: string} +export type Subnet = (typeof subnets)[keyof typeof subnets] & {id: string} -export const useModules = () => { +export const useSubnets = () => { const [sparkContractAddress, setSparkContractAddress] = useState() const [sparkTotalRewards, setSparkTotalRewards] = useState(0) @@ -151,19 +151,19 @@ export const useModules = () => { load() }, []) - const modulesUpdated = { - ...modules, + const subnetsUpdated = { + ...subnets, spark: { - ...modules.spark, + ...subnets.spark, contractAddress: sparkContractAddress, stats: { - ...modules.spark.stats, + ...subnets.spark.stats, totalRewards: sparkTotalRewards } } } return { - modules: Object.entries(modulesUpdated).map(([id, mod]) => ({ ...mod, id })) as Module[] + subnets: Object.entries(subnetsUpdated).map(([id, subnet]) => ({ ...subnet, id })) as Subnet[] } } diff --git a/renderer/src/lib/checker-config.tsx b/renderer/src/lib/checker-config.tsx index 735bbb7e6..b29233c76 100644 --- a/renderer/src/lib/checker-config.tsx +++ b/renderer/src/lib/checker-config.tsx @@ -88,8 +88,8 @@ export function exportSeedPhrase () { return window.electron.checkerConfig.exportSeedPhrase() } -export function saveModuleLogsAs () { - return window.electron.checkerConfig.saveModuleLogsAs() +export function saveSubnetLogsAs () { + return window.electron.checkerConfig.saveSubnetLogsAs() } export function checkForUpdates () { diff --git a/renderer/src/lib/routes.ts b/renderer/src/lib/routes.ts index 236f4c8fb..3d85f7bb2 100644 --- a/renderer/src/lib/routes.ts +++ b/renderer/src/lib/routes.ts @@ -1,7 +1,7 @@ export const ROUTES = { onboarding: '/', dashboard: '/dashboard', - modules: '/modules', + subnets: '/subnets', settings: '/settings', wallet: '/wallet' } as const diff --git a/renderer/src/pages/dashboard/ChartController.tsx b/renderer/src/pages/dashboard/ChartController.tsx index c44b5f1c4..919f6e718 100644 --- a/renderer/src/pages/dashboard/ChartController.tsx +++ b/renderer/src/pages/dashboard/ChartController.tsx @@ -26,19 +26,19 @@ function getDataInTimeRange (data: RewardsRecord[], timeRange: TimeRange) { const ChartController = ({ historicalRewards }: {historicalRewards: RewardsRecord[]}) => { const [timeRange, setTimeRange] = useState('7d') - const [moduleId, setModuleId] = useState('all') + const [subnetId, setSubnetId] = useState('all') const filteredHistoricalRewards = useMemo( () => getDataInTimeRange(historicalRewards, timeRange), [timeRange, historicalRewards] ) - const moduleIdsInRange = useMemo( + const subnetIdsInRange = useMemo( () => filteredHistoricalRewards.reduce( (acc, record) => [ ...acc, ...Object.keys(record.totalScheduledRewards).filter((id) => !acc.includes(id)) - ], ['All modules'] + ], ['All subnets'] ), [filteredHistoricalRewards]) return ( @@ -61,13 +61,13 @@ const ChartController = ({ historicalRewards }: {historicalRewards: RewardsRecor ))}