This is an automated email from the ASF dual-hosted git repository.
amaranhao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-fauxton.git
The following commit(s) were added to refs/heads/master by this push:
new 9dada0e Remove deprecated size properties from .info() (#1222)
9dada0e is described below
commit 9dada0e73f33e3143e3fcab4a9e4f6486816f2c3
Author: Alexis Côté <popoja...@users.noreply.github.com>
AuthorDate: Tue Sep 24 14:59:34 2019 -0400
Remove deprecated size properties from .info() (#1222)
* Remove deprecated size properties from .info()
* Apply review comments
---
app/addons/databases/__tests__/components.test.js | 14 +++++++-------
app/addons/databases/__tests__/stores.test.js | 13 ++++++++-----
app/addons/databases/stores.js | 3 ++-
.../documents/designdocinfo/components/DesignDocInfo.js | 5 +++--
4 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/app/addons/databases/__tests__/components.test.js
b/app/addons/databases/__tests__/components.test.js
index c1f83a1..6522e5d 100644
--- a/app/addons/databases/__tests__/components.test.js
+++ b/app/addons/databases/__tests__/components.test.js
@@ -116,7 +116,7 @@ describe('DatabaseTable', () => {
beforeEach(() => {
Actions.updateDatabases({
dbList: ['db1'],
- databaseDetails: [{db_name: 'db1', doc_count: 0, doc_del_count: 0}],
+ databaseDetails: [{db_name: 'db1', doc_count: 0, doc_del_count: 0,
sizes: {}}],
failedDbs: ['db1'],
fullDbList: ['db1']
});
@@ -165,7 +165,7 @@ describe('DatabaseTable', () => {
Actions.updateDatabases({
dbList: ['db1'],
- databaseDetails: [{db_name: 'db1', doc_count: 0, doc_del_count: 0}],
+ databaseDetails: [{db_name: 'db1', doc_count: 0, doc_del_count: 0,
sizes: {}}],
failedDbs: [],
fullDbList: ['db1']
});
@@ -188,7 +188,7 @@ describe('DatabaseTable', () => {
it('shows error message if row marked as failed to load', () => {
Actions.updateDatabases({
dbList: ['db1'],
- databaseDetails: [{db_name: 'db1', doc_count: 0, doc_del_count: 0}],
+ databaseDetails: [{db_name: 'db1', doc_count: 0, doc_del_count: 0,
sizes: {}}],
failedDbs: ['db1'],
fullDbList: ['db1']
});
@@ -204,7 +204,7 @@ describe('DatabaseTable', () => {
it('shows no error if row marked as loaded', () => {
Actions.updateDatabases({
dbList: ['db1'],
- databaseDetails: [{db_name: 'db1', doc_count: 0, doc_del_count: 0}],
+ databaseDetails: [{db_name: 'db1', doc_count: 0, doc_del_count: 0,
sizes: {}}],
failedDbs: [],
fullDbList: ['db1']
});
@@ -221,7 +221,7 @@ describe('DatabaseTable', () => {
it('shows Partitioned column only when prop is set to true', () => {
Actions.updateDatabases({
dbList: ['db1'],
- databaseDetails: [{db_name: 'db1', doc_count: 0, doc_del_count: 0,
props: {partitioned: true}}],
+ databaseDetails: [{db_name: 'db1', doc_count: 0, doc_del_count: 0,
sizes:{}, props: {partitioned: true}}],
failedDbs: [],
fullDbList: ['db1']
});
@@ -245,8 +245,8 @@ describe('DatabaseTable', () => {
Actions.updateDatabases({
dbList: ['db1', 'db2'],
databaseDetails: [
- {db_name: 'db1', doc_count: 1, doc_del_count: 0, props: {partitioned:
true}},
- {db_name: 'db2', doc_count: 2, doc_del_count: 0, props: {partitioned:
false}}
+ {db_name: 'db1', doc_count: 1, doc_del_count: 0, sizes: {}, props:
{partitioned: true}},
+ {db_name: 'db2', doc_count: 2, doc_del_count: 0, sizes: {}, props:
{partitioned: false}}
],
failedDbs: [],
fullDbList: ['db1', 'db2']
diff --git a/app/addons/databases/__tests__/stores.test.js
b/app/addons/databases/__tests__/stores.test.js
index d3483d4..0e94b11 100644
--- a/app/addons/databases/__tests__/stores.test.js
+++ b/app/addons/databases/__tests__/stores.test.js
@@ -27,7 +27,7 @@ describe('Databases Store', function () {
it('marks failed detail fetches as failed dbs', () => {
DatabaseActions.updateDatabases({
dbList: ['db1', 'db2'],
- databaseDetails: [{db_name: 'db1'}, {db_name: 'db2'}],
+ databaseDetails: [{db_name: 'db1', sizes: {}}, {db_name: 'db2', sizes:
{}}],
failedDbs: ['db1']
});
@@ -39,7 +39,7 @@ describe('Databases Store', function () {
it('unions details', () => {
DatabaseActions.updateDatabases({
dbList: ['db1'],
- databaseDetails: [{db_name: 'db1', doc_count: 5, doc_del_count: 3}],
+ databaseDetails: [{db_name: 'db1', doc_count: 5, doc_del_count: 3,
sizes: {}}],
failedDbs: []
});
@@ -60,15 +60,18 @@ describe('Databases Store', function () {
expect(!store.doesDatabaseExist('db3')).toBeTruthy();
});
- it('uses the data_size prop', () => {
+ it('uses the sizes.active prop', () => {
DatabaseActions.updateDatabases({
dbList: ['db1'],
databaseDetails: [{
db_name: 'db1',
doc_count: 5,
doc_del_count: 3,
- data_size: 1337,
- disk_size: 0
+ sizes: {
+ active: 1337,
+ external: 0,
+ file: 0,
+ }
}],
failedDbs: []
});
diff --git a/app/addons/databases/stores.js b/app/addons/databases/stores.js
index 2f77c4d..b3e05bc 100644
--- a/app/addons/databases/stores.js
+++ b/app/addons/databases/stores.js
@@ -112,7 +112,8 @@ const DatabasesStoreConstructor = FauxtonAPI.Store.extend({
if (!details) {
return {};
}
- const dataSize = details.data_size || details.disk_size || 0;
+ const {sizes} = details;
+ const dataSize = sizes.active || 0;
return {
dataSize: Helpers.formatSize(dataSize),
diff --git a/app/addons/documents/designdocinfo/components/DesignDocInfo.js
b/app/addons/documents/designdocinfo/components/DesignDocInfo.js
index 70d6050..3c80c94 100644
--- a/app/addons/documents/designdocinfo/components/DesignDocInfo.js
+++ b/app/addons/documents/designdocinfo/components/DesignDocInfo.js
@@ -56,8 +56,9 @@ export default class DesignDocInfo extends React.Component {
return <LoadLines />;
}
const viewIndex = this.props.viewIndex;
- const actualSize = (viewIndex.data_size) ?
viewIndex.data_size.toLocaleString('en') : 0;
- const dataSize = (viewIndex.disk_size) ?
viewIndex.disk_size.toLocaleString('en') : 0;
+ const {sizes} = viewIndex;
+ const actualSize = (sizes.active) ? sizes.active.toLocaleString('en') : 0;
+ const dataSize = (sizes.external) ? sizes.external.toLocaleString('en') :
0;
return (
<div className="metadata-page">
