From c43c13525d9d267719c6743276b54dfd6b0f460e Mon Sep 17 00:00:00 2001 From: Marcin Rataj Date: Thu, 14 Nov 2024 18:31:19 +0100 Subject: [PATCH 1/5] docs: clarify mfs total size caveat --- public/locales/en/files.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/locales/en/files.json b/public/locales/en/files.json index d49556511..10a103327 100644 --- a/public/locales/en/files.json +++ b/public/locales/en/files.json @@ -115,8 +115,8 @@ "clickToCancel": "Click to cancel", "blocks": "Blocks", "allBlocks": "All blocks", - "allBlocksDescription": "Total size of blocks on your entire IPFS node; this includes everything in Files, plus all locally pinned items and any temporary cached data", - "filesDescription": "Total size of data in the current directory (if a subdirectory, the size of all data in Files is also displayed)", + "allBlocksDescription": "Total size of blocks on your entire IPFS node; this includes everything in Files view (MFS), plus any additional low-level pins and any temporary cached blocks that were not garbage-collected yet.", + "filesDescription": "Total size of data in the current directory (if a subdirectory, the size of all data in Files view (MFS) is also displayed). If you have a big directory that is only partially fetched, a total size listed here could be bigger than your local repository.", "pinningQueue": "Pinning queue", "more": "More", "files": "Files", From 1f0ffbfe6c81d66e082491bfc9bfec72513dc313 Mon Sep 17 00:00:00 2001 From: Marcin Rataj Date: Thu, 14 Nov 2024 20:59:15 +0100 Subject: [PATCH 2/5] refactor: rename to localDatastoreDescription reducing confusion + forcing fresh translation without historical ones --- public/locales/en/files.json | 4 ++-- src/files/header/Header.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/locales/en/files.json b/public/locales/en/files.json index 10a103327..1ffa15023 100644 --- a/public/locales/en/files.json +++ b/public/locales/en/files.json @@ -114,8 +114,8 @@ "clickToDismiss": "Click to dismiss", "clickToCancel": "Click to cancel", "blocks": "Blocks", - "allBlocks": "All blocks", - "allBlocksDescription": "Total size of blocks on your entire IPFS node; this includes everything in Files view (MFS), plus any additional low-level pins and any temporary cached blocks that were not garbage-collected yet.", + "localDatastore": "Local Datastore", + "localDatastoreDescription": "Total size of all blocks currently stored on your IPFS node; this includes everything in the Files view (MFS), plus any additional low-level pins and any temporary cached blocks that were not garbage-collected yet.", "filesDescription": "Total size of data in the current directory (if a subdirectory, the size of all data in Files view (MFS) is also displayed). If you have a big directory that is only partially fetched, a total size listed here could be bigger than your local repository.", "pinningQueue": "Pinning queue", "more": "More", diff --git a/src/files/header/Header.js b/src/files/header/Header.js index 36298d287..6a14cd2fb 100644 --- a/src/files/header/Header.js +++ b/src/files/header/Header.js @@ -82,7 +82,7 @@ class Header extends React.Component { : size(filesSize) } - + { size(repoSize) } From 172cb4271b05e967dd45eddd524a348f789dd516 Mon Sep 17 00:00:00 2001 From: Marcin Rataj Date: Thu, 14 Nov 2024 21:31:12 +0100 Subject: [PATCH 3/5] refactor: rename to currentLocation similar, make it more clear the value applies to currently displayed directory --- public/locales/en/files.json | 4 +++- src/files/header/Header.js | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/public/locales/en/files.json b/public/locales/en/files.json index 1ffa15023..ef176e075 100644 --- a/public/locales/en/files.json +++ b/public/locales/en/files.json @@ -116,7 +116,9 @@ "blocks": "Blocks", "localDatastore": "Local Datastore", "localDatastoreDescription": "Total size of all blocks currently stored on your IPFS node; this includes everything in the Files view (MFS), plus any additional low-level pins and any temporary cached blocks that were not garbage-collected yet.", - "filesDescription": "Total size of data in the current directory (if a subdirectory, the size of all data in Files view (MFS) is also displayed). If you have a big directory that is only partially fetched, a total size listed here could be bigger than your local repository.", + "currentLocationRoot": "My Files", + "currentLocation": "Current Location", + "currentLocationDescription": "Total size of data in the current directory (if a subdirectory, the size of all data in Files view (MFS) is also displayed). This value includes both local and remote blocks. If you have a big directory that is only partially fetched, a total size listed here could be bigger than your local repository.", "pinningQueue": "Pinning queue", "more": "More", "files": "Files", diff --git a/src/files/header/Header.js b/src/files/header/Header.js index 6a14cd2fb..ce9142109 100644 --- a/src/files/header/Header.js +++ b/src/files/header/Header.js @@ -72,7 +72,7 @@ class Header extends React.Component { className='fill-teal PendingAnimation' /> } - + { hasUpperDirectory ? ( From 607b8116749c3f8f7cebaa7a7c75cca045a81692 Mon Sep 17 00:00:00 2001 From: Marcin Rataj Date: Thu, 14 Nov 2024 22:10:35 +0100 Subject: [PATCH 4/5] docs: add preloadNote --- public/locales/en/files.json | 1 + src/files/modals/add-by-path-modal/AddByPathModal.js | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/public/locales/en/files.json b/public/locales/en/files.json index ef176e075..b05fc26f7 100644 --- a/public/locales/en/files.json +++ b/public/locales/en/files.json @@ -54,6 +54,7 @@ "addByPathModal": { "title": "Import from IPFS", "description": "Insert an IPFS path (CID) to import.", + "preloadNote": "NOTE: Imported path is lazy-loaded by default, and will be retrieved on-demand as you browse it. To proactively prefetch imported path to the local Datastore, choose ”Download” from the context menu.", "importPathPlaceholder": "Path or CID (required)", "namePlaceholder": "Name (optional)", "examples": "Examples:" diff --git a/src/files/modals/add-by-path-modal/AddByPathModal.js b/src/files/modals/add-by-path-modal/AddByPathModal.js index 251fada86..b5b1ca7f8 100644 --- a/src/files/modals/add-by-path-modal/AddByPathModal.js +++ b/src/files/modals/add-by-path-modal/AddByPathModal.js @@ -106,6 +106,10 @@ class AddByPathModal extends React.Component { name='name' className='input-reset charcoal ba b--black-20 br1 pa2 mb2 db w-90 center focus-outline' type='text' /> + +
+

{t('addByPathModal.preloadNote')}

+
From e36311ee3981a9dfaf497490fb7bd7e42f739514 Mon Sep 17 00:00:00 2001 From: Marcin Rataj Date: Thu, 14 Nov 2024 22:35:35 +0100 Subject: [PATCH 5/5] docs: clarify size value sources --- public/locales/en/files.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/locales/en/files.json b/public/locales/en/files.json index b05fc26f7..0614e005d 100644 --- a/public/locales/en/files.json +++ b/public/locales/en/files.json @@ -116,10 +116,10 @@ "clickToCancel": "Click to cancel", "blocks": "Blocks", "localDatastore": "Local Datastore", - "localDatastoreDescription": "Total size of all blocks currently stored on your IPFS node; this includes everything in the Files view (MFS), plus any additional low-level pins and any temporary cached blocks that were not garbage-collected yet.", + "localDatastoreDescription": "Total size of all blocks currently stored in the Datastore of your IPFS node (“RepoSize” from “ipfs repo stat”). This includes everything in the Files view (MFS), low-level pins, and any recently removed or temporary cached blocks that were not garbage-collected yet.", "currentLocationRoot": "My Files", "currentLocation": "Current Location", - "currentLocationDescription": "Total size of data in the current directory (if a subdirectory, the size of all data in Files view (MFS) is also displayed). This value includes both local and remote blocks. If you have a big directory that is only partially fetched, a total size listed here could be bigger than your local repository.", + "currentLocationDescription": "Total size of the DAG behind the current directory (“CumulativeSize” from “ipfs files stat”). This value includes both local and remote blocks, and could be bigger than the size of your local datastore.", "pinningQueue": "Pinning queue", "more": "More", "files": "Files",