From 8caf62d728ad2f2f5e85e9120bba58fc228b8e38 Mon Sep 17 00:00:00 2001 From: Elle Kasai Date: Sat, 19 Jun 2021 18:46:55 +0900 Subject: [PATCH 1/7] Workspaces -> Folders --- src/cloud/lib/hooks/sidebar/useCloudSidebarTree.tsx | 2 +- src/cloud/lib/sidebar.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cloud/lib/hooks/sidebar/useCloudSidebarTree.tsx b/src/cloud/lib/hooks/sidebar/useCloudSidebarTree.tsx index a965ba81ee..dd56e18334 100644 --- a/src/cloud/lib/hooks/sidebar/useCloudSidebarTree.tsx +++ b/src/cloud/lib/hooks/sidebar/useCloudSidebarTree.tsx @@ -591,7 +591,7 @@ export function useCloudSidebarTree() { }) tree.push({ - label: 'Workspaces', + label: 'Folders', rows: navTree, controls: currentUserIsCoreMember ? [ diff --git a/src/cloud/lib/sidebar.ts b/src/cloud/lib/sidebar.ts index 07a1402db3..cdc1ff9bcd 100644 --- a/src/cloud/lib/sidebar.ts +++ b/src/cloud/lib/sidebar.ts @@ -1,7 +1,7 @@ export const cloudSidebaCategoryLabels = [ 'Bookmarks', 'Smart Folders', - 'Workspaces', + 'Folders', 'Private', 'Labels', 'More', From bd52dc25131adcd6a97fa4f0d315110197abf576 Mon Sep 17 00:00:00 2001 From: Elle Kasai Date: Sat, 19 Jun 2021 18:51:50 +0900 Subject: [PATCH 2/7] Workspace -> Folder --- .../Workspace/CreateWorkspaceModal.tsx | 2 +- .../contents/Workspace/EditWorkspaceModal.tsx | 2 +- .../contents/Workspace/WorkspaceModalForm.tsx | 4 ++-- .../PreferencesModal/MigrationTab.tsx | 2 +- .../molecules/Export/ExportProgressItem.tsx | 2 +- src/components/organisms/AppNavigator.tsx | 4 ++-- src/components/organisms/SidebarContainer.tsx | 2 +- .../pages/PouchDbDeprecationPage.tsx | 4 ++-- src/components/pages/StorageCreatePage.tsx | 2 +- src/electron/menu.ts | 20 +++++++++---------- src/lib/preferences.ts | 2 +- src/lib/v2/hooks/local/useLocalUI.tsx | 2 +- src/lib/v2/mappers/local/sidebarTree.tsx | 4 ++-- 13 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/cloud/components/organisms/Modal/contents/Workspace/CreateWorkspaceModal.tsx b/src/cloud/components/organisms/Modal/contents/Workspace/CreateWorkspaceModal.tsx index 4b7c5b5bb3..23efafecf5 100644 --- a/src/cloud/components/organisms/Modal/contents/Workspace/CreateWorkspaceModal.tsx +++ b/src/cloud/components/organisms/Modal/contents/Workspace/CreateWorkspaceModal.tsx @@ -5,7 +5,7 @@ import WorkspaceModalForm from './WorkspaceModalForm' const CreateWorkspaceModal = () => { return ( -

Create a Workspace

+

Create a Folder

 ) diff --git a/src/cloud/components/organisms/Modal/contents/Workspace/EditWorkspaceModal.tsx b/src/cloud/components/organisms/Modal/contents/Workspace/EditWorkspaceModal.tsx index a0d2a077f7..f43d38b1cb 100644 --- a/src/cloud/components/organisms/Modal/contents/Workspace/EditWorkspaceModal.tsx +++ b/src/cloud/components/organisms/Modal/contents/Workspace/EditWorkspaceModal.tsx @@ -9,7 +9,7 @@ interface EditWorkspaceModalProps { const EditWorkspaceModal = ({ workspace }: EditWorkspaceModalProps) => { return ( -

Edit your Workspace

+

Edit your Folder

 ) diff --git a/src/cloud/components/organisms/Modal/contents/Workspace/WorkspaceModalForm.tsx b/src/cloud/components/organisms/Modal/contents/Workspace/WorkspaceModalForm.tsx index 7f5a795142..5643260617 100644 --- a/src/cloud/components/organisms/Modal/contents/Workspace/WorkspaceModalForm.tsx +++ b/src/cloud/components/organisms/Modal/contents/Workspace/WorkspaceModalForm.tsx @@ -141,7 +141,7 @@ const WorkspaceModalForm = ({ workspace }: WorkspaceModalFormProps) => { setSending(true) try { if (body.name.trim() === '') { - throw new Error('Workspace name has to be filled.') + throw new Error('Folder name has to be filled.') } if (workspace != null) { await submitEditWorkSpaceHandler(team, workspace, body) @@ -189,7 +189,7 @@ const WorkspaceModalForm = ({ workspace }: WorkspaceModalFormProps) => { diff --git a/src/components/PreferencesModal/MigrationTab.tsx b/src/components/PreferencesModal/MigrationTab.tsx index 66aa1d2aa4..e55dc4e79d 100644 --- a/src/components/PreferencesModal/MigrationTab.tsx +++ b/src/components/PreferencesModal/MigrationTab.tsx @@ -147,7 +147,7 @@ const MigrationPage = ({ storage }: MigrationPageProps) => { -

Workspace

+

Folder

{ inputRef={inputRef} defaultIcon={mdiMessageQuestion} defaultInputValue={workspace.name} - placeholder='Workspace name' + placeholder='Folder name' submitButtonProps={{ label: t('storage.rename'), }} @@ -182,7 +182,7 @@ const TopLevelNavigator = () => { if (workspaceName == '' || workspaceName == null) { pushMessage({ title: 'Cannot rename workspace', - description: 'Workspace name should not be empty.', + description: 'Folder name should not be empty.', }) return } diff --git a/src/components/organisms/SidebarContainer.tsx b/src/components/organisms/SidebarContainer.tsx index 708edaabbb..3ef2dfe612 100644 --- a/src/components/organisms/SidebarContainer.tsx +++ b/src/components/organisms/SidebarContainer.tsx @@ -153,7 +153,7 @@ const SidebarContainer = ({ }, { type: 'normal', - label: 'Export Workspace', + label: 'Export Folder', click: () => exportDocuments(workspace, { folderName: workspace.name, diff --git a/src/components/pages/PouchDbDeprecationPage.tsx b/src/components/pages/PouchDbDeprecationPage.tsx index 72b83e4571..724cacc064 100644 --- a/src/components/pages/PouchDbDeprecationPage.tsx +++ b/src/components/pages/PouchDbDeprecationPage.tsx @@ -29,7 +29,7 @@ const PouchDbDeprecationPage = () => { { type: 'button', props: { - label: 'Convert to File System Workspace', + label: 'Convert to File System Folder', onClick: () => openTab('storage'), }, }, @@ -48,7 +48,7 @@ const PouchDbDeprecationPage = () => { }, { title: - 'You can also export the storage by selecting an app navigator tree, clicking on the context menu of workspace item and selecting "Export Workspace".', + 'You can also export the storage by selecting an app navigator tree, clicking on the context menu of workspace item and selecting "Export Folder".', description: 'Follow further export options and instructions to export all of your notes in desired format. Modify export options in Preferences | Export Settings tab.', }, diff --git a/src/components/pages/StorageCreatePage.tsx b/src/components/pages/StorageCreatePage.tsx index c89b8a68c2..f56c571822 100644 --- a/src/components/pages/StorageCreatePage.tsx +++ b/src/components/pages/StorageCreatePage.tsx @@ -17,7 +17,7 @@ const StorageCreatePage = () => { style={{ marginRight: 10 }} size={16} /> - Create Local Workspace + Create Local Folder ), }} diff --git a/src/electron/menu.ts b/src/electron/menu.ts index f923e5a230..5669a54a6d 100644 --- a/src/electron/menu.ts +++ b/src/electron/menu.ts @@ -195,59 +195,59 @@ export function getTemplateFromKeymap( submenu: [ { type: 'submenu', - label: 'Switch Workspace', + label: 'Switch Folder', submenu: [ { type: 'normal', - label: 'Switch to First Workspace', + label: 'Switch to First Folder', accelerator: mac ? 'Cmd + 1' : 'Ctrl + 1', click: createSwitchWorkspaceHandler(0), }, { type: 'normal', - label: 'Switch to Second Workspace', + label: 'Switch to Second Folder', accelerator: mac ? 'Cmd + 2' : 'Ctrl + 2', click: createSwitchWorkspaceHandler(1), }, { type: 'normal', - label: 'Switch to Third Workspace', + label: 'Switch to Third Folder', accelerator: mac ? 'Cmd + 3' : 'Ctrl + 3', click: createSwitchWorkspaceHandler(2), }, { type: 'normal', - label: 'Switch to 4th Workspace', + label: 'Switch to 4th Folder', accelerator: mac ? 'Cmd + 4' : 'Ctrl + 4', click: createSwitchWorkspaceHandler(3), }, { type: 'normal', - label: 'Switch to 5th Workspace', + label: 'Switch to 5th Folder', accelerator: mac ? 'Cmd + 5' : 'Ctrl + 5', click: createSwitchWorkspaceHandler(4), }, { type: 'normal', - label: 'Switch to 6th Workspace', + label: 'Switch to 6th Folder', accelerator: mac ? 'Cmd + 6' : 'Ctrl + 6', click: createSwitchWorkspaceHandler(5), }, { type: 'normal', - label: 'Switch to 7th Workspace', + label: 'Switch to 7th Folder', accelerator: mac ? 'Cmd + 7' : 'Ctrl + 7', click: createSwitchWorkspaceHandler(6), }, { type: 'normal', - label: 'Switch to 8th Workspace', + label: 'Switch to 8th Folder', accelerator: mac ? 'Cmd + 8' : 'Ctrl + 8', click: createSwitchWorkspaceHandler(7), }, { type: 'normal', - label: 'Switch to 9th Workspace', + label: 'Switch to 9th Folder', accelerator: mac ? 'Cmd + 9' : 'Ctrl + 9', click: createSwitchWorkspaceHandler(8), }, diff --git a/src/lib/preferences.ts b/src/lib/preferences.ts index 467a2fe7fd..d68663f9ef 100644 --- a/src/lib/preferences.ts +++ b/src/lib/preferences.ts @@ -55,7 +55,7 @@ export interface Preferences { 'general.noteSorting': NoteSortingOptions 'general.enableAnalytics': boolean - // Cloud Workspace + // Cloud Folder 'cloud.user': { id: string uniqueName: string diff --git a/src/lib/v2/hooks/local/useLocalUI.tsx b/src/lib/v2/hooks/local/useLocalUI.tsx index 42004180d7..08f9672345 100644 --- a/src/lib/v2/hooks/local/useLocalUI.tsx +++ b/src/lib/v2/hooks/local/useLocalUI.tsx @@ -75,7 +75,7 @@ export function useLocalUI() { if (workspaceName == '') { pushMessage({ title: 'Cannot rename workspace', - description: 'Workspace name should not be empty.', + description: 'Folder name should not be empty.', }) closeModalAndUpdateState() return diff --git a/src/lib/v2/mappers/local/sidebarTree.tsx b/src/lib/v2/mappers/local/sidebarTree.tsx index d4cb26c9da..16a733b384 100644 --- a/src/lib/v2/mappers/local/sidebarTree.tsx +++ b/src/lib/v2/mappers/local/sidebarTree.tsx @@ -136,7 +136,7 @@ export function mapTreeControls( return [ { type: MenuTypes.Normal, - label: 'Export Workspace', + label: 'Export Folder', icon: mdiExport, onClick: () => exportDocuments(workspace, { @@ -447,7 +447,7 @@ export function mapTree( }) } tree.push({ - label: 'Workspace', + label: 'Folder', rows: navTree, controls: [ { From f0ca064fbe665d9defeafef45df930a07849a1ed Mon Sep 17 00:00:00 2001 From: Elle Kasai Date: Sat, 19 Jun 2021 19:29:36 +0900 Subject: [PATCH 3/7] workspace -> folder --- .../molecules/Banner/SubLimitReachedBanner.tsx | 4 ++-- .../Modal/contents/Import/ImportModalGuide.tsx | 2 +- .../Modal/contents/SmartFolder/SmartFolderForm.tsx | 4 ++-- .../Modal/contents/Workspace/WorkspaceModalForm.tsx | 10 +++++----- src/cloud/components/organisms/error/ErrorPage.tsx | 2 +- .../components/organisms/settings/TeamSubLimit.tsx | 2 +- src/cloud/lib/hooks/sidebar/useCloudSidebarDnd.ts | 2 +- src/cloud/lib/hooks/useCloudResourceModals.tsx | 4 ++-- src/cloud/lib/hooks/useWorkspaceDelete.ts | 6 +++--- src/cloud/pages/[teamId]/workspaces/[workspaceId].tsx | 2 +- src/components/molecules/Export/ExportProgressItem.tsx | 4 ++-- src/components/organisms/AppNavigator.tsx | 2 +- src/components/pages/PouchDbDeprecationPage.tsx | 2 +- src/lib/v2/hooks/local/useLocalDnd.ts | 2 +- src/lib/v2/hooks/local/useLocalUI.tsx | 2 +- 15 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/cloud/components/molecules/Banner/SubLimitReachedBanner.tsx b/src/cloud/components/molecules/Banner/SubLimitReachedBanner.tsx index 167860b3a3..0633858611 100644 --- a/src/cloud/components/molecules/Banner/SubLimitReachedBanner.tsx +++ b/src/cloud/components/molecules/Banner/SubLimitReachedBanner.tsx @@ -29,8 +29,8 @@ const DocLimitReachedBanner = () => { {subscription == null - ? `Your workspace exceeds the limit of your current plan. (${freePlanDocLimit} created documents)` - : `Your workspace exceeds the limit of your current plan. (${subscription.seats} team members)`} + ? `Your folder exceeds the limit of your current plan. (${freePlanDocLimit} created documents)` + : `Your folder exceeds the limit of your current plan. (${subscription.seats} team members)`}