From e940fdcce64ad0faf608852fc564431b9b72e206 Mon Sep 17 00:00:00 2001 From: Alex Freska Date: Wed, 27 Nov 2024 17:16:27 -0500 Subject: [PATCH] refactor(renterd): bulk menu naming --- .../ContractsAddAllowlist.tsx | 0 .../ContractsAddBlocklist.tsx | 0 .../ContractsBulkDelete.tsx} | 2 +- .../ContractsRemoveAllowlist.tsx | 0 .../ContractsRemoveBlocklist.tsx | 0 .../index.tsx | 6 +++--- apps/renterd/components/Contracts/Layout.tsx | 4 ++-- apps/renterd/components/Files/Layout.tsx | 8 ++++---- .../FilesBulkDelete.tsx} | 2 +- .../FilesBulkMove.tsx} | 2 +- .../index.tsx} | 10 +++++----- .../FilesDirectoryDockedControls/index.tsx | 5 ----- .../index.tsx} | 6 +++--- .../FilesFlat/FilesFlatDockedControls/index.tsx | 5 ----- .../HostsAddAllowlist.tsx | 0 .../HostsAddBlocklist.tsx | 0 .../HostsRemoveAllowlist.tsx | 0 .../HostsRemoveBlocklist.tsx | 0 .../HostsResetLostSectorCount.tsx | 0 .../Hosts/{HostsBatchMenu => HostsBulkMenu}/index.tsx | 2 +- apps/renterd/components/Hosts/Layout.tsx | 4 ++-- .../KeysBulkDelete.tsx} | 2 +- .../Keys/{KeysBatchMenu => KeysBulkMenu}/index.tsx | 6 +++--- apps/renterd/components/Keys/KeysDockedControls.tsx | 5 ----- apps/renterd/components/Keys/Layout.tsx | 4 ++-- 25 files changed, 29 insertions(+), 44 deletions(-) rename apps/renterd/components/Contracts/{ContractsBatchMenu => ContractsBulkMenu}/ContractsAddAllowlist.tsx (100%) rename apps/renterd/components/Contracts/{ContractsBatchMenu => ContractsBulkMenu}/ContractsAddBlocklist.tsx (100%) rename apps/renterd/components/Contracts/{ContractsBatchMenu/ContractsBatchDelete.tsx => ContractsBulkMenu/ContractsBulkDelete.tsx} (97%) rename apps/renterd/components/Contracts/{ContractsBatchMenu => ContractsBulkMenu}/ContractsRemoveAllowlist.tsx (100%) rename apps/renterd/components/Contracts/{ContractsBatchMenu => ContractsBulkMenu}/ContractsRemoveBlocklist.tsx (100%) rename apps/renterd/components/Contracts/{ContractsBatchMenu => ContractsBulkMenu}/index.tsx (85%) rename apps/renterd/components/Files/{batchActions/FilesBatchDelete.tsx => bulkActions/FilesBulkDelete.tsx} (98%) rename apps/renterd/components/FilesDirectory/{FilesDirectoryDockedControls/FilesBatchMove.tsx => FilesDirectoryBulkMenu/FilesBulkMove.tsx} (97%) rename apps/renterd/components/FilesDirectory/{FilesDirectoryDockedControls/FilesDirectoryBatchMenu.tsx => FilesDirectoryBulkMenu/index.tsx} (54%) delete mode 100644 apps/renterd/components/FilesDirectory/FilesDirectoryDockedControls/index.tsx rename apps/renterd/components/FilesFlat/{FilesFlatDockedControls/FilesFlatBatchMenu.tsx => FilesFlatBulkMenu/index.tsx} (62%) delete mode 100644 apps/renterd/components/FilesFlat/FilesFlatDockedControls/index.tsx rename apps/renterd/components/Hosts/{HostsBatchMenu => HostsBulkMenu}/HostsAddAllowlist.tsx (100%) rename apps/renterd/components/Hosts/{HostsBatchMenu => HostsBulkMenu}/HostsAddBlocklist.tsx (100%) rename apps/renterd/components/Hosts/{HostsBatchMenu => HostsBulkMenu}/HostsRemoveAllowlist.tsx (100%) rename apps/renterd/components/Hosts/{HostsBatchMenu => HostsBulkMenu}/HostsRemoveBlocklist.tsx (100%) rename apps/renterd/components/Hosts/{HostsBatchMenu => HostsBulkMenu}/HostsResetLostSectorCount.tsx (100%) rename apps/renterd/components/Hosts/{HostsBatchMenu => HostsBulkMenu}/index.tsx (96%) rename apps/renterd/components/Keys/{KeysBatchMenu/KeysBatchDelete.tsx => KeysBulkMenu/KeysBulkDelete.tsx} (98%) rename apps/renterd/components/Keys/{KeysBatchMenu => KeysBulkMenu}/index.tsx (70%) delete mode 100644 apps/renterd/components/Keys/KeysDockedControls.tsx diff --git a/apps/renterd/components/Contracts/ContractsBatchMenu/ContractsAddAllowlist.tsx b/apps/renterd/components/Contracts/ContractsBulkMenu/ContractsAddAllowlist.tsx similarity index 100% rename from apps/renterd/components/Contracts/ContractsBatchMenu/ContractsAddAllowlist.tsx rename to apps/renterd/components/Contracts/ContractsBulkMenu/ContractsAddAllowlist.tsx diff --git a/apps/renterd/components/Contracts/ContractsBatchMenu/ContractsAddBlocklist.tsx b/apps/renterd/components/Contracts/ContractsBulkMenu/ContractsAddBlocklist.tsx similarity index 100% rename from apps/renterd/components/Contracts/ContractsBatchMenu/ContractsAddBlocklist.tsx rename to apps/renterd/components/Contracts/ContractsBulkMenu/ContractsAddBlocklist.tsx diff --git a/apps/renterd/components/Contracts/ContractsBatchMenu/ContractsBatchDelete.tsx b/apps/renterd/components/Contracts/ContractsBulkMenu/ContractsBulkDelete.tsx similarity index 97% rename from apps/renterd/components/Contracts/ContractsBatchMenu/ContractsBatchDelete.tsx rename to apps/renterd/components/Contracts/ContractsBulkMenu/ContractsBulkDelete.tsx index 66472c297..7288c40a2 100644 --- a/apps/renterd/components/Contracts/ContractsBatchMenu/ContractsBatchDelete.tsx +++ b/apps/renterd/components/Contracts/ContractsBulkMenu/ContractsBulkDelete.tsx @@ -10,7 +10,7 @@ import { useDialog } from '../../../contexts/dialog' import { useContracts } from '../../../contexts/contracts' import { pluralize } from '@siafoundation/units' -export function ContractsBatchDelete() { +export function ContractsBulkDelete() { const { multiSelect } = useContracts() const ids = useMemo( diff --git a/apps/renterd/components/Contracts/ContractsBatchMenu/ContractsRemoveAllowlist.tsx b/apps/renterd/components/Contracts/ContractsBulkMenu/ContractsRemoveAllowlist.tsx similarity index 100% rename from apps/renterd/components/Contracts/ContractsBatchMenu/ContractsRemoveAllowlist.tsx rename to apps/renterd/components/Contracts/ContractsBulkMenu/ContractsRemoveAllowlist.tsx diff --git a/apps/renterd/components/Contracts/ContractsBatchMenu/ContractsRemoveBlocklist.tsx b/apps/renterd/components/Contracts/ContractsBulkMenu/ContractsRemoveBlocklist.tsx similarity index 100% rename from apps/renterd/components/Contracts/ContractsBatchMenu/ContractsRemoveBlocklist.tsx rename to apps/renterd/components/Contracts/ContractsBulkMenu/ContractsRemoveBlocklist.tsx diff --git a/apps/renterd/components/Contracts/ContractsBatchMenu/index.tsx b/apps/renterd/components/Contracts/ContractsBulkMenu/index.tsx similarity index 85% rename from apps/renterd/components/Contracts/ContractsBatchMenu/index.tsx rename to apps/renterd/components/Contracts/ContractsBulkMenu/index.tsx index cfa638f61..3d26a754c 100644 --- a/apps/renterd/components/Contracts/ContractsBatchMenu/index.tsx +++ b/apps/renterd/components/Contracts/ContractsBulkMenu/index.tsx @@ -1,12 +1,12 @@ import { MultiSelectionMenu } from '@siafoundation/design-system' import { useContracts } from '../../../contexts/contracts' -import { ContractsBatchDelete } from './ContractsBatchDelete' +import { ContractsBulkDelete } from './ContractsBulkDelete' import { ContractsAddBlocklist } from './ContractsAddBlocklist' import { ContractsAddAllowlist } from './ContractsAddAllowlist' import { ContractsRemoveBlocklist } from './ContractsRemoveBlocklist' import { ContractsRemoveAllowlist } from './ContractsRemoveAllowlist' -export function ContractsBatchMenu() { +export function ContractsBulkMenu() { const { multiSelect } = useContracts() return ( @@ -19,7 +19,7 @@ export function ContractsBatchMenu() { - + ) } diff --git a/apps/renterd/components/Contracts/Layout.tsx b/apps/renterd/components/Contracts/Layout.tsx index 5a86058f2..a8d2465ab 100644 --- a/apps/renterd/components/Contracts/Layout.tsx +++ b/apps/renterd/components/Contracts/Layout.tsx @@ -7,7 +7,7 @@ import { } from '../RenterdAuthedLayout' import { ContractsActionsMenu } from './ContractsActionsMenu' import { ContractsFilterBar } from './ContractsFilterBar' -import { ContractsBatchMenu } from './ContractsBatchMenu' +import { ContractsBulkMenu } from './ContractsBulkMenu' export const Layout = RenterdAuthedLayout export function useLayoutProps(): RenterdAuthedPageLayoutProps { @@ -21,6 +21,6 @@ export function useLayoutProps(): RenterdAuthedPageLayoutProps { stats: , size: 'full', scroll: false, - dockedControls: , + dockedControls: , } } diff --git a/apps/renterd/components/Files/Layout.tsx b/apps/renterd/components/Files/Layout.tsx index 98a3c0b6a..4c226c745 100644 --- a/apps/renterd/components/Files/Layout.tsx +++ b/apps/renterd/components/Files/Layout.tsx @@ -9,9 +9,9 @@ import { } from '../RenterdAuthedLayout' import { FilesActionsMenu } from '../FilesDirectory/FilesActionsMenu' import { FilesStatsMenu } from '../FilesDirectory/FilesStatsMenu' -import { FilesDirectoryDockedControls } from '../FilesDirectory/FilesDirectoryDockedControls' +import { FilesDirectoryBulkMenu } from '../FilesDirectory/FilesDirectoryBulkMenu' import { useFilesManager } from '../../contexts/filesManager' -import { FilesFlatDockedControls } from '../FilesFlat/FilesFlatDockedControls' +import { FilesFlatBulkMenu } from '../FilesFlat/FilesFlatBulkMenu' export const Layout = RenterdAuthedLayout export function useLayoutProps(): RenterdAuthedPageLayoutProps { @@ -31,7 +31,7 @@ export function useLayoutProps(): RenterdAuthedPageLayoutProps { nav: , stats: , actions: , - dockedControls: , + dockedControls: , } } @@ -44,6 +44,6 @@ export function useLayoutProps(): RenterdAuthedPageLayoutProps { nav: , stats: , actions: , - dockedControls: , + dockedControls: , } } diff --git a/apps/renterd/components/Files/batchActions/FilesBatchDelete.tsx b/apps/renterd/components/Files/bulkActions/FilesBulkDelete.tsx similarity index 98% rename from apps/renterd/components/Files/batchActions/FilesBatchDelete.tsx rename to apps/renterd/components/Files/bulkActions/FilesBulkDelete.tsx index ec3d911b7..c5d44c4f9 100644 --- a/apps/renterd/components/Files/batchActions/FilesBatchDelete.tsx +++ b/apps/renterd/components/Files/bulkActions/FilesBulkDelete.tsx @@ -11,7 +11,7 @@ import { useObjectsRemove } from '@siafoundation/renterd-react' import { ObjectData } from '../../../contexts/filesManager/types' import { pluralize } from '@siafoundation/units' -export function FilesBatchDelete({ +export function FilesBulkDelete({ multiSelect, }: { multiSelect: MultiSelect diff --git a/apps/renterd/components/FilesDirectory/FilesDirectoryDockedControls/FilesBatchMove.tsx b/apps/renterd/components/FilesDirectory/FilesDirectoryBulkMenu/FilesBulkMove.tsx similarity index 97% rename from apps/renterd/components/FilesDirectory/FilesDirectoryDockedControls/FilesBatchMove.tsx rename to apps/renterd/components/FilesDirectory/FilesDirectoryBulkMenu/FilesBulkMove.tsx index 968a8748b..18d36dbf7 100644 --- a/apps/renterd/components/FilesDirectory/FilesDirectoryDockedControls/FilesBatchMove.tsx +++ b/apps/renterd/components/FilesDirectory/FilesDirectoryBulkMenu/FilesBulkMove.tsx @@ -3,7 +3,7 @@ import { FolderMoveTo16 } from '@siafoundation/react-icons' import { useFilesDirectory } from '../../../contexts/filesDirectory' import { useDialog } from '../../../contexts/dialog' -export function FilesBatchMove() { +export function FilesBulkMove() { const { openConfirmDialog } = useDialog() const { multiSelect, moveSelectedFiles, moveSelectedFilesOperationCount } = useFilesDirectory() diff --git a/apps/renterd/components/FilesDirectory/FilesDirectoryDockedControls/FilesDirectoryBatchMenu.tsx b/apps/renterd/components/FilesDirectory/FilesDirectoryBulkMenu/index.tsx similarity index 54% rename from apps/renterd/components/FilesDirectory/FilesDirectoryDockedControls/FilesDirectoryBatchMenu.tsx rename to apps/renterd/components/FilesDirectory/FilesDirectoryBulkMenu/index.tsx index bdbd36ae8..5c584a0a8 100644 --- a/apps/renterd/components/FilesDirectory/FilesDirectoryDockedControls/FilesDirectoryBatchMenu.tsx +++ b/apps/renterd/components/FilesDirectory/FilesDirectoryBulkMenu/index.tsx @@ -1,15 +1,15 @@ import { MultiSelectionMenu } from '@siafoundation/design-system' -import { FilesBatchDelete } from '../../Files/batchActions/FilesBatchDelete' +import { FilesBulkDelete } from '../../Files/bulkActions/FilesBulkDelete' import { useFilesDirectory } from '../../../contexts/filesDirectory' -import { FilesBatchMove } from './FilesBatchMove' +import { FilesBulkMove } from './FilesBulkMove' -export function FilesDirectoryBatchMenu() { +export function FilesDirectoryBulkMenu() { const { multiSelect } = useFilesDirectory() return ( - - + + ) } diff --git a/apps/renterd/components/FilesDirectory/FilesDirectoryDockedControls/index.tsx b/apps/renterd/components/FilesDirectory/FilesDirectoryDockedControls/index.tsx deleted file mode 100644 index 77feb42ce..000000000 --- a/apps/renterd/components/FilesDirectory/FilesDirectoryDockedControls/index.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import { FilesDirectoryBatchMenu } from './FilesDirectoryBatchMenu' - -export function FilesDirectoryDockedControls() { - return -} diff --git a/apps/renterd/components/FilesFlat/FilesFlatDockedControls/FilesFlatBatchMenu.tsx b/apps/renterd/components/FilesFlat/FilesFlatBulkMenu/index.tsx similarity index 62% rename from apps/renterd/components/FilesFlat/FilesFlatDockedControls/FilesFlatBatchMenu.tsx rename to apps/renterd/components/FilesFlat/FilesFlatBulkMenu/index.tsx index 7354079b1..96ebeea62 100644 --- a/apps/renterd/components/FilesFlat/FilesFlatDockedControls/FilesFlatBatchMenu.tsx +++ b/apps/renterd/components/FilesFlat/FilesFlatBulkMenu/index.tsx @@ -1,13 +1,13 @@ import { MultiSelectionMenu } from '@siafoundation/design-system' -import { FilesBatchDelete } from '../../Files/batchActions/FilesBatchDelete' +import { FilesBulkDelete } from '../../Files/bulkActions/FilesBulkDelete' import { useFilesFlat } from '../../../contexts/filesFlat' -export function FilesFlatBatchMenu() { +export function FilesFlatBulkMenu() { const { multiSelect } = useFilesFlat() return ( - + ) } diff --git a/apps/renterd/components/FilesFlat/FilesFlatDockedControls/index.tsx b/apps/renterd/components/FilesFlat/FilesFlatDockedControls/index.tsx deleted file mode 100644 index 48a9fb6e7..000000000 --- a/apps/renterd/components/FilesFlat/FilesFlatDockedControls/index.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import { FilesFlatBatchMenu } from './FilesFlatBatchMenu' - -export function FilesFlatDockedControls() { - return -} diff --git a/apps/renterd/components/Hosts/HostsBatchMenu/HostsAddAllowlist.tsx b/apps/renterd/components/Hosts/HostsBulkMenu/HostsAddAllowlist.tsx similarity index 100% rename from apps/renterd/components/Hosts/HostsBatchMenu/HostsAddAllowlist.tsx rename to apps/renterd/components/Hosts/HostsBulkMenu/HostsAddAllowlist.tsx diff --git a/apps/renterd/components/Hosts/HostsBatchMenu/HostsAddBlocklist.tsx b/apps/renterd/components/Hosts/HostsBulkMenu/HostsAddBlocklist.tsx similarity index 100% rename from apps/renterd/components/Hosts/HostsBatchMenu/HostsAddBlocklist.tsx rename to apps/renterd/components/Hosts/HostsBulkMenu/HostsAddBlocklist.tsx diff --git a/apps/renterd/components/Hosts/HostsBatchMenu/HostsRemoveAllowlist.tsx b/apps/renterd/components/Hosts/HostsBulkMenu/HostsRemoveAllowlist.tsx similarity index 100% rename from apps/renterd/components/Hosts/HostsBatchMenu/HostsRemoveAllowlist.tsx rename to apps/renterd/components/Hosts/HostsBulkMenu/HostsRemoveAllowlist.tsx diff --git a/apps/renterd/components/Hosts/HostsBatchMenu/HostsRemoveBlocklist.tsx b/apps/renterd/components/Hosts/HostsBulkMenu/HostsRemoveBlocklist.tsx similarity index 100% rename from apps/renterd/components/Hosts/HostsBatchMenu/HostsRemoveBlocklist.tsx rename to apps/renterd/components/Hosts/HostsBulkMenu/HostsRemoveBlocklist.tsx diff --git a/apps/renterd/components/Hosts/HostsBatchMenu/HostsResetLostSectorCount.tsx b/apps/renterd/components/Hosts/HostsBulkMenu/HostsResetLostSectorCount.tsx similarity index 100% rename from apps/renterd/components/Hosts/HostsBatchMenu/HostsResetLostSectorCount.tsx rename to apps/renterd/components/Hosts/HostsBulkMenu/HostsResetLostSectorCount.tsx diff --git a/apps/renterd/components/Hosts/HostsBatchMenu/index.tsx b/apps/renterd/components/Hosts/HostsBulkMenu/index.tsx similarity index 96% rename from apps/renterd/components/Hosts/HostsBatchMenu/index.tsx rename to apps/renterd/components/Hosts/HostsBulkMenu/index.tsx index 6138e5ec7..c020341a6 100644 --- a/apps/renterd/components/Hosts/HostsBatchMenu/index.tsx +++ b/apps/renterd/components/Hosts/HostsBulkMenu/index.tsx @@ -6,7 +6,7 @@ import { HostsRemoveBlocklist } from './HostsRemoveBlocklist' import { HostsRemoveAllowlist } from './HostsRemoveAllowlist' import { useHosts } from '../../../contexts/hosts' -export function HostsBatchMenu() { +export function HostsBulkMenu() { const { multiSelect } = useHosts() return ( diff --git a/apps/renterd/components/Hosts/Layout.tsx b/apps/renterd/components/Hosts/Layout.tsx index 40a46926d..024e1e9c9 100644 --- a/apps/renterd/components/Hosts/Layout.tsx +++ b/apps/renterd/components/Hosts/Layout.tsx @@ -7,7 +7,7 @@ import { } from '../RenterdAuthedLayout' import { HostsActionsMenu } from './HostsActionsMenu' import { HostsFilterBar } from './HostsFilterBar' -import { HostsBatchMenu } from './HostsBatchMenu' +import { HostsBulkMenu } from './HostsBulkMenu' export const Layout = RenterdAuthedLayout export function useLayoutProps(): RenterdAuthedPageLayoutProps { @@ -21,6 +21,6 @@ export function useLayoutProps(): RenterdAuthedPageLayoutProps { actions: , stats: , scroll: false, - dockedControls: , + dockedControls: , } } diff --git a/apps/renterd/components/Keys/KeysBatchMenu/KeysBatchDelete.tsx b/apps/renterd/components/Keys/KeysBulkMenu/KeysBulkDelete.tsx similarity index 98% rename from apps/renterd/components/Keys/KeysBatchMenu/KeysBatchDelete.tsx rename to apps/renterd/components/Keys/KeysBulkMenu/KeysBulkDelete.tsx index 1fd8c5bb9..f7e7b465e 100644 --- a/apps/renterd/components/Keys/KeysBatchMenu/KeysBatchDelete.tsx +++ b/apps/renterd/components/Keys/KeysBulkMenu/KeysBulkDelete.tsx @@ -14,7 +14,7 @@ import { omit } from '@technically/lodash' import { useDialog } from '../../../contexts/dialog' import { useKeys } from '../../../contexts/keys' -export function KeysBatchDelete() { +export function KeysBulkDelete() { const { multiSelect } = useKeys() const keys = useMemo( diff --git a/apps/renterd/components/Keys/KeysBatchMenu/index.tsx b/apps/renterd/components/Keys/KeysBulkMenu/index.tsx similarity index 70% rename from apps/renterd/components/Keys/KeysBatchMenu/index.tsx rename to apps/renterd/components/Keys/KeysBulkMenu/index.tsx index 2de5888d2..e8f906f7b 100644 --- a/apps/renterd/components/Keys/KeysBatchMenu/index.tsx +++ b/apps/renterd/components/Keys/KeysBulkMenu/index.tsx @@ -1,13 +1,13 @@ import { MultiSelectionMenu } from '@siafoundation/design-system' import { useKeys } from '../../../contexts/keys' -import { KeysBatchDelete } from './KeysBatchDelete' +import { KeysBulkDelete } from './KeysBulkDelete' -export function KeysBatchMenu() { +export function KeysBulkMenu() { const { multiSelect } = useKeys() return ( - + ) } diff --git a/apps/renterd/components/Keys/KeysDockedControls.tsx b/apps/renterd/components/Keys/KeysDockedControls.tsx deleted file mode 100644 index f2b5adfaa..000000000 --- a/apps/renterd/components/Keys/KeysDockedControls.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import { KeysBatchMenu } from './KeysBatchMenu' - -export function KeysDockedControls() { - return -} diff --git a/apps/renterd/components/Keys/Layout.tsx b/apps/renterd/components/Keys/Layout.tsx index 6f367c814..a538f67b6 100644 --- a/apps/renterd/components/Keys/Layout.tsx +++ b/apps/renterd/components/Keys/Layout.tsx @@ -7,7 +7,7 @@ import { } from '../RenterdAuthedLayout' import { KeysActionsMenu } from './KeysActionsMenu' import { KeysStatsMenu } from './KeysStatsMenu' -import { KeysDockedControls } from './KeysDockedControls' +import { KeysBulkMenu } from './KeysBulkMenu' export const Layout = RenterdAuthedLayout export function useLayoutProps(): RenterdAuthedPageLayoutProps { @@ -19,6 +19,6 @@ export function useLayoutProps(): RenterdAuthedPageLayoutProps { openSettings: () => openDialog('settings'), actions: , stats: , - dockedControls: , + dockedControls: , } }